[richfaces-svn-commits] JBoss Rich Faces SVN: r19432 - in branches/RF-8742: archetypes/rf-gae-sample and 42 other directories.

Author: alexsmirnov Date: 2010-10-04 13:21:44 -0400 (Mon, 04 Oct 2010) New Revision: 19432 Added: branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-extensions.xsd branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java branches/RF-8742/examples/output-demo/src/main/java/org/richfaces/SkinBean.java branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml Removed: branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml Modified: branches/RF-8742/ branches/RF-8742/archetypes/rf-gae-sample/pom.xml branches/RF-8742/archetypes/rf-gae-sample/readme.txt branches/RF-8742/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml branches/RF-8742/archetypes/richfaces-archetype-simpleapp/pom.xml branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml branches/RF-8742/bom/pom.xml branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/component.ftl branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml branches/RF-8742/core/api/src/main/java/org/richfaces/skin/Skin.java branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-base-component.js branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces.js branches/RF-8742/dist/readme-examples.txt branches/RF-8742/dist/readme-ui.txt branches/RF-8742/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml branches/RF-8742/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml branches/RF-8742/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js branches/RF-8742/examples/output-demo/src/main/webapp/WEB-INF/web.xml branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml branches/RF-8742/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml branches/RF-8742/parent/pom.xml branches/RF-8742/svnmerge-commit-message.txt branches/RF-8742/ui/input/ui/src/main/config/faces-config.xml branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js branches/RF-8742/ui/input/ui/src/main/templates/inputnumberslider.template.xml branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss branches/RF-8742/ui/output/ui/src/main/templates/popupPanel.template.xml Log: Merged revisions 19358-19359,19364,19367-19369,19371,19374-19377,19379-19385,19387,19393-19394,19400,19402-19404,19418-19422,19426,19430 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk ............... r19358 | nbelaevski | 2010-09-28 13:54:35 -0700 (Tue, 28 Sep 2010) | 1 line https://jira.jboss.org/browse/RF-7944 ............... r19359 | jbalunas(a)redhat.com | 2010-09-28 17:17:46 -0700 (Tue, 28 Sep 2010) | 1 line RF-9266 updated archetypes so that correct version is used in generated project ............... r19364 | konstantin.mishin | 2010-09-29 03:39:05 -0700 (Wed, 29 Sep 2010) | 1 line RF-9278 ............... r19367 | konstantin.mishin | 2010-09-29 04:19:09 -0700 (Wed, 29 Sep 2010) | 1 line RF-9218 ............... r19368 | konstantin.mishin | 2010-09-29 04:19:44 -0700 (Wed, 29 Sep 2010) | 1 line RF-9218 ............... r19369 | konstantin.mishin | 2010-09-29 05:02:10 -0700 (Wed, 29 Sep 2010) | 1 line RF-9201 ............... r19371 | pyaschenko | 2010-09-29 06:02:16 -0700 (Wed, 29 Sep 2010) | 1 line small fix: RICH_CONTAINER moved from richfaces-base-component.js to richfaces.js ............... r19374 | pyaschenko | 2010-09-29 07:05:48 -0700 (Wed, 29 Sep 2010) | 1 line https://jira.jboss.org/browse/RF-9071 ............... r19375 | konstantin.mishin | 2010-09-29 07:12:37 -0700 (Wed, 29 Sep 2010) | 1 line add step attribute ............... r19376 | jbalunas(a)redhat.com | 2010-09-29 07:13:52 -0700 (Wed, 29 Sep 2010) | 1 line RF-9386 upgraded myfaces to 2.0.2 ............... r19377 | jbalunas(a)redhat.com | 2010-09-29 07:14:11 -0700 (Wed, 29 Sep 2010) | 1 line RF-9386 upgraded myfaces to 2.0.2 ............... r19379 | alexsmirnov | 2010-09-29 09:13:49 -0700 (Wed, 29 Sep 2010) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-19112" from https://svn.jboss.org/repos/richfaces/branches/RF-9309 ............... r19380 | alexsmirnov | 2010-09-29 09:36:52 -0700 (Wed, 29 Sep 2010) | 9 lines Merged revisions 19378 via svnmerge from https://svn.jboss.org/repos/richfaces/branches/RF-9309 ........ r19378 | alexsmirnov | 2010-09-29 08:55:33 -0700 (Wed, 29 Sep 2010) | 1 line RF-9309 ........ ............... r19381 | alexsmirnov | 2010-09-29 09:38:34 -0700 (Wed, 29 Sep 2010) | 1 line add svnmerge file to ignore ............... r19382 | alexsmirnov | 2010-09-29 10:44:24 -0700 (Wed, 29 Sep 2010) | 2 lines CODING IN PROGRESS - issue RF-9323: CDK annotation @RendererSpecificComponent.attributes doesn't work https://jira.jboss.org/browse/RF-9323 ............... r19383 | alexsmirnov | 2010-09-29 11:55:42 -0700 (Wed, 29 Sep 2010) | 2 lines RESOLVED - issue RF-9325: CDK: can't specify 'readonly' attribute on html <input > element in the xml template https://jira.jboss.org/browse/RF-9325 ............... r19384 | alexsmirnov | 2010-09-29 11:56:18 -0700 (Wed, 29 Sep 2010) | 2 lines RESOLVED - issue RF-9325: CDK: can't specify 'readonly' attribute on html <input > element in the xml template https://jira.jboss.org/browse/RF-9325 ............... r19385 | jbalunas(a)redhat.com | 2010-09-29 13:26:07 -0700 (Wed, 29 Sep 2010) | 1 line [maven-release-plugin] prepare release 4.0.0.20100929-M3 ............... r19387 | jbalunas(a)redhat.com | 2010-09-29 13:27:22 -0700 (Wed, 29 Sep 2010) | 1 line [maven-release-plugin] prepare for next development iteration ............... r19393 | jbalunas(a)redhat.com | 2010-09-30 08:24:19 -0700 (Thu, 30 Sep 2010) | 1 line RF-9393 updated for M3 release ............... r19394 | jbalunas(a)redhat.com | 2010-09-30 08:24:45 -0700 (Thu, 30 Sep 2010) | 1 line RF-9393 updated for M3 release ............... r19400 | Alex.Kolonitsky | 2010-10-01 02:13:43 -0700 (Fri, 01 Oct 2010) | 1 line RF-8779 TabPanel: skinning component ............... r19402 | amarkhel | 2010-10-01 06:45:28 -0700 (Fri, 01 Oct 2010) | 1 line Fix RF-9148 ............... r19403 | amarkhel | 2010-10-01 06:46:56 -0700 (Fri, 01 Oct 2010) | 1 line Fix problem with label attribbute on progressbar component ............... r19404 | amarkhel | 2010-10-01 06:52:44 -0700 (Fri, 01 Oct 2010) | 1 line Add sample for progressBar ............... r19418 | jbalunas(a)redhat.com | 2010-10-01 12:29:39 -0700 (Fri, 01 Oct 2010) | 1 line RF-9400 part of fix ............... r19419 | alexsmirnov | 2010-10-01 14:44:47 -0700 (Fri, 01 Oct 2010) | 3 lines RESOLVED - issue RF-8950: Add cdk extension attributes to the template schema https://jira.jboss.org/browse/RF-8950 ............... r19420 | Alex.Kolonitsky | 2010-10-04 00:15:55 -0700 (Mon, 04 Oct 2010) | 1 line RF-9401 Tab panel: classes for tab are not set ............... r19421 | Alex.Kolonitsky | 2010-10-04 01:10:44 -0700 (Mon, 04 Oct 2010) | 1 line RF-9398 Tab panel: non-valid markup ............... r19422 | Alex.Kolonitsky | 2010-10-04 03:44:32 -0700 (Mon, 04 Oct 2010) | 4 lines RF-9401 Tab panel: classes for tab are not set RF-9352 Collapsible panel: facet headerCollapsed doesn't work RFPL-674 Accordion: class attribute is not set for headers and content ............... r19426 | jbalunas(a)redhat.com | 2010-10-04 07:39:19 -0700 (Mon, 04 Oct 2010) | 1 line RF-9400, RF-9404 - fixed filtering overrides, and updated version correctly ............... r19430 | alexsmirnov | 2010-10-04 09:06:49 -0700 (Mon, 04 Oct 2010) | 1 line https://jira.jboss.org/browse/RF-8950 ............... Property changes on: branches/RF-8742 ___________________________________________________________________ Name: svn:ignore - target .settings .project .classpath .clover .externalToolBuilders + target .settings .project .classpath .clover .externalToolBuilders svnmerge-commit-message.txt Name: svnmerge-integrated - /trunk:1-19356 + /trunk:1-19430 Modified: branches/RF-8742/archetypes/rf-gae-sample/pom.xml =================================================================== --- branches/RF-8742/archetypes/rf-gae-sample/pom.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/archetypes/rf-gae-sample/pom.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,86 +1,96 @@ -<?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"> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10</version> - <relativePath>../../build/parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.archetypes</groupId> - <artifactId>richfaces-archetype-gae</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - <name>RichFaces Archetypes: GAE Application</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </extension> - </extensions> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-4</version> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <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> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/</url> - </scm> -</project> - +<?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"> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10</version> + <relativePath>../../build/parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.archetypes</groupId> + <artifactId>richfaces-archetype-gae</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>maven-archetype</packaging> + <name>RichFaces Archetypes: GAE Application</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- Setting this property for resource filtering so that generated project + uses correct version of richfaces. + --> + <archetype.project.version>${project.version}</archetype.project.version> + </properties> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </extension> + </extensions> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <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> + </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> +</project> + Modified: branches/RF-8742/archetypes/rf-gae-sample/readme.txt =================================================================== --- branches/RF-8742/archetypes/rf-gae-sample/readme.txt 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/archetypes/rf-gae-sample/readme.txt 2010-10-04 17:21:44 UTC (rev 19432) @@ -10,7 +10,7 @@ 1) To generate a project from the archetype, run - mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes -DarchetypeArtifactId=richfaces-archetype-gae -DarchetypeVersion=<version> + mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes -DarchetypeArtifactId=richfaces-archetype-gae -DarchetypeVersion=<richfaces-version> -DgroupId=<yourGroupId> -DartifactId=<yourArtifactId> -Dversion=1.0-SNAPSHOT 2) To build the project for deploy to GAE cloud, run Modified: branches/RF-8742/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/RF-8742/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -26,7 +26,10 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.richfaces.bom.version>4.0.0.20100826-M2</org.richfaces.bom.version> + <!-- Setting this property for resource filtering so that generated project + uses correct version of richfaces. + --> + <org.richfaces.bom.version>${archetype.project.version}</org.richfaces.bom.version> </properties> <build> Modified: branches/RF-8742/archetypes/richfaces-archetype-simpleapp/pom.xml =================================================================== --- branches/RF-8742/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -34,6 +34,20 @@ <extensions>true</extensions> </plugin> </plugins> + <resources> + <!-- Selectively trigger filtering on resource directory + The second element turns on filtering only for META-INF directory + --> + <resource> + <directory>src/main/resources/</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/resources/META-INF/maven</directory> + <filtering>true</filtering> + <targetPath>META-INF/maven</targetPath> + </resource> + </resources> </build> <profiles> @@ -76,7 +90,7 @@ </build> </profile> </profiles> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,4 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="richfaces-archetype-simpleapp"> +<?xml version="1.0" encoding="UTF-8"?> + <archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archet... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-... http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" + name="richfaces-archetype-simpleapp"> + <requiredProperties> + <requiredProperty key="richfaces-version"> + <defaultValue>${project.version}</defaultValue> + </requiredProperty> + </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> <directory>src/main/java</directory> Modified: branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,7 +1,6 @@ #set( $symbol_pound = '#' ) #set( $symbol_dollar = '$' ) -#set( -$symbol_escape = '\' ) +#set($symbol_escape = '\' ) <?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"> @@ -31,11 +30,14 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> + <!-- Setting this property using archetype-metadata.xml requiredPorperty + so that generated project uses correct version of richfaces. + --> + <org.richfaces.bom.version>${richfaces-version}</org.richfaces.bom.version> </properties> <build> - <finalName>${artifactId}-${symbol_dollar}{project.version}</finalName> + <finalName>${artifactId}-${project.version}</finalName> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -49,7 +51,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> @@ -105,7 +107,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*</packagingExcludes> <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</warSourceExcludes> @@ -115,7 +117,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/RF-8742/bom/pom.xml =================================================================== --- branches/RF-8742/bom/pom.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/bom/pom.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -154,12 +154,12 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> </dependency> <!-- Misc --> Modified: branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java =================================================================== --- branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -373,9 +373,7 @@ for (PropertyBase parentAttribute : parentComponent.getAttributes()) { PropertyBase attribute = component.getOrCreateAttribute(parentAttribute.getName()); attribute.merge(parentAttribute); - // TODO Check generate status. Attribute should not be generated if the parent component - // represents - // concrete class. + // already exists in parent component. attribute.setGenerate(false); } } catch (NoSuchElementException e) { Modified: branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java =================================================================== --- branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -19,7 +19,6 @@ @Override public TemplateModel wrap(Object obj) throws TemplateModelException { - // TODO wrap specified model classes. TemplateModel templateModel; if (obj instanceof JavaStatement) { Modified: branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2010-10-04 17:21:44 UTC (rev 19432) @@ -19,10 +19,9 @@ <xs:schema targetNamespace="http://jboss.org/schema/richfaces/cdk/jsf/composite... xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite" xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core" + xmlns:xml="http://www.w3.org/XML/1998/namespace" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" /> <xs:annotation> <xs:documentation> @@ -308,7 +307,7 @@ <xs:complexType name="compositeImplementationType" mixed="true"> <xs:choice> - <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" /> + <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" namespace="##other " /> </xs:choice> </xs:complexType> Copied: branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-extensions.xsd (from rev 19430, trunk/cdk/generator/src/main/resources/META-INF/schema/cdk-extensions.xsd) =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-extensions.xsd (rev 0) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-extensions.xsd 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://jboss.org/schema/richfaces/cdk/ext" xmlns="http://jboss.org/schema/richfaces/cdk/ext" + elementFormDefault="qualified"> + + <xs:simpleType name="beanAttribute"> + <xs:restriction base="xs:string"> + <xs:pattern value="[a-zA-Z][a-zA-Z_]*" /> + </xs:restriction> + </xs:simpleType> + <xs:attributeGroup name="attrs"> + <xs:attributeGroup ref="coreattrs" /> + <xs:attributeGroup ref="i18n" /> + <xs:attributeGroup ref="events" /> + </xs:attributeGroup> + <xs:attributeGroup name="coreattrs"> + <xs:annotation> + <xs:documentation> + core attributes common to most elements + id + document-wide unique id + class space separated list of classes + style + associated style info + title advisory title/amplification + </xs:documentation> + </xs:annotation> + <xs:attribute ref="id" /> + <xs:attribute ref="style" /> + <xs:attribute ref="title" /> + </xs:attributeGroup> + + <xs:attribute name="id" type="beanAttribute" /> + <xs:attribute name="style" type="beanAttribute" /> + <xs:attribute name="title" type="beanAttribute" /> + + <xs:attributeGroup name="i18n"> + <xs:annotation> + <xs:documentation> + internationalization attributes + lang language code + (backwards compatible) + xml:lang language code (as per XML 1.0 spec) + dir direction for weak/neutral text + </xs:documentation> + </xs:annotation> + <xs:attribute ref="lang" /> + </xs:attributeGroup> + <xs:attribute name="lang" type="beanAttribute" /> + + <xs:attributeGroup name="classGroup"> + <xs:attribute ref="class" /> + </xs:attributeGroup> + <xs:attribute name="class" type="beanAttribute" /> + + <xs:attributeGroup name="events"> + <xs:annotation> + <xs:documentation> + attributes for common UI events + onclick a pointer + button was clicked + ondblclick a pointer button was double clicked + onmousedown a pointer button was pressed down + onmouseup a pointer + button was released + onmousemove a pointer was moved onto the element + onmouseout a pointer was moved away from the element + onkeypress a key + was pressed and released + onkeydown a key was pressed down + onkeyup a + key was released + </xs:documentation> + </xs:annotation> + <xs:attribute ref="onclick" /> + <xs:attribute ref="ondblclick" /> + <xs:attribute ref="onmousedown" /> + <xs:attribute ref="onmouseup" /> + <xs:attribute ref="onmouseover" /> + <xs:attribute ref="onmousemove" /> + <xs:attribute ref="onmouseout" /> + <xs:attribute ref="onkeypress" /> + <xs:attribute ref="onkeydown" /> + <xs:attribute ref="onkeyup" /> + </xs:attributeGroup> + <xs:attribute name="onclick" type="beanAttribute" /> + <xs:attribute name="ondblclick" type="beanAttribute" /> + <xs:attribute name="onmousedown" type="beanAttribute" /> + <xs:attribute name="onmouseup" type="beanAttribute" /> + <xs:attribute name="onmouseover" type="beanAttribute" /> + <xs:attribute name="onmousemove" type="beanAttribute" /> + <xs:attribute name="onmouseout" type="beanAttribute" /> + <xs:attribute name="onkeypress" type="beanAttribute" /> + <xs:attribute name="onkeydown" type="beanAttribute" /> + <xs:attribute name="onkeyup" type="beanAttribute" /> + + <xs:attributeGroup name="focus"> + <xs:annotation> + <xs:documentation> + attributes for elements that can get the focus + accesskey accessibility key character + tabindex position in tabbing + order + onfocus the element got the focus + onblur the element lost the + focus + </xs:documentation> + </xs:annotation> + <xs:attribute ref="accesskey" /> + <xs:attribute ref="tabindex" /> + <xs:attribute ref="onfocus" /> + <xs:attribute ref="onblur" /> + </xs:attributeGroup> + <xs:attribute name="accesskey" type="beanAttribute" /> + <xs:attribute name="tabindex" type="beanAttribute" /> + <xs:attribute name="onfocus" type="beanAttribute" /> + <xs:attribute name="onblur" type="beanAttribute" /> + + <xs:attribute name="align" type="beanAttribute" /> + <xs:attribute name="charset" type="beanAttribute"></xs:attribute> + <xs:attribute name="type" type="beanAttribute"></xs:attribute> + <xs:attribute name="name" type="beanAttribute"></xs:attribute> + <xs:attribute name="href" type="beanAttribute"></xs:attribute> + <xs:attribute name="hreflang" type="beanAttribute"></xs:attribute> + <xs:attribute name="rel" type="beanAttribute"></xs:attribute> + <xs:attribute name="rev" type="beanAttribute"></xs:attribute> + <xs:attribute name="shape" type="beanAttribute"></xs:attribute> + <xs:attribute name="coords" type="beanAttribute"></xs:attribute> + <xs:attribute name="target" type="beanAttribute"></xs:attribute> + + <xs:attribute name="cite" type="beanAttribute" /> + + <xs:attribute name="size" type="beanAttribute" /> + <xs:attribute name="color" type="beanAttribute" /> + <xs:attribute name="face" type="beanAttribute" /> + + <xs:attribute name="action" type="beanAttribute" /> + <xs:attribute name="method"></xs:attribute> + <xs:attribute name="enctype" type="beanAttribute" /> + <xs:attribute name="onsubmit" type="beanAttribute" /> + <xs:attribute name="onreset" type="beanAttribute" /> + <xs:attribute name="accept" type="beanAttribute" /> + <xs:attribute name="accept-charset" type="beanAttribute" /> + + <xs:attribute name="for" type="beanAttribute" /> + + <xs:attribute name="value" type="beanAttribute" /> + + <xs:attribute name="disabled" type="beanAttribute" /> + <xs:attribute name="readonly" type="beanAttribute" /> + <xs:attribute name="nowrap" type="beanAttribute" /> + <xs:attribute name="compact" type="beanAttribute" /> + <xs:attribute name="checked" type="beanAttribute" /> + <xs:attribute name="valign" type="beanAttribute" /> + <xs:attribute name="char" type="beanAttribute" /> + <xs:attribute name="charoff" type="beanAttribute" /> + <xs:attribute name="codebase" type="beanAttribute" /> + <xs:attribute name="alt" type="beanAttribute" /> + <xs:attribute name="clear" type="beanAttribute" /> + <xs:attribute name="span" type="beanAttribute" /> + <xs:attribute name="profile" type="beanAttribute" /> + <xs:attribute name="width" type="beanAttribute" /> + <xs:attribute name="src" type="beanAttribute" /> + <xs:attribute name="maxlength" type="beanAttribute" /> + <xs:attribute name="media" type="beanAttribute" /> + <xs:attribute name="http-equiv" type="beanAttribute" /> + <xs:attribute name="archive" type="beanAttribute" /> + <xs:attribute name="nohref" type="beanAttribute" /> + <xs:attribute name="longdesc" type="beanAttribute" /> + <xs:attribute name="usemap" type="beanAttribute" /> + <xs:attribute name="required" type="beanAttribute" /> + <xs:attribute name="rows" type="beanAttribute" /> + <xs:attribute name="cols" type="beanAttribute" /> + <xs:attribute name="bgcolor" type="beanAttribute" /> + <xs:attribute name="code" type="beanAttribute" /> + <xs:attribute name="height" type="beanAttribute" /> + <xs:attribute name="onselect" type="beanAttribute" /> + <xs:attribute name="onchange" type="beanAttribute" /> + <xs:attribute name="object" type="beanAttribute" /> + <xs:attribute name="border" type="beanAttribute" /> + <xs:attribute name="content" type="beanAttribute" /> + <xs:attribute name="hspace" type="beanAttribute" /> + <xs:attribute name="vspace" type="beanAttribute" /> + <xs:attribute name="scheme" type="beanAttribute" /> + +</xs:schema> \ No newline at end of file Modified: branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2010-10-04 17:21:44 UTC (rev 19432) @@ -26,7 +26,6 @@ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jboss.org/schema/richfaces/cdk/jstl/core" xmlns="http://jboss.org/schema/richfaces/cdk/jstl/core" - xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core" elementFormDefault="qualified" attributeFormDefault="unqualified"> <xs:annotation> @@ -35,8 +34,29 @@ </xs:documentation> </xs:annotation> - <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" /> + <xs:simpleType name="elStrictExpression"> + <xs:restriction base="xs:string"> + <xs:pattern value="#\{[^\}]+\}" /> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="literalExpression"> + <xs:restriction base="xs:string"> + <!-- TODO --> + <xs:pattern value=".*" /> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="elMixedExpression"> + <xs:restriction base="xs:string"> + <xs:pattern value=".*#\{[^\}]+\}.*" /> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="elFreeformExpression"> + <xs:restriction base="xs:string" /> + </xs:simpleType> + <xs:complexType name="arbitraryContent" mixed="true"> <xs:choice> <xs:any minOccurs="0" maxOccurs="unbounded" /> @@ -47,7 +67,7 @@ <xs:complexContent> <xs:extension base="arbitraryContent"> <xs:attribute name="test" form="unqualified" use="required" - type="cdk:elStrictExpression"> + type="elStrictExpression"> <xs:annotation> <xs:documentation> <p>The test condition that determines whether or not the body content should be processed.</p> @@ -111,14 +131,14 @@ <xs:complexType> <xs:complexContent> <xs:extension base="arbitraryContent"> - <xs:attribute name="items" type="cdk:elStrictExpression"> + <xs:attribute name="items" type="elStrictExpression"> <xs:annotation> <xs:documentation> <p>Collection of items to iterate over.</p> </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="var" type="cdk:literalExpression"> + <xs:attribute name="var" type="literalExpression"> <xs:annotation> <xs:documentation> <p>Name of the exported scoped variable for the current item of the iteration. Modified: branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2010-10-04 17:21:44 UTC (rev 19432) @@ -28,7 +28,9 @@ targetNamespace="http://jboss.org/schema/richfaces/cdk/core" xmlns="http://jboss.org/schema/richfaces/cdk/core" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:xhtml="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core" xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite"> + xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core" + xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite" + xmlns:x="http://jboss.org/schema/richfaces/cdk/ext"> <xs:annotation> <xs:documentation> @@ -36,33 +38,12 @@ </xs:documentation> </xs:annotation> - <xs:import schemaLocation="web-facesuicomponent_2_0.xsd" namespace="http://java.sun.com/xml/ns/javaee" /> + <xs:import schemaLocation="http://java.sun.com/xml/ns/javaee/web-facesuicompone... namespace="http://java.sun.com/xml/ns/javaee" /> <xs:import schemaLocation="cdk-composite.xsd" namespace="http://jboss.org/schema/richfaces/cdk/jsf/composite" /> <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://jboss.org/schema/richfaces/cdk/jstl/core" /> + <xs:import schemaLocation="cdk-extensions.xsd" namespace="http://jboss.org/schema/richfaces/cdk/ext" /> - <xs:simpleType name="elStrictExpression"> - <xs:restriction base="xs:string"> - <xs:pattern value="#\{[^\}]+\}" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="literalExpression"> - <xs:restriction base="xs:string"> - <!-- TODO --> - <xs:pattern value=".*" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="elMixedExpression"> - <xs:restriction base="xs:string"> - <xs:pattern value=".*#\{[^\}]+\}.*" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="elFreeformExpression"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="resourceDependencyTargets"> <xs:restriction base="xs:string"> <xs:enumeration value="body" /> @@ -145,8 +126,45 @@ </xs:simpleType> </xs:attribute> + <xs:attribute name="passThrough"> + <xs:annotation> + <xs:documentation> + <p>Enables pass-through rendering of attributes. Allows to define whitespace-separated list of attributes + to include. If component attribute name is different from default, the exact name can be added after colon.</p> + <p> + Examples: + + <ul> + <li><code><![CDATA[<div cdk:passThrough="title style"></code>]]></code></li> + <li><code><![CDATA[<div cdk:passThrough="title:headTitle style">]]></code></li> + </ul> + + <span class="usage"> + Attributes already defined on the tag are automatically excluded from pass-through + rendering. + </span> + </p> + <p>If "disabled" attribute of the component is true (i.e. boolean true or "true"), then + attributes that have associated behavior events are not encoded.</p> + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:restriction> + <xs:simpleType> + <xs:list> + <xs:simpleType> + <xs:restriction base="xs:NMTOKEN" /> + </xs:simpleType> + </xs:list> + </xs:simpleType> + <xs:minLength value="0" /> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attributeGroup name="core.attrs"> <xs:attribute ref="passThroughWithExclusions" /> + <xs:attribute ref="passThrough" /> </xs:attributeGroup> <xs:element name="root"> @@ -260,10 +278,11 @@ </li> <li> all content declared inside <code><![CDATA[<cdk:body>]]></code> tag is compiled into - statements of <code>encodeChildren(...)</code> method. + statements of <code>encodeChildren(...)</code> method. If content of body element is empty, + no encodeChildren(...) method will be generated unless 'enforce' attribute set to true. </li> <li> - all content declared before <code><![CDATA[<cdk:body>]]></code> tag is compiled into + all content declared after <code><![CDATA[<cdk:body>]]></code> tag is compiled into statements of <code>encodeEnd(...)</code> method </li> </ul> @@ -344,6 +363,39 @@ ]]></pre> <br /><br /> + If you want to disable default encodeChildren method, use enforce attribute: + <pre><![CDATA[ + ... + <cc:implementation> + <div id="myId"> + <cdk:body enforce="true"/> + </div> + </cc:implementation> + ... + ]]></pre> + produces the following code (unsignificant details are ommitted): + <pre><![CDATA[ + ... + + encodeBegin(...) { + ... + writer.startElement("div", cc); + writer.writeAttribute("id", "myId", null); + } + + encodeChildren(...) { + // empty method. + } + + encodeEnd(...) { + ... + writer.endElement("div"); + } + + ... + ]]></pre> + + <br /><br /> The following code snippet: <pre><![CDATA[ ... @@ -374,11 +426,14 @@ <xs:choice> <xs:any minOccurs="0" maxOccurs="unbounded" /> </xs:choice> + <xs:attribute name="enforce" type="xs:boolean"/> </xs:complexType> </xs:element> <xs:element ref="c:if" /> <xs:element ref="c:choose" /> <xs:element ref="call" /> + <xs:element ref="switch" /> + <xs:element ref="object" /> </xs:choice> </xs:group> @@ -426,7 +481,7 @@ <xs:complexType mixed="true"> <xs:simpleContent> <xs:extension base="xs:string"> - <xs:attribute name="name" form="unqualified" type="literalExpression" use="required"> + <xs:attribute name="name" form="unqualified" type="c:literalExpression" use="required"> <xs:annotation> <xs:documentation> <p>Name of the variable, corresponding to Java identifier syntax.</p> @@ -461,12 +516,13 @@ <xs:annotation> <xs:documentation> <p>Variable type name. CDK automatically resolves simple names for primitive types, - JSF API classes and objects from java.lang.* or java.util.*.</p> + JSF API classes and objects from java.lang.* or java.util.*. + For parametrised types you can use java generics syntax </p> <p>Examples: <ul> <li><code><![CDATA[<cdk:object type="java.lang.String" ...>]]></code></li> <li><code><![CDATA[<cdk:object type="float" ...>]]></code></li> - <li><code><![CDATA[<cdk:object type="List" ...>]]></code></li> + <li><code><![CDATA[<cdk:object type="List<String>" ...>]]></code></li> <li><code><![CDATA[<cdk:object type="UIComponent" ...>]]></code></li> </ul> </p> @@ -475,24 +531,6 @@ </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="type-arguments" form="unqualified" type="xs:string"> - <xs:annotation> - <xs:documentation> - <p>Comma-separated list of generic type arguments for usage with types like - java.util.List or java.util.Map.</p> - <p>Examples: - <ul> - <li> - <code><![CDATA[<cdk:object name="map" type="Map" type-arguments="String, Object" />]]></code> - </li> - <li> - <code><![CDATA[<cdk:object name="list" type="List" type-arguments="UIComponent" />]]></code> - </li> - </ul> - </p> - </xs:documentation> - </xs:annotation> - </xs:attribute> </xs:extension> </xs:simpleContent> </xs:complexType> @@ -541,7 +579,7 @@ </xs:complexType> </xs:element> </xs:sequence> - <xs:attribute name="key" use="required" form="unqualified" type="elStrictExpression" /> + <xs:attribute name="key" use="required" form="unqualified" type="c:elStrictExpression" /> </xs:complexType> </xs:element> </xs:schema> Modified: branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2010-10-04 17:21:44 UTC (rev 19432) @@ -18,9 +18,10 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns:xml="http://www.w3.org/XML/1998/namespace" elementFormDefault="qualified" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core" - xmlns:cdk-addinfo="http://jboss.org/schema/richfaces/cdk/additional-... + xmlns:cdk-addinfo="http://jboss.org/schema/richfaces/cdk/additional-... + xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core" + xmlns:x="http://jboss.org/schema/richfaces/cdk/ext"> - <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" /> <xs:annotation> <xs:documentation> @@ -80,6 +81,10 @@ </xs:documentation> </xs:annotation> + <xs:import schemaLocation="cdk-template.xsd" namespace="http://jboss.org/schema/richfaces/cdk/core" /> + <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://jboss.org/schema/richfaces/cdk/jstl/core" /> + <xs:import schemaLocation="cdk-extensions.xsd" namespace="http://jboss.org/schema/richfaces/cdk/ext" /> + <xs:annotation> <xs:documentation> ================== Imported Names @@ -93,7 +98,7 @@ media type, as per [RFC2045] </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="ContentTypes"> @@ -103,7 +108,7 @@ [RFC2045] </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="Charset"> @@ -112,7 +117,7 @@ a character encoding, as per [RFC2045] </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="Charsets"> @@ -122,7 +127,7 @@ per [RFC2045] </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="LanguageCode"> @@ -131,7 +136,7 @@ a language code, as per [RFC3066] </xs:documentation> </xs:annotation> - <xs:union memberTypes="xs:language cdk:elMixedExpression" /> + <xs:union memberTypes="xs:language c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="Character"> @@ -148,7 +153,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -165,7 +170,7 @@ one or more digits </xs:documentation> </xs:annotation> - <xs:union memberTypes="simpleType.Number cdk:elMixedExpression" /> + <xs:union memberTypes="simpleType.Number c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="tabindexNumber"> @@ -188,7 +193,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression" /> + <xs:restriction base="c:elMixedExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -199,7 +204,7 @@ space-separated list of link types </xs:documentation> </xs:annotation> - <xs:union memberTypes="xs:NMTOKENS cdk:elMixedExpression" /> + <xs:union memberTypes="xs:NMTOKENS c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="MediaDesc"> @@ -215,7 +220,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -226,7 +231,7 @@ a Uniform Resource Identifier, see [RFC2396] </xs:documentation> </xs:annotation> - <xs:union memberTypes="xs:anyURI cdk:elMixedExpression" /> + <xs:union memberTypes="xs:anyURI c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="UriList"> @@ -236,7 +241,7 @@ Identifiers </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="Datetime"> @@ -245,7 +250,7 @@ date and time information. ISO date format </xs:documentation> </xs:annotation> - <xs:union memberTypes="xs:dateTime cdk:elMixedExpression" /> + <xs:union memberTypes="xs:dateTime c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="Script"> @@ -254,7 +259,7 @@ script expression </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="StyleSheet"> @@ -263,7 +268,7 @@ style sheet data </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="Text"> @@ -272,7 +277,7 @@ used for titles etc. </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:simpleType name="FrameTarget"> @@ -288,7 +293,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -306,7 +311,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -324,7 +329,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -335,7 +340,7 @@ integer representing length in pixels </xs:documentation> </xs:annotation> - <xs:union memberTypes="xs:nonNegativeInteger cdk:elMixedExpression" /> + <xs:union memberTypes="xs:nonNegativeInteger c:elMixedExpression" /> </xs:simpleType> <xs:annotation> @@ -355,7 +360,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -373,7 +378,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -395,7 +400,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -428,26 +433,26 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> <!-- TODO: add constraints --> <xs:simpleType name="ID"> - <xs:union memberTypes="xs:ID cdk:elMixedExpression" /> + <xs:union memberTypes="xs:ID c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="IDREF"> - <xs:union memberTypes="xs:IDREF cdk:elMixedExpression" /> + <xs:union memberTypes="xs:IDREF c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="IDREFS"> - <xs:union memberTypes="xs:IDREFS cdk:elMixedExpression" /> + <xs:union memberTypes="xs:IDREFS c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="NMTOKEN"> - <xs:union memberTypes="xs:NMTOKEN cdk:elMixedExpression" /> + <xs:union memberTypes="xs:NMTOKEN c:elMixedExpression" /> </xs:simpleType> <xs:simpleType name="NMTOKENS"> - <xs:union memberTypes="xs:NMTOKENS cdk:elMixedExpression" /> + <xs:union memberTypes="xs:NMTOKENS c:elMixedExpression" /> </xs:simpleType> <xs:annotation> @@ -466,6 +471,7 @@ </xs:appinfo> </xs:annotation> </xs:attribute> + <xs:attribute ref="x:class"/> </xs:attributeGroup> <xs:attributeGroup name="coreattrs"> @@ -484,6 +490,7 @@ <xs:attribute name="id" type="ID" /> <xs:attribute name="style" type="StyleSheet" /> <xs:attribute name="title" type="Text" /> + <xs:attributeGroup ref="x:coreattrs" /> </xs:attributeGroup> <xs:simpleType name="simpleType.dir"> @@ -509,9 +516,10 @@ <xs:attribute ref="xml:lang" /> <xs:attribute name="dir"> <xs:simpleType> - <xs:union memberTypes="simpleType.dir cdk:elMixedExpression" /> + <xs:union memberTypes="simpleType.dir c:elMixedExpression" /> </xs:simpleType> </xs:attribute> + <xs:attributeGroup ref="x:i18n" /> </xs:attributeGroup> <xs:attributeGroup name="events"> @@ -543,6 +551,7 @@ <xs:attribute name="onkeypress" type="Script" /> <xs:attribute name="onkeydown" type="Script" /> <xs:attribute name="onkeyup" type="Script" /> + <xs:attributeGroup ref="x:events" /> </xs:attributeGroup> <xs:attributeGroup name="focus"> @@ -561,6 +570,7 @@ <xs:attribute name="tabindex" type="tabindexNumber" /> <xs:attribute name="onfocus" type="Script" /> <xs:attribute name="onblur" type="Script" /> + <xs:attributeGroup ref="x:focus" /> </xs:attributeGroup> <xs:attributeGroup name="attrs"> @@ -588,11 +598,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:align"/> </xs:attributeGroup> <xs:annotation> @@ -868,7 +879,19 @@ <xs:attribute default="rect" name="shape" type="Shape"></xs:attribute> <xs:attribute name="coords" type="Coords"></xs:attribute> <xs:attribute name="target" type="FrameTarget"></xs:attribute> - <xs:attributeGroup ref="cdk:core.attrs" /> + + <xs:attribute ref="x:charset" ></xs:attribute> + <xs:attribute ref="x:type" ></xs:attribute> + <xs:attribute ref="x:name" ></xs:attribute> + <xs:attribute ref="x:href" ></xs:attribute> + <xs:attribute ref="x:hreflang" ></xs:attribute> + <xs:attribute ref="x:rel" ></xs:attribute> + <xs:attribute ref="x:rev" ></xs:attribute> + <xs:attribute ref="x:shape" ></xs:attribute> + <xs:attribute ref="x:coords" ></xs:attribute> + <xs:attribute ref="x:target" ></xs:attribute> + + <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:group name="a.children"> @@ -1126,7 +1149,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -1144,7 +1167,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -1331,7 +1354,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -1346,11 +1369,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:compact" /> </xs:attributeGroup> <xs:element name="ul" type="ul.content"> @@ -1380,7 +1404,7 @@ first list item in an ordered list. </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:element name="ol" type="ol.content"> @@ -1413,7 +1437,7 @@ LIStyle is constrained to: "(ULStyle|OLStyle)" </xs:documentation> </xs:annotation> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> <xs:element name="li"> @@ -1640,14 +1664,14 @@ <xs:attributeGroup ref="events" /> <xs:attribute name="lang" type="LanguageCode" /> <xs:attribute ref="xml:lang" /> - <xs:attribute name="dir" use="required"> + <xs:attribute name="dir" use="optional"> <xs:annotation> <xs:appinfo> <cdk-addinfo:default-value>ltr</cdk-addinfo:default-value> </xs:appinfo> </xs:annotation> <xs:simpleType> - <xs:union memberTypes="simpleType.dir cdk:elMixedExpression" /> + <xs:union memberTypes="simpleType.dir c:elMixedExpression" /> </xs:simpleType> </xs:attribute> </xs:extension> @@ -1824,6 +1848,7 @@ <xs:extension base="Inline"> <xs:attributeGroup ref="attrs" /> <xs:attribute name="cite" type="URI" /> + <xs:attribute ref="x:cite" /> </xs:extension> </xs:complexContent> </xs:complexType> @@ -2001,6 +2026,10 @@ <xs:attribute name="size" /> <xs:attribute name="color" type="Color" /> <xs:attribute name="face" /> + + <xs:attribute ref="x:size" /> + <xs:attribute ref="x:color" /> + <xs:attribute ref="x:face" /> </xs:extension> </xs:complexContent> </xs:complexType> @@ -2098,7 +2127,7 @@ <xs:complexContent> <xs:extension base="form.content"> <xs:attributeGroup ref="attrs" /> - <xs:attribute name="action" use="required" type="URI" /> + <xs:attribute name="action" use="optional" type="URI" /> <xs:attribute name="method" default="get"> <xs:simpleType> <xs:union> @@ -2109,7 +2138,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2121,6 +2150,16 @@ <xs:attribute name="accept" type="ContentTypes" /> <xs:attribute name="accept-charset" type="Charsets" /> <xs:attribute name="target" type="FrameTarget" /> + + <xs:attribute ref="x:action" /> + <xs:attribute ref="x:method" ></xs:attribute> + <xs:attribute ref="x:enctype" /> + <xs:attribute ref="x:onsubmit" /> + <xs:attribute ref="x:onreset" /> + <xs:attribute ref="x:accept" /> + <xs:attribute ref="x:accept-charset" /> + <xs:attribute ref="x:target" /> + </xs:extension> </xs:complexContent> </xs:complexType> @@ -2141,6 +2180,12 @@ <xs:attribute name="accesskey" type="Character" /> <xs:attribute name="onfocus" type="Script" /> <xs:attribute name="onblur" type="Script" /> + + <xs:attribute ref="x:for" /> + <xs:attribute ref="x:accesskey" /> + <xs:attribute ref="x:onfocus" /> + <xs:attribute ref="x:onblur" /> + </xs:extension> </xs:complexContent> </xs:complexType> @@ -2163,7 +2208,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2178,11 +2223,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:checked" /> </xs:attributeGroup> <xs:attributeGroup name="disabledGroup"> @@ -2195,11 +2241,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:disabled"></xs:attribute> </xs:attributeGroup> <xs:attributeGroup name="readonlyGroup"> @@ -2212,11 +2259,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:readonly"></xs:attribute> </xs:attributeGroup> <xs:element name="input" type="input.content"> @@ -2286,7 +2334,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2334,11 +2382,16 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + + <xs:attribute ref="x:name" /> + <xs:attribute ref="x:value" /> + <xs:attribute ref="x:type" /> + </xs:extension> </xs:complexContent> </xs:complexType> @@ -2392,7 +2445,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2419,7 +2472,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2439,7 +2492,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2466,13 +2519,18 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> <xs:attribute name="char" type="Character" /> <xs:attribute name="charoff" type="Length" /> + + <xs:attribute ref="x:align"/> + <xs:attribute ref="x:char"/> + <xs:attribute ref="x:charoff"/> + </xs:attributeGroup> <xs:attributeGroup name="cellvalign"> @@ -2493,11 +2551,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:valign"/> </xs:attributeGroup> <xs:element name="table" type="table.content"> @@ -2514,7 +2573,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elFreeformExpression" /> + <xs:restriction base="c:elFreeformExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2607,7 +2666,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression" /> + <xs:restriction base="c:elMixedExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2629,11 +2688,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression" /> + <xs:restriction base="c:elMixedExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:nowrap" /> </xs:attributeGroup> <xs:element name="th"> @@ -2711,12 +2771,24 @@ <xs:attribute name="object" type="xs:anySimpleType"></xs:attribute> <xs:attribute name="alt" type="Text"></xs:attribute> <xs:attribute name="name" type="NMTOKEN"></xs:attribute> - <xs:attribute use="required" name="width" type="Length"></xs:attribute> - <xs:attribute use="required" name="height" type="Length"></xs:attribute> + <xs:attribute use="optional" name="width" type="Length"></xs:attribute> + <xs:attribute use="optional" name="height" type="Length"></xs:attribute> <xs:attribute name="align" type="ImgAlign"></xs:attribute> <xs:attribute name="hspace" type="Pixels"></xs:attribute> <xs:attribute name="vspace" type="Pixels"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> + + <xs:attribute ref="x:codebase" ></xs:attribute> + <xs:attribute ref="x:archive" ></xs:attribute> + <xs:attribute ref="x:code" ></xs:attribute> + <xs:attribute ref="x:object" ></xs:attribute> + <xs:attribute ref="x:alt" ></xs:attribute> + <xs:attribute ref="x:name" ></xs:attribute> + <xs:attribute ref="x:width" ></xs:attribute> + <xs:attribute ref="x:height" ></xs:attribute> + <xs:attribute ref="x:align" ></xs:attribute> + <xs:attribute ref="x:hspace" ></xs:attribute> + <xs:attribute ref="x:vspace" ></xs:attribute> </xs:complexType> <xs:group name="applet.children"> @@ -2753,28 +2825,47 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> - <xs:attribute use="required" name="alt" type="Text"></xs:attribute> + + <xs:attribute use="optional" name="alt" type="Text"></xs:attribute> <xs:attribute name="target" type="FrameTarget"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> + + <xs:attribute ref="x:alt" ></xs:attribute> + <xs:attribute ref="x:target" ></xs:attribute> + <xs:attribute ref="x:shape" ></xs:attribute> + <xs:attribute ref="x:coords" ></xs:attribute> + <xs:attribute ref="x:href" ></xs:attribute> + <xs:attribute ref="x:nohref"></xs:attribute> + </xs:complexType> <xs:complexType name="base.content"> <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attribute name="id" type="ID"></xs:attribute> <xs:attribute name="href" type="URI"></xs:attribute> <xs:attribute name="target" type="FrameTarget"></xs:attribute> + + <xs:attribute ref="x:id" ></xs:attribute> + <xs:attribute ref="x:href" ></xs:attribute> + <xs:attribute ref="x:target" ></xs:attribute> + <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="basefont.content"> <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attribute name="id" type="ID" /> - <xs:attribute use="required" name="size" type="xs:anySimpleType" /> + <xs:attribute use="optional" name="size" type="xs:anySimpleType" /> <xs:attribute name="color" type="Color" /> <xs:attribute name="face" type="xs:anySimpleType" /> + + <xs:attribute ref="x:id" /> + <xs:attribute ref="x:size" /> + <xs:attribute ref="x:color" /> + <xs:attribute ref="x:face" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="br.content"> @@ -2792,11 +2883,12 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> + <xs:attribute ref="x:clear" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="col.content"> @@ -2806,6 +2898,10 @@ <xs:attribute name="width" type="MultiLength"></xs:attribute> <xs:attributeGroup ref="cellhalign"></xs:attributeGroup> <xs:attributeGroup ref="cellvalign"></xs:attributeGroup> + + <xs:attribute ref="x:span" /> + <xs:attribute ref="x:width" /> + <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="colgroup.content"> @@ -2815,6 +2911,9 @@ <xs:attribute name="width" type="MultiLength" /> <xs:attributeGroup ref="cellhalign" /> <xs:attributeGroup ref="cellvalign" /> + + <xs:attribute ref="x:span" /> + <xs:attribute ref="x:width" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:group name="colgroup.children"> @@ -2885,6 +2984,9 @@ <xs:attributeGroup ref="i18n"></xs:attributeGroup> <xs:attribute name="id" type="ID"></xs:attribute> <xs:attribute name="profile" type="URI"></xs:attribute> + + <xs:attribute ref="x:id" /> + <xs:attribute ref="x:profile" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -2923,7 +3025,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2937,19 +3039,24 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> </xs:attribute> <xs:attribute name="size" type="Pixels"></xs:attribute> <xs:attribute name="width" type="Length"></xs:attribute> + + <xs:attribute ref="x:size" /> + <xs:attribute ref="x:width" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="html.content"> <xs:group ref="html.children" /> <xs:attributeGroup ref="i18n"></xs:attributeGroup> <xs:attribute name="id" type="ID"></xs:attribute> + + <xs:attribute ref="x:id" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:group name="html.children"> @@ -2962,8 +3069,8 @@ <xs:complexType name="img.content"> <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> - <xs:attribute use="required" name="src" type="URI"></xs:attribute> - <xs:attribute use="required" name="alt" type="Text"> + <xs:attribute use="optional" name="src" type="URI"></xs:attribute> + <xs:attribute use="optional" name="alt" type="Text"> <xs:annotation> <xs:appinfo> <cdk-addinfo:default-value></cdk-addinfo:default-value> @@ -2986,7 +3093,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> @@ -2995,6 +3102,18 @@ <xs:attribute name="border" type="Length"></xs:attribute> <xs:attribute name="hspace" type="Pixels"></xs:attribute> <xs:attribute name="vspace" type="Pixels"></xs:attribute> + + <xs:attribute ref="x:src" ></xs:attribute> + <xs:attribute ref="x:alt" ></xs:attribute> + <xs:attribute ref="x:name" ></xs:attribute> + <xs:attribute ref="x:longdesc" ></xs:attribute> + <xs:attribute ref="x:height" ></xs:attribute> + <xs:attribute ref="x:width" ></xs:attribute> + <xs:attribute ref="x:usemap" ></xs:attribute> + <xs:attribute ref="x:align" ></xs:attribute> + <xs:attribute ref="x:border" ></xs:attribute> + <xs:attribute ref="x:hspace" ></xs:attribute> + <xs:attribute ref="x:vspace" ></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="input.content"> @@ -3018,6 +3137,20 @@ <xs:attribute name="onchange" type="Script"></xs:attribute> <xs:attribute name="accept" type="ContentTypes"></xs:attribute> <xs:attribute name="align" type="ImgAlign"></xs:attribute> + + <xs:attribute ref="x:type" ></xs:attribute> + <xs:attribute ref="x:name" ></xs:attribute> + <xs:attribute ref="x:value" ></xs:attribute> + <xs:attribute ref="x:size" ></xs:attribute> + <xs:attribute ref="x:maxlength" ></xs:attribute> + <xs:attribute ref="x:src" ></xs:attribute> + <xs:attribute ref="x:alt" ></xs:attribute> + <xs:attribute ref="x:usemap" ></xs:attribute> + <xs:attribute ref="x:onselect" ></xs:attribute> + <xs:attribute ref="x:onchange" ></xs:attribute> + <xs:attribute ref="x:accept" ></xs:attribute> + <xs:attribute ref="x:align" ></xs:attribute> + <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="isindex.content"> @@ -3038,6 +3171,15 @@ <xs:attribute name="rev" type="LinkTypes"></xs:attribute> <xs:attribute name="media" type="MediaDesc"></xs:attribute> <xs:attribute name="target" type="FrameTarget"></xs:attribute> + + <xs:attribute ref="x:charset" ></xs:attribute> + <xs:attribute ref="x:href" ></xs:attribute> + <xs:attribute ref="x:hreflang" ></xs:attribute> + <xs:attribute ref="x:type" ></xs:attribute> + <xs:attribute ref="x:rel" ></xs:attribute> + <xs:attribute ref="x:rev" ></xs:attribute> + <xs:attribute ref="x:media" ></xs:attribute> + <xs:attribute ref="x:target" ></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="map.content"> @@ -3045,10 +3187,15 @@ <xs:attributeGroup ref="i18n"></xs:attributeGroup> <xs:attributeGroup ref="events"></xs:attributeGroup> <xs:attributeGroup ref="classGroup" /> - <xs:attribute use="required" name="id" type="ID" /> + <xs:attribute use="optional" name="id" type="ID" /> <xs:attribute name="style" type="StyleSheet" /> <xs:attribute name="title" type="Text" /> <xs:attribute name="name" type="xs:anySimpleType" /> + + <xs:attribute ref="x:id" /> + <xs:attribute ref="x:style" /> + <xs:attribute ref="x:title" /> + <xs:attribute ref="x:name" /> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3091,9 +3238,16 @@ <xs:attribute name="id" type="ID"></xs:attribute> <xs:attribute name="http-equiv" type="xs:anySimpleType"></xs:attribute> <xs:attribute name="name" type="xs:anySimpleType"></xs:attribute> - <xs:attribute use="required" name="content" type="xs:anySimpleType"> + <xs:attribute use="optional" name="content" type="xs:anySimpleType"> </xs:attribute> <xs:attribute name="scheme" type="xs:anySimpleType"></xs:attribute> + + <xs:attribute ref="x:id" ></xs:attribute> + <xs:attribute ref="x:http-equiv" ></xs:attribute> + <xs:attribute ref="x:name" ></xs:attribute> + <xs:attribute ref="x:content" > + </xs:attribute> + <xs:attribute ref="x:scheme" ></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="object.content" mixed="true"> @@ -3108,7 +3262,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> @@ -3172,7 +3326,7 @@ <xs:group ref="optgroup.children" /> <xs:attributeGroup ref="attrs"></xs:attributeGroup> <xs:attributeGroup ref="disabledGroup" /> - <xs:attribute use="required" name="label" type="Text"></xs:attribute> + <xs:attribute use="optional" name="label" type="Text"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3196,7 +3350,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> @@ -3208,7 +3362,7 @@ <xs:complexType name="param.content"> <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attribute name="id" type="ID"></xs:attribute> - <xs:attribute use="required" name="name" type="xs:anySimpleType"> + <xs:attribute use="optional" name="name" type="xs:anySimpleType"> </xs:attribute> <xs:attribute name="value" type="xs:anySimpleType"></xs:attribute> <xs:attribute default="data" name="valuetype"> @@ -3222,7 +3376,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> @@ -3234,7 +3388,7 @@ <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attribute name="id" type="ID"></xs:attribute> <xs:attribute name="charset" type="Charset"></xs:attribute> - <xs:attribute use="required" name="type" type="ContentType"></xs:attribute> + <xs:attribute use="optional" name="type" type="ContentType"></xs:attribute> <xs:attribute name="language" type="xs:anySimpleType"></xs:attribute> <xs:attribute name="src" type="URI"></xs:attribute> <xs:attribute name="defer"> @@ -3246,7 +3400,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression"></xs:restriction> + <xs:restriction base="c:elMixedExpression"></xs:restriction> </xs:simpleType> </xs:union> </xs:simpleType> @@ -3269,7 +3423,7 @@ </xs:restriction> </xs:simpleType> <xs:simpleType> - <xs:restriction base="cdk:elMixedExpression" /> + <xs:restriction base="c:elMixedExpression" /> </xs:simpleType> </xs:union> </xs:simpleType> @@ -3295,7 +3449,7 @@ <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attributeGroup ref="i18n"></xs:attributeGroup> <xs:attribute name="id" type="ID"></xs:attribute> - <xs:attribute use="required" name="type" type="ContentType"></xs:attribute> + <xs:attribute use="optional" name="type" type="ContentType"></xs:attribute> <xs:attribute name="media" type="MediaDesc"></xs:attribute> <xs:attribute name="title" type="Text"></xs:attribute> <xs:attribute fixed="preserve" ref="xml:space"></xs:attribute> @@ -3357,11 +3511,17 @@ <xs:attributeGroup ref="focus"></xs:attributeGroup> <xs:attributeGroup ref="disabledGroup" /> <xs:attribute name="name" type="xs:anySimpleType"></xs:attribute> - <xs:attribute use="required" name="rows" type="Number"></xs:attribute> - <xs:attribute use="required" name="cols" type="Number"></xs:attribute> + <xs:attribute use="optional" name="rows" type="Number"></xs:attribute> + <xs:attribute use="optional" name="cols" type="Number"></xs:attribute> <xs:attributeGroup ref="readonlyGroup" /> <xs:attribute name="onselect" type="Script"></xs:attribute> <xs:attribute name="onchange" type="Script"></xs:attribute> + + <xs:attribute ref="x:name" ></xs:attribute> + <xs:attribute ref="x:rows" ></xs:attribute> + <xs:attribute ref="x:cols" ></xs:attribute> + <xs:attribute ref="x:onselect" ></xs:attribute> + <xs:attribute ref="x:onchange" ></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> <xs:complexType name="tfoot.content"> @@ -3398,6 +3558,7 @@ <xs:group ref="cdk:structural" minOccurs="0" maxOccurs="unbounded" /> <xs:attributeGroup ref="i18n"></xs:attributeGroup> <xs:attribute name="id" type="ID"></xs:attribute> + <xs:attribute ref="x:id"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3407,6 +3568,8 @@ <xs:attributeGroup ref="cellhalign"></xs:attributeGroup> <xs:attributeGroup ref="cellvalign"></xs:attributeGroup> <xs:attribute name="bgcolor" type="Color"></xs:attribute> + + <xs:attribute ref="x:bgcolor"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> @@ -3425,6 +3588,8 @@ <xs:attributeGroup ref="attrs" /> <xs:attribute name="type" type="ULStyle" /> <xs:attributeGroup ref="compactGroup" /> + + <xs:attribute ref="x:type"></xs:attribute> <xs:attributeGroup ref="cdk:core.attrs" /> </xs:complexType> Modified: branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/component.ftl =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/component.ftl 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/component.ftl 2010-10-04 17:21:44 UTC (rev 19432) @@ -18,7 +18,6 @@ import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.component.StateHelper; -import org.richfaces.component.PartialStateHolderHelper; import ${baseClass}; <#include "_attributes_import.ftl"> Modified: branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl =================================================================== --- branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,12 +1,16 @@ -<#if value.literal && value == "true"> +<#if value.literal > + <#if value == '"true"' || value == '"${attributeName}"' > ${responseWriterVariable}.writeAttribute("${attributeName}","${attributeName}",null); + </#if> <#else> <#if value.type == "boolean" > if(${value}) { <#elseif value.type == "Boolean" > if(Boolean.TRUE.equals(${value})) { + <#elseif value.type == "String" > + if("${attributeName}".equals(${value}) || Boolean.valueOf(${value}) ) { <#else> - if(Boolean.valueOf(String.valueOf(${value}))) { + if(null != ${value} && ( Boolean.valueOf(${value}.toString()) || "${attributeName}".equals(${value}.toString())) ) { </#if> ${responseWriterVariable}.writeAttribute("${attributeName}","${attributeName}",null); } Modified: branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java =================================================================== --- branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -63,6 +63,7 @@ description=@Description(displayName="Test HTML5 abbreviation",largeIcon="large.gif",smallIcon="spall.png"), tag=(a)Tag(name=&quot;abbr&quot;,generate=true,handler=&quot;org.richfaces.cdk.test.facelets.AbbrTagHandler&quot;), generate="org.richfaces.cdk.test.component.html.HtmlTestAbbr", + attributes={"core-props.xml","events-props.xml","i18n-props.xml"}, interfaces=Html5Attributes.class, renderer=(a)JsfRenderer(type=&quot;org.richfaces.cdk.test.HtmlAbbrRenderer&quot;)), @RendererSpecificComponent(type = "org.richfaces.cdk.test.TestHtmlDfn", Modified: branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java =================================================================== --- branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/Html5Attributes.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -48,7 +48,7 @@ /** * @return */ - @Attribute(events=@EventName("ondrag")) + @Attribute(events=@EventName("drag")) public abstract DraggableState getDraggable(); /** Modified: branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml =================================================================== --- branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/cdk/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core" +<cdk:root xmlns="http://jboss.org/schema/richfaces/cdk/xhtml-el" xmlns:cdk="http://jboss.org/schema/richfaces/cdk/core" xmlns:c="http://jboss.org/schema/richfaces/cdk/jstl/core" xmlns:cc="http://jboss.org/schema/richfaces/cdk/jsf/composite" xmlns:x="http://jboss.org/schema/richfaces/cdk/ext"> <cc:interface> @@ -37,7 +37,9 @@ </cc:interface> <cc:implementation> - <div id="#{clientId}" cdk:passThroughWithExclusions="id dir lang"> + <div id="#{clientId}" cdk:passThroughWithExclusions="id dir lang" > + <input readonly="readonly"/> + <a x:onclick="onBodyClick" onclick="" href="/root/"/> <c:if test="#{component.attributes['ifTest'] != null}">if content</c:if> <c:choose> <c:when test="#{component.attributes['anotherTest'] != null}">when content</c:when> @@ -51,7 +53,7 @@ <ul x:style="listStyle" x:class="listClass" cdk:passThrough="id title:listTitle onclick:onlistclick ondblclick:onlistdblclick"> <c:forEach items="#{component.children}" var="iterationVar"> <li>forEach content <cdk:call>iterationVar.encodeAll(facesContext)</cdk:call></li> - </c:forEach> + </c:forEach> </ul> </div> </cc:implementation> Modified: branches/RF-8742/core/api/src/main/java/org/richfaces/skin/Skin.java =================================================================== --- branches/RF-8742/core/api/src/main/java/org/richfaces/skin/Skin.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/core/api/src/main/java/org/richfaces/skin/Skin.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -252,6 +252,8 @@ */ public static final String TAB_WEIGHT_FONT = "tabWeightFont"; + public static final String TAB_BACKGROUND_COLOR = "tabBackgroundColor"; + public static final String TRIM_COLOR = "trimColor"; /** Copied: branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java (from rev 19430, trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java) =================================================================== --- branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java (rev 0) +++ branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TabHeaderGradient.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,41 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; + +import javax.faces.context.FacesContext; + +/** + * @author akolonitsky + * @since Sep 30, 2010 + */ +public class TabHeaderGradient extends BaseGradient { + + @Override + protected void initializeProperties(FacesContext context, Skin skin) { + super.initializeProperties(context, skin); + setBaseColorParam(Skin.GENERAL_BACKGROUND_COLOR); + setGradientColorParam(Skin.TAB_BACKGROUND_COLOR); + } +} Copied: branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java (from rev 19430, trunk/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java) =================================================================== --- branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java (rev 0) +++ branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/images/TopTabHeaderGradient.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,41 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.renderkit.html.images; + +import org.richfaces.renderkit.html.BaseGradient; +import org.richfaces.skin.Skin; + +import javax.faces.context.FacesContext; + +/** + * @author akolonitsky + * @since Sep 30, 2010 + */ +public class TopTabHeaderGradient extends BaseGradient { + + @Override + protected void initializeProperties(FacesContext context, Skin skin) { + super.initializeProperties(context, skin); + setBaseColorParam(Skin.TAB_BACKGROUND_COLOR); + setGradientColorParam(Skin.GENERAL_BACKGROUND_COLOR); + } +} Modified: branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-base-component.js =================================================================== --- branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-base-component.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces-base-component.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -4,8 +4,6 @@ (function ($, richfaces, params) { - - var RICH_CONTAINER = "richfaces"; richfaces.blankFunction = function (){}; //TODO: add it to global library @@ -177,7 +175,7 @@ * @type String * */ name: "BaseComponent", - + /** * Method for converting object to string * @@ -230,7 +228,7 @@ source = source || this.id; var element = richfaces.getDomElement(source); if (element) { - element[RICH_CONTAINER] = element[RICH_CONTAINER] || {}; + element[richfaces.RICH_CONTAINER] = element[richfaces.RICH_CONTAINER] || {}; element.richfaces.component = this; } return element; @@ -270,7 +268,7 @@ eventObj.initEvent( eventType, true, false ); } } - eventObj[RICH_CONTAINER] = {component:this, data: data}; + eventObj[richfaces.RICH_CONTAINER] = {component:this, data: data}; var eventHandler = this.options['on'+eventType]; Modified: branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces.js =================================================================== --- branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -13,6 +13,8 @@ (function(jQuery, richfaces) { + richfaces.RICH_CONTAINER = "richfaces"; + // get DOM element by id or DOM element or jQuery object richfaces.getDomElement = function (source) { var type = typeof source; Modified: branches/RF-8742/dist/readme-examples.txt =================================================================== --- branches/RF-8742/dist/readme-examples.txt 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/dist/readme-examples.txt 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,6 +1,6 @@ RichFaces 4.0 Examples ========================================================= -Version 4.0.0.M2 +Version 4.0.0.M3 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt). @@ -21,11 +21,11 @@ More additional information about build profiles for concrete applications and working with them - inside readme's for application itself. -NEW for M2: richfaces-showcase contains readme.txt which shows how to publish the application to Google Application Engine. +NOTE: richfaces-showcase contains readme.txt which shows how to publish the application to Google Application Engine. Using IDE to work with examples ------------------------------- - *You could use Jboss Tools with m2eclipse plugin and just import the examples as maven-based projects. + *You could use JBoss Tools with m2eclipse plugin and just import the examples as maven-based projects. *Or if you have not using m2eclipse - execute: mvn eclipse:ecllipse Modified: branches/RF-8742/dist/readme-ui.txt =================================================================== --- branches/RF-8742/dist/readme-ui.txt 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/dist/readme-ui.txt 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,6 +1,6 @@ RichFaces - Ajax enabled JSF 2.0 component library ========================================================= -Version 4.0.0.M2 +Version 4.0.0.M3 This software is distributed under the terms of the FSF Lesser Gnu Public License (see lgpl.txt). @@ -8,18 +8,18 @@ ------------------------------- 1) Put RichFaces libraries and its dependencies in your application libraries folder: - 1.1) richfaces-core-api-4.0.0.20100824-M2.jar - 1.2) richfaces-core-impl-4.0.0.20100824-M2.jar - 1.3) richfaces-components-api-4.0.0.20100824-M2.jar - 1.4) richfaces-components-ui-4.0.0.20100824-M2.jar + 1.1) richfaces-core-api-4.0.0.20101001-M3.jar + 1.2) richfaces-core-impl-4.0.0.20101001-M3.jar + 1.3) richfaces-components-api-4.0.0.20101001-M3.jar + 1.4) richfaces-components-ui-4.0.0.20101001-M3.jar 1.5) sac-1.3, cssparser-0.9.5 - required for components CSS work 1.6) google-guava-r06 - core runtime dependency. - 1.7) annotations.jar from org.richfaces.cdk . It's optional and should be added only if some RichFaces components will be - created/accessed dynamically from some appication actions/listeners. + 1.7) annotations.jar from org.richfaces.cdk + - It's optional and only needs to be added if RichFaces components will be + created/accessed dynamically in your apps actions/listeners. For optimal performance it's recommended to add one of these caching frameworks to application classpath: EhCache, JBoss Cache, OsCache. - 2) As opposed to the previous 3.x.y versions of RichFaces, no special configuration steps are necessary. You don't need to modify web.xml or faces-config.xml @@ -27,8 +27,8 @@ Use xmlns:a4j="http://richfaces.org/a4j" namespace for core components Use xmlns:rich="http://richfaces.org/rich" namespace for rich components -4) Add one of the available RichFaces 4.0.M2 components to your page and try it! - 4.1) Take a look at the RichFaces examples for assistance with usage. +4) Add one of the available RichFaces 4.0.M3 components to your page and try it! +4.1) Take a look at the RichFaces examples for assistance with usage. Available Components/Behaviors/Tags/Functions @@ -81,21 +81,25 @@ --------------------------------- Output: --------------------------------- +rich:collapsiblePanel rich:panel rich:popupPanel +rich:tabPanel rich:togglePanel rich:toggleControl rich:togglePanelItem rich:itemChangeListener rich:accordion rich:accordionItem +rich:progressBar --------------------------------- -Output: +Input: --------------------------------- rich:autocomplete rich:inplaceInput rich:inputNumberSlider +rich:inputNumberSpinner Learn more ---------- Modified: branches/RF-8742/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml =================================================================== --- branches/RF-8742/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/input-demo/src/main/webapp/examples/inputNumberSlider.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -39,12 +39,17 @@ <f:selectItems value="#{skinBean.skins}"/> </h:selectOneMenu> <br /> + <h:outputText value="Date: "/> + <h:outputText id="date" value="#{inputNumberSliderBean.date}" /> + <br /> <ins:inputNumberSlider id="ins" value="#{inputNumberSliderBean.value}" accesskey="#{inputNumberSliderBean.accesskey}" delay="#{inputNumberSliderBean.delay}" disabled="#{inputNumberSliderBean.disabled}" enableManualInput="#{inputNumberSliderBean.enableManualInput}" inputPosition="#{inputNumberSliderBean.inputPosition}" inputSize="#{inputNumberSliderBean.inputSize}" showArrows="#{inputNumberSliderBean.showArrows}" showBoundaryValues="#{inputNumberSliderBean.showBoundaryValues}" showInput="#{inputNumberSliderBean.showInput}" showToolTip="#{inputNumberSliderBean.showToolTip}" maxValue="#{inputNumberSliderBean.maxValue}" minValue="#{inputNumberSliderBean.minValue}" - step="#{inputNumberSliderBean.step}" /> + step="#{inputNumberSliderBean.step}" > + <f:ajax render="date" /> + </ins:inputNumberSlider> <br /> <h:outputText value="Accesskey: "/> <h:inputText value="#{inputNumberSliderBean.accesskey}"> Modified: branches/RF-8742/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml =================================================================== --- branches/RF-8742/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/input-demo/src/main/webapp/qunit/autocomplete-qunit.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -30,9 +30,14 @@ <p>Page</p> <h:form id="form"> - <input:autocomplete id="autocompleteDefault" value="a" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country"> + <input:autocomplete id="autocompleteDefault" value="a" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" + onchange="return onEvent.call(this, event);" onselectitem="return onEvent.call(this, event);" onblur="return onEvent.call(this, event);" onfocus="return onEvent.call(this, event);"> #{country.name} #{country.iso} #{country.domain} </input:autocomplete><br /> + <input:autocomplete id="autocompleteDefault2" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" + onselectitem="return onEvent.call(this, event);" showButton="true" mode="client"> + #{country.name} #{country.iso} #{country.domain} + </input:autocomplete><br /> <input:autocomplete id="autocompleteClientMode" mode="client" fetchValue="#{country.name}" autocompleteMethod="#{autoCompleteBean.autocomplete}" var="country" showButton="true"> #{country.name} #{country.iso} #{country.domain} </input:autocomplete><br /> Modified: branches/RF-8742/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js =================================================================== --- branches/RF-8742/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/input-demo/src/main/webapp/resources/tests/autocomplete-qunit.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -25,7 +25,9 @@ var AUTOCOMPLETE_ID = "form:autocomplete"; + // Constructor tests test("RichFaces.ui.Autocomplete constructor test", function () { + expect(15); var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); ok(c instanceof RichFaces.ui.AutocompleteBase, "inctance of RichFaces.ui.AutocompleteBase"); @@ -46,7 +48,9 @@ equals(c.options.filterFunction, undefined, "options.filterFunction"); }); + // Client API tests test("RichFaces.ui.Autocomplete client api function's", function () { + expect(5); var CLIENT_API_BASE = ['show','hide','getNamespace','getInputValue','setInputValue']; var CLIENT_API = []; var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); @@ -58,6 +62,7 @@ }); test("RichFaces.ui.Autocomplete client api: show/hide [attachToDom=true]", function () { + expect(6); var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); var e = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultList'); equals(e.parentNode.tagName.toLowerCase(), "div", "before show list attached to"); @@ -73,44 +78,163 @@ }); test("RichFaces.ui.Autocomplete client api: getNamespace", function () { + expect(1); var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); equals(c.getNamespace(), '.'+RichFaces.Event.createNamespace(c.name, AUTOCOMPLETE_ID+'Default'), "getNamespace"); }); test("RichFaces.ui.Autocomplete client api: getInputValue / setInputValue", function () { + expect(2); var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); equals(c.getInputValue(), 'a', "getInputValue"); c.setInputValue("b"); equals(c.getInputValue(), 'b', "getInputValue after setInputValue"); }); - -/* - test("RichFaces.ui.Tab test events", function () { - var componentId = TAB_ID; - var c = RichFaces.$(componentId); - - expect(5); - var beforeitemchngeHandler = function (event, comp, data) { - ok(true, "beforeitemchnge handler invouked"); - - same(data.id, componentId, "component id"); - same(data.oldItem.getName(), c.items[0].getName(), "old item"); - same(data.newItem.getName(), c.items[1].getName(), "new item"); - - return true; + + //Inline user's event handlers tests + window.checkInlineEvent = function (event, c, checkData) { + var richContainer = event[RichFaces.RICH_CONTAINER]; + ok(richContainer, "rich container is present in event"); + ok(richContainer.component, "component is present in rich container"); + equals(richContainer.component, c, "component"); + if (checkData) { + ok(typeof richContainer.data!="undefined", "data is present in rich container"); + equals(richContainer.data, RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input').value, "data"); + } + }; + + test("RichFaces.ui.Autocomplete inline event handlers: focus/blur", function () { + expect(10); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + + window.onEvent = function (event) { + ok(event, "event is present"); + equals(event.type, "focus", "event type after focus"); + checkInlineEvent(event, c); }; + var input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultInput'); + input.focus(); + + window.onEvent = function (event) { + ok(event, "event is present"); + equals(event.type, "blur", "event type after blur"); + checkInlineEvent(event, c); + }; + input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input'); + input.focus(); + window.onEvent = function (){}; + }); + + test("RichFaces.ui.Autocomplete inline event handlers: change", function () { + expect(5); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + + window.onEvent = function (event) { + if (event.type!="change") return; + ok(event, "event is present"); + equals(event.type, "change", "event type"); + checkInlineEvent(event, c); + }; + var input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultInput'); + input.value=""; + input.focus(); + input.value="a"; + input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input'); + input.focus(); + window.onEvent = function (){}; + }); + + test("RichFaces.ui.Autocomplete inline event handlers: selectitem", function () { + expect(7); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default2'); + + window.onEvent = function (event) { + if (event.type!="selectitem") return; + ok(event, "event is present"); + equals(event.type, "selectitem", "event type"); + checkInlineEvent(event, c, true); + }; + var input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input'); + input.value="a"; + var button = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Button'); + RichFaces.Event.fire(button,"mousedown"); + c.__onEnter.call(c, {which:13}); + c.hide(); + input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'ClientModeInput'); + input.focus(); + window.onEvent = function (){}; + }); + + //Binded user's event handlers tests + window.checkBindedEvent = function (event, element, c) { + equals(element.id, c.id, "element id"); + equals(RichFaces.$(element.id), c, "component"); + }; + + test("RichFaces.ui.Autocomplete binded event handlers: focus/blur", function () { + expect(10); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + RichFaces.Event.bindById(AUTOCOMPLETE_ID+'Default', {"focus": function (event, element) { + ok(event, "event is present"); + ok(element, "element is present"); + equals(event.type, "focus", "event type after focus"); + checkBindedEvent(event, element, c); + }, + "blur": function (event, element) { + ok(event, "event is present"); + ok(element, "element is present"); + equals(event.type, "blur", "event type after blur"); + checkBindedEvent(event, element, c); + } + }); + var input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultInput'); + input.focus(); + input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input'); + input.focus(); + RichFaces.Event.unbindById(AUTOCOMPLETE_ID+'Default', "focus blur"); + }); + + test("RichFaces.ui.Autocomplete binded event handlers: change", function () { + expect(5); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default'); + RichFaces.Event.bindById(AUTOCOMPLETE_ID+'Default', "change", function (event, element) { + ok(event, "event is present"); + ok(element, "element is present"); + equals(event.type, "change", "event type"); + checkBindedEvent(event, element, c); + }); + var input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'DefaultInput'); + input.value=""; + input.focus(); + input.value="a" + input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input'); + input.focus(); + RichFaces.Event.unbindById(AUTOCOMPLETE_ID+'Default', "change"); + }); + + test("RichFaces.ui.Autocomplete binded event handlers: selectitem", function () { + expect(7); + var c = RichFaces.$(AUTOCOMPLETE_ID+'Default2'); + + RichFaces.Event.bindById(AUTOCOMPLETE_ID+'Default2', "selectitem", function (event, element, data) { + ok(event, "event is present"); + ok(element, "element is present"); + ok(data, "data is present"); + equals(data, RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input').value, "data"); + equals(event.type, "selectitem", "event type"); + checkBindedEvent(event, element, c); + }); + var input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Input'); + input.value="a"; + var button = RichFaces.getDomElement(AUTOCOMPLETE_ID+'Default2Button'); + RichFaces.Event.fire(button,"mousedown"); + c.__onEnter.call(c, {which:13}); + c.hide(); + input = RichFaces.getDomElement(AUTOCOMPLETE_ID+'ClientModeInput'); + input.focus(); + RichFaces.Event.unbindById(AUTOCOMPLETE_ID+'Default2', "selectitem"); + }); + + // TODO add modes test ?? or create selenium tests for modes ?? - var beforeitemchngeHandlerWrapper = RichFaces.Event.bindById(componentId, "beforeitemchange", beforeitemchngeHandler); - - var itemchangeHandler = handler("itemchnge handler invouked", undefined); - var itemchangeHandlerWrapper = RichFaces.Event.bindById(componentId, "itemchange", itemchangeHandler); - - c.switchToItem("name2"); - - RichFaces.Event.unbindById(componentId, "beforeitemchange", beforeitemchngeHandlerWrapper); - RichFaces.Event.unbindById(componentId, "itemchange", itemchangeHandlerWrapper); - - c.switchToItem("name1"); - }); - */ }); Copied: branches/RF-8742/examples/output-demo/src/main/java/org/richfaces/SkinBean.java (from rev 19430, trunk/examples/output-demo/src/main/java/org/richfaces/SkinBean.java) =================================================================== --- branches/RF-8742/examples/output-demo/src/main/java/org/richfaces/SkinBean.java (rev 0) +++ branches/RF-8742/examples/output-demo/src/main/java/org/richfaces/SkinBean.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,61 @@ +package org.richfaces; + +import java.io.Serializable; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; +import javax.faces.model.SelectItem; + +@SessionScoped +@ManagedBean(name = "skinBean") +public class SkinBean implements Serializable { + + private static final long serialVersionUID = 2744605279708632184L; + + private SelectItem[] skinSetItems = { + new SelectItem("blueSky"), + new SelectItem("classic"), + new SelectItem("deepMarine"), + new SelectItem("DEFAULT"), + new SelectItem("emeraldTown"), + new SelectItem("japanCherry"), + new SelectItem("NULL"), + new SelectItem("plain"), + new SelectItem("ruby"), + new SelectItem("wine") + }; + + private String skin = "classic"; + + private boolean enableElementsSkinning = true; + + private boolean enableClassesSkinning = false; + + public String getSkin() { + return skin; + } + + public void setSkin(String skin) { + this.skin = skin; + } + + public boolean isEnableElementsSkinning() { + return enableElementsSkinning; + } + + public void setEnableElementsSkinning(boolean enableElementsSkinning) { + this.enableElementsSkinning = enableElementsSkinning; + } + + public boolean isEnableClassesSkinning() { + return enableClassesSkinning; + } + + public void setEnableClassesSkinning(boolean enableClassesSkinning) { + this.enableClassesSkinning = enableClassesSkinning; + } + + public SelectItem[] getSkinSetItems() { + return skinSetItems; + } +} Modified: branches/RF-8742/examples/output-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/WEB-INF/web.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/output-demo/src/main/webapp/WEB-INF/web.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -5,7 +5,22 @@ version="2.5"> <display-name>Sample RichFaces 4 Application</display-name> + <context-param> + <param-name>org.richfaces.skin</param-name> + <param-value>#{skinBean.skin}</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinning</param-name> + <param-value>#{skinBean.enableElementsSkinning}</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinningClasses</param-name> + <param-value>#{skinBean.enableClassesSkinning}</param-value> + </context-param> + + + <context-param> <param-name>javax.faces.PROJECT_STAGE</param-name> <param-value>Development</param-value> </context-param> Modified: branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -15,8 +15,8 @@ <p>Page</p> <h:form id="f"> - <pn:tabPanel id="panel" switchType="ajax"> - <pn:tab header="tab1 header"> + <pn:tabPanel id="panel" switchType="ajax" tabHeaderClassDisabled="myClass_01"> + <pn:tab header="tab1 header" headerClassDisabled="myClass_02"> Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. </pn:tab> <pn:tab header="tab2 header"> Modified: branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -16,6 +16,19 @@ <ui:insert name="scripts" ></ui:insert> + + <h:form> + <h:commandButton value="Classic"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="classic"/> + </h:commandButton> + <h:commandButton value="BlueSky"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="blueSky"/> + </h:commandButton> + <h:commandButton value="DeepMarine"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="deepMarine"/> + </h:commandButton> + </h:form> + <table width="100%"> <thead> <tr> Copied: branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar (from rev 19430, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar) Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,71 +0,0 @@ -/** - * - */ -package org.richfaces.demo.progressBar; - -import java.util.Date; - -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - -/** - * @author Ilya Shaikovsky - * - */ -@ManagedBean -@ViewScoped -public class ProgressBarBean { - - private boolean buttonRendered = true; - private boolean enabled=false; - private Long startTime; - - public String startProcess() { - setEnabled(true); - setButtonRendered(false); - setStartTime(new Date().getTime()); - return null; - } - - public Long getCurrentValue(){ - if (isEnabled()) { - Long current = (new Date().getTime() - startTime)/1000; - if (current>100){ - setButtonRendered(true); - } else if (current.equals(0)) { - return new Long(1); - } - return (new Date().getTime() - startTime)/1000; - } - if (startTime == null) { - return Long.valueOf(-1); - } else { - return Long.valueOf(101); - } - - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public Long getStartTime() { - return startTime; - } - - public void setStartTime(Long startTime) { - this.startTime = startTime; - } - - public boolean isButtonRendered() { - return buttonRendered; - } - - public void setButtonRendered(boolean buttonRendered) { - this.buttonRendered = buttonRendered; - } -} Copied: branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java (from rev 19430, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/java/org/richfaces/demo/progressBar/ProgressBarBean.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,71 @@ +/** + * + */ +package org.richfaces.demo.progressBar; + +import java.util.Date; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ViewScoped; + +/** + * @author Ilya Shaikovsky + * + */ +@ManagedBean +@ViewScoped +public class ProgressBarBean { + + private boolean buttonRendered = true; + private boolean enabled=false; + private Long startTime; + + public String startProcess() { + setEnabled(true); + setButtonRendered(false); + setStartTime(new Date().getTime()); + return null; + } + + public Long getCurrentValue(){ + if (isEnabled()) { + Long current = (new Date().getTime() - startTime)/1000; + if (current>100){ + setButtonRendered(true); + } else if (current.equals(0)) { + return new Long(1); + } + return (new Date().getTime() - startTime)/1000; + } + if (startTime == null) { + return Long.valueOf(-1); + } else { + return Long.valueOf(101); + } + + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public Long getStartTime() { + return startTime; + } + + public void setStartTime(Long startTime) { + this.startTime = startTime; + } + + public boolean isButtonRendered() { + return buttonRendered; + } + + public void setButtonRendered(boolean buttonRendered) { + this.buttonRendered = buttonRendered; + } +} Modified: branches/RF-8742/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -341,6 +341,20 @@ </sample> </samples> </demo> + <demo> + <id>progressBar</id> + <name>rich:progressBar</name> + <samples> + <sample> + <id>ajaxProgressBar</id> + <name>ProgressBar in ajax mode</name> + </sample> + <sample> + <id>clientProgressBar</id> + <name>ProgressBar in client mode</name> + </sample> + </samples> + </demo> </demos> </group> <group new="true"> @@ -367,6 +381,16 @@ </samples> </demo> <demo> + <id>inputNumberSpinner</id> + <name>rich:inputNumberSpinner</name> + <samples> + <sample> + <id>spinners</id> + <name>Different Spinners samples</name> + </sample> + </samples> + </demo> + <demo> <id>inplaceInput</id> <name>rich:inplaceInput</name> <samples> Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner) Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples) Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,17 +0,0 @@ -<!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"> - - <p>Here is an example of default inputNumberSpinner:</p> - - <rich:inputNumberSpinner value="50"/> - - <p>Here is one more inputNumberSpinner:</p> - - <rich:inputNumberSpinner value="50" step="10"/> - -</ui:composition> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/samples/spinners-sample.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,17 @@ +<!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"> + + <p>Here is an example of default inputNumberSpinner:</p> + + <rich:inputNumberSpinner value="50"/> + + <p>Here is one more inputNumberSpinner:</p> + + <rich:inputNumberSpinner value="50" step="10"/> + +</ui:composition> \ No newline at end of file Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,20 +0,0 @@ -<!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>InputNumberSpinner is a highly customizable component that is used to define a numeric - input in a given range. A user can use a spinner control or just type some text into an input field.</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:composition> - -</html> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/inputNumberSpinner/spinners.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,20 @@ +<!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>InputNumberSpinner is a highly customizable component that is used to define a numeric + input in a given range. A user can use a spinner control or just type some text into an input field.</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:composition> + +</html> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar) Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,25 +0,0 @@ -<!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>ProgressBar worked in "ajax" mode </p> - <br/> - <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/progressBar/ProgressBarBean.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 Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/ajaxProgressBar.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,25 @@ +<!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>ProgressBar worked in "ajax" mode </p> + <br/> + <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/progressBar/ProgressBarBean.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 Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,22 +0,0 @@ -<!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>ProgressBar worked in "client" mode </p> - <br/> - - <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:composition> - -</html> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/clientProgressBar.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,22 @@ +<!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>ProgressBar worked in "client" mode </p> + <br/> + + <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:composition> + +</html> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples) Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,32 +0,0 @@ -<!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:form id="form"> - <rich:progressBar mode="ajax" value="#{progressBarBean.currentValue}" - interval="2000" - enabled="#{progressBarBean.enabled}" minValue="-1" maxValue="100" - reRenderAfterComplete="progressPanel"> - <f:facet name="initial"> - <br /> - <h:outputText value="Process doesn't started yet" /> - <a4j:commandButton action="#{progressBarBean.startProcess}" - value="Start Process" execute="@form" - rendered="#{progressBarBean.buttonRendered}" - style="margin: 9px 0px 5px;" /> - </f:facet> - <f:facet name="complete"> - <br /> - <h:outputText value="Process Done" /> - <a4j:commandButton action="#{progressBarBean.startProcess}" - value="Restart Process" execute="@form" - rendered="#{progressBarBean.buttonRendered}" - style="margin: 9px 0px 5px;" /> - </f:facet> - <h:outputText value="#{progressBarBean.currentValue} %"/> - </rich:progressBar> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/ajaxProgressBar-sample.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,32 @@ +<!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:form id="form"> + <rich:progressBar mode="ajax" value="#{progressBarBean.currentValue}" + interval="2000" + enabled="#{progressBarBean.enabled}" minValue="-1" maxValue="100" + reRenderAfterComplete="progressPanel"> + <f:facet name="initial"> + <br /> + <h:outputText value="Process doesn't started yet" /> + <a4j:commandButton action="#{progressBarBean.startProcess}" + value="Start Process" execute="@form" + rendered="#{progressBarBean.buttonRendered}" + style="margin: 9px 0px 5px;" /> + </f:facet> + <f:facet name="complete"> + <br /> + <h:outputText value="Process Done" /> + <a4j:commandButton action="#{progressBarBean.startProcess}" + value="Restart Process" execute="@form" + rendered="#{progressBarBean.buttonRendered}" + style="margin: 9px 0px 5px;" /> + </f:facet> + <h:outputText value="#{progressBarBean.currentValue} %"/> + </rich:progressBar> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml 2010-10-04 16:06:49 UTC (rev 19430) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,40 +0,0 @@ -<!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"> - <script> -//<![CDATA[ - var counter = 1; - var intervalID; - function updateProgress(i) { - RichFaces.$('form2:progressBar').setValue(counter*5); - if ((counter++)>20){ - clearInterval(intervalID); - document.getElementById('button').disabled=false; - } - } - - function startProgress(){ - counter=1; - document.getElementById('button').disabled=true; - RichFaces.$('form2:progressBar').enable(); - RichFaces.$('form2:progressBar').setValue(1); - intervalID = setInterval(updateProgress,5000); - } -//]]> - </script> - <h:form id="form2"> - <rich:progressBar mode="client" id="progressBar"> - <f:facet name="initial"> - <h:outputText value="Process doesn't started yet"/> - </f:facet> - <f:facet name="complete"> - <h:outputText value="Process Done"/> - </f:facet> - </rich:progressBar> - <button type="button" onclick="startProgress();" style="margin: 9px 0px 5px;" id="button">Start Progress</button> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml (from rev 19430, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml) =================================================================== --- branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml (rev 0) +++ branches/RF-8742/examples/richfaces-showcase/src/main/webapp/richfaces/progressBar/samples/clientProgressBar-sample.xhtml 2010-10-04 17:21:44 UTC (rev 19432) @@ -0,0 +1,40 @@ +<!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"> + <script> +//<![CDATA[ + var counter = 1; + var intervalID; + function updateProgress(i) { + RichFaces.$('form2:progressBar').setValue(counter*5); + if ((counter++)>20){ + clearInterval(intervalID); + document.getElementById('button').disabled=false; + } + } + + function startProgress(){ + counter=1; + document.getElementById('button').disabled=true; + RichFaces.$('form2:progressBar').enable(); + RichFaces.$('form2:progressBar').setValue(1); + intervalID = setInterval(updateProgress,5000); + } +//]]> + </script> + <h:form id="form2"> + <rich:progressBar mode="client" id="progressBar"> + <f:facet name="initial"> + <h:outputText value="Process doesn't started yet"/> + </f:facet> + <f:facet name="complete"> + <h:outputText value="Process Done"/> + </f:facet> + </rich:progressBar> + <button type="button" onclick="startProgress();" style="margin: 9px 0px 5px;" id="button">Start Progress</button> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-8742/parent/pom.xml =================================================================== --- branches/RF-8742/parent/pom.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/parent/pom.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -379,13 +379,13 @@ <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-api</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> <artifactId>myfaces-impl</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> Modified: branches/RF-8742/svnmerge-commit-message.txt =================================================================== --- branches/RF-8742/svnmerge-commit-message.txt 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/svnmerge-commit-message.txt 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,242 +1,146 @@ -Merged revisions 19231-19234,19248-19249,19255-19256,19258-19262,19276,19279-19281,19283,19285,19291-19299,19307,19312,19315,19318-19319,19325,19341-19342,19345-19351,19353-19355 via svnmerge from +Merged revisions 19358-19359,19364,19367-19369,19371,19374-19377,19379-19385,19387,19393-19394,19400,19402-19404,19418-19422,19426,19430 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk ................ - r19231 | pyaschenko | 2010-09-17 01:01:17 -0700 (Fri, 17 Sep 2010) | 3 lines + r19358 | nbelaevski | 2010-09-28 13:54:35 -0700 (Tue, 28 Sep 2010) | 1 line - https://jira.jboss.org/browse/RF-9105 - onblur, onfocus, onchange, onselectitem user event handlers support was added - handlers script output was fixed + https://jira.jboss.org/browse/RF-7944 ................ - r19232 | pyaschenko | 2010-09-17 01:11:22 -0700 (Fri, 17 Sep 2010) | 2 lines + r19359 | jbalunas(a)redhat.com | 2010-09-28 17:17:46 -0700 (Tue, 28 Sep 2010) | 1 line - https://jira.jboss.org/browse/RF-9105 - onchange bubble fix + RF-9266 updated archetypes so that correct version is used in generated project ................ - r19233 | pyaschenko | 2010-09-17 01:38:05 -0700 (Fri, 17 Sep 2010) | 1 line + r19364 | konstantin.mishin | 2010-09-29 03:39:05 -0700 (Wed, 29 Sep 2010) | 1 line - https://jira.jboss.org/browse/RFPL-761 + RF-9278 ................ - r19234 | pyaschenko | 2010-09-17 01:43:11 -0700 (Fri, 17 Sep 2010) | 1 line + r19367 | konstantin.mishin | 2010-09-29 04:19:09 -0700 (Wed, 29 Sep 2010) | 1 line - https://jira.jboss.org/browse/RFPL-761 + RF-9218 ................ - r19248 | nbelaevski | 2010-09-17 11:15:10 -0700 (Fri, 17 Sep 2010) | 1 line + r19368 | konstantin.mishin | 2010-09-29 04:19:44 -0700 (Wed, 29 Sep 2010) | 1 line - https://jira.jboss.org/browse/RF-8937 + RF-9218 ................ - r19249 | nbelaevski | 2010-09-17 12:05:01 -0700 (Fri, 17 Sep 2010) | 3 lines + r19369 | konstantin.mishin | 2010-09-29 05:02:10 -0700 (Wed, 29 Sep 2010) | 1 line - Initialized merge tracking via "svnmerge" with revisions "1-18996" from - https://svn.jboss.org/repos/richfaces/branches/RF-7944 + RF-9201 ................ - r19255 | nbelaevski | 2010-09-18 16:11:09 -0700 (Sat, 18 Sep 2010) | 4 lines + r19371 | pyaschenko | 2010-09-29 06:02:16 -0700 (Wed, 29 Sep 2010) | 1 line - Merged revisions 19109-19110,19113,19160,19199 via svnmerge from - https://svn.jboss.org/repos/richfaces/branches/RF-7944 + small fix: RICH_CONTAINER moved from richfaces-base-component.js to richfaces.js ................ - r19256 | nbelaevski | 2010-09-18 16:35:46 -0700 (Sat, 18 Sep 2010) | 1 line + r19374 | pyaschenko | 2010-09-29 07:05:48 -0700 (Wed, 29 Sep 2010) | 1 line - Added missing configuration records for tab/tabPanel components + https://jira.jboss.org/browse/RF-9071 ................ - r19258 | nbelaevski | 2010-09-18 17:41:18 -0700 (Sat, 18 Sep 2010) | 2 lines + r19375 | konstantin.mishin | 2010-09-29 07:12:37 -0700 (Wed, 29 Sep 2010) | 1 line - https://jira.jboss.org/browse/RF-9344 - added missing tab_bg.gif for tabPanel component + add step attribute ................ - r19259 | nbelaevski | 2010-09-18 18:21:32 -0700 (Sat, 18 Sep 2010) | 1 line + r19376 | jbalunas(a)redhat.com | 2010-09-29 07:13:52 -0700 (Wed, 29 Sep 2010) | 1 line - https://jira.jboss.org/browse/RF-9351 + RF-9386 upgraded myfaces to 2.0.2 ................ - r19260 | nbelaevski | 2010-09-20 01:09:38 -0700 (Mon, 20 Sep 2010) | 1 line + r19377 | jbalunas(a)redhat.com | 2010-09-29 07:14:11 -0700 (Wed, 29 Sep 2010) | 1 line - https://jira.jboss.org/browse/RF-9341 + RF-9386 upgraded myfaces to 2.0.2 ................ - r19261 | nbelaevski | 2010-09-20 01:56:19 -0700 (Mon, 20 Sep 2010) | 2 lines + r19379 | alexsmirnov | 2010-09-29 09:13:49 -0700 (Wed, 29 Sep 2010) | 3 lines - https://jira.jboss.org/browse/RF-9361 - https://jira.jboss.org/browse/RF-9363 + Initialized merge tracking via "svnmerge" with revisions "1-19112" from + https://svn.jboss.org/repos/richfaces/branches/RF-9309 ................ - r19262 | nbelaevski | 2010-09-20 02:15:16 -0700 (Mon, 20 Sep 2010) | 1 line + r19380 | alexsmirnov | 2010-09-29 09:36:52 -0700 (Wed, 29 Sep 2010) | 9 lines - Fixed duplicate ajax responses generation in tabPanel -................ - r19276 | konstantin.mishin | 2010-09-21 06:27:20 -0700 (Tue, 21 Sep 2010) | 3 lines + Merged revisions 19378 via svnmerge from + https://svn.jboss.org/repos/richfaces/branches/RF-9309 - Removed merge tracking for "svnmerge" for - https://svn.jboss.org/repos/richfaces/branches/RF-7944 -................ - r19279 | konstantin.mishin | 2010-09-21 07:57:06 -0700 (Tue, 21 Sep 2010) | 3 lines - - Initialized merge tracking via "svnmerge" with revisions "1-19212" from - https://svn.jboss.org/repos/richfaces/branches/RF-9151 -................ - r19280 | konstantin.mishin | 2010-09-21 08:23:14 -0700 (Tue, 21 Sep 2010) | 45 lines - - Merged revisions 19224-19225,19244-19247,19271-19273,19278 via svnmerge from - https://svn.jboss.org/repos/richfaces/branches/RF-9151 - ........ - r19224 | konstantin.mishin | 2010-09-16 21:06:09 +0300 (Thu, 16 Sep 2010) | 1 line + r19378 | alexsmirnov | 2010-09-29 08:55:33 -0700 (Wed, 29 Sep 2010) | 1 line - RF-9193 + RF-9309 ........ - r19225 | konstantin.mishin | 2010-09-16 21:08:24 +0300 (Thu, 16 Sep 2010) | 1 line - - RF-9200 - ........ - r19244 | konstantin.mishin | 2010-09-17 20:50:16 +0300 (Fri, 17 Sep 2010) | 1 line - - RF-9194 - ........ - r19245 | konstantin.mishin | 2010-09-17 20:52:10 +0300 (Fri, 17 Sep 2010) | 1 line - - RF-9194 - ........ - r19246 | konstantin.mishin | 2010-09-17 20:53:39 +0300 (Fri, 17 Sep 2010) | 1 line - - RF-9195 - ........ - r19247 | konstantin.mishin | 2010-09-17 21:10:07 +0300 (Fri, 17 Sep 2010) | 1 line - - RF-9200 - ........ - r19271 | konstantin.mishin | 2010-09-21 14:20:51 +0300 (Tue, 21 Sep 2010) | 1 line - - RF-9194 - ........ - r19272 | konstantin.mishin | 2010-09-21 14:26:44 +0300 (Tue, 21 Sep 2010) | 1 line - - RF-9195 - ........ - r19273 | konstantin.mishin | 2010-09-21 14:28:55 +0300 (Tue, 21 Sep 2010) | 1 line - - RF-9200 - ........ - r19278 | konstantin.mishin | 2010-09-21 17:44:03 +0300 (Tue, 21 Sep 2010) | 1 line - - RF-9195 - ........ ................ - r19281 | konstantin.mishin | 2010-09-21 08:34:26 -0700 (Tue, 21 Sep 2010) | 3 lines + r19381 | alexsmirnov | 2010-09-29 09:38:34 -0700 (Wed, 29 Sep 2010) | 1 line - Removed merge tracking for "svnmerge" for - https://svn.jboss.org/repos/richfaces/branches/RF-9151 + add svnmerge file to ignore ................ - r19283 | konstantin.mishin | 2010-09-21 08:44:05 -0700 (Tue, 21 Sep 2010) | 1 line + r19382 | alexsmirnov | 2010-09-29 10:44:24 -0700 (Wed, 29 Sep 2010) | 2 lines - RF-9337 + CODING IN PROGRESS - issue RF-9323: CDK annotation @RendererSpecificComponent.attributes doesn't work + https://jira.jboss.org/browse/RF-9323 ................ - r19285 | konstantin.mishin | 2010-09-21 08:55:24 -0700 (Tue, 21 Sep 2010) | 1 line + r19383 | alexsmirnov | 2010-09-29 11:55:42 -0700 (Wed, 29 Sep 2010) | 2 lines - RF-9337 + RESOLVED - issue RF-9325: CDK: can't specify 'readonly' attribute on html <input > element in the xml template + https://jira.jboss.org/browse/RF-9325 ................ - r19291 | amarkhel | 2010-09-21 10:31:29 -0700 (Tue, 21 Sep 2010) | 1 line + r19384 | alexsmirnov | 2010-09-29 11:56:18 -0700 (Wed, 29 Sep 2010) | 2 lines - RF-9328 + RESOLVED - issue RF-9325: CDK: can't specify 'readonly' attribute on html <input > element in the xml template + https://jira.jboss.org/browse/RF-9325 ................ - r19292 | amarkhel | 2010-09-21 10:34:26 -0700 (Tue, 21 Sep 2010) | 1 line + r19385 | jbalunas(a)redhat.com | 2010-09-29 13:26:07 -0700 (Wed, 29 Sep 2010) | 1 line - RF-9313 + [maven-release-plugin] prepare release 4.0.0.20100929-M3 ................ - r19293 | amarkhel | 2010-09-21 10:41:11 -0700 (Tue, 21 Sep 2010) | 1 line + r19387 | jbalunas(a)redhat.com | 2010-09-29 13:27:22 -0700 (Wed, 29 Sep 2010) | 1 line - Progressbar initial commit + [maven-release-plugin] prepare for next development iteration ................ - r19294 | amarkhel | 2010-09-21 12:44:36 -0700 (Tue, 21 Sep 2010) | 1 line + r19393 | jbalunas(a)redhat.com | 2010-09-30 08:24:19 -0700 (Thu, 30 Sep 2010) | 1 line - RF-RF-9301 + RF-9393 updated for M3 release ................ - r19295 | amarkhel | 2010-09-21 12:45:23 -0700 (Tue, 21 Sep 2010) | 1 line + r19394 | jbalunas(a)redhat.com | 2010-09-30 08:24:45 -0700 (Thu, 30 Sep 2010) | 1 line - RF-9303 + RF-9393 updated for M3 release ................ - r19296 | amarkhel | 2010-09-21 12:46:09 -0700 (Tue, 21 Sep 2010) | 1 line + r19400 | Alex.Kolonitsky | 2010-10-01 02:13:43 -0700 (Fri, 01 Oct 2010) | 1 line - RF-9303 + RF-8779 TabPanel: skinning component ................ - r19297 | amarkhel | 2010-09-21 12:46:37 -0700 (Tue, 21 Sep 2010) | 1 line + r19402 | amarkhel | 2010-10-01 06:45:28 -0700 (Fri, 01 Oct 2010) | 1 line - RF-9297 + Fix RF-9148 ................ - r19298 | amarkhel | 2010-09-21 12:47:10 -0700 (Tue, 21 Sep 2010) | 1 line + r19403 | amarkhel | 2010-10-01 06:46:56 -0700 (Fri, 01 Oct 2010) | 1 line - RF-9300 + Fix problem with label attribbute on progressbar component ................ - r19299 | amarkhel | 2010-09-21 12:47:48 -0700 (Tue, 21 Sep 2010) | 1 line + r19404 | amarkhel | 2010-10-01 06:52:44 -0700 (Fri, 01 Oct 2010) | 1 line - RF-9363 + Add sample for progressBar ................ - r19307 | pyaschenko | 2010-09-22 02:12:46 -0700 (Wed, 22 Sep 2010) | 2 lines + r19418 | jbalunas(a)redhat.com | 2010-10-01 12:29:39 -0700 (Fri, 01 Oct 2010) | 1 line - https://jira.jboss.org/browse/RF-9301 - bugfix after style classes renaming + RF-9400 part of fix ................ - r19312 | amarkhel | 2010-09-22 04:26:05 -0700 (Wed, 22 Sep 2010) | 1 line + r19419 | alexsmirnov | 2010-10-01 14:44:47 -0700 (Fri, 01 Oct 2010) | 3 lines - Fix styles for popup + RESOLVED - issue RF-8950: Add cdk extension attributes to the template schema + https://jira.jboss.org/browse/RF-8950 ................ - r19315 | konstantin.mishin | 2010-09-22 06:22:14 -0700 (Wed, 22 Sep 2010) | 1 line + r19420 | Alex.Kolonitsky | 2010-10-04 00:15:55 -0700 (Mon, 04 Oct 2010) | 1 line - RF-9302 + RF-9401 Tab panel: classes for tab are not set ................ - r19318 | amarkhel | 2010-09-22 10:06:22 -0700 (Wed, 22 Sep 2010) | 1 line + r19421 | Alex.Kolonitsky | 2010-10-04 01:10:44 -0700 (Mon, 04 Oct 2010) | 1 line - Fix styles for progressbar + RF-9398 Tab panel: non-valid markup ................ - r19319 | konstantin.mishin | 2010-09-22 11:22:03 -0700 (Wed, 22 Sep 2010) | 1 line + r19422 | Alex.Kolonitsky | 2010-10-04 03:44:32 -0700 (Mon, 04 Oct 2010) | 4 lines - RF-9292 + RF-9401 Tab panel: classes for tab are not set + RF-9352 Collapsible panel: facet headerCollapsed doesn't work + RFPL-674 Accordion: class attribute is not set for headers and content ................ - r19325 | konstantin.mishin | 2010-09-23 08:45:24 -0700 (Thu, 23 Sep 2010) | 1 line + r19426 | jbalunas(a)redhat.com | 2010-10-04 07:39:19 -0700 (Mon, 04 Oct 2010) | 1 line - RF-9291 + RF-9400, RF-9404 - fixed filtering overrides, and updated version correctly ................ - r19341 | amarkhel | 2010-09-24 08:02:58 -0700 (Fri, 24 Sep 2010) | 1 line + r19430 | alexsmirnov | 2010-10-04 09:06:49 -0700 (Mon, 04 Oct 2010) | 1 line - Fix problem with domElementAttachment + https://jira.jboss.org/browse/RF-8950 ................ - r19342 | amarkhel | 2010-09-24 08:18:00 -0700 (Fri, 24 Sep 2010) | 1 line - - Fix problem with domElementAttachment -................ - r19345 | pyaschenko | 2010-09-27 07:13:39 -0700 (Mon, 27 Sep 2010) | 1 line - - https://jira.jboss.org/browse/RF-9277 -................ - r19346 | pyaschenko | 2010-09-27 09:36:34 -0700 (Mon, 27 Sep 2010) | 1 line - - https://jira.jboss.org/browse/RF-9071 -................ - r19347 | konstantin.mishin | 2010-09-27 11:56:19 -0700 (Mon, 27 Sep 2010) | 1 line - - RF-9294 -................ - r19348 | konstantin.mishin | 2010-09-27 12:25:28 -0700 (Mon, 27 Sep 2010) | 1 line - - RF-9292 -................ - r19349 | amarkhel | 2010-09-27 12:27:49 -0700 (Mon, 27 Sep 2010) | 1 line - - RF-9328 -................ - r19350 | amarkhel | 2010-09-27 12:28:11 -0700 (Mon, 27 Sep 2010) | 1 line - - RF-9362 -................ - r19351 | konstantin.mishin | 2010-09-27 12:36:07 -0700 (Mon, 27 Sep 2010) | 1 line - - RF-9292 -................ - r19353 | konstantin.mishin | 2010-09-28 05:00:57 -0700 (Tue, 28 Sep 2010) | 1 line - - RF-9277 -................ - r19354 | pyaschenko | 2010-09-28 08:28:52 -0700 (Tue, 28 Sep 2010) | 1 line - - small namespace fix -................ - r19355 | pyaschenko | 2010-09-28 09:43:40 -0700 (Tue, 28 Sep 2010) | 1 line - - https://jira.jboss.org/browse/RF-9071 -................ Modified: branches/RF-8742/ui/input/ui/src/main/config/faces-config.xml =================================================================== --- branches/RF-8742/ui/input/ui/src/main/config/faces-config.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/input/ui/src/main/config/faces-config.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -151,6 +151,14 @@ </property-extension> </property> <property> + <property-name>onchange</property-name> + <property-class>java.lang.String</property-class> + <property-extension> + <cdk:generate>true</cdk:generate> + <cdk:event-name default="true">change</cdk:event-name> + </property-extension> + </property> + <property> <property-name>showArrows</property-name> <property-class>boolean</property-class> <default-value>false</default-value> @@ -495,6 +503,14 @@ </property-extension> </property> <property> + <property-name>step</property-name> + <property-class>java.lang.String</property-class> + <default-value>"1"</default-value> + <property-extension> + <cdk:generate>true</cdk:generate> + </property-extension> + </property> + <property> <property-name>style</property-name> <property-class>java.lang.String</property-class> <property-extension> Modified: branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js =================================================================== --- branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inputNumberSlider.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -68,20 +68,20 @@ }, decrease: function (event) { - this.setValue(this.value - this.step); + this.setValue(this.value - this.step, event); }, increase: function (event) { - this.setValue(this.value + this.step); + this.setValue(this.value + this.step, event); }, - setValue: function (value) { + setValue: function (value, event) { if (!this.disabled) { - this.__setValue(value); + this.__setValue(value, event); } }, - __setValue: function (value) { + __setValue: function (value, event) { if (!isNaN(value)) { value = Math.round(value / this.step) * this.step; //TODO Add normal support of float values. E.g. '0.3' should be instead of '0.30000000000000004'. if (value > this.maxValue) { @@ -96,34 +96,37 @@ this.tooltip.text(value); this.tooltip.setPosition(this.handle,{from: 'LT', offset: [0, -3]}); //TODO Seems offset doesn't work now. this.value = value; + if (this.onchange && (!event || event.type)) { + this.onchange.call(this.element[0], event); + } } } }, - __inputHandler: function () { + __inputHandler: function (event) { var value = Number(this.input.val()); if (isNaN(value)) { this.input.val(this.value); } else { - this.__setValue(value); + this.__setValue(value, event); } }, __keydownHandler: function (event) { if (event.keyCode == 37) { //LEFT - this.__setValue(Number(this.input.val()) - this.step); + this.__setValue(Number(this.input.val()) - this.step, event); event.preventDefault(); } else if (event.keyCode == 39) { //RIGHT - this.__setValue(Number(this.input.val()) + this.step); + this.__setValue(Number(this.input.val()) + this.step, event); event.preventDefault(); } }, __decreaseHandler: function (event) { var component = this; - component.decrease(); + component.decrease(event); this.intervalId = window.setInterval(function() { - component.decrease(); + component.decrease(event); }, this.delay); jQuery(document).one("mouseup", true, jQuery.proxy(this.__clearInterval, this)); this.decreaseButton.addClass(this.decreaseSelectedClass); @@ -132,9 +135,9 @@ __increaseHandler: function (event) { var component = this; - component.increase(); + component.increase(event); this.intervalId = window.setInterval(function() { - component.increase(); + component.increase(event); }, this.delay); jQuery(document).one("mouseup",jQuery.proxy(this.__clearInterval, this)); this.increaseButton.addClass(this.increaseSelectedClass); @@ -163,7 +166,7 @@ __mousemoveHandler: function (event) { var value = this.range * (event.pageX - this.track.position().left) / (this.track.width() - this.handle.width()) + this.minValue; - this.__setValue(value); + this.__setValue(value, event); event.preventDefault(); }, Modified: branches/RF-8742/ui/input/ui/src/main/templates/inputnumberslider.template.xml =================================================================== --- branches/RF-8742/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/input/ui/src/main/templates/inputnumberslider.template.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -68,11 +68,14 @@ <c:if test="#{component.attributes['showToolTip']}"> <span class="rf-insl-tt #{component.attributes['toolTipClass']}">#{getInputValue(facesContext, component)}</span> </c:if> + <!-- TODO Rewrite the next line when the CDK will support normal way to take event handlers from attributes and behaviors. --> + <cdk:object name="onchange" type="String" value="#{convertToString(RenderKitUtils.getAttributeAndBehaviorsValue(facesContext, component, RenderKitUtils.attributes().generic('onchange', 'onchange', 'change').first()))}" /> <script type="text/javascript">new RichFaces.ui.InputNumberSlider('#{clientId}', { delay: #{component.attributes['delay']}, disabled: #{component.attributes['disabled']}, maxValue: #{component.attributes['maxValue']}, minValue: #{component.attributes['minValue']}, + onchange: #{onchange.length() > 0 ? 'function (event) {' + onchange + '}' : 'null' }, step: #{component.attributes['step']}, tabIndex: #{RenderKitUtils.shouldRenderAttribute(component.attributes['tabindex']) ? component.attributes['tabindex'] : 'null'} }, { Modified: branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss =================================================================== --- branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.ecss 2010-10-04 17:21:44 UTC (rev 19432) @@ -57,7 +57,7 @@ overflow: hidden; } -.rf-edt-ftr-cnt { +div.rf-edt-ftr-cnt { overflow-x: auto; overflow-y: visible; } Modified: branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js =================================================================== --- branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -128,14 +128,13 @@ options = options || {}; var ranges = new richfaces.utils.Ranges(); var element = document.getElementById(id); - var bodyElement, contentElement, spacerElement, dataTableElement, rows, rowHeight, parts, tbodies, shiftIndex, - activeIndex, selectionFlag; + var bodyElement, contentElement, spacerElement, dataTableElement, normalPartStyle, rows, rowHeight, parts, tbodies, + shiftIndex, activeIndex, selectionFlag; var dragElement = document.getElementById(id + ":d"); var reorderElement = document.getElementById(id + ":r"); var reorderMarkerElement = document.getElementById(id + ":rm"); var widthInput = document.getElementById(id + ":wi"); var selectionInput = document.getElementById(id + ":si"); - var normalPartStyle = richfaces.utils.getCSSRule("div.rf-edt-cnt").style; var header = jQuery(element).children(".rf-edt-hdr"); var resizerHolders = header.find(".rf-edt-rsz-cntr"); @@ -168,11 +167,10 @@ normalPartStyle.width = width + "px"; } normalPartStyle.display = "block"; + scrollElement.style.overflowX = ""; if (scrollElement.clientWidth < scrollElement.scrollWidth && scrollElement.scrollHeight == scrollElement.offsetHeight) { scrollElement.style.overflowX = "scroll"; - } else { - scrollElement.style.overflowX = ""; } var delta = scrollElement.firstChild.offsetHeight - scrollElement.clientHeight; if (delta) { @@ -183,7 +181,7 @@ } var height = element.clientHeight; var el = element.firstChild; - while (el && el.nodeName && el.nodeName.toUpperCase() != "TABLE") { + while (el && (!el.nodeName || el.nodeName.toUpperCase() != "TABLE")) { if(el.nodeName && el.nodeName.toUpperCase() == "DIV" && el != bodyElement) { height -= el.offsetHeight; } @@ -244,6 +242,7 @@ var initialize = function() { bodyElement = document.getElementById(id + ":b"); bodyElement.tabIndex = -1; //TODO don't use tabIndex. + normalPartStyle = richfaces.utils.getCSSRule("div.rf-edt-cnt").style; var bodyJQuery = jQuery(bodyElement); contentElement = bodyJQuery.children("div:first")[0]; if (contentElement) { @@ -625,6 +624,10 @@ //JS API element["richfaces"] = element["richfaces"] || {}; // TODO ExtendedDataTable should extend richfaces.BaseComponent instead of using it. element.richfaces.component = this; + this.destroy = function() { + element.richfaces.component = null; + jQuery(window).unbind("resize", updateLayout); + } this.getColumnPosition = function(id) { var position; Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -43,6 +43,12 @@ return COMPONENT_FAMILY; } - - + @Override + public String getActiveItem() { + String res = super.getActiveItem(); + if (res == null) { + res = getFirstItem().getName(); + } + return res; + } } Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanelTitledItem.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -41,7 +41,7 @@ public enum HeaderStates { active("act"), inactive("inact"), - disable("dis"); + disabled("dis"); private final String abbreviation; Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -25,6 +25,7 @@ import javax.faces.FacesException; import javax.faces.component.UIComponent; import javax.faces.component.behavior.ClientBehaviorContext; +import javax.faces.context.FacesContext; import org.ajax4jsf.component.behavior.ClientBehavior; import org.richfaces.component.AbstractTogglePanel; @@ -97,17 +98,26 @@ + comp.getClientId(getFacesContext()) + ") has not been found."); } } else { - UIComponent control = comp; - while (control != null) { - if (control instanceof AbstractTogglePanel) { - return (AbstractTogglePanel) control; - } + return getEnclosedPanel(comp); + } + } - control = control.getParent(); + public static AbstractTogglePanel getEnclosedPanel(UIComponent comp) { + if (comp == null) { + return null; + } + + UIComponent control = comp; + while (control != null) { + if (control instanceof AbstractTogglePanel) { + return (AbstractTogglePanel) control; } - throw new FacesException("Parent panel for control (id=" - + comp.getClientId(getFacesContext()) + ") has not been found."); + + control = control.getParent(); } + + throw new FacesException("Parent panel for control (id=" + + comp.getClientId(FacesContext.getCurrentInstance()) + ") has not been found."); } @Override Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlAccordionItem.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -23,6 +23,8 @@ package org.richfaces.component.html; import org.richfaces.component.UITogglePanelTitledItem; +import org.richfaces.component.behavior.ToggleControl; + import javax.faces.component.behavior.ClientBehaviorHolder; import java.util.Arrays; @@ -94,8 +96,12 @@ return COMPONENT_FAMILY; } + public HtmlAccordion getAccordion() { + return (HtmlAccordion) ToggleControl.getEnclosedPanel(this); + } + public String getHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassActive); + return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getAccordion().getItemHeaderClassActive()); } public void setHeaderClassActive(String headerClassActive) { @@ -103,7 +109,7 @@ } public String getHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled); + return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled, getAccordion().getItemHeaderClassDisabled()); } public void setHeaderClassDisabled(String headerClassDisabled) { @@ -111,7 +117,7 @@ } public String getHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassInactive); + return (String) getStateHelper().eval(PropertyKeys.headerClassInactive, getAccordion().getItemHeaderClassInactive()); } public void setHeaderClassInactive(String headerClassInactive) { @@ -119,7 +125,7 @@ } public String getHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.headerClass); + return (String) getStateHelper().eval(PropertyKeys.headerClass, getAccordion().getItemHeaderClass()); } public void setHeaderClass(String headerClass) { @@ -135,7 +141,7 @@ } public String getContentClass() { - return (String) getStateHelper().eval(PropertyKeys.contentClass); + return (String) getStateHelper().eval(PropertyKeys.contentClass, getAccordion().getItemContentClass()); } public void setContentClass(String contentClass) { Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/html/HtmlTab.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -23,8 +23,8 @@ package org.richfaces.component.html; import org.richfaces.component.UITogglePanelTitledItem; + import javax.faces.component.behavior.ClientBehaviorHolder; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -94,8 +94,12 @@ return COMPONENT_FAMILY; } + public HtmlTabPanel getTabPanel() { + return (HtmlTabPanel) this.getParent(); + } + public String getHeaderClassActive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassActive); + return (String) getStateHelper().eval(PropertyKeys.headerClassActive, getTabPanel().getTabHeaderClassActive()); } public void setHeaderClassActive(String headerClassActive) { @@ -103,7 +107,7 @@ } public String getHeaderClassDisabled() { - return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled); + return (String) getStateHelper().eval(PropertyKeys.headerClassDisabled, getTabPanel().getTabHeaderClassDisabled()); } public void setHeaderClassDisabled(String headerClassDisabled) { @@ -111,7 +115,7 @@ } public String getHeaderClassInactive() { - return (String) getStateHelper().eval(PropertyKeys.headerClassInactive); + return (String) getStateHelper().eval(PropertyKeys.headerClassInactive, getTabPanel().getTabHeaderClassInactive()); } public void setHeaderClassInactive(String headerClassInactive) { @@ -119,7 +123,7 @@ } public String getHeaderClass() { - return (String) getStateHelper().eval(PropertyKeys.headerClass); + return (String) getStateHelper().eval(PropertyKeys.headerClass, getTabPanel().getTabHeaderClass()); } public void setHeaderClass(String headerClass) { @@ -135,7 +139,7 @@ } public String getContentClass() { - return (String) getStateHelper().eval(PropertyKeys.contentClass); + return (String) getStateHelper().eval(PropertyKeys.contentClass, getTabPanel().getTabContentClass()); } public void setContentClass(String contentClass) { Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/AccordionItemRenderer.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -137,7 +137,7 @@ boolean isDisabled = titledItem.isDisabled(); encodeHeader(context, titledItem, writer, HeaderStates.inactive, !isActive && !isDisabled); encodeHeader(context, titledItem, writer, HeaderStates.active, isActive && !isDisabled); - encodeHeader(context, titledItem, writer, HeaderStates.disable, isDisabled); + encodeHeader(context, titledItem, writer, HeaderStates.disabled, isDisabled); writer.endElement("div"); } Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -152,7 +152,9 @@ try { if (children) { this.renderChildren(context, component); - } + } else if (component.getAttributes().get("label") != null) { + clonedWriter.write(component.getAttributes().get("label").toString()); + } } finally { clonedWriter.flush(); context.setResponseWriter(writer); Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-10-04 17:21:44 UTC (rev 19432) @@ -23,7 +23,7 @@ package org.richfaces.renderkit.html; import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.active; -import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disable; +import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.disabled; import static org.richfaces.component.AbstractTogglePanelTitledItem.HeaderStates.inactive; import static org.richfaces.component.html.HtmlAccordion.PropertyKeys.height; import static org.richfaces.component.util.HtmlUtil.concatClasses; @@ -136,7 +136,7 @@ encodeTabHeader(context, tab, writer, inactive, !isActive && !isDisabled); encodeTabHeader(context, tab, writer, active, isActive && !isDisabled); - encodeTabHeader(context, tab, writer, disable, isDisabled); + encodeTabHeader(context, tab, writer, disabled, isDisabled); } @@ -195,7 +195,7 @@ w.startElement("td", comp); w.writeAttribute(STYLE, style, null); w.writeAttribute(CLASS, classStyle, null); - w.startElement("br", comp); + w.write("<br />"); w.endElement("td"); } Modified: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/CollapsiblePanelItem.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -45,7 +45,7 @@ }, __state : function () { - return this.getName() === "true" ? "expanded" : "collapsed"; + return this.getName() === "true" ? "exp" : "colps"; }, __header : function (state) { Modified: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2010-10-04 17:21:44 UTC (rev 19432) @@ -491,13 +491,11 @@ if (this.parent) { if (this.domReattached) { this.saveInputValues(element); - this.parent.append(this.shadeDiv); - this.parent.append(this.shadowDiv); - this.parent.append(element); + this.div.append(this.shadeDiv); + this.div.append(this.shadowDiv); + this.div.append(element); this.domReattached = false; - } else { - this.parent.hide(); } } @@ -549,14 +547,14 @@ if (newSize >= this.currentMinWidth || this.options.autosized) { if (diff.deltaWidth) { cssHashWH.width = newSize + 'px'; - shadowHashWH.width = newSize + shadowDepth + 'px'; + shadowHashWH.width = newSize + 'px'; contentHashWH.width = newSize - scrollerWidth + 'px'; scrollerHashWH.width = newSize - scrollerWidth + 'px'; } } else { if (diff.deltaWidth) { cssHashWH.width = this.currentMinWidth + 'px'; - shadowHashWH.width = this.currentMinWidth + shadowDepth + 'px'; + shadowHashWH.width = this.currentMinWidth + 'px'; contentHashWH.width = this.currentMinWidth - scrollerWidth + 'px'; scrollerHashWH.width = this.currentMinWidth - scrollerWidth + 'px'; vetoes.vx = oldSize - this.currentMinWidth; @@ -568,7 +566,7 @@ if (newSize > this.options.maxWidth) { if (diff.deltaWidth) { cssHashWH.width = this.currentMaxWidth + 'px'; - shadowHashWH.width = this.currentMaxWidth + shadowDepth + 'px'; + shadowHashWH.width = this.currentMaxWidth + 'px'; contentHashWH.width = this.currentMaxWidth - scrollerWidth + 'px'; scrollerHashWH.width = this.currentMaxWidth - scrollerWidth + 'px'; vetoes.vx = oldSize - this.currentMaxWidth; @@ -604,13 +602,13 @@ if (newSize >= this.currentMinHeight || this.options.autosized) { if (diff.deltaHeight) { cssHashWH.height = newSize + 'px'; - shadowHashWH.height = newSize + shadowDepth + 'px'; + shadowHashWH.height = newSize + 'px'; scrollerHashWH.height = newSize - scrollerHeight + 'px'; } } else { if (diff.deltaHeight) { cssHashWH.height = this.currentMinHeight + 'px'; - shadowHashWH.height = this.currentMinHeight + shadowDepth + 'px'; + shadowHashWH.height = this.currentMinHeight + 'px'; scrollerHashWH.height = this.currentMinHeight - scrollerHeight + 'px'; vetoes.vy = oldSize - this.currentMinHeight; } @@ -621,7 +619,7 @@ if (newSize > this.options.maxHeight) { if (diff.deltaHeight) { cssHashWH.height = this.currentMaxHeight + 'px'; - shadowHashWH.height = this.currentMaxHeight + shadowDepth + 'px'; + shadowHashWH.height = this.currentMaxHeight + 'px'; scrollerHashWH.height = this.currentMaxHeight - scrollerHeight + 'px'; vetoes.vy = oldSize - this.currentMaxHeight; } @@ -715,8 +713,8 @@ findForm: function(elt) { var target = elt; while (target) { - if (!target[0].tagName /* document node doesn't have tagName */ - || target[0].tagName.toLowerCase() != "form") { + if (target[0] && (!target[0].tagName /* document node doesn't have tagName */ + || target[0].tagName.toLowerCase() != "form")) { target = $(target).parent(); } else { Modified: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-10-04 17:21:44 UTC (rev 19432) @@ -1,15 +1,14 @@ - .rf-tb-hdr { - white-space: nowrap; - border: "1px solid #{richSkin.panelBorderColor}"; + white-space: nowrap; + border: "1px solid #{richSkin.panelBorderColor}"; cursor : pointer; padding : 0px 5px 3px 5px; vertical-align : top; - /*gradient - from generalBackgroundColor to tabBackgroundColor*/ - background-image: "url(#{resource['org.richfaces.images:tabBg.png']})"; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.TabHeaderGradient']})"; background-position: top; background-repeat: repeat-x; background-color: "#{richSkin.tabBackgroundColor}"; + color: '#{richSkin.generalTextColor}'; } @@ -17,7 +16,7 @@ border-bottom: 0px; font-weight: bold; vertical-align: top; - background-image: "url(#{resource['org.richfaces.images:actTabBg.png']})"; + background-image: "url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']})"; background-position: top; background-repeat: repeat-x; background-color: "#{richSkin.additionalBackgroundColor}"; @@ -28,11 +27,15 @@ } .rf-tb-hdr-dis { - color: "#{richSkin.tabDisabledTextColor}"; - cursor: default; + color: "#{richSkin.tabDisabledTextColor}"; + cursor: default; } .rf-tb-hdr-tabline-vis { + background:url("tabline_bg.gif") repeat-x scroll center top #EEF4FB; + border-color:#A6A6A6 #A6A6A6 -moz-use-text-color; + border-style:solid solid none; + border-width:1px 1px 0; padding-top: 2px; overflow: hidden; height: 25px; @@ -40,7 +43,7 @@ position: relative; } -.rf-tb-hdr_tabs { +.rf-tb-hdr-tabs { border: 0px; width: 100%; height: 100%; @@ -65,7 +68,7 @@ } .rf-tb-hdr-scrl_l { - background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; + background: "url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']}) top repeat-x #{richSkin.additionalBackgroundColor}"; position: absolute; top: 1px; left: 1px; @@ -80,7 +83,7 @@ } .rf-tb-hdr-scrl_r { - background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; + background: "url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']}) top repeat-x #{richSkin.additionalBackgroundColor}"; position: absolute; top: 1px; right: 17px; @@ -95,7 +98,7 @@ } .rf-tb-hdr-tablst { - background: "url(#{resource['org.richfaces.images:actTabBg.png']}) top repeat-x #{richSkin.additionalBackgroundColor}"; + background: "url(#{resource['org.richfaces.renderkit.html.images.TopTabHeaderGradient']}) top repeat-x #{richSkin.additionalBackgroundColor}"; position: absolute; top: 1px; right: 1px; Modified: branches/RF-8742/ui/output/ui/src/main/templates/popupPanel.template.xml =================================================================== --- branches/RF-8742/ui/output/ui/src/main/templates/popupPanel.template.xml 2010-10-04 17:04:35 UTC (rev 19431) +++ branches/RF-8742/ui/output/ui/src/main/templates/popupPanel.template.xml 2010-10-04 17:21:44 UTC (rev 19432) @@ -34,14 +34,14 @@ <c:if test="#{component.getFacet('header')!=null and component.getFacet('header').rendered}"> <div id="#{clientId}_header" class="rf-pp-hdr #{component.attributes['headerClass']}" > - <div id="#{clientId}_header_content" class="rf-pp-hdr-сnt"> + <div id="#{clientId}_header_content" class="rf-pp-hdr-cnt"> <cdk:call expression="renderHeaderFacet(facesContext, component)"/> </div> </div> </c:if> <c:if test="#{component.attributes['header'] != null and (component.getFacet('header')==null or !component.getFacet('header').rendered)}"> <div id="#{clientId}_header" class="rf-pp-hdr #{component.attributes['headerClass']}" > - <div id="#{clientId}_header_content" class="rf-pp-hdr-сnt"> + <div id="#{clientId}_header_content" class="rf-pp-hdr-cnt"> #{component.attributes['header']} </div> </div>