r1528 - in xwiki/trunk: . build-tools/src/main/resources/build-tools core

[Vincent Massol]

Author: vmassol
Date: 2006-11-10 17:50:57 +0100 (Fri, 10 Nov 2006)
New Revision: 1528

Added:
   xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle-suppressions.xml
Modified:
   xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml
   xwiki/trunk/core/pom.xml
   xwiki/trunk/pom.xml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Added a checkstyle suppressions file for better control of what to apply checkstyle on

Added: xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle-suppressions.xml
===================================================================
--- xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle-suppressions.xml	2006-11-09 09:01:03 UTC (rev 1527)
+++ xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle-suppressions.xml	2006-11-10 16:50:57 UTC (rev 1528)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+  <!-- As we're currently in a code style migration we are turning off some checks here. The goal
+       is to reduce this list so that all checks are on . For example to exclude all checks for
+       all Java classes, except the Leftcurly check, you would write:
+
+       <suppress checks="(!?LeftCurly)" files=".*\.java"/>
+
+       To exclude all checks for all classes except for the Api.java class you would write:
+
+       <suppress checks=".*" files="(!?Api.java)"/>
+  -->
+  <suppress checks=".*" files=".*"/>
+</suppressions>


Property changes on: xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle-suppressions.xml
___________________________________________________________________
Name: svn:keywords
   + "Author Date Id Revision"
Name: svn:eol-style
   + native

Modified: xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml
===================================================================
--- xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml	2006-11-09 09:01:03 UTC (rev 1527)
+++ xwiki/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml	2006-11-10 16:50:57 UTC (rev 1528)
@@ -11,6 +11,11 @@
 <!-- Checkstyle properties for XWiki projects -->
 <module name="Checker">
 
+  <!-- Other modules -->
+  <module name="SuppressionFilter">
+    <property name="file" value="${checkstyle.suppressions.file}"/>
+  </module>
+
   <!--
      ======================================================================================
        Checks that do not require a TreeWalker (sorted alphabetically)

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-11-09 09:01:03 UTC (rev 1527)
+++ xwiki/trunk/core/pom.xml	2006-11-10 16:50:57 UTC (rev 1528)
@@ -357,15 +357,9 @@
   <build>
     <plugins>
       <plugin>
-        <!-- Apply the Checkstyle configurations defined in the top level pom.xml file but only for the files
-             that are considered clean. This is because we're in a transition phase to clean all the XWiki source
-             files but this is going to take long and thus we're using a staggered approach. -->
+        <!-- Apply the Checkstyle configurations defined in the top level pom.xml file -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <includes></includes>
-          <excludes>**/*.java</excludes>
-        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: xwiki/trunk/pom.xml
===================================================================
--- xwiki/trunk/pom.xml	2006-11-09 09:01:03 UTC (rev 1527)
+++ xwiki/trunk/pom.xml	2006-11-10 16:50:57 UTC (rev 1528)
@@ -74,6 +74,8 @@
             <consoleOutput>true</consoleOutput>
             <configLocation>build-tools/checkstyle.xml</configLocation>
             <headerLocation>build-tools/checkstyle.license</headerLocation>
+            <suppressionsLocation>build-tools/checkstyle-suppressions.xml</suppressionsLocation>
+            <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
           </configuration>
           <executions>
             <execution>