[richfaces-svn-commits] JBoss Rich Faces SVN: r18691 - in trunk: cdk/parent and 18 other directories.

Author: jbalunas(a)redhat.com Date: 2010-08-16 20:41:59 -0400 (Mon, 16 Aug 2010) New Revision: 18691 Removed: trunk/core/api/checkstyle-suppressions.xml trunk/core/commons/checkstyle-suppressions.xml Modified: trunk/ trunk/cdk/parent/pom.xml trunk/core/api/pom.xml trunk/core/commons/pom.xml trunk/core/impl/checkstyle-suppressions.xml trunk/core/impl/pom.xml trunk/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java trunk/core/impl/src/main/java/org/richfaces/VersionBean.java trunk/core/impl/src/main/java/org/richfaces/application/InitializationListener.java trunk/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java trunk/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java trunk/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java trunk/core/parent/pom.xml trunk/examples/core-demo/pom.xml trunk/examples/iteration-demo/pom.xml trunk/examples/misc-demo/pom.xml trunk/examples/repeater-demo/pom.xml trunk/examples/richfaces-showcase/pom.xml trunk/ui/output/ui/checkstyle-suppressions.xml trunk/ui/output/ui/pom.xml trunk/ui/parent/pom.xml Log: Merged revisions 18679-18680,18685 via svnmerge from https://svn.jboss.org/repos/richfaces/branches/RF-9023 ....... r18679 | jbalunas(a)redhat.com | 2010-08-16 18:07:55 -0400 (Mon, 16 Aug 2010) | 1 line Fixed 33 checkstyle errors after re-initializing checkstyle check in impl ....... r18680 | jbalunas(a)redhat.com | 2010-08-16 18:08:48 -0400 (Mon, 16 Aug 2010) | 1 line RF-9023 & some check style clean up ....... r18685 | jbalunas(a)redhat.com | 2010-08-16 19:33:56 -0400 (Mon, 16 Aug 2010) | 1 line RF-9023 further non-core/ui updates for checkstyle changes ....... Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/RF-9023:1-18668 /branches/RF-9040_build_updated_m2:1-18626 + /branches/RF-9023:1-18690 /branches/RF-9040_build_updated_m2:1-18626 Modified: trunk/cdk/parent/pom.xml =================================================================== --- trunk/cdk/parent/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/cdk/parent/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -114,17 +114,6 @@ <version>1.0.2</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <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.camel</groupId> <artifactId>guice-maven-plugin</artifactId> <version>2.2.0</version> Deleted: trunk/core/api/checkstyle-suppressions.xml =================================================================== --- trunk/core/api/checkstyle-suppressions.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/api/checkstyle-suppressions.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/core/api/pom.xml =================================================================== --- trunk/core/api/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/api/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/core/commons/checkstyle-suppressions.xml =================================================================== --- trunk/core/commons/checkstyle-suppressions.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/commons/checkstyle-suppressions.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/core/commons/pom.xml =================================================================== --- trunk/core/commons/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/commons/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/core/impl/checkstyle-suppressions.xml =================================================================== --- trunk/core/impl/checkstyle-suppressions.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/checkstyle-suppressions.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/core/impl/pom.xml =================================================================== --- trunk/core/impl/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- trunk/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -50,6 +50,16 @@ private List<GeneralCacheAdministrator> cacheAdministrators = new ArrayList<GeneralCacheAdministrator>(1); + public OSCacheCacheFactory() throws ClassNotFoundException { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + if (classLoader == null) { + classLoader = OSCacheCacheFactory.class.getClassLoader(); + } + + //try load cache class to check its presence in classpath + Class.forName(GeneralCacheAdministrator.class.getName(), false, classLoader); + } + private static Properties loadProperties() throws IOException { Properties properties = new Properties(); URL resource = OSCacheCache.class.getResource("oscache.properties"); @@ -71,16 +81,6 @@ return properties; } - - public OSCacheCacheFactory() throws ClassNotFoundException { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if (classLoader == null) { - classLoader = OSCacheCacheFactory.class.getClassLoader(); - } - - //try load cache class to check its presence in classpath - Class.forName(GeneralCacheAdministrator.class.getName(), false, classLoader); - } public Cache createCache(FacesContext facesContext, String cacheName, Map<?, ?> env) { //TODO - handle cache name Modified: trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -30,7 +30,6 @@ import org.ajax4jsf.util.ELUtils; import org.richfaces.application.ServiceTracker; -import org.richfaces.skin.Skin; /** * This class hold all methods for get application init parameters. Created for @@ -39,11 +38,7 @@ * @author asmirnov */ public final class ContextInitParameters { - /** - * - */ - private static final int DEFAULT_TTL = 60 * 60 * 24; - + public static final String[] DATATABLE_USES_VIEW_LOCALE = {"org.richfaces.datatableUsesViewLocale"}; /** @@ -75,6 +70,7 @@ public static final String EXECUTE_AWT_INITIALIZER = "org.richfaces.executeAWTInitializer"; + private static final int DEFAULT_TTL = 60 * 60 * 24; private static final String[] RESOURCES_TTL_ARRAY = { RESOURCES_TTL }; private static final String[] RESOURCES_CACHE_SIZE_ARRAY = { RESOURCES_CACHE_SIZE }; Modified: trunk/core/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -42,8 +42,11 @@ */ public final class VersionBean { + public static final Version VERSION = new Version(); + private static final org.slf4j.Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); + /** * Class for incapsulate version info. * @@ -197,8 +200,6 @@ } } - public static final Version VERSION = new Version(); - public String getVendor() { return VERSION.getImplementationVendor(); } Modified: trunk/core/impl/src/main/java/org/richfaces/application/InitializationListener.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -51,7 +51,8 @@ private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); private static final class AWTInitializer { - + private AWTInitializer() { } + private static boolean checkGetSystemClassLoaderAccess() { try { ClassLoader.getSystemClassLoader(); @@ -130,8 +131,8 @@ ArrayList<Module> modules = new ArrayList<Module>(); modules.add(new DefaultModule()); try { - modules.addAll(ServiceLoader.loadServices(Module.class)); - injector.init(modules); + modules.addAll(ServiceLoader.loadServices(Module.class)); + injector.init(modules); } catch (ServiceException e) { throw new FacesException(e); } Modified: trunk/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -1,7 +1,5 @@ package org.richfaces.application; -import java.util.List; - import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; Modified: trunk/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -40,6 +40,14 @@ private String[] columnClasses = null; + public SequenceRendererHelper(UISequence sequence) { + super(); + this.sequence = sequence; + + this.rowClasses = splitClassesString((String) sequence.getAttributes().get("rowClasses")); + this.columnClasses = splitClassesString((String) sequence.getAttributes().get("columnClasses")); + } + private static String[] splitClassesString(String s) { if (s != null) { return s.split(","); @@ -56,14 +64,6 @@ return null; } - public SequenceRendererHelper(UISequence sequence) { - super(); - this.sequence = sequence; - - this.rowClasses = splitClassesString((String) sequence.getAttributes().get("rowClasses")); - this.columnClasses = splitClassesString((String) sequence.getAttributes().get("columnClasses")); - } - public UISequence getSequence() { return sequence; } Modified: trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -31,11 +31,6 @@ private DefaultResourceCodec defaultResourceCodec; - public DefaultResourceCodecData(DefaultResourceCodec defaultResourceCodec) { - super(); - this.defaultResourceCodec = defaultResourceCodec; - } - private String resourceName; private String libraryName; @@ -52,6 +47,11 @@ //lazy evaluated private Object data = null; + public DefaultResourceCodecData(DefaultResourceCodec defaultResourceCodec) { + super(); + this.defaultResourceCodec = defaultResourceCodec; + } + protected void setResourceName(String resourceName) { this.resourceName = resourceName; } Modified: trunk/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2010-08-17 00:41:59 UTC (rev 18691) @@ -38,40 +38,6 @@ */ final class SkinImpl extends AbstractSkin { - private static class MutableInteger { - private int value; - - public int getAndIncrement() { - return value++; - } - - public int getAndDecrement() { - return value--; - } - } - - private String name; - - private MutableInteger getCounter(FacesContext context) { - Map<Object, Object> attr = context.getAttributes(); - - MutableInteger counter = (MutableInteger) attr.get(MutableInteger.class); - if (counter == null) { - counter = new MutableInteger(); - attr.put(MutableInteger.class, counter); - } - - return counter; - } - - private abstract static class Operation { - - public abstract Object executeLocal(FacesContext facesContext, SkinImpl skin, String name); - - public abstract Object executeBase(FacesContext facesContext, Skin skin, String name); - - } - private static final Operation RESOLVE = new Operation() { public Object executeLocal(FacesContext facesContext, SkinImpl skin, String name) { @@ -114,9 +80,23 @@ } }; - + private final Map<Object, Object> skinParams; - + + private static class MutableInteger { + private int value; + + public int getAndIncrement() { + return value++; + } + + public int getAndDecrement() { + return value--; + } + } + + private String name; + /** * Skin can instantiate only by factory method. * @@ -126,7 +106,27 @@ this.skinParams = properties; this.name = name; } + + private MutableInteger getCounter(FacesContext context) { + Map<Object, Object> attr = context.getAttributes(); + + MutableInteger counter = (MutableInteger) attr.get(MutableInteger.class); + if (counter == null) { + counter = new MutableInteger(); + attr.put(MutableInteger.class, counter); + } + + return counter; + } + + private abstract static class Operation { + + public abstract Object executeLocal(FacesContext facesContext, SkinImpl skin, String name); + public abstract Object executeBase(FacesContext facesContext, Skin skin, String name); + + } + protected Map<Object, Object> getSkinParams() { return skinParams; } Modified: trunk/core/parent/pom.xml =================================================================== --- trunk/core/parent/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/core/parent/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/examples/core-demo/pom.xml =================================================================== --- trunk/examples/core-demo/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/examples/core-demo/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -124,24 +124,6 @@ </dependencies> <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> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> Modified: trunk/examples/iteration-demo/pom.xml =================================================================== --- trunk/examples/iteration-demo/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/examples/iteration-demo/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -141,24 +141,6 @@ </dependencies> <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> <plugin> <groupId>org.apache.maven.plugins</groupId> Modified: trunk/examples/misc-demo/pom.xml =================================================================== --- trunk/examples/misc-demo/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/examples/misc-demo/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -156,24 +156,6 @@ </profiles> <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> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> Modified: trunk/examples/repeater-demo/pom.xml =================================================================== --- trunk/examples/repeater-demo/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/examples/repeater-demo/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -134,24 +134,6 @@ </profiles> <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> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> Modified: trunk/examples/richfaces-showcase/pom.xml =================================================================== --- trunk/examples/richfaces-showcase/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/examples/richfaces-showcase/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -104,22 +104,6 @@ <build> <finalName>richfaces-showcase</finalName> - <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> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> Modified: trunk/ui/output/ui/checkstyle-suppressions.xml =================================================================== --- trunk/ui/output/ui/checkstyle-suppressions.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/ui/output/ui/checkstyle-suppressions.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/ui/output/ui/pom.xml =================================================================== --- trunk/ui/output/ui/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/ui/output/ui/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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: trunk/ui/parent/pom.xml =================================================================== --- trunk/ui/parent/pom.xml 2010-08-17 00:30:13 UTC (rev 18690) +++ trunk/ui/parent/pom.xml 2010-08-17 00:41:59 UTC (rev 18691) @@ -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>