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/14 07:06:29 UTC
svn commit: r1157468 - in /incubator/whirr/trunk: ./ cli/ core/
core/src/main/java/org/apache/whirr/service/ examples/ services/cassandra/
services/cdh/ services/elasticsearch/ services/hadoop/ services/hama/
services/hbase/ services/voldemort/ service...
Author: asavu
Date: Sun Aug 14 05:06:28 2011
New Revision: 1157468
URL: http://svn.apache.org/viewvc?rev=1157468&view=rev
Log:
WHIRR-361. refactor jclouds dependencies (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/BlobStoreContextBuilder.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.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=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Sun Aug 14 05:06:28 2011
@@ -50,6 +50,8 @@ Trunk (unreleased changes)
WHIRR-349. Retry if blobstore put fails (Karel Vervaeke and asavu)
+ WHIRR-361. refactor jclouds dependencies (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=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/cli/pom.xml (original)
+++ incubator/whirr/trunk/cli/pom.xml Sun Aug 14 05:06:28 2011
@@ -75,18 +75,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/core/pom.xml (original)
+++ incubator/whirr/trunk/core/pom.xml Sun Aug 14 05:06:28 2011
@@ -38,20 +38,20 @@
<artifactId>jclouds-compute</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.jclouds.api</groupId>
<artifactId>byon</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-enterprise</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
+ <artifactId>jclouds-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java Sun Aug 14 05:06:28 2011
@@ -21,6 +21,10 @@ package org.apache.whirr.service;
import org.apache.whirr.ClusterSpec;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.BlobStoreContextFactory;
+import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
+import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
+
+import com.google.common.collect.ImmutableSet;
public class BlobStoreContextBuilder {
@@ -31,7 +35,9 @@ public class BlobStoreContextBuilder {
public static BlobStoreContext build(final BlobStoreContextFactory factory,
final ClusterSpec spec) {
return factory.createContext(spec.getBlobStoreProvider(),
- spec.getBlobStoreIdentity(), spec.getBlobStoreCredential());
+ spec.getBlobStoreIdentity(), spec.getBlobStoreCredential(),
+ ImmutableSet.of(new SLF4JLoggingModule(),
+ new EnterpriseConfigurationModule()));
}
}
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=1157468&r1=1157467&r2=1157468&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 14 05:06:28 2011
@@ -39,7 +39,8 @@ import org.jclouds.compute.ComputeServic
import org.jclouds.compute.Utils;
import org.jclouds.domain.Credentials;
import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
-import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.jclouds.enterprise.config.EnterpriseConfigurationModule;
+import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
import org.jclouds.rest.RestContext;
import org.jclouds.sshj.config.SshjSshClientModule;
@@ -71,8 +72,11 @@ public enum ComputeCache implements Func
jcloudsConfig.setProperty("byon.endpoint", jcloudsConfig.getProperty("jclouds.byon.endpoint"));
}
- Set<AbstractModule> wiring = ImmutableSet.of(new SshjSshClientModule(),
- new Log4JLoggingModule(), new BindLoginCredentialsPatchForEC2());
+ Set<AbstractModule> wiring = ImmutableSet.of(
+ new SshjSshClientModule(),
+ new SLF4JLoggingModule(),
+ new EnterpriseConfigurationModule(),
+ new BindLoginCredentialsPatchForEC2());
return new IgnoreCloseComputeServiceContext(factory.createContext(
arg0.provider, arg0.identity, arg0.credential,
Modified: incubator/whirr/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/examples/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/examples/pom.xml (original)
+++ incubator/whirr/trunk/examples/pom.xml Sun Aug 14 05:06:28 2011
@@ -45,18 +45,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Sun Aug 14 05:06:28 2011
@@ -83,7 +83,12 @@
</dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-enterprise</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=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cassandra/pom.xml (original)
+++ incubator/whirr/trunk/services/cassandra/pom.xml Sun Aug 14 05:06:28 2011
@@ -42,22 +42,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/cdh/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cdh/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cdh/pom.xml (original)
+++ incubator/whirr/trunk/services/cdh/pom.xml Sun Aug 14 05:06:28 2011
@@ -64,22 +64,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/elasticsearch/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/elasticsearch/pom.xml (original)
+++ incubator/whirr/trunk/services/elasticsearch/pom.xml Sun Aug 14 05:06:28 2011
@@ -42,22 +42,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/hadoop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/pom.xml (original)
+++ incubator/whirr/trunk/services/hadoop/pom.xml Sun Aug 14 05:06:28 2011
@@ -45,22 +45,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/hama/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hama/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hama/pom.xml (original)
+++ incubator/whirr/trunk/services/hama/pom.xml Sun Aug 14 05:06:28 2011
@@ -68,22 +68,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/pom.xml (original)
+++ incubator/whirr/trunk/services/hbase/pom.xml Sun Aug 14 05:06:28 2011
@@ -56,22 +56,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/voldemort/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/voldemort/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/voldemort/pom.xml (original)
+++ incubator/whirr/trunk/services/voldemort/pom.xml Sun Aug 14 05:06:28 2011
@@ -42,22 +42,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: incubator/whirr/trunk/services/zookeeper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/pom.xml?rev=1157468&r1=1157467&r2=1157468&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/pom.xml (original)
+++ incubator/whirr/trunk/services/zookeeper/pom.xml Sun Aug 14 05:06:28 2011
@@ -42,22 +42,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>