WHIRR-319. Run rat & checkstyle before packaging (tomwhite and asavu)

git-svn-id: https://svn.apache.org/repos/asf/incubator/whirr/trunk@1130219 13f79535-47bb-0310-9956-ffa450edef68

BUILD.txt

@@ -10,7 +10,7 @@ BUILDING
 
 To run unit tests and install artifacts locally:
 
-mvn clean install
+mvn install
 
 To build a source package:
 

CHANGES.txt

@@ -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

build-tools/src/assemble-bin.xml

@@ -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>

build-tools/src/assemble-src.xml

@@ -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>

core/src/main/resources/META-INF/services/org.apache.whirr.ClusterController

@@ -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

core/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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

core/src/test/java/org/apache/whirr/ClusterTest.java

@@ -35,7 +35,7 @@
 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() {

core/src/test/resources/META-INF/services/org.apache.whirr.ClusterController

@@ -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

examples/src/main/java/org/apache/whirr/examples/HadoopClusterExample.java

@@ -47,7 +47,6 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.PrintStream;
 import java.io.Writer;
 import java.util.Map;
 

pom.xml

@@ -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>

services/cassandra/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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

services/elasticsearch/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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

services/hadoop/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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

services/hbase/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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

services/voldemort/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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

services/zookeeper/src/main/resources/META-INF/services/org.apache.whirr.service.ClusterActionHandler

@@ -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