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/06/01 18:47:48 UTC
svn commit: r1130219 - in /incubator/whirr/trunk: ./ build-tools/src/
core/src/main/resources/META-INF/services/
core/src/test/java/org/apache/whirr/
core/src/test/resources/META-INF/services/
examples/src/main/java/org/apache/whirr/examples/ services/...
Author: asavu
Date: Wed Jun 1 16:47:47 2011
New Revision: 1130219
URL: http://svn.apache.org/viewvc?rev=1130219&view=rev
Log:
WHIRR-319. Run rat & checkstyle before packaging (tomwhite and asavu)
Modified:
incubator/whirr/trunk/BUILD.txt
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/build-tools/src/assemble-bin.xml
incubator/whirr/trunk/build-tools/src/assemble-src.xml
incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.ClusterController
incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
incubator/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterTest.java
incubator/whirr/trunk/core/src/test/resources/META-INF/services/org.apache.whirr.ClusterController
incubator/whirr/trunk/examples/src/main/java/org/apache/whirr/examples/HadoopClusterExample.java
incubator/whirr/trunk/pom.xml
incubator/whirr/trunk/services/cassandra/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
incubator/whirr/trunk/services/elasticsearch/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
incubator/whirr/trunk/services/hadoop/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
incubator/whirr/trunk/services/hbase/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
incubator/whirr/trunk/services/voldemort/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
incubator/whirr/trunk/services/zookeeper/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
Modified: incubator/whirr/trunk/BUILD.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/BUILD.txt?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/BUILD.txt (original)
+++ incubator/whirr/trunk/BUILD.txt Wed Jun 1 16:47:47 2011
@@ -10,7 +10,7 @@ BUILDING
To run unit tests and install artifacts locally:
-mvn clean install
+mvn install
To build a source package:
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Wed Jun 1 16:47:47 2011
@@ -6,6 +6,8 @@ Trunk (unreleased changes)
WHIRR-28. Add examples module (asavu)
+ WHIRR-319. Run rat & checkstyle before packaging (tomwhite and asavu)
+
Release 0.5.0 - 2011-05-16
INCOMPATIBLE CHANGES
Modified: incubator/whirr/trunk/build-tools/src/assemble-bin.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/build-tools/src/assemble-bin.xml?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/build-tools/src/assemble-bin.xml (original)
+++ incubator/whirr/trunk/build-tools/src/assemble-bin.xml Wed Jun 1 16:47:47 2011
@@ -44,6 +44,10 @@
<exclude>**/${project.build.directory}/**</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/*.log</exclude>
+ <exclude>**/*.log.*</exclude>
+ <exclude>**/*.rej</exclude>
+ <exclude>**/*.classpath</exclude>
+ <exclude>**/whirr-logo.ai</exclude>
</excludes>
</fileSet>
<fileSet>
Modified: incubator/whirr/trunk/build-tools/src/assemble-src.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/build-tools/src/assemble-src.xml?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/build-tools/src/assemble-src.xml (original)
+++ incubator/whirr/trunk/build-tools/src/assemble-src.xml Wed Jun 1 16:47:47 2011
@@ -21,6 +21,7 @@
<formats>
<format>tar.gz</format>
</formats>
+ <baseDirectory>${project.build.finalName}-src</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
@@ -32,6 +33,10 @@
<exclude>**/${project.build.directory}/**</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/*.log</exclude>
+ <exclude>**/*.log.*</exclude>
+ <exclude>**/*.rej</exclude>
+ <exclude>**/*.classpath</exclude>
+ <exclude>**/whirr-logo.ai</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.ClusterController
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.ClusterController?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.ClusterController (original)
+++ incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.ClusterController Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.ByonClusterController
\ No newline at end of file
Modified: incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/core/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.service.NoopClusterActionHandler
\ No newline at end of file
Modified: incubator/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterTest.java?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterTest.java (original)
+++ incubator/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterTest.java Wed Jun 1 16:47:47 2011
@@ -35,7 +35,7 @@ import static org.junit.Assert.fail;
public class ClusterTest {
private Cluster cluster;
- private final int NUMBER_OF_INSTANCES = 5;
+ private static final int NUMBER_OF_INSTANCES = 5;
@Before
public void setUp() {
Modified: incubator/whirr/trunk/core/src/test/resources/META-INF/services/org.apache.whirr.ClusterController
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/test/resources/META-INF/services/org.apache.whirr.ClusterController?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/test/resources/META-INF/services/org.apache.whirr.ClusterController (original)
+++ incubator/whirr/trunk/core/src/test/resources/META-INF/services/org.apache.whirr.ClusterController Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.ClusterControllerFactoryTest$TestClusterController
\ No newline at end of file
Modified: incubator/whirr/trunk/examples/src/main/java/org/apache/whirr/examples/HadoopClusterExample.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/examples/src/main/java/org/apache/whirr/examples/HadoopClusterExample.java?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/examples/src/main/java/org/apache/whirr/examples/HadoopClusterExample.java (original)
+++ incubator/whirr/trunk/examples/src/main/java/org/apache/whirr/examples/HadoopClusterExample.java Wed Jun 1 16:47:47 2011
@@ -47,7 +47,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.PrintStream;
import java.io.Writer;
import java.util.Map;
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Wed Jun 1 16:47:47 2011
@@ -213,21 +213,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
+ <configLocation>./build-tools/src/main/resources/checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failsOnError>true</failsOnError>
<!-- HBaseServiceController fails checkstyle since Thrift TException cannot be found.
Probably a classpath issue, so until that is fixed, we exclude the class. -->
<excludes>**/org/apache/whirr/service/hbase/integration/HBaseServiceController.java</excludes>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.whirr</groupId>
- <artifactId>whirr-build-tools</artifactId>
- <version>0.6.0-incubating-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -336,25 +338,28 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.6</version>
+ <version>0.7</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludes>
<exclude>**/BUILD.txt</exclude>
<exclude>**/CHANGES.txt</exclude>
- <exclude>**/DISCLAIMER.txt</exclude>
<exclude>**/NOTICE-src.txt</exclude>
- <exclude>**/.svn/**</exclude>
<exclude>.git/**</exclude>
<exclude>.gitignore</exclude>
<exclude>**/*.json</exclude>
<exclude>**/*.confluence</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/META-INF/services/*</exclude>
- <exclude>**/target/**</exclude>
- <exclude>lib/*LICENSE*</exclude>
<exclude>**/src/main/resources/version-banner.txt</exclude>
<exclude>docs/**</exclude>
- <exclude>**/*.log</exclude>
+ <exclude>**/*.log*</exclude>
+ <exclude>src/site/resources/images/whirr-logo.ai</exclude> <!-- binary -->
</excludes>
</configuration>
</plugin>
@@ -393,9 +398,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
- <configLocation>checkstyle.xml</configLocation>
+ <configLocation>./build-tools/src/main/resources/checkstyle.xml</configLocation>
</configuration>
</plugin>
<plugin>
Modified: incubator/whirr/trunk/services/cassandra/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cassandra/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cassandra/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/services/cassandra/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.service.cassandra.CassandraClusterActionHandler
\ No newline at end of file
Modified: incubator/whirr/trunk/services/elasticsearch/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/elasticsearch/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/services/elasticsearch/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/services/elasticsearch/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.service.elasticsearch.ElasticSearchHandler
\ No newline at end of file
Modified: incubator/whirr/trunk/services/hadoop/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1,3 +1,14 @@
+# Licensed 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.
org.apache.whirr.service.hadoop.HadoopNameNodeClusterActionHandler
org.apache.whirr.service.hadoop.HadoopDataNodeClusterActionHandler
org.apache.whirr.service.hadoop.HadoopJobTrackerClusterActionHandler
Modified: incubator/whirr/trunk/services/hbase/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/services/hbase/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1,3 +1,14 @@
+# Licensed 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.
org.apache.whirr.service.hbase.HBaseMasterClusterActionHandler
org.apache.whirr.service.hbase.HBaseRegionServerClusterActionHandler
org.apache.whirr.service.hbase.HBaseRestServerClusterActionHandler
Modified: incubator/whirr/trunk/services/voldemort/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/voldemort/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/services/voldemort/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/services/voldemort/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.service.voldemort.VoldemortClusterActionHandler
Modified: incubator/whirr/trunk/services/zookeeper/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler?rev=1130219&r1=1130218&r2=1130219&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler (original)
+++ incubator/whirr/trunk/services/zookeeper/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler Wed Jun 1 16:47:47 2011
@@ -1 +1,12 @@
+# Licensed 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.
org.apache.whirr.service.zookeeper.ZooKeeperClusterActionHandler
\ No newline at end of file