You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2010/09/20 18:59:04 UTC
svn commit: r999008 - in /incubator/whirr/trunk: ./
cli/src/test/java/org/apache/whirr/cli/command/
core/src/main/java/org/apache/whirr/service/
services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/
services/hadoop/src/test/j...
Author: tomwhite
Date: Mon Sep 20 16:59:04 2010
New Revision: 999008
URL: http://svn.apache.org/viewvc?rev=999008&view=rev
Log:
WHIRR-93. Fail on checkstyle violation.
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/LaunchClusterCommandTest.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
incubator/whirr/trunk/pom.xml
incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java
incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java
incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Sep 20 16:59:04 2010
@@ -6,6 +6,10 @@ Trunk (unreleased changes)
WHIRR-89. Support maven 3 builds. (Adrian Cole via tomwhite)
+ BUG FIXES
+
+ WHIRR-93. Fail on checkstyle violation. (tomwhite)
+
Release 0.1.0 - 2010-09-02
INCOMPATIBLE CHANGES
Modified: incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/LaunchClusterCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/LaunchClusterCommandTest.java?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/LaunchClusterCommandTest.java (original)
+++ incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/LaunchClusterCommandTest.java Mon Sep 20 16:59:04 2010
@@ -18,7 +18,6 @@
package org.apache.whirr.cli.command;
-import static org.apache.whirr.service.ClusterSpec.Property.INSTANCE_TEMPLATES;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -28,7 +27,6 @@ import static org.mockito.Mockito.verify
import static org.mockito.Mockito.when;
import com.google.common.collect.Sets;
-import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
import com.google.inject.internal.Lists;
@@ -37,8 +35,6 @@ import java.io.File;
import java.io.PrintStream;
import java.util.Collections;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.whirr.service.Cluster;
import org.apache.whirr.service.ClusterSpec;
import org.apache.whirr.service.Service;
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java Mon Sep 20 16:59:04 2010
@@ -24,11 +24,9 @@ import static org.jclouds.http.Payloads.
import static org.jclouds.http.Payloads.newFilePayload;
import static org.jclouds.util.Utils.toStringAndClose;
-import com.google.common.base.Charsets;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Mon Sep 20 16:59:04 2010
@@ -153,6 +153,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
+ <configuration>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <failsOnError>true</failsOnError>
+ <excludes>**/org/jclouds/aws/ec2/compute/functions/RunningInstanceToNodeMetadata.java</excludes>
+ </configuration>
<dependencies>
<dependency>
<groupId>org.apache.whirr</groupId>
Modified: incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java (original)
+++ incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java Mon Sep 20 16:59:04 2010
@@ -30,7 +30,6 @@ import java.util.Set;
import org.apache.cassandra.thrift.Cassandra;
import org.apache.cassandra.thrift.TokenRange;
import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.thrift.TException;
Modified: incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java Mon Sep 20 16:59:04 2010
@@ -127,11 +127,11 @@ public class HadoopServiceTest {
ClusterStatus clusterStatus = client.getClusterStatus();
int taskTrackerCount = clusterStatus.getTaskTrackers();
if (taskTrackerCount > 0) {
- break;
+ break;
}
try {
- System.out.print(".");
- Thread.sleep(1000);
+ System.out.print(".");
+ Thread.sleep(1000);
} catch (InterruptedException e) {
break;
}
Modified: incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java?rev=999008&r1=999007&r2=999008&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java (original)
+++ incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java Mon Sep 20 16:59:04 2010
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.whirr.service.ClusterSpec;
@@ -73,25 +72,25 @@ public class ZooKeeperServiceTest {
private CountDownLatch latch = new CountDownLatch(1);
public void connect(String hosts) throws IOException, InterruptedException {
- zk = new ZooKeeper(hosts, 5000, this);
- latch.await();
+ zk = new ZooKeeper(hosts, 5000, this);
+ latch.await();
}
public ZooKeeper getZooKeeper() {
- return zk;
+ return zk;
}
@Override
public void process(WatchedEvent event) {
- if (event.getState() == KeeperState.SyncConnected) {
- latch.countDown();
- }
+ if (event.getState() == KeeperState.SyncConnected) {
+ latch.countDown();
+ }
}
public void close() throws InterruptedException {
- if (zk != null) {
- zk.close();
- }
+ if (zk != null) {
+ zk.close();
+ }
}
}