5:53 p.m.
Author: jbalunas(a)redhat.com
Date: 2010-05-12 18:53:13 -0400 (Wed, 12 May 2010)
New Revision: 17011
Added:
root/core/trunk/checkstyle-suppressions.xml
Removed:
root/core/trunk/impl/checkstyle-suppressions.xml
Modified:
root/core/trunk/api/pom.xml
root/core/trunk/impl/pom.xml
root/core/trunk/parent/pom.xml
Log:
Fix checkstyle settings for the core module
Modified: root/core/trunk/api/pom.xml
===================================================================
--- root/core/trunk/api/pom.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/api/pom.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -86,4 +86,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <!-- Trigger checkstyle for this build -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Added: root/core/trunk/checkstyle-suppressions.xml
===================================================================
--- root/core/trunk/checkstyle-suppressions.xml (rev 0)
+++ root/core/trunk/checkstyle-suppressions.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="DoubleCheckedLocking"
files="MultipartRequestRegistry.java" />
+ <suppress checks="FallThrough" files="JSMin.java" />
+ <suppress checks="IllegalCatch" files="UISwitchablePanel.java"
/>
+ <suppress checks="ModifiedControlVariable"
files="MultipartRequest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java"
/>
+ <suppress checks="IllegalCatch"
files="PartialViewContextImpl.java" />
+ <suppress checks="FallThrough" files="StagingServer.java"
/>
+ <suppress checks="ModifiedControlVariable" files="Cookie.java"
/>
+ <suppress checks="IllegalCatch" files="CacheManager.java"
/>
+ <suppress checks="MissingSwitchDefault"
files="JSONTokener.java" />
+ <suppress checks="IllegalCatch" files="AjaxViewRoot.java"
/>
+ <suppress checks="FallThrough" files="XMLTokener.java" />
+ <suppress checks="IllegalCatch"
files="ResourceHandlerImpl.java" />
+ <suppress checks="IllegalThrows"
files="AbstractThreadedTest.java" />
+ <suppress checks="ModifiedControlVariable"
files="URLCodec.java" />
+
+ <!-- TODO it is hot fix for building process, this files belong to the test-base
module,
+ and must be removed from here -->
+ <suppress checks="IllegalCatch"
files="AbstractThreadedTest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java"
/>
+</suppressions>
Deleted: root/core/trunk/impl/checkstyle-suppressions.xml
===================================================================
--- root/core/trunk/impl/checkstyle-suppressions.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/impl/checkstyle-suppressions.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<suppressions>
- <suppress checks="DoubleCheckedLocking"
files="MultipartRequestRegistry.java" />
- <suppress checks="FallThrough" files="JSMin.java" />
- <suppress checks="IllegalCatch" files="UISwitchablePanel.java"
/>
- <suppress checks="ModifiedControlVariable"
files="MultipartRequest.java" />
- <suppress checks="IllegalCatch" files="StagingServer.java"
/>
- <suppress checks="IllegalCatch"
files="PartialViewContextImpl.java" />
- <suppress checks="FallThrough" files="StagingServer.java"
/>
- <suppress checks="ModifiedControlVariable" files="Cookie.java"
/>
- <suppress checks="IllegalCatch" files="CacheManager.java"
/>
- <suppress checks="MissingSwitchDefault"
files="JSONTokener.java" />
- <suppress checks="IllegalCatch" files="AjaxViewRoot.java"
/>
- <suppress checks="FallThrough" files="XMLTokener.java" />
- <suppress checks="IllegalCatch"
files="ResourceHandlerImpl.java" />
- <suppress checks="IllegalThrows"
files="AbstractThreadedTest.java" />
- <suppress checks="ModifiedControlVariable"
files="URLCodec.java" />
-
- <!-- TODO it is hot fix for building process, this files belong to the test-base
module,
- and must be removed from here -->
- <suppress checks="IllegalCatch"
files="AbstractThreadedTest.java" />
- <suppress checks="IllegalCatch" files="StagingServer.java"
/>
-</suppressions>
Modified: root/core/trunk/impl/pom.xml
===================================================================
--- root/core/trunk/impl/pom.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/impl/pom.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -141,9 +141,20 @@
<directory>target/javascript</directory>
</resource>
</resources>
-
+
<plugins>
+ <!-- Trigger checkstyle for this build -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+
+ <!--
+ TODO Centralize this because calendar and context menu
+ use this too
+ -->
+ <!-- Note: This may be removed by redisgn -->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<executions>
@@ -154,9 +165,29 @@
</execution>
</executions>
</plugin>
-
- <!-- The following plugins are specific to impl, and create, process, and
document JavaScript resources -->
+
+ <!--
+ TODO should be in profile not here. The path in profile
+ is correct
+ -->
<plugin>
+ <!-- Configure js documentation plugin -->
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ <configuration>
+
<jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir>
+ <includes>**/*.js</includes>
+ <caseSensitive>true</caseSensitive>
+ </configuration>
+ </plugin>
+
+ <!--
+ The following 2 plugins are specific to impl, and
+ create, process, and document JavaScript resources NOTE:
+ these are legacy and they and the resources they
+ reference can be removed
+ -->
+ <plugin>
<!-- Configure ant scripts to generate javascript -->
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -243,16 +274,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- Configure js documentation plugin -->
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <configuration>
-
<jsDir>${basedir}/src/main/resources/Meta-inf/resources</jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -280,7 +301,12 @@
</executions>
</plugin>
<plugin>
- <!-- Configure JavaScript Doc Tool -->
+ <!--
+ TODO - this can go to central, but should
+ check settings. This is also related to docs
+ so perhaps add to a doc profile Configure
+ JavaScript Doc Tool
+ -->
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>maven-jstools-plugin</artifactId>
<executions>
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-12 22:47:44 UTC (rev 17010)
+++ root/core/trunk/parent/pom.xml 2010-05-12 22:53:13 UTC (rev 17011)
@@ -38,6 +38,7 @@
<properties>
<richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
+
<richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version>
</properties>
<dependencyManagement>
@@ -78,4 +79,27 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <!-- Configure checkstyle plugin for commons -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>checkstyle</artifactId>
+
<version>${richfaces.checkstyle.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+
<configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
+
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
\ No newline at end of file