Author: jbalunas(a)redhat.com Date: 2010-08-16 18:08:48 -0400 (Mon, 16 Aug 2010) New Revision: 18680 Removed: branches/RF-9023/core/api/checkstyle-suppressions.xml branches/RF-9023/core/commons/checkstyle-suppressions.xml Modified: branches/RF-9023/core/api/pom.xml branches/RF-9023/core/commons/pom.xml branches/RF-9023/core/impl/checkstyle-suppressions.xml branches/RF-9023/core/impl/pom.xml branches/RF-9023/core/parent/pom.xml branches/RF-9023/ui/output/ui/checkstyle-suppressions.xml branches/RF-9023/ui/output/ui/pom.xml branches/RF-9023/ui/parent/pom.xml Log: RF-9023 & some check style clean up Deleted: branches/RF-9023/core/api/checkstyle-suppressions.xml =================================================================== --- branches/RF-9023/core/api/checkstyle-suppressions.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/api/checkstyle-suppressions.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -1,32 +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" /> - - <!-- TODO it is hot fix for building process, this files belong to the ui/output/trunk/panela/ui module, - and must be removed from here --> - <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> -</suppressions> Modified: branches/RF-9023/core/api/pom.xml =================================================================== --- branches/RF-9023/core/api/pom.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/api/pom.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -80,15 +80,6 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <!-- Trigger checkstyle checking for this module --> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core... Deleted: branches/RF-9023/core/commons/checkstyle-suppressions.xml =================================================================== --- branches/RF-9023/core/commons/checkstyle-suppressions.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/commons/checkstyle-suppressions.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -1,32 +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" /> - - <!-- TODO it is hot fix for building process, this files belong to the ui/output/trunk/panela/ui module, - and must be removed from here --> - <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> -</suppressions> Modified: branches/RF-9023/core/commons/pom.xml =================================================================== --- branches/RF-9023/core/commons/pom.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/commons/pom.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -55,15 +55,6 @@ <scope>test</scope> </dependency> </dependencies> - - <build> - <plugins> - <!-- Trigger checkstyle checking for this module --> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/comm... Modified: branches/RF-9023/core/impl/checkstyle-suppressions.xml =================================================================== --- branches/RF-9023/core/impl/checkstyle-suppressions.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/impl/checkstyle-suppressions.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -4,6 +4,10 @@ "-//Puppy Crawl//DTD Suppressions 1.0//EN" "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> +<!-- NOTE: Because of issues with maven checkstyle plugin each suppression + file must have all suppressions defined. + + See RF-9077 for details. --> <suppressions> <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" /> <suppress checks="FallThrough" files="JSMin.java" /> @@ -28,5 +32,5 @@ <!-- TODO it is hot fix for building process, this files belong to the ui/output/trunk/panela/ui module, and must be removed from here --> - <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> + <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> </suppressions> Modified: branches/RF-9023/core/impl/pom.xml =================================================================== --- branches/RF-9023/core/impl/pom.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/impl/pom.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -124,8 +124,15 @@ </dependencies> <build> - <plugins> + <plugin> + <!-- Checkstyle only required here because suppressions needed --> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + </configuration> + </plugin> + <!-- TODO Centralize this because calendar and context menu use this too Note: This may be removed by redisgn Modified: branches/RF-9023/core/parent/pom.xml =================================================================== --- branches/RF-9023/core/parent/pom.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/core/parent/pom.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -73,25 +73,13 @@ </dependencyManagement> <build> - <pluginManagement> - <plugins> - <plugin> - <!-- Configure checkstyle report for this module --> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle - </artifactId> - <version>${richfaces.checkstyle.version} - </version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <plugins> + <!-- Trigger checkstyle checking for this module --> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> </build> - <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: branches/RF-9023/ui/output/ui/checkstyle-suppressions.xml =================================================================== --- branches/RF-9023/ui/output/ui/checkstyle-suppressions.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/ui/output/ui/checkstyle-suppressions.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -4,6 +4,33 @@ "-//Puppy Crawl//DTD Suppressions 1.0//EN" "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> +<!-- NOTE: Because of issues with maven checkstyle plugin each suppression + file must have all suppressions defined. + + See RF-9077 for details. --> <suppressions> - <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> + <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" /> + + <!-- TODO it is hot fix for building process, this files belong to the ui/output/trunk/panela/ui module, + and must be removed from here --> + <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> </suppressions> Modified: branches/RF-9023/ui/output/ui/pom.xml =================================================================== --- branches/RF-9023/ui/output/ui/pom.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/ui/output/ui/pom.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -38,6 +38,13 @@ <build> <plugins> <plugin> + <!-- Checkstyle only required here because suppressions needed --> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation> + </configuration> + </plugin> + <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> </plugin> Modified: branches/RF-9023/ui/parent/pom.xml =================================================================== --- branches/RF-9023/ui/parent/pom.xml 2010-08-16 22:07:55 UTC (rev 18679) +++ branches/RF-9023/ui/parent/pom.xml 2010-08-16 22:08:48 UTC (rev 18680) @@ -37,7 +37,6 @@ <packaging>pom</packaging> <properties> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <build> @@ -77,17 +76,10 @@ </pluginManagement> <plugins> + <!-- Trigger checkstyle checking for this module --> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId>