Author: asavu
Date: Mon Oct 24 18:39:50 2011
New Revision: 1188281
URL: http://svn.apache.org/viewvc?rev=1188281&view=rev
Log:
WHIRR-400. Upgrade to jclouds 1.2.1 (Adrian Cole and asavu)
Removed:
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/CreateFileStatement.java
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/SaveHttpResponseTo.java
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/src/main/java/org/apache/whirr/RolePredicates.java
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ConfigureClusterAction.java
whirr/trunk/core/src/main/java/org/apache/whirr/service/FirewallManager.java
whirr/trunk/core/src/main/java/org/apache/whirr/util/BlobCache.java
whirr/trunk/pom.xml
whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/statements/InstallModuleFromGit.java
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Mon Oct 24 18:39:50 2011
@@ -46,6 +46,8 @@ Trunk (unreleased changes)
WHIRR-342. hadoop/hbase configuration & active roles on a node (kve via
asavu)
+ WHIRR-400. Upgrade to jclouds 1.2.1 (Adrian Cole and asavu)
+
BUG FIXES
WHIRR-377. Fix broken CLI logging config. (asavu via tomwhite)
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/RolePredicates.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/RolePredicates.java?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/RolePredicates.java
(original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/RolePredicates.java Mon Oct
24 18:39:50 2011
@@ -18,15 +18,14 @@
package org.apache.whirr;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Sets;
-
import java.util.Collections;
import java.util.Set;
import org.apache.whirr.Cluster.Instance;
+import org.jclouds.javax.annotation.Nullable;
-import javax.annotation.Nullable;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Sets;
/**
* {@link Predicate}s for matching {@link Instance}s with certain cluster
roles.
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ConfigureClusterAction.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/actions/ConfigureClusterAction.java?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
---
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ConfigureClusterAction.java
(original)
+++
whirr/trunk/core/src/main/java/org/apache/whirr/actions/ConfigureClusterAction.java
Mon Oct 24 18:39:50 2011
@@ -18,17 +18,26 @@
package org.apache.whirr.actions;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Ints;
+import static org.apache.whirr.RolePredicates.onlyRolesIn;
+import static
org.jclouds.compute.options.RunScriptOptions.Builder.overrideCredentialsWith;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
import org.apache.whirr.Cluster;
-import org.apache.whirr.Cluster.Instance;
import org.apache.whirr.ClusterSpec;
import org.apache.whirr.InstanceTemplate;
import org.apache.whirr.RolePredicates;
+import org.apache.whirr.Cluster.Instance;
import org.apache.whirr.service.ClusterActionEvent;
import org.apache.whirr.service.ClusterActionHandler;
import org.apache.whirr.service.FirewallManager.Rule;
@@ -37,26 +46,18 @@ import org.jclouds.compute.ComputeServic
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.domain.Credentials;
+import org.jclouds.javax.annotation.Nullable;
import org.jclouds.scriptbuilder.domain.OsFamily;
import org.jclouds.scriptbuilder.domain.Statement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import static org.apache.whirr.RolePredicates.onlyRolesIn;
-import static
org.jclouds.compute.options.RunScriptOptions.Builder.overrideCredentialsWith;
+import com.google.common.base.Function;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.google.common.primitives.Ints;
/**
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/service/FirewallManager.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/FirewallManager.java?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
---
whirr/trunk/core/src/main/java/org/apache/whirr/service/FirewallManager.java
(original)
+++
whirr/trunk/core/src/main/java/org/apache/whirr/service/FirewallManager.java
Mon Oct 24 18:39:50 2011
@@ -23,22 +23,21 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
import org.apache.whirr.Cluster;
-import org.apache.whirr.Cluster.Instance;
import org.apache.whirr.ClusterSpec;
+import org.apache.whirr.Cluster.Instance;
import org.apache.whirr.service.jclouds.FirewallSettings;
import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Function;
import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import javax.annotation.Nullable;
-
public class FirewallManager {
public static class Rule {
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/util/BlobCache.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/util/BlobCache.java?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/util/BlobCache.java
(original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/util/BlobCache.java Mon Oct
24 18:39:50 2011
@@ -18,31 +18,30 @@
package org.apache.whirr.util;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.Set;
-
+import com.google.common.base.Function;
+import com.google.common.collect.Maps;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.whirr.ClusterSpec;
import org.apache.whirr.service.BlobStoreContextBuilder;
-import org.apache.whirr.service.jclouds.SaveHttpResponseTo;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.domain.Location;
import org.jclouds.http.HttpRequest;
+import org.jclouds.scriptbuilder.domain.SaveHttpResponseTo;
import org.jclouds.scriptbuilder.domain.Statement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Function;
-import com.google.common.collect.Maps;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.Set;
import static org.jclouds.blobstore.options.PutOptions.Builder.multipart;
Modified: whirr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
--- whirr/trunk/pom.xml (original)
+++ whirr/trunk/pom.xml Mon Oct 24 18:39:50 2011
@@ -53,7 +53,7 @@
</modules>
<properties>
- <jclouds.version>1.1.1</jclouds.version>
+ <jclouds.version>1.2.1</jclouds.version>
</properties>
<dependencyManagement>
@@ -61,7 +61,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>r09</version>
+ <version>10.0.1</version>
</dependency>
<dependency>
<groupId>ca.juliusdavies</groupId>
Modified:
whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
---
whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
(original)
+++
whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
Mon Oct 24 18:39:50 2011
@@ -20,16 +20,16 @@ package org.apache.whirr.service.hadoop;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
-
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
-import org.apache.whirr.service.jclouds.CreateFileStatement;
import org.jclouds.scriptbuilder.domain.Statement;
+import java.util.Iterator;
+import java.util.List;
+
+import static
org.jclouds.scriptbuilder.domain.Statements.createOrOverwriteFile;
+
/**
* Helper class to convert between Hadoop configuration representations.
*/
@@ -66,7 +66,7 @@ public class HadoopConfigurationConverte
public static Statement asCreateXmlConfigurationFileStatement(String path,
Configuration hadoopConfig) {
- return new CreateFileStatement(path,
asXmlConfigurationLines(hadoopConfig));
+ return createOrOverwriteFile(path, asXmlConfigurationLines(hadoopConfig));
}
@VisibleForTesting
@@ -93,7 +93,7 @@ public class HadoopConfigurationConverte
public static Statement asCreateEnvironmentVariablesFileStatement(String
path,
Configuration config) {
- return new CreateFileStatement(path, asEnvironmentVariablesLines(config));
+ return createOrOverwriteFile(path, asEnvironmentVariablesLines(config));
}
}
Modified:
whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/statements/InstallModuleFromGit.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/statements/InstallModuleFromGit.java?rev=1188281&r1=1188280&r2=1188281&view=diff
==============================================================================
---
whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/statements/InstallModuleFromGit.java
(original)
+++
whirr/trunk/services/puppet/src/main/java/org/apache/whirr/service/puppet/statements/InstallModuleFromGit.java
Mon Oct 24 18:39:50 2011
@@ -26,8 +26,7 @@ import static org.jclouds.scriptbuilder.
import java.net.URI;
-import javax.annotation.Nullable;
-
+import org.jclouds.javax.annotation.Nullable;
import org.jclouds.scriptbuilder.domain.OsFamily;
import org.jclouds.scriptbuilder.domain.Statement;
