You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2011/08/07 22:32:55 UTC
svn commit: r1154760 - in /incubator/whirr/trunk: ./ cli/ core/
core/src/main/java/org/apache/whirr/service/
core/src/test/java/org/apache/whirr/actions/ examples/ services/cassandra/
services/cdh/ services/elasticsearch/ services/hadoop/ services/hama...
Author: asavu
Date: Sun Aug 7 20:32:54 2011
New Revision: 1154760
URL: http://svn.apache.org/viewvc?rev=1154760&view=rev
Log:
WHIRR-354. Upgrade to jclouds 1.1.0 (Adrian Cole via asavu)
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/cli/pom.xml
incubator/whirr/trunk/core/pom.xml
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java
incubator/whirr/trunk/examples/pom.xml
incubator/whirr/trunk/pom.xml
incubator/whirr/trunk/services/cassandra/pom.xml
incubator/whirr/trunk/services/cdh/pom.xml
incubator/whirr/trunk/services/elasticsearch/pom.xml
incubator/whirr/trunk/services/hadoop/pom.xml
incubator/whirr/trunk/services/hama/pom.xml
incubator/whirr/trunk/services/hbase/pom.xml
incubator/whirr/trunk/services/voldemort/pom.xml
incubator/whirr/trunk/services/zookeeper/pom.xml
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Sun Aug 7 20:32:54 2011
@@ -41,6 +41,8 @@ Trunk (unreleased changes)
WHIRR-350. Update Hama service to 0.3 version (Edward J. Yoon via asavu)
+ WHIRR-354. Upgrade to jclouds 1.1.0 (Adrian Cole via asavu)
+
BUG FIXES
WHIRR-315. Temporary override Providers#withIds until jclouds
Modified: incubator/whirr/trunk/cli/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/cli/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/cli/pom.xml (original)
+++ incubator/whirr/trunk/cli/pom.xml Sun Aug 7 20:32:54 2011
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/core/pom.xml (original)
+++ incubator/whirr/trunk/core/pom.xml Sun Aug 7 20:32:54 2011
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java Sun Aug 7 20:32:54 2011
@@ -41,7 +41,7 @@ import org.jclouds.domain.Credentials;
import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
import org.jclouds.rest.RestContext;
-import org.jclouds.ssh.jsch.config.JschSshClientModule;
+import org.jclouds.sshj.config.SshjSshClientModule;
/**
* A convenience class for building jclouds {@link ComputeServiceContext} objects.
@@ -71,7 +71,7 @@ public enum ComputeCache implements Func
jcloudsConfig.setProperty("byon.endpoint", jcloudsConfig.getProperty("jclouds.byon.endpoint"));
}
- Set<AbstractModule> wiring = ImmutableSet.of(new JschSshClientModule(),
+ Set<AbstractModule> wiring = ImmutableSet.of(new SshjSshClientModule(),
new Log4JLoggingModule(), new BindLoginCredentialsPatchForEC2());
return new IgnoreCloseComputeServiceContext(factory.createContext(
Modified: incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java (original)
+++ incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java Sun Aug 7 20:32:54 2011
@@ -294,7 +294,7 @@ public class BootstrapClusterActionTest
"ec2", "" + roles + id, "nodeId" + id + i,
location, new URI("http://node" + i),
userMetadata, ImmutableSet.<String>of(), null, null, null, null, NodeState.RUNNING, 22,
- addresses, addresses, null, loginCredentials);
+ addresses, addresses, null, loginCredentials, "hostname");
if (i < only) {
nodes.add(nodeMeta);
LOG.info("{} - Node successfully started: {}", roles, nodeMeta.getId());
Modified: incubator/whirr/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/examples/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/examples/pom.xml (original)
+++ incubator/whirr/trunk/examples/pom.xml Sun Aug 7 20:32:54 2011
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Sun Aug 7 20:32:54 2011
@@ -51,7 +51,7 @@
</modules>
<properties>
- <jclouds.version>1.0.0</jclouds.version>
+ <jclouds.version>1.1.0</jclouds.version>
</properties>
<dependencyManagement>
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency>
Modified: incubator/whirr/trunk/services/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cassandra/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cassandra/pom.xml (original)
+++ incubator/whirr/trunk/services/cassandra/pom.xml Sun Aug 7 20:32:54 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/cdh/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cdh/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cdh/pom.xml (original)
+++ incubator/whirr/trunk/services/cdh/pom.xml Sun Aug 7 20:32:54 2011
@@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/elasticsearch/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/elasticsearch/pom.xml (original)
+++ incubator/whirr/trunk/services/elasticsearch/pom.xml Sun Aug 7 20:32:54 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/hadoop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/pom.xml (original)
+++ incubator/whirr/trunk/services/hadoop/pom.xml Sun Aug 7 20:32:54 2011
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/hama/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hama/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hama/pom.xml (original)
+++ incubator/whirr/trunk/services/hama/pom.xml Sun Aug 7 20:32:54 2011
@@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/pom.xml (original)
+++ incubator/whirr/trunk/services/hbase/pom.xml Sun Aug 7 20:32:54 2011
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/voldemort/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/voldemort/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/voldemort/pom.xml (original)
+++ incubator/whirr/trunk/services/voldemort/pom.xml Sun Aug 7 20:32:54 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
Modified: incubator/whirr/trunk/services/zookeeper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/pom.xml?rev=1154760&r1=1154759&r2=1154760&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/pom.xml (original)
+++ incubator/whirr/trunk/services/zookeeper/pom.xml Sun Aug 7 20:32:54 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-jsch</artifactId>
+ <artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>