[richfaces-svn-commits] JBoss Rich Faces SVN: r18716 - in branches/cdk-8570: archetypes/richfaces-component and 56 other directories.

Author: alexsmirnov Date: 2010-08-17 11:26:45 -0400 (Tue, 17 Aug 2010) New Revision: 18716 Added: branches/cdk-8570/archetypes/richfaces-component-short/assembler.xml branches/cdk-8570/archetypes/richfaces-component-short/readme.txt branches/cdk-8570/archetypes/richfaces-component/assembler.xml branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml Removed: branches/cdk-8570/core/api/checkstyle-suppressions.xml branches/cdk-8570/core/commons/checkstyle-suppressions.xml Modified: branches/cdk-8570/ branches/cdk-8570/cdk/parent/pom.xml branches/cdk-8570/core/api/pom.xml branches/cdk-8570/core/commons/pom.xml branches/cdk-8570/core/impl/checkstyle-suppressions.xml branches/cdk-8570/core/impl/pom.xml branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java branches/cdk-8570/core/impl/src/main/java/org/richfaces/VersionBean.java branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/InitializationListener.java branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java branches/cdk-8570/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java branches/cdk-8570/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java branches/cdk-8570/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java branches/cdk-8570/core/parent/pom.xml branches/cdk-8570/examples/core-demo/pom.xml branches/cdk-8570/examples/input-demo/pom.xml branches/cdk-8570/examples/iteration-demo/pom.xml branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataGrid.xhtml branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataTable.xhtml branches/cdk-8570/examples/iteration-demo/src/main/webapp/extendedtable.xhtml branches/cdk-8570/examples/iteration-demo/src/main/webapp/index.xhtml branches/cdk-8570/examples/misc-demo/pom.xml branches/cdk-8570/examples/output-demo/pom.xml branches/cdk-8570/examples/repeater-demo/pom.xml branches/cdk-8570/examples/richfaces-showcase/pom.xml branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java branches/cdk-8570/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/samples/simple-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/simple.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml branches/cdk-8570/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java branches/cdk-8570/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java branches/cdk-8570/ui/dist/richfaces-components-api/pom.xml branches/cdk-8570/ui/dist/richfaces-components-ui/pom.xml branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractColumn.java branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss branches/cdk-8570/ui/output/ui/checkstyle-suppressions.xml branches/cdk-8570/ui/output/ui/pom.xml branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java branches/cdk-8570/ui/parent/pom.xml Log: Merged revisions 18690-18693,18696-18698,18700-18702,18704-18715 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk ............... r18690 | jbalunas(a)redhat.com | 2010-08-16 17:30:13 -0700 (Mon, 16 Aug 2010) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-18668" from https://svn.jboss.org/repos/richfaces/branches/RF-9023 ............... r18691 | jbalunas(a)redhat.com | 2010-08-16 17:41:59 -0700 (Mon, 16 Aug 2010) | 17 lines 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 ........ ............... r18692 | jbalunas(a)redhat.com | 2010-08-16 18:33:24 -0700 (Mon, 16 Aug 2010) | 1 line Updated to latest parent snapshot ............... r18693 | jbalunas(a)redhat.com | 2010-08-16 18:41:02 -0700 (Mon, 16 Aug 2010) | 1 line Updated input demo to latest parent ............... r18696 | ilya_shaikovsky | 2010-08-17 00:29:01 -0700 (Tue, 17 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-9080 -adjustments after component refactoring. ............... r18697 | ilya_shaikovsky | 2010-08-17 01:11:30 -0700 (Tue, 17 Aug 2010) | 1 line </a4j:outputPanel> ............... r18698 | ilya_shaikovsky | 2010-08-17 01:23:51 -0700 (Tue, 17 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-8794 ............... r18700 | abelevich | 2010-08-17 03:21:07 -0700 (Tue, 17 Aug 2010) | 1 line fix ClassCastException when rowspan or colspan is used ............... r18701 | Alex.Kolonitsky | 2010-08-17 04:12:56 -0700 (Tue, 17 Aug 2010) | 1 line fix build checkstyle problem ............... r18702 | Alex.Kolonitsky | 2010-08-17 04:21:01 -0700 (Tue, 17 Aug 2010) | 1 line RF-9015 ............... r18704 | ilya_shaikovsky | 2010-08-17 05:14:49 -0700 (Tue, 17 Aug 2010) | 2 lines https://jira.jboss.org/browse/RF-9086 https://jira.jboss.org/browse/RF-9047 ............... r18705 | Alex.Kolonitsky | 2010-08-17 06:16:12 -0700 (Tue, 17 Aug 2010) | 1 line revert previous change ............... r18706 | abelevich | 2010-08-17 06:34:21 -0700 (Tue, 17 Aug 2010) | 1 line add link to DataGrid sample, fix extendedDataTable sample, add datascroller component to the dataGrid, extendedDataTable samples ............... r18707 | abelevich | 2010-08-17 06:38:49 -0700 (Tue, 17 Aug 2010) | 1 line add dataTablePreRenderListener registration, fix selection clientBehavior ............... r18708 | abelevich | 2010-08-17 06:40:59 -0700 (Tue, 17 Aug 2010) | 1 line ............... r18709 | nbelaevski | 2010-08-17 06:41:49 -0700 (Tue, 17 Aug 2010) | 1 line Bad path in extendedDataTable.ecss fixed ............... r18710 | ilya_shaikovsky | 2010-08-17 07:57:20 -0700 (Tue, 17 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-9092 ............... r18711 | nbelaevski | 2010-08-17 08:01:52 -0700 (Tue, 17 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-8945 ............... r18712 | Alex.Kolonitsky | 2010-08-17 08:03:04 -0700 (Tue, 17 Aug 2010) | 1 line fix dist ............... r18713 | nbelaevski | 2010-08-17 08:05:53 -0700 (Tue, 17 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-9025 ............... r18714 | ilya_shaikovsky | 2010-08-17 08:11:57 -0700 (Tue, 17 Aug 2010) | 1 line new items markers in case of just new samples. ............... r18715 | Alex.Kolonitsky | 2010-08-17 08:12:02 -0700 (Tue, 17 Aug 2010) | 1 line fix dist ............... Property changes on: branches/cdk-8570 ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-18684 + /trunk:1-18715 Copied: branches/cdk-8570/archetypes/richfaces-component/assembler.xml (from rev 18715, trunk/archetypes/richfaces-component/assembler.xml) =================================================================== --- branches/cdk-8570/archetypes/richfaces-component/assembler.xml (rev 0) +++ branches/cdk-8570/archetypes/richfaces-component/assembler.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,22 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <formats> + <format>dir</format> + </formats> + + <files> + <file> + <source>pom.xml</source> + </file> + <file> + <source>readme.txt</source> + </file> + </files> + + <fileSets> + <fileSet> + <directory>src</directory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Copied: branches/cdk-8570/archetypes/richfaces-component-short/assembler.xml (from rev 18715, trunk/archetypes/richfaces-component-short/assembler.xml) =================================================================== --- branches/cdk-8570/archetypes/richfaces-component-short/assembler.xml (rev 0) +++ branches/cdk-8570/archetypes/richfaces-component-short/assembler.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,22 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <formats> + <format>dir</format> + </formats> + + <files> + <file> + <source>pom.xml</source> + </file> + <file> + <source>readme.txt</source> + </file> + </files> + + <fileSets> + <fileSet> + <directory>src</directory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Copied: branches/cdk-8570/archetypes/richfaces-component-short/readme.txt (from rev 18715, trunk/archetypes/richfaces-component-short/readme.txt) =================================================================== --- branches/cdk-8570/archetypes/richfaces-component-short/readme.txt (rev 0) +++ branches/cdk-8570/archetypes/richfaces-component-short/readme.txt 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,22 @@ +RichFaces 4 Archetype + +This archetype creates a folder/pom.xml structure for component (like in tables) + +/<artifact-id> + src/main/java + pom.xml + +To generate a project from the archetype, run + +mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes -DarchetypeArtifactId=richfaces-component + -Dcategory=<version> -Dname=<name> + +in such case will be created artifacts with: + category : <category> + name : <name> + groupId : org.richfaces.ui.<category> + artifact : <category>-<name> + version : 4.0.0-SNAPSHOT + +TODO link to wiki page +TODO example with panels \ No newline at end of file Modified: branches/cdk-8570/cdk/parent/pom.xml =================================================================== --- branches/cdk-8570/cdk/parent/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/cdk/parent/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/api/checkstyle-suppressions.xml =================================================================== --- branches/cdk-8570/core/api/checkstyle-suppressions.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/api/checkstyle-suppressions.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/core/api/pom.xml =================================================================== --- branches/cdk-8570/core/api/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/api/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/core/commons/checkstyle-suppressions.xml =================================================================== --- branches/cdk-8570/core/commons/checkstyle-suppressions.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/commons/checkstyle-suppressions.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/core/commons/pom.xml =================================================================== --- branches/cdk-8570/core/commons/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/commons/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/core/impl/checkstyle-suppressions.xml =================================================================== --- branches/cdk-8570/core/impl/checkstyle-suppressions.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/checkstyle-suppressions.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/core/impl/pom.xml =================================================================== --- branches/cdk-8570/core/impl/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/cache/OSCacheCacheFactory.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/richfaces/VersionBean.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/richfaces/VersionBean.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/InitializationListener.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/InitializationListener.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/richfaces/application/ServicesFactoryImpl.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/richfaces/renderkit/SequenceRendererHelper.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/richfaces/resource/DefaultResourceCodecData.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java =================================================================== --- branches/cdk-8570/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/core/parent/pom.xml =================================================================== --- branches/cdk-8570/core/parent/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/core/parent/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/examples/core-demo/pom.xml =================================================================== --- branches/cdk-8570/examples/core-demo/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/core-demo/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/examples/input-demo/pom.xml =================================================================== --- branches/cdk-8570/examples/input-demo/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/input-demo/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -5,7 +5,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -77,17 +77,16 @@ </build> <dependencies> + <!-- JSF impl should be switchable in example specific parent --> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> <version>1.1</version> @@ -109,7 +108,7 @@ <goal>war</goal> </goals> <configuration> - <webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> <classifier>jee6</classifier> <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> @@ -119,7 +118,7 @@ <configuration> <webResources> <resource> - <directory>${symbol_dollar}{basedir}/src/main/java</directory> + <directory>${basedir}/src/main/java</directory> <targetPath>/WEB-INF/src</targetPath> </resource> </webResources> @@ -133,8 +132,8 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-parent</artifactId> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> <version>${version}</version> <scope>import</scope> <type>pom</type> @@ -152,13 +151,14 @@ <artifactId>richfaces-ui-core-ui</artifactId> </dependency> + <!-- JSF impl should be switchable in example specific parent --> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: branches/cdk-8570/examples/iteration-demo/pom.xml =================================================================== --- branches/cdk-8570/examples/iteration-demo/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/iteration-demo/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataGrid.xhtml =================================================================== --- branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataGrid.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataGrid.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -54,7 +54,12 @@ <h:outputText value="#{record.name}"/> <h:outputText value="#{record.title}"/> - <h:outputText value="#{record.EMail}"/> + <h:outputText value="#{record.EMail}"/> + + <f:facet name="footer"> + <it:dataScroller id="scroller3" for="dataGrid" page="#{dataBean.page}" maxPages="7"></it:dataScroller> + </f:facet> + </it:dataGrid> </h:form> </h:body> Modified: branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataTable.xhtml =================================================================== --- branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -21,7 +21,7 @@ </f:facet> <f:facet name="header"> - <h:outputText value="header facet" /> + <h:outputText value="header"/> </f:facet> <it:column id="column_name" sortBy="#{record.name}" Modified: branches/cdk-8570/examples/iteration-demo/src/main/webapp/extendedtable.xhtml =================================================================== --- branches/cdk-8570/examples/iteration-demo/src/main/webapp/extendedtable.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/iteration-demo/src/main/webapp/extendedtable.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -6,7 +6,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://richfaces.org/rich"> + xmlns:it="http://richfaces.org/iteration"> <!-- JBoss, Home of Professional Open Source Copyright ${year}, Red Hat, Inc. and individual contributors @@ -75,7 +75,8 @@ <input id="selectionLocker" type="checkbox"/> <h:outputText value="Selected rowKeys" style="padding-left: 30px;"/> <h:outputText id="selectionOutput" value="#{dataBean.selectedRowKeys}"/> - <rich:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2" + + <it:extendedDataTable id="extendedDataTable" clientRows="40" rows="100" frozenColumns="2" value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data." styleClass="extendedDataTable" rowKeyVar="rkv" filterVar="fv" sortMode="multi" selectionMode="#{dataBean.selectionMode}" selectedRowKeys="#{dataBean.selectedRowKeys}" @@ -86,11 +87,12 @@ </f:facet> <f:facet name="footer"> <h:outputText value="Footer of table."/> + </f:facet> <f:facet name="noData"> <h:outputText value="There isn't data." style="border: solid black 1px;"/> </f:facet> - <rich:column id="rkv"> + <it:column id="rkv"> <f:facet name="header"> <h:outputText value="Index"/> </f:facet> @@ -100,11 +102,11 @@ <h:outputText id="footerFacet" value="index"/> </f:facet> </c:if> - </rich:column> - <rich:column> + </it:column> + <it:column> <textarea cols="5" rows="5"/> - </rich:column> - <rich:column id="column_name" filterExpression="#{fn:containsIgnoreCase(record.name, fv)}" sortBy="#{record.name}"> + </it:column> + <it:column id="column_name" filterExpression="#{fn:containsIgnoreCase(record.name, fv)}" sortBy="#{record.name}"> <f:facet name="header"> <h:outputText id="columnHeader1" value="Column Header Facet"/> </f:facet> @@ -114,30 +116,30 @@ <h:outputText id="columnFooter1" value="Column Footer Facet"/> </f:facet> </c:if> - </rich:column> + </it:column> - <rich:column id="column_title" width="200px" sortBy="#{record.title}"> + <it:column id="column_title" width="200px" sortBy="#{record.title}"> <h:outputText value="#{record.title}" /> <c:if test="#{dataBean.rendered}"> <f:facet name="footer"> <h:outputText id="columnFooter2" value="Column Footer Facet2"/> </f:facet> </c:if> - </rich:column> + </it:column> - <rich:column id="column_email" width="300px"> + <it:column id="column_email" width="300px"> <h:outputText value="#{record.EMail}" /> - </rich:column> - <rich:column id="column_company_name" width="300px"> + </it:column> + <it:column id="column_company_name" width="300px"> <h:outputText value="#{record.companies[0].name}" /> - </rich:column> - <rich:column id="column_company_state"> + </it:column> + <it:column id="column_company_state"> <h:outputText value="#{record.companies[0].state}" /> - </rich:column> - <rich:column id="column_company_phone"> + </it:column> + <it:column id="column_company_phone"> <h:outputText value="#{record.companies[0].phone}" /> - </rich:column> - </rich:extendedDataTable> + </it:column> + </it:extendedDataTable> <input id="submit" type="submit" /> </h:form> </h:body> Modified: branches/cdk-8570/examples/iteration-demo/src/main/webapp/index.xhtml =================================================================== --- branches/cdk-8570/examples/iteration-demo/src/main/webapp/index.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/iteration-demo/src/main/webapp/index.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -10,9 +10,11 @@ <ul> <li><h:link outcome="dataTable">rich:DataTable</h:link></li> <li><h:link outcome="extendedtable">rich:extendedDataTable</h:link></li> + <li><h:link outcome="extendedtable">rich:DataGrid</h:link></li> <li><h:link outcome="filteringAndSorting">filtering and sorting feature</h:link></li> <li><h:link outcome="list">rich:list</h:link></li> </ul> + <h:form> <h:panelGrid columns="3"> Modified: branches/cdk-8570/examples/misc-demo/pom.xml =================================================================== --- branches/cdk-8570/examples/misc-demo/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/misc-demo/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/examples/output-demo/pom.xml =================================================================== --- branches/cdk-8570/examples/output-demo/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/output-demo/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -109,7 +109,7 @@ <goal>war</goal> </goals> <configuration> - <webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> <classifier>jee6</classifier> <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> @@ -119,7 +119,7 @@ <configuration> <webResources> <resource> - <directory>${symbol_dollar}{basedir}/src/main/java</directory> + <directory>${basedir}/src/main/java</directory> <targetPath>/WEB-INF/src</targetPath> </resource> </webResources> Modified: branches/cdk-8570/examples/repeater-demo/pom.xml =================================================================== --- branches/cdk-8570/examples/repeater-demo/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/repeater-demo/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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: branches/cdk-8570/examples/richfaces-showcase/pom.xml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -1,279 +1,295 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" -> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10-SNAPSHOT</version> + </parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>richfaces-showcase</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>war</packaging> - <name>Richfaces Examples: Richfaces Showcase Application</name> + <groupId>org.richfaces.examples</groupId> + <artifactId>richfaces-showcase</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>Richfaces Examples: Richfaces Showcase Application</name> - <properties> - <!-- FIXME these should be through the richfaces-parent --> - <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repo... - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <properties> + <!-- FIXME these should be through the richfaces-parent --> + <snapshotRepository>dav:https://repository.jboss.org/nexus/content/repo... + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <jetty.port>8080</jetty.port> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> - </properties> + <jetty.port>8080</jetty.port> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> + </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <version>${org.richfaces.bom.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${org.richfaces.bom.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> - <!-- - simple logger binding: only messages of level INFO and - higher are printed - --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> + <!-- + simple logger binding: only messages of level INFO and higher are + printed + --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> - <!-- Log4J dependency used in examples --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> + <!-- Log4J dependency used in examples --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> - <build> - <finalName>richfaces-showcase</finalName> + <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> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.18</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector - implementation="org.mortbay.jetty.nio.SelectChannelConnector" - > - <port>${jetty.port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> + <profiles> + <profile> + <id>jdk5</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </execution> + </executions> + <configuration> + <classifier>tomcat6</classifier> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> - <profiles> - <profile> - <id>jdk5</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.2</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*,WEB-INF/lib/jstl-*</warSourceExcludes> - </configuration> - </execution> - </executions> - <configuration> - <classifier>tomcat6</classifier> - </configuration> - </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>group-sources</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>sources</finalName> + <descriptor>assembler.xml</descriptor> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + <configuration> + <classesDirectory>${basedir}/target/sources/sources</classesDirectory> + <classifier>sources</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>group-sources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>sources</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - <configuration> - <classesDirectory>${basedir}/target/sources/sources</classesDirectory> - <classifier>sources</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> + <repositories> + <!-- FIXME - This should be set globally in parent --> + <repository> + <id>maven-repository2.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> - <repositories> - <!-- FIXME - This should be set globally in parent --> - <repository> - <id>maven-repository2.dev.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces</url> - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/function/FunctionBean.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -2,17 +2,12 @@ import javax.faces.bean.ManagedBean; import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; @ManagedBean(name = "functionBean") @RequestScoped public class FunctionBean { private String text; - public void processHover() { - setText(FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("name")); - } - public String getText() { return text; } Copied: branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java (from rev 18715, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java) =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java (rev 0) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/ExtTableSelectionBean.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,59 @@ +package org.richfaces.demo.tables; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ManagedProperty; +import javax.faces.bean.SessionScoped; +import javax.faces.event.AjaxBehaviorEvent; + +import org.richfaces.component.UIExtendedDataTable; +import org.richfaces.demo.tables.model.cars.InventoryItem; + +@ManagedBean +@SessionScoped +public class ExtTableSelectionBean { + private Collection<Object> selection; + @ManagedProperty(value = "#{carsBean.allInventoryItems}") + private List<InventoryItem> inventoryItems; + private List<InventoryItem> selectionItems = new ArrayList<InventoryItem>(); + + public void selectionListener(AjaxBehaviorEvent event){ + UIExtendedDataTable dataTable = (UIExtendedDataTable)event.getComponent(); + Object originalKey = dataTable.getRowKey(); + selectionItems.clear(); + for (Object selectionKey: selection) { + dataTable.setRowKey(selectionKey); + if (dataTable.isRowAvailable()){ + selectionItems.add((InventoryItem)dataTable.getRowData()); + } + } + dataTable.setRowKey(originalKey); + } + + public Collection<Object> getSelection() { + return selection; + } + + public void setSelection(Collection<Object> selection) { + this.selection = selection; + } + + public List<InventoryItem> getInventoryItems() { + return inventoryItems; + } + + public void setInventoryItems(List<InventoryItem> inventoryItems) { + this.inventoryItems = inventoryItems; + } + + public List<InventoryItem> getSelectionItems() { + return selectionItems; + } + + public void setSelectionItems(List<InventoryItem> selectionItems) { + this.selectionItems = selectionItems; + } +} Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -230,7 +230,7 @@ </sample> </samples> </demo> - <demo> + <demo new="true"> <id>extendedDataTable</id> <name>rich:extendedDataTable</name> <samples> @@ -238,6 +238,10 @@ <id>simpleTable</id> <name>ExtendedData Table Basic Usage</name> </sample> + <sample new="true"> + <id>exTableSelection</id> + <name>ExtendedData Table Selection usage</name> + </sample> </samples> </demo> <demo> @@ -310,7 +314,7 @@ <sample> <id>simple</id> <name>Simple Toggle Panel</name> - </sample> + </sample> </samples> </demo> <demo> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/samples/simple-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/samples/simple-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/samples/simple-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -5,13 +5,50 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> + <style> +.rf-ac{ + width: 500px; +} +.rf-aci-c { + height: 220px; +} +</style> <h:form> <rich:accordion> - <rich:accordionItem header="First Item"> - <h:outputText value="hello from 1" /> + <rich:accordionItem header="Overview:"> + <h:graphicImage value="/images/icons/common/rf.png" + style="float:right" /> + RichFaces is a component library for JSF and an advanced framework for + easily integrating AJAX capabilities into business applications. + <ul> + <li>100+ AJAX enabled components in two libraries</li> + <li>a4j: page centric AJAX controls</li> + <li>rich: self contained, ready to use components</li> + <li>Whole set of JSF benefits while working with AJAX</li> + <li>Skinnability mechanism</li> + <li>Component Development Kit (CDK)</li> + <li>Dynamic resources handling</li> + <li>Testing facilities for components, actions, listeners, and + pages</li> + <li>Broad cross-browser support</li> + <li>Large and active community</li> + </ul> </rich:accordionItem> - <rich:accordionItem header="Second Item"> - <h:outputText value="hello from 2" /> + <rich:accordionItem header="JSF 2 and RichFaces 4:"> + <p>We are working hard on RichFaces 4.0 which will have full JSF + 2 integration. That is not all though, here is a summary of updates + and features:</p> + <ul> + <li>Redesigned modular repository and build system.</li> + <li>Simplified Component Development Kit with annotations, + faces-config extensions, advanced templates support and more..</li> + <li>Ajax framework improvements extending the JSF 2 + specification.</li> + <li>Component review for consistency, usability, and redesign + following semantic HTML principles where possible.</li> + <li>Both server-side and client-side performance optimization.</li> + <li>Strict code clean-up and review.</li> + </ul> </rich:accordionItem> </rich:accordion> </h:form> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/simple.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/simple.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/accordion/simple.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -5,14 +5,14 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>The Accordion (panelBar from 3.3.x) is a set of panels when one panel is expanded, + <p>The <b>Accordion</b> (<i>panelBar from 3.3.x</i>) is a set of panels when one panel is expanded, but other ones are collapsed. </p> <p> - Additionally to previous 3.3.x functionality - accordion in 4.x was finally added with - different modes functionality. So as all the switchable panels it could be used with next modes - - "client", "ajax" and "server". + <b>Main addition</b> to previous 3.3.x functionality - accordion in 4.x was finally added with + different switching <b>switchType</b>'s. So as all the switchable panels it could be used with next modes - + "<i>client</i>", "<i>ajax</i>" and "<i>server</i>". </p> - <p>The following demo shows the simple example of usage for the Accordion in client mode.</p> + <p>The following demo shows the simple example of usage for the Accordion in client mode:</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -16,6 +16,13 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/common/SelectsBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View Bean Source" /> + <ui:param name="hideLabel" value="Hide Bean Source" /> + </ui:include> + </ui:composition> </html> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/component-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -20,6 +20,7 @@ <f:param name="sample" value="#{s.id}" /> <f:attribute name="style" value="#{(s.id == demoNavigator.currentSample.id) ? 'color:orange' : ''}"/> </h:link> + <h:outputText rendered="#{s.newItem}" value="NEW!" styleClass="new_marker" /> <h:outputText value=" | " rendered="#{not status.last}" /> </ui:repeat> </rich:panel> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -55,12 +55,12 @@ </rich:column> </rich:dataTable> </h:form> - <script> - $('.stable tr').mouseover(function(){$(this).addClass('active-row')}); - $('.stable tr').mouseout(function(){$(this).removeClass('active-row')}); + + <rich:jQuery selector=".stable tr:odd" query="addClass('odd-row')" /> + <rich:jQuery selector=".stable tr:even" query="addClass('even-row')" /> + <rich:jQuery selector=".stable tr" event="mouseover" + query="jQuery(this).addClass('active-row')"/> + <rich:jQuery selector=".stable tr" event="mouseout" + query="jQuery(this).removeClass('active-row')"/> - $('.stable tr:odd').addClass('odd-row'); - $('.stable tr:even').addClass('even-row'); - -</script> </ui:composition> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -14,5 +14,29 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/ReportBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View ReportBean Source" /> + <ui:param name="hideLabel" value="Hide ReportBean Source" /> + </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/model/expenses/ExpenseReport.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View ExpenseReport Source" /> + <ui:param name="hideLabel" value="Hide ExpenseReport Source" /> + </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/model/expenses/ExpenseReportRecord.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View ExpenseReportRecord Source" /> + <ui:param name="hideLabel" value="Hide ExpenseReportRecord Source" /> + </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/model/expenses/ExpenseReportRecordItem.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View ExpenseReportRecordItem Source" /> + <ui:param name="hideLabel" value="Hide ExpenseReportRecordItem Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -12,5 +12,11 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/CarsFilteringBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View CarsFilteringBean Source" /> + <ui:param name="hideLabel" value="Hide CarsFilteringBean Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -20,5 +20,11 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/CapitalsSortingBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View CapitalsSortingBean Source" /> + <ui:param name="hideLabel" value="Hide CapitalsSortingBean Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml (from rev 18715, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml) =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml (rev 0) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/exTableSelection.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> +<p>This sample shows the selection management using built-in selection functionality.</p> +<p><b>selectionMode</b> attribute which controls selection mode has three values:</p> +<p> +<ul> +<li>multi</li> +<li>single</li> +<li>none</li> +</ul> +</p> +<p>And in order to manage your selection - use <b>selection</b> attribute which should be pointed to +some <b>collection of objects</b>. It will <b>hold rowKeys</b> of currently selected rows.</p> +<p>Look to next simple sample:</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/ExtTableSelectionBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View ExtSelectionBean Source" /> + <ui:param name="hideLabel" value="Hide ExtSelectionBean Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file Copied: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml (from rev 18715, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml) =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml (rev 0) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/exTableSelection-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,74 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:panelGrid columns="2"> + <h:form> + <rich:extendedDataTable + value="#{extTableSelectionBean.inventoryItems}" var="car" + selection="#{extTableSelectionBean.selection}" id="table" + frozenColumns="2" style="height:300px; width:500px;"> + <a4j:ajax execute="@form" + event="selectionchange" + listener="#{extTableSelectionBean.selectionListener}" render=":res" /> + <f:facet name="header"> + <h:outputText value="Cars marketplace" /> + </f:facet> + <rich:column> + <f:facet name="header"> + <h:outputText value="vendor" /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="VIN Code" /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Items stock" /> + </f:facet> + <h:outputText value="#{car.stock}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Days Live" /> + </f:facet> + <h:outputText value="#{car.daysLive}" /> + </rich:column> + </rich:extendedDataTable> + </h:form> + <a4j:outputPanel id="res"> + <rich:panel header="Selected Rows:" + rendered="#{not empty extTableSelectionBean.selectionItems}"> + <rich:list type="unordered" + value="#{extTableSelectionBean.selectionItems}" var="sel"> + <h:outputText value="#{sel.vendor} - #{sel.model} - #{sel.price}" /> + </rich:list> + </rich:panel> + </a4j:outputPanel> + </h:panelGrid> +</ui:composition> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -8,7 +8,7 @@ <h:form> <rich:extendedDataTable value="#{carsBean.allInventoryItems}" var="car" id="table" frozenColumns="2" - style="height:300px; width:500px;"> + style="height:300px; width:500px;" selectionMode="none"> <f:facet name="header"> <h:outputText value="Cars marketplace" /> </f:facet> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -12,7 +12,8 @@ <li>Support "frozen" columns which are not scrolled on using horizontal scroll</li> </ul> - + <p>The component not requires special model usage but supports all the standard ones and all the + models which rich:dataTable supports.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -3,7 +3,38 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"> + <p>rich:jQuery integrates jQuery javascript framework into the + JavaServer Faces application. The component allows to apply the styles + and behavior to the DOM elements dynamically, including the result of + JSF components rendering.</p> + <p>The <b>selector</b> attribute defines an object or list of objects, + the query defined with the query attribute will be applied to. + And <b>query</b> attribute should be defined with valid JavaScript statements or jQuery api calls</p> + + <p>rich:jQuery can be used in next major modes:</p> + <ul> + <li>as a once time query applied immediately or on document ready + event</li> + <li>definition of event handler which bound to elements returned + by selector on some event.</li> + <li>as a javascript function that can be invoked from the custom + javascript</li> + </ul> + <p>The modes chosen with <b>timing</b>, <b>name </b>and <b>event </b>attributes that + can have the following options:</p> + <p><b>Timing</b></p> + <ul> + <li>immediate - applying the query immediately</li> + <li>domready - applying the query when the document is loaded.</li> + </ul> + <p><b>event </b>and <b>attachType </b>defined allows to bind the query to some + event of elements which returned by selector. "attachType" could be + "<i>live</i>", "<i>bind</i>" and "<i>one</i>".</p> + <p>Defining <b>name </b>attribute - causes <u>timing too be ignored</u> and + just named function to call from js to be created.</p> + +This demo shows how to attach the mouseover/mouseout events to the DOM objects. However the images below show how to make them enlarged. <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -39,11 +39,8 @@ <rich:jQuery selector="#gallery img" query="addClass('pic-normal')" /> <rich:jQuery selector="#gallery img" query="wrap('&lt;div class=\'wrap1\'&gt;&lt;/div&gt;')" /> - <rich:jQuery selector="#gallery img" - query="mouseover(function(){enlargePic(this)})" /> - <rich:jQuery selector="#gallery img" - query="mouseout(function(){normalPic(this)})" /> - - <rich:jQuery name="enlargePic" query="stop().animate({width:'180px'})" /> - <rich:jQuery name="normalPic" query="stop().animate({width:'120px'})" /> + <rich:jQuery selector="#gallery img" event="mouseover" + query="jQuery(this).stop().animate({width:'180px'})" /> + <rich:jQuery selector="#gallery img" event="mouseout" + query="jQuery(this).stop().animate({width:'120px'})" /> </ui:composition> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -22,9 +22,8 @@ </tbody> </table> <h:form> - <a4j:jsFunction name="updateName" render="showname" - action="#{functionBean.processHover}"> - <f:param name="name" /> + <a4j:jsFunction name="updateName" render="showname"> + <a4j:param name="name" assignTo="#{functionBean.text}"/> </a4j:jsFunction> </h:form> </ui:composition> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -15,6 +15,12 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/resources/rich/messages.xhtml" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Messages Composite Component" /> + <ui:param name="hideLabel" value="Hide Messages Composite Component" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -25,7 +25,12 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> - + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/poll/PollBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View Bean Source" /> + <ui:param name="hideLabel" value="Hide Bean Source" /> + </ui:include> <rich:panel> <b>NOTE:</b>polling is automatically disabled in this demo after one minute of working. </rich:panel> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -22,6 +22,12 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/push/ChoicesBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View Bean Source" /> + <ui:param name="hideLabel" value="Hide Bean Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -17,9 +17,10 @@ a4j:region</b> component and has no execute definitions - them uses<b> execute="@region"</b></p> <p>Look to the simple example below. There are two similar user - info panels. But the ajax behaviors inside the first panel uses execute - declarations and pointed to panelGrid id. And the second panel inputs - just wrapped to region without any additional execute definitions.</p> + info panels. But the <b><u>button inside the first panel will not works</u> </b>as not uses execute + declarations and by default execut equals to @this. Separate definition needed to start working properly. + And the <b>second panel inputs + just wrapped to region with the commandButton and works</b> without any additional execute definitions.</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -15,16 +15,11 @@ </f:facet> <h:panelGrid columns="2" id="userInfoPanel1"> <h:outputText value="User Name: " /> - <h:inputText value="#{regionBean.user1.name}"> - <a4j:ajax render="echopanel1" event="keyup" - execute="userInfoPanel1" /> - </h:inputText> + <h:inputText value="#{regionBean.user1.name}"/> <h:outputText value="User email: " /> - <h:inputText value="#{regionBean.user1.email}"> - <a4j:ajax render="echopanel1" event="keyup" - execute="userInfoPanel1" /> - </h:inputText> + <h:inputText value="#{regionBean.user1.email}"/> </h:panelGrid> + <a4j:commandButton render="echopanel1" value="submit"/> </h:panelGrid> <h:panelGrid columns="2" id="echopanel1"> <f:facet name="header"> @@ -46,14 +41,11 @@ <a4j:region> <h:panelGrid columns="2"> <h:outputText value="User Name: " /> - <h:inputText value="#{regionBean.user2.name}"> - <a4j:ajax render="echopanel2" event="keyup" /> - </h:inputText> + <h:inputText value="#{regionBean.user2.name}"/> <h:outputText value="User email: " /> - <h:inputText value="#{regionBean.user2.email}"> - <a4j:ajax render="echopanel2" event="keyup" /> - </h:inputText> + <h:inputText value="#{regionBean.user2.email}"/> </h:panelGrid> + <a4j:commandButton render="echopanel2" value="submit"/> </a4j:region> </h:panelGrid> <h:panelGrid columns="2" id="echopanel2"> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -15,5 +15,11 @@ <ui:param name="openLabel" value="View Source" /> <ui:param name="hideLabel" value="Hide Source" /> </ui:include> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="/WEB-INF/src/org/richfaces/demo/tables/CapitalsBean.java" /> + <ui:param name="sourceType" value="java" /> + <ui:param name="openLabel" value="View Bean Source" /> + <ui:param name="hideLabel" value="Hide Bean Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -8,7 +8,7 @@ <p>This sample shows simple master-detail table implemented using<b> rich:dataTable</b> and<b> rich:subtable</b> components</p> <p>There is one feature which is completely new for 4.x - subtables - now could be collapsed/expanded by using new component <b>rich:tableToggleControl</b></p> + now could be collapsed/expanded by using new component <b>rich:subTableToggleControl</b></p> <p>Switching customization:</p> <ul> <li>subTable's could be collapsed/expanded in different modes Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -6,31 +6,46 @@ xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> <style> -.rf-tp-i { - border: 1px solid #{ richSkin.panelBorderColor +.rf-tgp-i { + border: 1px solid #{richSkin.panelBorderColor}; + padding:5px; } -} +.tabDiv { + border: 1px solid #{ richSkin.panelBorderColor}; + cursor:pointer; + width:110px; + padding-left:5px; + float:left; + } </style> <h:form> - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl forPanel="panel1" targetItem="item1" /> - </h:commandLink> - <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl forPanel="panel1" targetItem="item2" /> - </h:commandLink> - <rich:togglePanel id="panel1" activeItem="item1"> - <rich:togglePanelItem name="item1" styleClass="rf-tp-i"> + <rich:togglePanel id="panel1" activeItem="item1" render="tabs"> + <rich:togglePanelItem name="item1"> <p>This toggle panel switches in Ajax mode. So only one active item loaded to the client.</p> <p>For now you are at Panel 1</p> </rich:togglePanelItem> - <rich:togglePanelItem name="item2" styleClass="rf-tp-i"> + <rich:togglePanelItem name="item2"> <p>After the second link click - panel changed active item to the second one according to name specified in the togglePanelBehavior</p> <p>For now you are at Panel 2</p> </rich:togglePanelItem> </rich:togglePanel> + <a4j:outputPanel id="tabs"> + <a4j:outputPanel layout="block" styleClass="tabDiv"> + <rich:toggleControl event="click" forPanel="panel1" + targetItem="item1" /> + <h:outputText value="Toggle Panel Item 1" + style="#{rich:findComponent('panel1').activeItem == 'item1' ? 'font-weight:bold' : 'font-weight:normal'}" /> + </a4j:outputPanel> + <a4j:outputPanel layout="block" styleClass="tabDiv"> + <rich:toggleControl event="click" forPanel="panel1" + targetItem="item2" /> + <h:outputText value="Toggle Panel Item 2" + style="#{rich:findComponent('panel1').activeItem == 'item2' ? 'font-weight:bold' : 'font-weight:normal'}" /> + </a4j:outputPanel> + </a4j:outputPanel> + <br clear="both"/> </h:form> </ui:composition> \ No newline at end of file Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -5,6 +5,18 @@ xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> +<p><b>togglePanel</b> is a base component for all switchable panels in RichFaces. It renders +sequence of states that can be switched (toggled) by a behavior +called <b>toggleControl</b>. rich:togglePanel has no default appearance. You can define it using +the set of child <b>togglePanelItem's</b> with any given content inside. </p> +<p> <b>switchType</b> attribute defines the strategy of switching. The possible values for this attributes are:</p> +<ul> +<li><b>client</b> - switching happens on the client without any request to the server. The jsf form is not required in this mode</li> +<li><b>ajax</b> - when states are switched, the content of new states comes from the server in Ajax way.</li> +<li><b>server</b> - the whole page is reloaded when states are switched</li> +</ul> +<p>As the component not provides any predefined layout it could be used for creation of any kind of switchable panels easilly. +Here is the sample of simplest tabbed pane organized using that component:</p> <ui:include src="#{demoNavigator.sampleIncludeURI}" /> <ui:include src="/templates/includes/source-view.xhtml"> <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> Modified: branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml =================================================================== --- branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml 2010-08-17 15:26:45 UTC (rev 18716) @@ -19,20 +19,20 @@ <h:outputLink value="#" onclick="jQuery(#{rich:element('hide')}).slideDown(); jQuery(#{rich:element('show')}).hide(); return false;" id="sh1" styleClass="show"> - <h:outputText value="#{empty openlabel?'View Source' : openlabel }" /> + <h:outputText value="#{empty openLabel?'View Source' : openLabel }" /> </h:outputLink> </a4j:outputPanel> <a4j:outputPanel id="hide" layout="block" style="display:none"> <h:outputLink styleClass="hide" value="#" onclick="jQuery(#{rich:element('hide')}).slideUp(); jQuery(#{rich:element('show')}).show(500); return false;"> - <h:outputText value="#{empty hidelabel?'Hide Source' : openlabel }" /> + <h:outputText value="#{empty hideLabel?'Hide Source' : hideLabel }" /> </h:outputLink> <at:syntaxHighlighter styleClass="source" src="#{src}" sourceType="#{sourceType}" /> <h:outputLink styleClass="hide" value="#" onclick="jQuery(#{rich:element('hide')}).slideUp(); jQuery(#{rich:element('show')}).show(500); return false;"> - <h:outputText value="#{empty hidelabel?'Hide Source' : openlabel }" /> + <h:outputText value="#{empty hideLabel?'Hide Source' : hideLabel }" /> </h:outputLink> </a4j:outputPanel> </a4j:outputPanel> Modified: branches/cdk-8570/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java =================================================================== --- branches/cdk-8570/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -58,7 +58,19 @@ // TagHandlers structure is created when view is compiled // so there's no need to check for BehaviorsStack - return factory.createComponentHandlerDelegate(new BehaviorsAddingComponentHandlerWrapper(owner)); + + ComponentHandler wrappedHandler = owner; + + //TODO - consider re-wrapping by smb. other, use attributes to handle + if (wrappedHandler instanceof BehaviorsAddingComponentHandlerWrapper) { + //MyFaces calls delegate factory just in ComponentHandler class ctor, so this is to avoid infinite recursion + //our delegate is fine with null value + return null; + } else { + wrappedHandler = new BehaviorsAddingComponentHandlerWrapper(owner); + } + + return factory.createComponentHandlerDelegate(wrappedHandler); } /* Modified: branches/cdk-8570/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java =================================================================== --- branches/cdk-8570/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -161,7 +161,7 @@ private String extractQueueScript(HtmlPage page) { HtmlElement scriptElement = page.getElementById(QueueRegistry.QUEUE_SCRIPT_ID); if (scriptElement != null) { - return getTextContent(scriptElement); + return getTextContent(scriptElement).replaceAll("(^<!--)|(//-->$)", ""); } return null; } Modified: branches/cdk-8570/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/cdk-8570/ui/dist/richfaces-components-api/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/dist/richfaces-components-api/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -152,7 +152,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>org.richfaces.ui.common, org.richfaces.ui.core, org.richfaces.ui.iteration, org.richfaces.ui.output, org.richfaces.ui.input</includeGroupIds> + <includeGroupIds>org.richfaces.ui.core, org.richfaces.ui.iteration, org.richfaces.ui.output, org.richfaces.ui.input</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> Modified: branches/cdk-8570/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/cdk-8570/ui/dist/richfaces-components-ui/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/dist/richfaces-components-ui/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -176,7 +176,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}.common, ${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, ${assembly.projects.group}.output</includeGroupIds> + <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, ${assembly.projects.group}.output</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> Modified: branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractColumn.java =================================================================== --- branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractColumn.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractColumn.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -64,10 +64,10 @@ public abstract Object getFilterValue(); @Attribute - public abstract Object getRowspan(); + public abstract int getRowspan(); @Attribute - public abstract Object getColspan(); + public abstract int getColspan(); @Attribute public abstract Comparator<?> getComparator(); Modified: branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java =================================================================== --- branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -33,6 +33,7 @@ import javax.faces.context.FacesContext; import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.EventName; import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; @@ -74,8 +75,14 @@ } @Attribute(defaultValue = "0") - public abstract int getFrozenColumns(); + public abstract int getFrozenColumns(); + @Attribute(events=@EventName(value="selectionchange", defaultEvent=true)) + public abstract String getOnselectionchange(); + + @Attribute(events=@EventName("beforeselectionchange")) + public abstract String getOnbeforeselectionchange(); + public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) { if (SCROLL.equals(metaComponentId)) { Object oldRowKey = getRowKey(); Modified: branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java =================================================================== --- branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/iteration/ui/src/main/java/org/richfaces/event/DataTablePreRenderListener.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -37,12 +37,13 @@ import org.ajax4jsf.Messages; import org.richfaces.DataScrollerUtils; +import org.richfaces.component.AbstractDataScroller; import org.richfaces.component.UIDataAdaptor; -import org.richfaces.component.AbstractDataScroller; import org.richfaces.component.util.MessageUtil; import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; + public class DataTablePreRenderListener implements SystemEventListener { private static final Logger LOG = RichfacesLogger.COMPONENTS.getLogger(); Copied: branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml (from rev 18715, trunk/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml) =================================================================== --- branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml (rev 0) +++ branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/dataTable.faces-config.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -0,0 +1,35 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- +JBoss, Home of Professional Open Source +Copyright ${year}, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. +--> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + version="2.0"> + + <application> + <system-event-listener> + <system-event-listener-class>org.richfaces.event.DataTablePreRenderListener</system-event-listener-class> + <system-event-class>javax.faces.event.PreRenderComponentEvent</system-event-class> + </system-event-listener> + </application> +</faces-config> \ No newline at end of file Modified: branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss =================================================================== --- branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-08-17 15:26:45 UTC (rev 18716) @@ -146,7 +146,7 @@ height: 9px; font-size: 9px; width: 9px; - background-image: url("#{resource['reorderMarker.gif']}"); + background-image: url("#{resource['org.richfaces:reorderMarker.gif']}"); display: none; } Modified: branches/cdk-8570/ui/output/ui/checkstyle-suppressions.xml =================================================================== --- branches/cdk-8570/ui/output/ui/checkstyle-suppressions.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/output/ui/checkstyle-suppressions.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/ui/output/ui/pom.xml =================================================================== --- branches/cdk-8570/ui/output/ui/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/output/ui/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java =================================================================== --- branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelItemRenderer.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -25,6 +25,7 @@ import org.ajax4jsf.javascript.JSObject; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.component.AbstractTogglePanelItem; +import org.richfaces.component.util.HtmlUtil; import javax.faces.application.ResourceDependencies; import javax.faces.application.ResourceDependency; @@ -52,6 +53,11 @@ private static final String ENTER = "enter"; @Override + protected String getStyleClass(UIComponent component) { + return HtmlUtil.concatClasses("rf-tgp-i", attributeAsString(component, "styleClass")); + } + + @Override protected void writeJavaScript(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { Modified: branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java =================================================================== --- branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2010-08-17 15:26:45 UTC (rev 18716) @@ -44,6 +44,7 @@ import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.AbstractTogglePanel; import org.richfaces.component.AbstractTogglePanelItem; +import org.richfaces.component.util.HtmlUtil; /** * @author akolonitsky @@ -116,6 +117,11 @@ } @Override + protected String getStyleClass(UIComponent component) { + return HtmlUtil.concatClasses("rf-tgp", attributeAsString(component, "styleClass")); + } + + @Override protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { Modified: branches/cdk-8570/ui/parent/pom.xml =================================================================== --- branches/cdk-8570/ui/parent/pom.xml 2010-08-17 15:12:02 UTC (rev 18715) +++ branches/cdk-8570/ui/parent/pom.xml 2010-08-17 15:26:45 UTC (rev 18716) @@ -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>