richfaces-svn-commits
December 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 102 discussions
JBoss Rich Faces SVN: r23028 - modules/tests/metamer/trunk/application.
by richfaces-svn-commits＠lists.jboss.org
Author: jjamrich
Date: 2011-12-01 10:47:52 -0500 (Thu, 01 Dec 2011)
New Revision: 23028
Modified:
modules/tests/metamer/trunk/application/pom.xml
Log:
RFPL-1572: make push component working in Metamer
This is just simple fix for existing push example. Just add loading appropriate modules into classpath
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-12-01 15:41:43 UTC (rev 23027)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-12-01 15:47:52 UTC (rev 23028)
@@ -152,6 +152,15 @@
<version>[7.0.2.Final,)</version>
<scope>provided</scope>
</dependency>
+
+ <!-- JBoss AS7 management -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller-client</artifactId>
+ <version>7.0.2.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -188,7 +197,7 @@
<SCM-Revision>${buildNumber}</SCM-Revision>
<SCM-Timestamp>${timestamp}</SCM-Timestamp>
<!-- define SLF4J dependency in JBoss AS 7 -->
- <Dependencies>org.slf4j,org.jboss.as.process-controller</Dependencies>
+ <Dependencies>org.slf4j,org.jboss.as.process-controller,org.jboss.as.controller-client</Dependencies>
</manifestEntries>
</archive>
</configuration>
13 years
- 1
- 0
JBoss Rich Faces SVN: r23027 - in modules/tests/metamer/trunk: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 10:41:43 -0500 (Thu, 01 Dec 2011)
New Revision: 23027
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-12-01 15:41:37 UTC (rev 23026)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-12-01 15:41:43 UTC (rev 23027)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0.20111201-CR2</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-12-01 15:41:37 UTC (rev 23026)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-12-01 15:41:43 UTC (rev 23027)
@@ -31,14 +31,14 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.1.0.20111201-CR2</version>
+ <version>4.1.0-SNAPSHOT</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
</scm>
<licenses>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-12-01 15:41:37 UTC (rev 23026)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-12-01 15:41:43 UTC (rev 23027)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0.20111201-CR2</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<artifactId>metamer-ftest-source</artifactId>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-12-01 15:41:37 UTC (rev 23026)
+++ modules/tests/metamer/trunk/pom.xml 2011-12-01 15:41:43 UTC (rev 23027)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0.20111201-CR2</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url>
</scm>
<distributionManagement>
13 years
- 1
- 0
JBoss Rich Faces SVN: r23026 - modules/tests/metamer/tags.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 10:41:37 -0500 (Thu, 01 Dec 2011)
New Revision: 23026
Added:
modules/tests/metamer/tags/metamer-4.1.0.20111201-CR2/
Log:
[maven-release-plugin] copy for tag metamer-4.1.0.20111201-CR2
13 years
- 1
- 0
JBoss Rich Faces SVN: r23025 - in modules/tests/metamer/trunk: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 10:41:26 -0500 (Thu, 01 Dec 2011)
New Revision: 23025
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
[maven-release-plugin] prepare release metamer-4.1.0.20111201-CR2
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-12-01 15:02:17 UTC (rev 23024)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-12-01 15:41:26 UTC (rev 23025)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20111201-CR2</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-12-01 15:02:17 UTC (rev 23024)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-12-01 15:41:26 UTC (rev 23025)
@@ -31,14 +31,14 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20111201-CR2</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
</scm>
<licenses>
@@ -81,8 +81,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.1.0-SNAPSHOT</deployable.version>
- <ftest.source.version>4.1.0-SNAPSHOT</ftest.source.version>
+ <deployable.version>4.1.0.20111201-CR2</deployable.version>
+ <ftest.source.version>4.1.0.20111201-CR2</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
<jsf.config>Mojarra-2.0</jsf.config>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-12-01 15:02:17 UTC (rev 23024)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-12-01 15:41:26 UTC (rev 23025)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20111201-CR2</version>
</parent>
<artifactId>metamer-ftest-source</artifactId>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-12-01 15:02:17 UTC (rev 23024)
+++ modules/tests/metamer/trunk/pom.xml 2011-12-01 15:41:26 UTC (rev 23025)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20111201-CR2</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
</scm>
<distributionManagement>
13 years
- 1
- 0
JBoss Rich Faces SVN: r23024 - modules/tests/archetypes/richfaces-simpleapp-ftest/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 10:02:17 -0500 (Thu, 01 Dec 2011)
New Revision: 23024
Modified:
modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml
===================================================================
--- modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml 2011-12-01 15:02:12 UTC (rev 23023)
+++ modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml 2011-12-01 15:02:17 UTC (rev 23024)
@@ -30,14 +30,14 @@
<groupId>org.richfaces.tests.archetypes</groupId>
<artifactId>richfaces-simpleapp-ftest</artifactId>
- <version>4.1.0.20111201-CR2</version>
+ <version>4.1.0-SNAPSHOT</version>
<name>richfaces-simpleapp-ftest</name>
<description>Functional Test for richfaces-archetype-simpleapp</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/archetypes...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/archetypes/ri...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/archetypes/richfa...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/archetypes...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/archetypes/ri...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/archetypes/richfa...</url>
</scm>
<licenses>
13 years
- 1
- 0
JBoss Rich Faces SVN: r23023 - modules/tests/archetypes/richfaces-simpleapp-ftest/tags.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 10:02:12 -0500 (Thu, 01 Dec 2011)
New Revision: 23023
Added:
modules/tests/archetypes/richfaces-simpleapp-ftest/tags/richfaces-simpleapp-ftest-4.1.0.20111201-CR2/
Log:
[maven-scm] copy for tag richfaces-simpleapp-ftest-4.1.0.20111201-CR2
13 years
- 1
- 0
JBoss Rich Faces SVN: r23022 - modules/tests/archetypes/richfaces-simpleapp-ftest/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 10:01:59 -0500 (Thu, 01 Dec 2011)
New Revision: 23022
Modified:
modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml
Log:
[maven-release-plugin] prepare release richfaces-simpleapp-ftest-4.1.0.20111201-CR2
Modified: modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml
===================================================================
--- modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml 2011-12-01 14:40:21 UTC (rev 23021)
+++ modules/tests/archetypes/richfaces-simpleapp-ftest/trunk/pom.xml 2011-12-01 15:01:59 UTC (rev 23022)
@@ -30,14 +30,14 @@
<groupId>org.richfaces.tests.archetypes</groupId>
<artifactId>richfaces-simpleapp-ftest</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.0.20111201-CR2</version>
<name>richfaces-simpleapp-ftest</name>
<description>Functional Test for richfaces-archetype-simpleapp</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/archetypes...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/archetypes/ri...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/archetypes/richfa...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/archetypes...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/archetypes/ri...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/archetypes/richfa...</url>
</scm>
<licenses>
13 years
- 1
- 0
JBoss Rich Faces SVN: r23021 - in modules/tests/metamer/branches/wfk2-product-branch: application and 51 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 09:40:21 -0500 (Thu, 01 Dec 2011)
New Revision: 23021
Added:
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/CompactDisc.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Labeled.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/State.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/RichFacesTreeNode.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/SwingTreeNode.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContent.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContentFactory.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/rebel.xml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/image.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/filtering.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/rf-11656.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/componentToInclude.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/outOfTemplateAfterToInclude.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeDataModel.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeNode.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleSwingTreeNode.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFiltering.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java
Removed:
modules/tests/metamer/branches/wfk2-product-branch/.gitignore
modules/tests/metamer/branches/wfk2-product-branch/application/metamer/
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDropBehavior/
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simple.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml
Modified:
modules/tests/metamer/branches/wfk2-product-branch/
modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JCommandButtonBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichAutocompleteBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCollapsibleSubTableBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichEditorBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Company.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDiscXmlDescriptor.java
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichEditorBean.properties
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/META-INF/MANIFEST.MF
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/WEB-INF/web.xml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/list.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/list.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataScroller/simple.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components1.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components2.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/facets.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/filtering.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/scroller.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/simple.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richEditor/simple.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml
modules/tests/metamer/branches/wfk2-product-branch/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestCounter.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestInterval.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AbstractAutocompleteTest.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataTable/TestDataTableSortingUsingComponentControl.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/EditorAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSortingUsingComponentControl.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderWithJSR303.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestScroller.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreePhases.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/AbstractValidatorsTest.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsCSV.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsJSR303.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidator.java
modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java
modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/pom.xml
modules/tests/metamer/branches/wfk2-product-branch/release.sh
Log:
merged with trunk after RichFaces 4.1.0.CR1
Property changes on: modules/tests/metamer/branches/wfk2-product-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /modules/tests/metamer/trunk:22762-22826,22828-22843
+ /modules/tests/metamer/trunk:22762-22826,22828-22843,22845-23019
Deleted: modules/tests/metamer/branches/wfk2-product-branch/.gitignore
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/.gitignore 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/.gitignore 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,10 +0,0 @@
-/.checkstyle
-/.classpath
-/.project
-/.settings
-/target
-/profiles.xml
-/nbactions.xml
-/faces-config.NavData
-/nb-configuration.xml
-/ftest-source/src/main/java/org/testng/Assert.java
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/pom.xml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-M3-redhat-1</version>
+ <version>4.1.0-CR1-redhat-1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -49,8 +49,8 @@
<dependencies>
<!-- RichFaces 4 -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-api</artifactId>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
@@ -110,7 +110,7 @@
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -144,6 +144,14 @@
<artifactId>hibernate-validator</artifactId>
<version>4.1.0.Final</version>
</dependency>
+
+ <!-- JBoss AS7 management -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-process-controller</artifactId>
+ <version>[7.0.2.Final,)</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -180,7 +188,7 @@
<SCM-Revision>${buildNumber}</SCM-Revision>
<SCM-Timestamp>${timestamp}</SCM-Timestamp>
<!-- define SLF4J dependency in JBoss AS 7 -->
- <Dependencies>org.slf4j</Dependencies>
+ <Dependencies>org.slf4j,org.jboss.as.process-controller</Dependencies>
</manifestEntries>
</archive>
</configuration>
@@ -302,6 +310,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>war-default</id>
<activation>
@@ -316,7 +325,7 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<classifier>jee6</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
+ <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
<executions>
<execution>
@@ -371,7 +380,7 @@
</goals>
<configuration>
<classifier>jee6-bundled-myfaces</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
+ <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
</configuration>
</execution>
</executions>
@@ -428,7 +437,7 @@
</goals>
<configuration>
<classifier>myfaces</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
+ <packagingExcludes>WEB-INF/lib/javax.faces-*,WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
</configuration>
</execution>
</executions>
@@ -437,134 +446,6 @@
</build>
</profile>
<profile>
- <id>war-mojarra-snapshot</id>
- <activation>
- <property>
- <name>jsf_profile</name>
- <value>jsf_ri_2_1_snapshot</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>mojarra-snapshot</id>
- <phase>integration-test</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <classifier>mojarra-snapshot</classifier>
- <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>war-myfaces-snapshot</id>
- <activation>
- <property>
- <name>jsf_profile</name>
- <value>myfaces_snapshot</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>myfaces-snapshot</id>
- <phase>integration-test</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <classifier>myfaces-snapshot</classifier>
- <packagingExcludes>WEB-INF/lib/jsf-api-*,WEB-INF/lib/jsf-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>war-mojarra_2_1</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.3-b02</version>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.3-b02</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>mojarra_2_1</id>
- <phase>integration-test</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <classifier>mojarra_2_1</classifier>
- <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/jsp-api*</packagingExcludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>war-jee6-bundled-mojarra_2_1</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.3-b02</version>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.3-b02</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <executions>
- <execution>
- <id>jee6-bundled-mojarra_2_1</id>
- <phase>integration-test</phase>
- <goals>
- <goal>war</goal>
- </goals>
- <configuration>
- <classifier>jee6-bundled-mojarra_2_1</classifier>
- <packagingExcludes>WEB-INF/lib/myfaces-api-*,WEB-INF/lib/myfaces-impl-*,WEB-INF/lib/validation-api-*,WEB-INF/lib/hibernate-validator-*,WEB-INF/lib/jsp-api*,WEB-INF/lib/slf4j*,WEB-INF/lib/log4j*</packagingExcludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>myfaces-development</id>
<dependencies>
<dependency>
@@ -591,21 +472,6 @@
</dependencies>
</profile>
<profile>
- <id>mojarra_2_1-development</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.3-b02</version>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.3-b02</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>jee-development</id>
<dependencies>
<dependency>
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -79,7 +79,7 @@
@PostConstruct
public void init() {
logger = LoggerFactory.getLogger(RichBean.class);
- logger.info("initializing bean " + getClass().getName());
+ logger.debug("initializing bean " + getClass().getName());
createSkinList();
createComponentsMap();
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/VersionBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -69,7 +69,8 @@
InputStream inStream = getClass().getClassLoader().getResourceAsStream("version.properties");
properties.load(inStream);
} catch (Exception e) {
- LOGGER.warn(
+ LOGGER
+ .warn(
"Unable to load version.properties using PomVersion.class.getClassLoader().getResourceAsStream(...)",
e);
}
@@ -113,7 +114,7 @@
}
fullVersion = implementationTitle + " by " + implementationVendor + ", version " + implementationVersion
- + " SVN r. " + scmRevision;
+ + " SVN r. " + scmRevision;
return fullVersion;
}
@@ -155,7 +156,6 @@
public String getJsfVersion() {
-
if (jsfVersion != null) {
return jsfVersion;
}
@@ -182,7 +182,8 @@
}
public String getBrowserVersion() {
- HttpServletRequest request = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
+ HttpServletRequest request = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext()
+ .getRequest();
return request.getHeader("user-agent");
}
@@ -198,13 +199,21 @@
String result = null;
try {
- result = getJBossASVersionInfo();
+ result = getJBossAS7VersionInfo();
} catch (FailToRetrieveInfo e) {
result = e.getMessage();
}
if (result == null) {
try {
+ result = getJBossAS6VersionInfo();
+ } catch (FailToRetrieveInfo e) {
+ result = e.getMessage();
+ }
+ }
+
+ if (result == null) {
+ try {
result = getTomcatVersionInfo();
} catch (FailToRetrieveInfo e) {
result = e.getMessage();
@@ -223,8 +232,8 @@
@Override
protected Object obtainInfo() throws ClassNotFoundException, IllegalAccessException,
- InstantiationException, SecurityException, NoSuchMethodException, IllegalArgumentException,
- InvocationTargetException {
+ InstantiationException, SecurityException, NoSuchMethodException, IllegalArgumentException,
+ InvocationTargetException {
Class<?> clazz = Class.forName("org.apache.catalina.util.ServerInfo");
return clazz.getMethod("getServerInfo").invoke(null);
@@ -234,9 +243,9 @@
return result.replace("/", " ");
}
- public static String getJBossASVersionInfo() {
- String versionNumber = (String) new JBossASVersionInfoObtainer("getVersionNumber").getInfo();
- String buildNumber = (String) new JBossASVersionInfoObtainer("getBuildID").getInfo();
+ public static String getJBossAS6VersionInfo() {
+ String versionNumber = (String) new JBossAS6VersionInfoObtainer("getVersionNumber").getInfo();
+ String buildNumber = (String) new JBossAS6VersionInfoObtainer("getBuildID").getInfo();
if (versionNumber == null) {
return null;
@@ -254,18 +263,27 @@
return buffer.toString();
}
- private static class JBossASVersionInfoObtainer extends InfoObtainer {
+ public static String getJBossAS7VersionInfo() {
+ try {
+ Class.forName("org.jboss.as.version.Version");
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ return "JBoss AS " + org.jboss.as.version.Version.AS_VERSION;
+ }
+ private static class JBossAS6VersionInfoObtainer extends InfoObtainer {
+
private String methodName;
- public JBossASVersionInfoObtainer(String methodName) {
+ public JBossAS6VersionInfoObtainer(String methodName) {
super();
this.methodName = methodName;
}
@Override
protected Object obtainInfo() throws ClassNotFoundException, IllegalAccessException, InstantiationException,
- SecurityException, NoSuchMethodException, IllegalArgumentException, InvocationTargetException {
+ SecurityException, NoSuchMethodException, IllegalArgumentException, InvocationTargetException {
Class<?> clazz = Class.forName("org.jboss.bootstrap.impl.as.server.ASVersion");
Object classInstance = clazz.getMethod("getInstance").invoke(null);
@@ -276,8 +294,8 @@
private abstract static class InfoObtainer {
protected abstract Object obtainInfo() throws ClassNotFoundException, IllegalAccessException,
- InstantiationException, SecurityException, NoSuchMethodException, IllegalArgumentException,
- InvocationTargetException;
+ InstantiationException, SecurityException, NoSuchMethodException, IllegalArgumentException,
+ InvocationTargetException;
public final Object getInfo() {
try {
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JCommandButtonBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JCommandButtonBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/a4j/A4JCommandButtonBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -62,8 +62,6 @@
attributes.setAttribute("action", "first6CharsAction");
attributes.setAttribute("actionListener", "toUpperCaseActionListener");
- attributes.setAttribute("disabled", false);
- attributes.get("disabled").setType(Boolean.class);
attributes.setAttribute("render", "output1 output2 output3");
attributes.setAttribute("rendered", true);
attributes.setAttribute("value", "command button");
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichAutocompleteBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichAutocompleteBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichAutocompleteBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -156,7 +156,7 @@
}
return result;
}
-
+
public void setCapitals(List<Capital> capitals) {
this.capitals = capitals;
}
@@ -196,4 +196,8 @@
this.value4 = value4;
}
+ public List<Capital> getCapitals() {
+ return capitals;
+ }
+
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCollapsibleSubTableBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCollapsibleSubTableBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichCollapsibleSubTableBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -79,6 +79,9 @@
private Map<String, Object> filtering = new HashMap<String, Object>();
// expanded
private Map<List<Employee>, Boolean> expanded = new HashMap<List<Employee>, Boolean>();
+
+ // expanded state for employee detail (for RF-11656)
+ private Map<Employee, Boolean> expandedEmployee = new HashMap<Employee, Boolean>();
/**
* Initializes the managed bean.
@@ -181,4 +184,12 @@
public Map<List<Employee>, Boolean> getExpanded() {
return expanded;
}
+
+ public Map<Employee, Boolean> getExpandedEmployee() {
+ return expandedEmployee;
+ }
+
+ public void setExpandedEmployee(Map<Employee, Boolean> expandedEmployee) {
+ this.expandedEmployee = expandedEmployee;
+ }
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichDataScrollerBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -45,6 +45,7 @@
private static final long serialVersionUID = 122475400649809L;
private static Logger logger;
private Attributes attributes;
+ private Attributes tableAttributes;
private boolean state = true;
/**
@@ -56,7 +57,7 @@
logger.debug("initializing bean " + getClass().getName());
attributes = Attributes.getComponentAttributesFromFacesConfig(UIDataScroller.class, getClass());
-
+
attributes.setAttribute("boundaryControls", "show");
attributes.setAttribute("fastControls", "show");
attributes.setAttribute("stepControls", "show");
@@ -69,6 +70,9 @@
attributes.setAttribute("renderIfSinglePage", true);
attributes.setAttribute("for", "richDataTable");
+ tableAttributes = Attributes.getEmptyAttributes(getClass());
+ tableAttributes.setAttribute("rows", 9);
+
}
public Attributes getAttributes() {
@@ -79,6 +83,14 @@
this.attributes = attributes;
}
+ public Attributes getTableAttributes() {
+ return tableAttributes;
+ }
+
+ public void setTableAttributes(Attributes tableAttributes) {
+ this.tableAttributes = tableAttributes;
+ }
+
/**
* Getter for state.
* @return true if non-empty data model should be used in table
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichEditorBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichEditorBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichEditorBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -47,7 +47,7 @@
public class RichEditorBean implements Serializable {
public static final Logger LOG = LoggerFactory.getLogger(RichEditorBean.class);
- /** Genrated serial UID */
+ /** Generated serial UID */
private static final long serialVersionUID = -6029256813894981250L;
private Attributes attributes;
@@ -59,7 +59,9 @@
attributes.setAttribute("rendered", Boolean.TRUE);
attributes.setAttribute("requiredMessage", "Editor's value cannot be empty!");
attributes.setAttribute("toolbar", "basic");
+ attributes.setAttribute("skin", "richfaces");
+ attributes.remove("config"); // config facet covered with @toolbar=custom
attributes.remove("converter");
attributes.remove("converterMessage");
attributes.remove("validator");
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -24,26 +24,37 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
import javax.annotation.PostConstruct;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ViewScoped;
import javax.faces.event.ComponentSystemEvent;
+import org.richfaces.model.SwingTreeNodeDataModelImpl;
+import org.richfaces.model.TreeDataModel;
+
import org.richfaces.component.UITree;
import org.richfaces.event.DropEvent;
import org.richfaces.tests.metamer.Attributes;
import org.richfaces.tests.metamer.bean.Model;
import org.richfaces.tests.metamer.bean.RichBean;
-import org.richfaces.tests.metamer.model.tree.CompactDisc;
+import org.richfaces.tests.metamer.model.CompactDisc;
+import org.richfaces.tests.metamer.model.Company;
+import org.richfaces.tests.metamer.model.Labeled;
+import org.richfaces.tests.metamer.model.State;
import org.richfaces.tests.metamer.model.tree.CompactDiscXmlDescriptor;
-import org.richfaces.tests.metamer.model.tree.Company;
-import org.richfaces.tests.metamer.model.tree.Country;
-import org.richfaces.tests.metamer.model.tree.NamedNode;
+import org.richfaces.tests.metamer.model.tree.RichFacesTreeNode;
+import org.richfaces.tests.metamer.model.tree.SwingTreeNode;
+import org.richfaces.tests.metamer.model.tree.TreeNodeWithContent;
+import org.richfaces.tests.metamer.model.tree.TreeNodeWithContentFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,20 +70,28 @@
private static Logger logger;
private Attributes attributes;
- private List<NamedNode> root = new ArrayList<NamedNode>();
+ private RichFacesTreeNode<Labeled> richfacesTreeNodeRoot;
+ private TreeDataModel<?> richFacesTreeDataModelRoot;
+ private List<SwingTreeNode<Labeled>> swingTreeNodeRoot;
private Collection<? extends Serializable> selection;
// FIXME: @ManagedProperty(value = "#{model}")
// private Model model;
+ private Map<State, Set<Company>> companiesCache;
+ private Map<Company, Set<CompactDisc>> cdCache;
- private Map<String, Country> countriesCache = new HashMap<String, Country>();
- private Map<String, Company> companiesCache = new HashMap<String, Company>();
-
private boolean testLoadingFacet = false;
private boolean delayedRender = false;
- private Map<NamedNode, Boolean> expanded = new HashMap<NamedNode, Boolean>();
+ private Map<TreeNodeWithContent<Labeled>, Boolean> expanded = new HashMap<TreeNodeWithContent<Labeled>, Boolean>();
+ private Comparator<Labeled> labeledComparator = new Comparator<Labeled>() {
+ @Override
+ public int compare(Labeled o1, Labeled o2) {
+ return o1.getLabel().compareTo(o2.getLabel());
+ }
+ };
+
/**
* Initializes the managed bean.
*/
@@ -95,6 +114,9 @@
attributes.remove("stateVar");
attributes.remove("nodeType");
+ // build cache
+ companiesCache = new TreeMap<State, Set<Company>>(labeledComparator);
+ cdCache = new HashMap<Company, Set<CompactDisc>>();
for (CompactDiscXmlDescriptor descriptor : Model.unmarshallCompactDiscs()) {
createCompactDisc(descriptor);
}
@@ -108,54 +130,40 @@
this.attributes = attributes;
}
- private CompactDisc createCompactDisc(CompactDiscXmlDescriptor descriptor) {
- final Company company = findOrCreateCompany(descriptor);
-
- CompactDisc cd = new CompactDisc(descriptor.getTitle(), descriptor.getArtist(), company, descriptor.getPrice(),
- descriptor.getYear());
- company.getCds().add(cd);
- expanded.put(cd, false);
- return cd;
+
+ public void processDragging(DropEvent dropEvent) {
+ RichBean.logToPage("* dropListener");
}
- private Company findOrCreateCompany(CompactDiscXmlDescriptor descriptor) {
- final Country country = findOrCreateCountry(descriptor);
-
- String companyName = descriptor.getCompany();
- Company company = companiesCache.get(companyName);
- if (company == null) {
- company = new Company();
- company.setName(companyName);
- company.setParent(country);
- country.getCompanies().add(company);
- companiesCache.put(companyName, company);
- expanded.put(company, false);
+ public TreeDataModel<?> getRichFacesTreeDataModelRoot() {
+ if (richFacesTreeDataModelRoot == null) {
+ richFacesTreeDataModelRoot = new SwingTreeNodeDataModelImpl();
+ richFacesTreeDataModelRoot.setWrappedData(getSwingTreeNodeRoot());
}
- return company;
+ return richFacesTreeDataModelRoot;
}
-
- private Country findOrCreateCountry(CompactDiscXmlDescriptor descriptor) {
- String countryName = descriptor.getCountry();
- Country country = countriesCache.get(countryName);
- if (country == null) {
- country = new Country();
- country.setName(countryName);
- countriesCache.put(countryName, country);
- expanded.put(country, false);
- root.add(country);
+
+ public RichFacesTreeNode<Labeled> getRichFacesTreeNodeRoot() {
+ if (richfacesTreeNodeRoot == null) {
+ List<RichFacesTreeNode<Labeled>> richfacesTreeNodeList = (List<RichFacesTreeNode<Labeled>>) (List<?>) buldTree(RichFacesTreeNode.createFactory());
+ richfacesTreeNodeRoot = new RichFacesTreeNode<Labeled>();
+ int i=0;
+ for (RichFacesTreeNode node : richfacesTreeNodeList) {
+ richfacesTreeNodeRoot.addChild(i, node);
+ i++;
+ }
}
- return country;
+ return richfacesTreeNodeRoot;
}
- public void processDragging(DropEvent dropEvent) {
- RichBean.logToPage("* dropListener");
+ public List<SwingTreeNode<Labeled>> getSwingTreeNodeRoot() {
+ if (swingTreeNodeRoot == null) {
+ List<SwingTreeNode<Labeled>> swingTreeNodelist = (List<SwingTreeNode<Labeled>>) (List<?>) buldTree(SwingTreeNode.createFactory());
+ swingTreeNodeRoot = swingTreeNodelist;
+ }
+ return swingTreeNodeRoot;
}
- public List<NamedNode> getRoot() {
-
- return root;
- }
-
public Collection<? extends Serializable> getSelection() {
return selection;
}
@@ -190,19 +198,67 @@
}
}
- public Map<NamedNode, Boolean> getExpanded() {
+ public Map<TreeNodeWithContent<Labeled>, Boolean> getExpanded() {
return expanded;
}
public void expandAll() {
- for (Entry<NamedNode, Boolean> entry : expanded.entrySet()) {
+ for (Entry<TreeNodeWithContent<Labeled>, Boolean> entry : expanded.entrySet()) {
entry.setValue(true);
}
}
public void collapseAll() {
- for (Entry<NamedNode, Boolean> entry : expanded.entrySet()) {
+ for (Entry<TreeNodeWithContent<Labeled>, Boolean> entry : expanded.entrySet()) {
entry.setValue(false);
}
}
+
+ private List<TreeNodeWithContent<Labeled>> buldTree(TreeNodeWithContentFactory<TreeNodeWithContent<Labeled>> treeNodeFactory) {
+ List<TreeNodeWithContent<Labeled>> firstLevelNodes = new ArrayList<TreeNodeWithContent<Labeled>>();
+ for(State state : companiesCache.keySet()) {
+ TreeNodeWithContent<Labeled> stateTreeNode = treeNodeFactory.createTreeNode(null, state);
+ stateTreeNode.setType("country");
+ for(Company company : companiesCache.get(state)) {
+ TreeNodeWithContent<Labeled> companyTreeNode = treeNodeFactory.createTreeNode(stateTreeNode, company);
+ companyTreeNode.setType("company");
+ for (CompactDisc cd : cdCache.get(company)) {
+ TreeNodeWithContent<Labeled> cdTreeNode = treeNodeFactory.createTreeNode(companyTreeNode, cd);
+ cdTreeNode.setType("cd");
+ expanded.put(cdTreeNode, false);
+ }
+ expanded.put(companyTreeNode, false);
+ }
+ expanded.put(stateTreeNode, false);
+ firstLevelNodes.add(stateTreeNode);
+ }
+ return firstLevelNodes;
+ }
+
+ private CompactDisc createCompactDisc(CompactDiscXmlDescriptor descriptor) {
+ final Company company = findOrCreateCompany(descriptor);
+ CompactDisc cd = new CompactDisc(descriptor.getTitle(), descriptor.getArtist());
+ cdCache.get(company).add(cd);
+ return cd;
+ }
+
+ private Company findOrCreateCompany(CompactDiscXmlDescriptor descriptor) {
+ final State country = findOrCreateCountry(descriptor);
+ Company company = new Company(descriptor.getCompany());
+ if (!cdCache.containsKey(company)) {
+ cdCache.put(company, new TreeSet<CompactDisc>(labeledComparator));
+ companiesCache.get(country).add(company);
+ }
+ return company;
+ }
+
+ private State findOrCreateCountry(CompactDiscXmlDescriptor descriptor) {
+ String countryName = descriptor.getCountry();
+ State country = new State();
+ country.setName(countryName);
+ if (!companiesCache.containsKey(country)) {
+ companiesCache.put(country, new TreeSet<Company>(labeledComparator));
+ }
+ return country;
+ }
}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/CompactDisc.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/CompactDisc.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/CompactDisc.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/CompactDisc.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public class CompactDisc implements Labeled, Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private String artist;
+ private String title;
+
+ public CompactDisc(String title, String artist) {
+ this.artist = artist;
+ this.title = title;
+ }
+
+ @Override
+ public String getLabel() {
+ return artist + " - " + title;
+ }
+
+ public String getArtist() {
+ return artist;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setArtist(String artist) {
+ this.artist = artist;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @Override
+ public String toString() {
+ return "CompactDisc [artist=" + artist + ", title=" + title + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((artist == null) ? 0 : artist.hashCode());
+ result = prime * result + ((title == null) ? 0 : title.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CompactDisc other = (CompactDisc) obj;
+ if (artist == null) {
+ if (other.artist != null)
+ return false;
+ } else if (!artist.equals(other.artist))
+ return false;
+ if (title == null) {
+ if (other.title != null)
+ return false;
+ } else if (!title.equals(other.title))
+ return false;
+ return true;
+ }
+
+
+}
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Company.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Company.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Company.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -33,7 +33,7 @@
* @version $Revision$
*/
@XmlRootElement(name = "company")
-public class Company implements Serializable {
+public class Company implements Labeled, Serializable {
private static final long serialVersionUID = -1L;
private String name;
@@ -93,5 +93,14 @@
public int hashCode() {
return 31 + 17 * name.hashCode();
}
+
+ public String getLabel() {
+ return name;
+ }
+
+ @Override
+ public String toString() {
+ return "Company [name=" + name + "]";
+ }
}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Labeled.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Labeled.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Labeled.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/Labeled.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public interface Labeled {
+
+ String getLabel();
+
+}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/State.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/State.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/State.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/State.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public class State implements Labeled, Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private String name;
+
+ @Override
+ public String getLabel() {
+ return name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "Country [name=" + name + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ State other = (State) obj;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ return true;
+ }
+
+}
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDisc.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,104 +0,0 @@
-package org.richfaces.tests.metamer.model.tree;
-
-import java.util.Enumeration;
-
-import javax.swing.tree.TreeNode;
-
-public class CompactDisc extends NamedNode {
-
- private static final long serialVersionUID = 1L;
-
- private Company company;
- private String artist;
- private String title;
- private float price;
- private int year;
-
- public CompactDisc() {
- this.setType("cd");
- }
-
- public CompactDisc(String title, String artist, Company company, float price, int year) {
- super();
- this.setType("cd");
- this.company = company;
- this.artist = artist;
- this.title = title;
- this.price = price;
- this.year = year;
- }
-
- public TreeNode getChildAt(int childIndex) {
- return null;
- }
-
- public int getChildCount() {
- return 0;
- }
-
- public TreeNode getParent() {
- return company;
- }
-
- public int getIndex(TreeNode node) {
- return 0;
- }
-
- public boolean getAllowsChildren() {
- return false;
- }
-
- public boolean isLeaf() {
- return true;
- }
-
- public Enumeration<TreeNode> children() {
- return new Enumeration<TreeNode>() {
-
- public boolean hasMoreElements() {
- return false;
- }
-
- public TreeNode nextElement() {
- return null;
- }
- };
- }
-
- public String getArtist() {
- return artist;
- }
-
- public void setArtist(String artist) {
- this.artist = artist;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public float getPrice() {
- return price;
- }
-
- public void setPrice(float price) {
- this.price = price;
- }
-
- public int getYear() {
- return year;
- }
-
- public void setYear(int year) {
- this.year = year;
- }
-
- @Override
- public String toString() {
- return "CompactDisc [artist=" + artist + ", title=" + title + "]";
- }
-}
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDiscXmlDescriptor.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDiscXmlDescriptor.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/CompactDiscXmlDescriptor.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -5,6 +5,8 @@
import javax.xml.bind.annotation.XmlElement;
public class CompactDiscXmlDescriptor implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private String artist;
private String title;
private String country;
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Company.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,80 +0,0 @@
-package org.richfaces.tests.metamer.model.tree;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.swing.tree.TreeNode;
-
-import com.google.common.collect.Iterators;
-
-public class Company extends NamedNode {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
- private List<CompactDisc> compactDiscs = new ArrayList<CompactDisc>();
-
- private Country country;
-
- public Company() {
- this.setType("company");
- }
-
- public TreeNode getChildAt(int childIndex) {
- return compactDiscs.get(childIndex);
- }
-
- public int getChildCount() {
- return compactDiscs.size();
- }
-
- public TreeNode getParent() {
- return country;
- }
-
- public void setParent(Country country) {
- this.country = country;
- }
-
- public int getIndex(TreeNode node) {
- return compactDiscs.indexOf(node);
- }
-
- public boolean getAllowsChildren() {
- return true;
- }
-
- public boolean isLeaf() {
- return compactDiscs.isEmpty();
- }
-
- public Enumeration children() {
- return Iterators.asEnumeration(compactDiscs.iterator());
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Country getCountry() {
- return country;
- }
-
- public void setCountry(Country country) {
- this.country = country;
- }
-
- public List<CompactDisc> getCds() {
- return compactDiscs;
- }
-
- @Override
- public String toString() {
- return "Company [name=" + name + "]";
- }
-}
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/Country.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,66 +0,0 @@
-package org.richfaces.tests.metamer.model.tree;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.swing.tree.TreeNode;
-
-import com.google.common.collect.Iterators;
-
-public class Country extends NamedNode {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
- private List<Company> companies = new ArrayList<Company>();
-
- public Country() {
- this.setType("country");
- }
-
- public TreeNode getChildAt(int childIndex) {
- return companies.get(childIndex);
- }
-
- public int getChildCount() {
- return companies.size();
- }
-
- public TreeNode getParent() {
- return null;
- }
-
- public int getIndex(TreeNode node) {
- return companies.indexOf(node);
- }
-
- public boolean getAllowsChildren() {
- return true;
- }
-
- public boolean isLeaf() {
- return companies.isEmpty();
- }
-
- public Enumeration<Company> children() {
- return Iterators.asEnumeration(companies.iterator());
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public List<Company> getCompanies() {
- return companies;
- }
-
- @Override
- public String toString() {
- return "Country [name=" + name + "]";
- }
-}
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/NamedNode.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,20 +0,0 @@
-package org.richfaces.tests.metamer.model.tree;
-
-import java.io.Serializable;
-
-import javax.swing.tree.TreeNode;
-
-public abstract class NamedNode implements TreeNode, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String type;
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/RichFacesTreeNode.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/RichFacesTreeNode.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/RichFacesTreeNode.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/RichFacesTreeNode.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,123 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model.tree;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.richfaces.model.TreeNode;
+import org.richfaces.tests.metamer.model.Labeled;
+import org.richfaces.tests.metamer.model.tree.TreeNodeWithContent;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public class RichFacesTreeNode<Content extends Labeled> implements TreeNode, TreeNodeWithContent<Content>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Map<Object, TreeNode> children = new HashMap<Object, TreeNode>();
+ private List<Object> keys = new ArrayList<Object>();
+ private Content content;
+ private String type;
+
+ @Override
+ public void addChild(Object key, TreeNode child) {
+ children.put(key, child);
+ keys.add(key);
+ }
+
+ @Override
+ public Content getContent() {
+ return content;
+ }
+
+ @Override
+ public TreeNode getChild(Object key) {
+ return children.get(key);
+ }
+
+ @Override
+ public Iterator<Object> getChildrenKeysIterator() {
+ return keys.iterator();
+ }
+
+ @Override
+ public int indexOf(Object key) {
+ return keys.indexOf(key);
+ }
+
+ @Override
+ public void insertChild(int index, Object key, TreeNode child) {
+ children.put(key, child);
+ keys.add(index, key);
+ }
+
+ @Override
+ public boolean isLeaf() {
+ return children.isEmpty();
+ }
+
+ @Override
+ public void removeChild(Object key) {
+ children.remove(key);
+ keys.remove(key);
+ }
+
+ @Override
+ public void setContent(Content content) {
+ this.content = content;
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ @Override
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ @Override
+ public String toString() {
+ return content == null ? super.toString() : content.toString();
+ }
+
+ public static TreeNodeWithContentFactory<TreeNodeWithContent<Labeled>> createFactory() {
+ return new TreeNodeWithContentFactory<TreeNodeWithContent<Labeled>>() {
+ @Override
+ public RichFacesTreeNode<Labeled> createTreeNode(TreeNodeWithContent<Labeled> parent, Labeled content) {
+ RichFacesTreeNode<Labeled> treeNode = new RichFacesTreeNode<Labeled>();
+ treeNode.setContent(content);
+ if (parent != null) {
+ RichFacesTreeNode<Labeled> castedParent = (RichFacesTreeNode<Labeled>) parent;
+ castedParent.addChild(treeNode.getContent(), treeNode);
+ }
+ return treeNode;
+ }
+ };
+ }
+}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/SwingTreeNode.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/SwingTreeNode.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/SwingTreeNode.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/SwingTreeNode.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model.tree;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.swing.tree.TreeNode;
+
+import org.richfaces.tests.metamer.model.Labeled;
+
+import com.google.common.collect.Iterators;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public class SwingTreeNode<Content extends Labeled> implements TreeNode, TreeNodeWithContent<Content>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Content content;
+ private List<TreeNode> children = new ArrayList<TreeNode>();
+ private TreeNode parent;
+ private String type;
+
+ public void addChild(TreeNode child) {
+ children.add(child);
+ }
+
+ @Override
+ public Content getContent() {
+ return content;
+ }
+
+ @Override
+ public void setContent(Content content) {
+ this.content = content;
+ }
+
+ @Override
+ public Enumeration<TreeNode> children() {
+ return Iterators.asEnumeration(children.iterator());
+ }
+
+ @Override
+ public boolean getAllowsChildren() {
+ return isLeaf();
+ }
+
+ @Override
+ public TreeNode getChildAt(int childIndex) {
+ return children.get(childIndex);
+ }
+
+ @Override
+ public int getChildCount() {
+ return children.size();
+ }
+
+ @Override
+ public int getIndex(TreeNode node) {
+ return children.indexOf(node);
+ }
+
+ @Override
+ public TreeNode getParent() {
+ return parent;
+ }
+
+ public void setParent(TreeNode parent) {
+ this.parent = parent;
+ }
+
+ @Override
+ public boolean isLeaf() {
+ return children.isEmpty();
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ @Override
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public static TreeNodeWithContentFactory<TreeNodeWithContent<Labeled>> createFactory() {
+ return new TreeNodeWithContentFactory<TreeNodeWithContent<Labeled>>() {
+ @Override
+ public SwingTreeNode<Labeled> createTreeNode(TreeNodeWithContent<Labeled> parent, Labeled content) {
+ SwingTreeNode<Labeled> treeNode = new SwingTreeNode<Labeled>();
+ treeNode.setContent(content);
+ if (parent != null) {
+ SwingTreeNode<Labeled> castedParent = (SwingTreeNode<Labeled>) parent;
+ castedParent.addChild(treeNode);
+ treeNode.setParent(castedParent);
+ }
+ return treeNode;
+ }
+ };
+ }
+
+ @Override
+ public String toString() {
+ return content == null ? super.toString() : content.toString();
+ }
+
+}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContent.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContent.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContent.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContent.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model.tree;
+
+import org.richfaces.tests.metamer.model.Labeled;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public interface TreeNodeWithContent<Content extends Labeled> {
+
+ Content getContent();
+
+ String getType();
+
+ void setContent(Content content);
+
+ void setType(String type);
+}
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContentFactory.java (from rev 23019, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContentFactory.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContentFactory.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/model/tree/TreeNodeWithContentFactory.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.model.tree;
+
+import org.richfaces.tests.metamer.model.Labeled;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public interface TreeNodeWithContentFactory<TreeNode extends TreeNodeWithContent<Labeled>> {
+
+ TreeNode createTreeNode(TreeNode parent, Labeled content);
+}
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichEditorBean.properties
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichEditorBean.properties 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/org/richfaces/tests/metamer/bean/rich/RichEditorBean.properties 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,3 +1,7 @@
attr.toolbar.basic=basic
attr.toolbar.full=full
attr.toolbar.custom=custom
+attr.skin.richfaces=richfaces
+attr.skin.v2=v2
+attr.skin.kama=kama
+attr.skin.office2003=office2003
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/rebel.xml (from rev 23019, modules/tests/metamer/trunk/application/src/main/resources/rebel.xml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/rebel.xml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/resources/rebel.xml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com"
+ xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
+
+ <classpath>
+ <dir name="${rebel.workspace.path}/metamer/application/target/classes" />
+ </classpath>
+
+ <web>
+ <link target="/">
+ <dir name="${rebel.workspace.path}/metamer/application/src/main/resources" />
+ <dir name="${rebel.workspace.path}/metamer/application/src/main/webapp" />
+ </link>
+ </web>
+
+</application>
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/META-INF/MANIFEST.MF
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/META-INF/MANIFEST.MF 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/META-INF/MANIFEST.MF 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Class-Path:
-Dependencies: org.slf4j
+Dependencies: org.slf4j,org.jboss.as.process-controller
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/WEB-INF/web.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/WEB-INF/web.xml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/WEB-INF/web.xml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,97 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <display-name>metamer</display-name>
- <!-- disabled because of a bug in Mojarra 2.1 showing an error message on every page
- <context-param>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <display-name>metamer</display-name>
+
+ <!-- disabled because of a bug in Mojarra 2.1 showing an error message on every page
+ <context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
- </context-param>-->
- <context-param>
- <param-name>com.sun.faces.enableMissingResourceLibraryDetection</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>server</param-value>
- </context-param>
- <context-param>
- <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>org.richfaces.fileUpload.maxRequestSize</param-name>
- <param-value>2097152</param-value>
- </context-param>
- <context-param>
- <param-name>org.richfaces.push.jms.connectionPassword</param-name>
- <param-value>guest</param-value>
- </context-param>
- <context-param>
- <param-name>org.richfaces.push.jms.connectionUsername</param-name>
- <param-value>guest</param-value>
- </context-param>
-
- <!-- resource mapping enable/disable/configure -->
- <context-param>
- <param-name>org.richfaces.resourceMapping.compressedStages</param-name>
- <param-value>None</param-value>
- </context-param>
- <!-- -->
- <context-param>
- <param-name>org.richfaces.resourceMapping.packedStages</param-name>
- <param-value>None</param-value>
- </context-param>
- <!-- -->
- <context-param>
- <param-name>org.richfaces.resourceMapping.enabled</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>org.richfaces.skin</param-name>
- <param-value>#{richBean.skin}</param-value>
- </context-param>
- <filter>
- <filter-name>PushFilter</filter-name>
- <filter-class>org.richfaces.webapp.PushFilter</filter-class>
- <async-supported>true</async-supported>
- </filter>
- <filter>
- <filter-name>Test Identity Filter</filter-name>
- <filter-class>org.richfaces.tests.metamer.TestIdentityFilter</filter-class>
- <async-supported>true</async-supported>
- </filter>
- <filter-mapping>
- <filter-name>PushFilter</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
- <filter-mapping>
- <filter-name>Test Identity Filter</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>Resource Servlet</servlet-name>
- <servlet-class>org.richfaces.webapp.ResourceServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource Servlet</servlet-name>
- <url-pattern>/org.richfaces.resources/*</url-pattern>
- </servlet-mapping>
- <welcome-file-list>
- <welcome-file>faces/index.xhtml</welcome-file>
- </welcome-file-list>
+ </context-param>
+ -->
+ <context-param>
+ <param-name>com.sun.faces.enableMissingResourceLibraryDetection</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.fileUpload.maxRequestSize</param-name>
+ <param-value>2097152</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.push.jms.connectionPassword</param-name>
+ <param-value>guest</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.push.jms.connectionUsername</param-name>
+ <param-value>guest</param-value>
+ </context-param>
+ <!-- resource mapping enable/disable/configure -->
+ <context-param>
+ <param-name>org.richfaces.resourceMapping.compressedStages</param-name>
+ <param-value>None</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.resourceMapping.packedStages</param-name>
+ <param-value>None</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.resourceMapping.enabled</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.skin</param-name>
+ <param-value>#{richBean.skin}</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>PushFilter</filter-name>
+ <filter-class>org.richfaces.webapp.PushFilter</filter-class>
+ <async-supported>true</async-supported>
+ </filter>
+ <filter>
+ <filter-name>Test Identity Filter</filter-name>
+ <filter-class>org.richfaces.tests.metamer.TestIdentityFilter</filter-class>
+ <async-supported>true</async-supported>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>PushFilter</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>Test Identity Filter</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>Resource Servlet</servlet-name>
+ <servlet-class>org.richfaces.webapp.ResourceServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource Servlet</servlet-name>
+ <url-pattern>/org.richfaces.resources/*</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>faces/index.xhtml</welcome-file>
+ </welcome-file-list>
+
+ <error-page>
+ <error-code>500</error-code>
+ <location>/faces/error/500.xhtml</location>
+ </error-page>
+ <error-page>
+ <error-code>404</error-code>
+ <location>/faces/error/404.xhtml</location>
+ </error-page>
+
</web-app>
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -53,8 +53,7 @@
rich:accordion
</h:column>
<h:column>
- <ui:remove>
- <!-- rich:accordion id="accordion" itemChangeListener="#{richBean.itemChangeListener}" >
+ <rich:accordion id="accordion" itemChangeListener="#{richBean.itemChangeListener}" >
<rich:accordionItem id="item1" name="item1" header="Item 1">
content of item 1
</rich:accordionItem>
@@ -62,8 +61,7 @@
content of item 2
</rich:accordionItem>
<a4j:ajax listener="#{richBean.actionListener}" render="output" />
- </rich:accordion-->
- </ui:remove>
+ </rich:accordion>
</h:column>
<h:column>
@@ -90,24 +88,20 @@
rich:editor
</h:column>
<h:column>
- <ui:remove>
- <!-- rich:editor id="editor1" value="#{a4jAjaxBean.input}" width="310px" height="40px"
+ <rich:editor id="editor1" value="#{a4jAjaxBean.input}" width="310px" height="40px"
valueChangeListener="#{richBean.valueChangeListener}" >
<a4j:ajax listener="#{richBean.actionListener}" render="output" />
- </rich:editor-->
- </ui:remove>
+ </rich:editor>
</h:column>
<h:column>
rich:inplaceInput
</h:column>
<h:column>
- <ui:remove>
- <!--rich:inplaceInput id="inplaceInput" value="#{a4jAjaxBean.input}"
+ <rich:inplaceInput id="inplaceInput" value="#{a4jAjaxBean.input}"
valueChangeListener="#{richBean.valueChangeListener}" >
<a4j:ajax listener="#{richBean.actionListener}" render="output" />
- </rich:inplaceInput-->
- </ui:remove>
+ </rich:inplaceInput>
</h:column>
<h:column>
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/image.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/a4jCommandButton/image.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/image.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/image.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <h:panelGrid id="panel" columns="2">
+ <h:inputText id="input" value="#{a4jButtonBean.input}" />
+
+ <a4j:commandButton id="a4jCommandButton"
+ action="#{a4jButtonBean.attributes.action}"
+ actionListener="#{a4jButtonBean.attributes.actionListener}"
+ bypassUpdates="#{a4jButtonBean.attributes['bypassUpdates'].value}"
+ data="#{a4jButtonBean.attributes['data'].value}"
+ disabled="#{a4jButtonBean.attributes['disabled'].value}"
+ execute="#{a4jButtonBean.attributes['execute'].value}"
+ image="/resources/images/star.png"
+ immediate="#{a4jButtonBean.attributes['immediate'].value}"
+ limitRender="#{a4jButtonBean.attributes['limitRender'].value}"
+ onbeforedomupdate="#{a4jButtonBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{a4jButtonBean.attributes['onbegin'].value}"
+ onclick="#{a4jButtonBean.attributes['onclick'].value}"
+ oncomplete="#{a4jButtonBean.attributes['oncomplete'].value}"
+ ondblclick="#{a4jButtonBean.attributes['ondblclick'].value}"
+ onkeydown="#{a4jButtonBean.attributes['onkeydown'].value}"
+ onkeypress="#{a4jButtonBean.attributes['onkeypress'].value}"
+ onkeyup="#{a4jButtonBean.attributes['onkeyup'].value}"
+ onmousedown="#{a4jButtonBean.attributes['onmousedown'].value}"
+ onmousemove="#{a4jButtonBean.attributes['onmousemove'].value}"
+ onmouseout="#{a4jButtonBean.attributes['onmouseout'].value}"
+ onmouseover="#{a4jButtonBean.attributes['onmouseover'].value}"
+ onmouseup="#{a4jButtonBean.attributes['onmouseup'].value}"
+ render="#{a4jButtonBean.attributes['render'].value}"
+ rendered="#{a4jButtonBean.attributes['rendered'].value}"
+ status="#{a4jButtonBean.attributes['status'].value}"
+ style="#{a4jButtonBean.attributes['style'].value}"
+ styleClass="#{a4jButtonBean.attributes['styleClass'].value}"
+ title="#{a4jButtonBean.attributes['title'].value}"
+ type="#{a4jButtonBean.attributes['type'].value}"
+ value="#{a4jButtonBean.attributes['value'].value}"
+ />
+ </h:panelGrid>
+
+ <h:panelGrid id="outputs" columns="2">
+ output: <h:outputText value="#{a4jButtonBean.input}" id="output1" />
+ action: <h:outputText value="#{a4jButtonBean.input2}" id="output2" />
+ action listener:<h:outputText value="#{a4jButtonBean.input3}" id="output3" />
+ </h:panelGrid>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{a4jButtonBean.attributes}" id="attributes" render="log"/>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/list.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/list.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jCommandButton/list.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!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:ui="http://java.sun.com/jsf/facelets"
- xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
- <!--
+<!--
JBoss, Home of Professional Open Source
Copyright 2010-2011, Red Hat, Inc. and individual contributors
by the @authors tag. See the copyright.txt in the distribution for a
@@ -25,18 +25,22 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
- <ui:composition template="/templates/list.xhtml">
+<ui:composition template="/templates/list.xhtml">
- <ui:define name="pageTitle">A4J Command Button</ui:define>
+ <ui:define name="pageTitle">A4J Command Button</ui:define>
- <ui:define name="links">
+ <ui:define name="links">
- <metamer:testPageLink id="simple" outcome="simple" value="Simple">
+ <metamer:testPageLink id="simple" outcome="simple" value="Simple">
Simple page that contains <b>a4j:commandButton</b> and input boxes for all its attributes.
- </metamer:testPageLink>
+ </metamer:testPageLink>
- </ui:define>
+ <metamer:testPageLink id="image" outcome="image" value="Image">
+ Simple page that contains <b>a4j:commandButton</b> with image and input boxes for all its attributes.
+ </metamer:testPageLink>
- </ui:composition>
+ </ui:define>
+</ui:composition>
+
</html>
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/autocomplete.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -44,7 +44,6 @@
converterMessage="#{richAutocompleteBean.attributes['converterMessage'].value}"
disabled="#{richAutocompleteBean.attributes['disabled'].value}"
filterFunction="#{richAutocompleteBean.attributes['filterFunction'].value}"
- fetchValue="#{richAutocompleteBean.attributes['fetchValue'].value}"
immediate="#{richAutocompleteBean.attributes['immediate'].value}"
inputClass="#{richAutocompleteBean.attributes['inputClass'].value}"
layout="#{richAutocompleteBean.attributes['layout'].value}"
@@ -89,7 +88,6 @@
validatorMessage="#{richAutocompleteBean.attributes['validatorMessage'].value}"
value="#{richAutocompleteBean.attributes['value'].value}"
valueChangeListener="#{richBean.valueChangeListener}"
- var="#{richAutocompleteBean.attributes['var'].value}"
>
<a4j:ajax event="change"
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/filtering.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richAutocomplete/filtering.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/filtering.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/filtering.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="head">
+ <script type="text/javascript">
+ /* function filtering by string occurence in state and name */
+ function customClientFilterFunction(subString, value) {
+
+ if (subString.length >= 2) {
+ if(value.indexOf(subString)!=-1) {
+ // console.log(' # ' + subString + ' matches on ' + value);
+ return true;
+ }
+ } else return false;
+ };
+
+ </script>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <rich:autocomplete id="autocomplete"
+ autocompleteList="#{richAutocompleteBean.capitals}"
+ autofill="#{richAutocompleteBean.attributes['autofill'].value}"
+ clientFilterFunction="#{richAutocompleteBean.attributes['clientFilterFunction'].value}"
+ converterMessage="#{richAutocompleteBean.attributes['converterMessage'].value}"
+ disabled="#{richAutocompleteBean.attributes['disabled'].value}"
+ fetchValue="#{capital.state}"
+ immediate="#{richAutocompleteBean.attributes['immediate'].value}"
+ inputClass="#{richAutocompleteBean.attributes['inputClass'].value}"
+ layout="#{richAutocompleteBean.attributes['layout'].value}"
+ minChars="#{richAutocompleteBean.attributes['minChars'].value}"
+ mode="#{richAutocompleteBean.attributes['mode'].value}"
+ onbeforedomupdate="#{richAutocompleteBean.attributes['onbeforedomupdate'].value}"
+ onbegin="#{richAutocompleteBean.attributes['onbegin'].value}"
+ onblur="#{richAutocompleteBean.attributes['onblur'].value}"
+ onchange="#{richAutocompleteBean.attributes['onchange'].value}"
+ onclick="#{richAutocompleteBean.attributes['onclick'].value}"
+ oncomplete="#{richAutocompleteBean.attributes['oncomplete'].value}"
+ ondblclick="#{richAutocompleteBean.attributes['ondblclick'].value}"
+ onerror="#{richAutocompleteBean.attributes['onerror'].value}"
+ onfocus="#{richAutocompleteBean.attributes['onfocus'].value}"
+ onkeydown="#{richAutocompleteBean.attributes['onkeydown'].value}"
+ onkeypress="#{richAutocompleteBean.attributes['onkeypress'].value}"
+ onkeyup="#{richAutocompleteBean.attributes['onkeyup'].value}"
+ onlistclick="#{richAutocompleteBean.attributes['onlistclick'].value}"
+ onlistdblclick="#{richAutocompleteBean.attributes['onlistdblclick'].value}"
+ onlistkeydown="#{richAutocompleteBean.attributes['onlistkeydown'].value}"
+ onlistkeypress="#{richAutocompleteBean.attributes['onlistkeypress'].value}"
+ onlistkeyup="#{richAutocompleteBean.attributes['onlistkeyup'].value}"
+ onlistmousedown="#{richAutocompleteBean.attributes['onlistmousedown'].value}"
+ onlistmousemove="#{richAutocompleteBean.attributes['onlistmousemove'].value}"
+ onlistmouseout="#{richAutocompleteBean.attributes['onlistmouseout'].value}"
+ onlistmouseover="#{richAutocompleteBean.attributes['onlistmouseover'].value}"
+ onlistmouseup="#{richAutocompleteBean.attributes['onlistmouseup'].value}"
+ onmousedown="#{richAutocompleteBean.attributes['onmousedown'].value}"
+ onmousemove="#{richAutocompleteBean.attributes['onmousemove'].value}"
+ onmouseout="#{richAutocompleteBean.attributes['onmouseout'].value}"
+ onmouseover="#{richAutocompleteBean.attributes['onmouseover'].value}"
+ onmouseup="#{richAutocompleteBean.attributes['onmouseup'].value}"
+ onselectitem="#{richAutocompleteBean.attributes['onselectitem'].value}"
+ popupClass="#{richAutocompleteBean.attributes['popupClass'].value}"
+ rendered="#{richAutocompleteBean.attributes['rendered'].value}"
+ required="#{richAutocompleteBean.attributes['required'].value}"
+ requiredMessage="#{richAutocompleteBean.attributes['requiredMessage'].value}"
+ selectFirst="#{richAutocompleteBean.attributes['selectFirst'].value}"
+ selectedItemClass="#{richAutocompleteBean.attributes['selectedItemClass'].value}"
+ showButton="#{richAutocompleteBean.attributes['showButton'].value}"
+ tokens="#{richAutocompleteBean.attributes['tokens'].value}"
+ validatorMessage="#{richAutocompleteBean.attributes['validatorMessage'].value}"
+ value="#{richAutocompleteBean.attributes['value'].value}"
+ valueChangeListener="#{richBean.valueChangeListener}"
+ var="capital"
+ >
+ #{capital.name} of #{capital.state}
+
+ <a4j:ajax event="change"
+ render="#{richAutocompleteBean.ajaxAttributes['render'].value}"
+ execute="#{richAutocompleteBean.ajaxAttributes['execute'].value}"
+ listener="#{richBean.changeEventListener}" />
+
+ <a4j:ajax event="selectitem" render="output"
+ listener="#{richBean.actionListener}"
+ />
+
+ </rich:autocomplete>
+
+ <br/><br/>
+ Your selection: <h:outputText id="output" value="#{richAutocompleteBean.attributes['value'].value}"/>
+
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <metamer:attributes value="#{richAutocompleteBean.attributes}" id="attributes" />
+ <metamer:attributes value="#{richAutocompleteBean.ajaxAttributes}" id="ajaxAttributes" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/list.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/list.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richAutocomplete/list.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -47,6 +47,10 @@
<metamer:testPageLink id="csv" outcome="csv" value="Client Side Validation">
Simple page that contains some <b>rich:autocomplete</b>s testing client-side validation..
</metamer:testPageLink>
+
+ <metamer:testPageLink id="filtering" outcome="filtering" value="Filtering">
+ Simple page that contains <b>rich:autocomplete</b> with filtering functions.
+ </metamer:testPageLink>
</ui:define>
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/list.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -64,6 +64,10 @@
<metamer:testPageLink id="keepSaved" outcome="keepSaved" value="Keep Saved">
Page for testing attribute keepSaved of <b>rich:collapsibleSubTable</b>.
</metamer:testPageLink>
+
+ <metamer:testPageLink id="rf-11656" outcome="rf-11656" value="RF-11656">
+ Page for testing <a href="https://issues.jboss.org/browse/RF-11656" target="_blank" >RF-11656</a>
+ </metamer:testPageLink>
</ui:define>
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/rf-11656.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsibleSubTable/rf-11656.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/rf-11656.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richCollapsibleSubTable/rf-11656.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:metamer="http://java.sun.com/jsf/composite/metamer">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="component">
+
+ <p>
+ Page with nested collapsibleSubTable to verify <a href="https://issues.jboss.org/browse/RF-11656" target="_blank">RF-11656</a>
+ <br/><br/>
+ Nested collapsibleSubTable contains information about employee's company (Company Name and Phone).
+ <br/>
+ collapsibleSubTableToggler managing @expanded on nested CollapsibleSubTable is labeled "Employess's Company Details".
+ If you are not able to collapse Company details for employee, it is still not working<br/>
+ This attribute value (@expanded) for nested collapsibleSubTable should be set to false as well, and don't work.
+ </p>
+
+ <rich:dataTable id="richDataTable" value="#{richSubTableBean.lists}" var="list" keepSaved="true">
+ <f:facet name="header">
+ <rich:columnGroup id="columnGroup">
+ <rich:column id="columnHeaderEmployees" colspan="3">
+ <h:outputText id="columnHeaderEmployeesText" value="Employees" />
+ </rich:column>
+ <rich:column id="columnHeaderName" breakRowBefore="true">
+ <h:outputText id="columnHeaderNameText" value="Name" />
+ </rich:column>
+ <rich:column id="columnHeaderTitle">
+ <h:outputText id="columnHeaderTitleText" value="Title" />
+ </rich:column>
+ <rich:column id="columnHeaderBirthdate">
+ <h:outputText id="columnHeaderBirthdateText" value="Birthdate" />
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+ <rich:column id="columnSubTable1" colspan="3">
+ <rich:collapsibleSubTableToggler id="subTableTC" for="richSubTable1"/>
+ <h:outputText value="#{list[0].sex == 'MALE' ? 'Men' : 'Women'}" />
+ </rich:column>
+
+
+ <rich:collapsibleSubTable id="richSubTable1"
+ value="#{richSubTableBean.state ? list : null}"
+ var="employee"
+ rows="3"
+ expandMode="ajax"
+ expanded="#{richSubTableBean.expanded[list]}">
+
+ <rich:column>
+ <h:outputText style="margin-left: 15px" value="#{employee.name}"/>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{employee.title}"/>
+ </rich:column>
+ <rich:column id="columnBirthdate">
+ <h:outputText id="birthdate" value="#{employee.birthdate}">
+ <f:convertDateTime pattern="d MMM yyyy"/>
+ </h:outputText>
+ </rich:column>
+
+ <rich:collapsibleSubTable value="#{employee.companies}"
+ var="company"
+ id="richSubTable2"
+ rows="2"
+ expandMode="ajax"
+ expanded="#{richSubTableBean.expandedEmployee[employee]}">
+ <!-- Following ^^^^^^^^ attribute doesn't influence component as expected -->
+ <rich:column>
+ <f:facet name="header">
+ <rich:collapsibleSubTableToggler id="subTableTC2" for="richSubTable2"/>
+ <h:outputText value="Employee's Company Details" />
+ </f:facet>
+ </rich:column>
+
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Company Name"/>
+ </f:facet>
+ <h:outputText style="margin-left: 30px" value="#{company.name}"/>
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Company Phone"/>
+ </f:facet>
+ <h:outputText value="#{company.phone}"/>
+ </rich:column>
+ </rich:collapsibleSubTable>
+ </rich:collapsibleSubTable>
+
+ </rich:dataTable>
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataScroller/simple.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataScroller/simple.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -51,22 +51,32 @@
for="#{richDataScrollerBean.attributes['for'].value}"
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}"
+ data="#{richDataScrollerBean.attributes['data'].value}"
+ execute="#{richDataScrollerBean.attributes['execute'].value}"
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
+ limitRender="#{richDataScrollerBean.attributes['limitRender'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
+ onbegin="#{richDataScrollerBean.attributes['onbegin'].value}"
+ onbeforedomupdate="#{richDataScrollerBean.attributes['onbeforedomupdate'].value}"
+ oncomplete="#{richDataScrollerBean.attributes['oncomplete'].value}"
page="#{richDataScrollerBean.attributes['page'].value}"
render="#{richDataScrollerBean.attributes['render'].value} #{nestedComponentId}"
renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
rendered="#{richDataScrollerBean.attributes['rendered'].value}"
+ status="#{richDataScrollerBean.attributes['status'].value}"
stepControls="#{richDataScrollerBean.attributes['stepControls'].value}"
+ style="#{richDataScrollerBean.attributes['style'].value}"
+ styleClass="#{richDataScrollerBean.attributes['styleClass'].value}"
+ title="#{richDataScrollerBean.attributes['title'].value}"
/>
</ui:define>
<ui:define name="component">
<rich:dataTable id="richDataTable"
- rows="9"
+ rows="#{richDataScrollerBean.tableAttributes['rows'].value}"
value="#{richDataScrollerBean.state ? model.capitals : null}"
var="record"
>
@@ -101,16 +111,26 @@
<rich:dataScroller id="scroller2"
boundaryControls="#{richDataScrollerBean.attributes['boundaryControls'].value}"
+ data="#{richDataScrollerBean.attributes['data'].value}"
+ execute="#{richDataScrollerBean.attributes['execute'].value}"
fastControls="#{richDataScrollerBean.attributes['fastControls'].value}"
fastStep="#{richDataScrollerBean.attributes['fastStep'].value}"
first="#{richDataScrollerBean.attributes['first'].value}"
lastPageMode="#{richDataScrollerBean.attributes['lastPageMode'].value}"
+ limitRender="#{richDataScrollerBean.attributes['limitRender'].value}"
maxPages="#{richDataScrollerBean.attributes['maxPages'].value}"
+ onbegin="#{richDataScrollerBean.attributes['onbegin'].value}"
+ onbeforedomupdate="#{richDataScrollerBean.attributes['onbeforedomupdate'].value}"
+ oncomplete="#{richDataScrollerBean.attributes['oncomplete'].value}"
page="#{richDataScrollerBean.attributes['page'].value}"
render="#{richDataScrollerBean.attributes['render'].value} scroller1"
renderIfSinglePage="#{richDataScrollerBean.attributes['renderIfSinglePage'].value}"
rendered="#{richDataScrollerBean.attributes['rendered'].value}"
+ status="#{richDataScrollerBean.attributes['status'].value}"
stepControls="#{richDataScrollerBean.attributes['stepControls'].value}"
+ style="#{richDataScrollerBean.attributes['style'].value}"
+ styleClass="#{richDataScrollerBean.attributes['styleClass'].value}"
+ title="#{richDataScrollerBean.attributes['title'].value}"
/>
</f:facet>
@@ -209,8 +229,10 @@
</fieldset>
<br/><br/>
-
+ <h2>Attributes</h2>
<metamer:attributes value="#{richDataScrollerBean.attributes}" id="attributes" />
+ <h2>Table Attributes</h2>
+ <metamer:attributes value="#{richDataScrollerBean.tableAttributes}" id="tableAttributes" />
</ui:define>
</ui:composition>
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components1.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -54,6 +54,8 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/components2.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -55,6 +55,8 @@
<rich:dataTable id="richDataTable"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/facets.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -54,6 +54,8 @@
<rich:dataTable id="richDataTable"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/filtering.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -55,6 +55,8 @@
<ui:define name="component">
<rich:dataTable id="richDataTable"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/scroller.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -58,6 +58,8 @@
<rich:dataTable id="richDataTable"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/simple.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -54,6 +54,8 @@
<rich:dataTable id="richDataTable"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-column.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -56,6 +56,8 @@
<rich:dataTable id="richDataTable"
binding="#{richDataTableBean.binding}"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richDataTable/sorting-using-component-control.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -55,6 +55,8 @@
<rich:dataTable id="richDataTable"
captionClass="#{richDataTableBean.attributes['captionClass'].value}"
+ cellspacing="#{richDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richDataTableBean.attributes['columnClasses'].value}"
first="#{richDataTableBean.attributes['first'].value}"
footerClass="#{richDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richEditor/simple.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richEditor/simple.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richEditor/simple.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -45,7 +45,7 @@
immediate="#{richEditorBean.attributes['immediate'].value}"
lang="#{richEditorBean.attributes['lang'].value}"
onblur="#{richEditorBean.attributes['onblur'].value}"
- ondirty="document.title = parseInt(document.title) + 1"
+ ondirty="#{richEditorBean.attributes['ondirty'].value}"
onchange="#{richEditorBean.attributes['onchange'].value}"
onfocus="#{richEditorBean.attributes['onfocus'].value}"
oninit="#{richEditorBean.attributes['oninit'].value}"
@@ -80,7 +80,8 @@
{ name: 'tools', items : [ 'Maximize','-','About' ] }
]
</f:facet>
- </c:if>
+ </c:if>
+ <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" />
</rich:editor>
<br/>
@@ -90,6 +91,39 @@
<br/><br/>
Your text: <h:outputText id="output" value="#{richEditorBean.attributes['value'].value}"/>
+ <br/><br/>
+ <fieldset>
+ <legend>JavaScript API of rich:editor by h:commandButton</legend>
+
+ <h:commandButton id="setReadOnly" value="setReadonly()">
+ <rich:componentControl event="click" operation="setReadonly" target="editor" />
+ </h:commandButton>
+
+ <h:commandButton id="setValue" value="setValue()">
+ <rich:componentControl event="click" operation="setVallue" target="editor" >
+ <f:param value="NEW EDITOR VALUE SET BY EDITOR JS API!" />
+ </rich:componentControl>
+ </h:commandButton>
+
+ </fieldset>
+
+ <br/>
+ <fieldset>
+ <legend>JavaScript API of rich:editor by a4j:commandButton</legend>
+
+ <a4j:commandButton value="getValue()" onclick="alert('Editor value: '+#{rich:component('editor')}.getValue());" />
+ <a4j:commandButton value="setValue()" onclick="#{rich:component('editor')}.setValue('NEW VALUE SET BY JS!')" />
+ <a4j:commandButton value="getInput()" onclick="alert('Inut value: '+#{rich:component('editor')}.getInput());" />
+ <a4j:commandButton value="focus()" onclick="#{rich:component('editor')}.focus()" />
+ <a4j:commandButton value="blur()" onclick="#{rich:component('editor')}.blur()" />
+ <a4j:commandButton value="isFocused()" onclick="alert('Is editor focused: '+#{rich:component('editor')}.isFocused());" />
+ <a4j:commandButton value="isDirty()" onclick="alert('Is editor dirty: '+#{rich:component('editor')}.isDirty());" />
+ <a4j:commandButton value="isValueChanged()" onclick="alert('Is editor value changed: '+#{rich:component('editor')}.isValueChanged());" />
+ <a4j:commandButton value="isReadonly()" onclick="alert('Is editor readonly: '+#{rich:component('editor')}.isReadonly());" />
+ <a4j:commandButton value="setReadonly()" onclick="#{rich:component('editor')}.setReadonly()" />
+
+ </fieldset>
+
</ui:define>
<ui:define name="outOfTemplateAfter">
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -101,6 +101,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -94,6 +94,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/facets.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -58,6 +58,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -91,6 +91,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -60,6 +60,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/selection.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -66,6 +66,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -58,6 +58,8 @@
<ui:define name="component">
<rich:extendedDataTable id="richEDT"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-column.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -92,6 +92,8 @@
<rich:extendedDataTable id="richEDT"
binding="#{richExtendedDataTableBean.binding}"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richExtendedDataTable/sorting-using-component-control.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -92,6 +92,8 @@
<rich:extendedDataTable id="richEDT"
binding="#{richExtendedDataTableBean.binding}"
+ cellspacing="#{richExtendedDataTableBean.attributes['cellspacing'].value}"
+ cellpadding="#{richExtendedDataTableBean.attributes['cellpadding'].value}"
columnClasses="#{richExtendedDataTableBean.attributes['columnClasses'].value}"
first="#{richExtendedDataTableBean.attributes['first'].value}"
footerClass="#{richExtendedDataTableBean.attributes['footerClass'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -72,6 +72,7 @@
onkeyup="#{richInplaceSelectBean.attributes['onkeyup'].value}"
onlistclick="#{richInplaceSelectBean.attributes['onlistclick'].value}"
onlistdblclick="#{richInplaceSelectBean.attributes['onlistdblclick'].value}"
+ onlisthide="#{richInplaceSelectBean.attributes['onlisthide'].value}"
onlistkeydown="#{richInplaceSelectBean.attributes['onlistkeydown'].value}"
onlistkeypress="#{richInplaceSelectBean.attributes['onlistkeypress'].value}"
onlistkeyup="#{richInplaceSelectBean.attributes['onlistkeyup'].value}"
@@ -80,6 +81,7 @@
onlistmouseout="#{richInplaceSelectBean.attributes['onlistmouseout'].value}"
onlistmouseover="#{richInplaceSelectBean.attributes['onlistmouseover'].value}"
onlistmouseup="#{richInplaceSelectBean.attributes['onlistmouseup'].value}"
+ onlistshow="#{richInplaceSelectBean.attributes['onlistshow'].value}"
onmousedown="#{richInplaceSelectBean.attributes['onmousedown'].value}"
onmousemove="#{richInplaceSelectBean.attributes['onmousemove'].value}"
onmouseout="#{richInplaceSelectBean.attributes['onmouseout'].value}"
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -72,6 +72,7 @@
onkeyup="#{richInplaceSelectBean.attributes['onkeyup'].value}"
onlistclick="#{richInplaceSelectBean.attributes['onlistclick'].value}"
onlistdblclick="#{richInplaceSelectBean.attributes['onlistdblclick'].value}"
+ onlisthide="#{richInplaceSelectBean.attributes['onlisthide'].value}"
onlistkeydown="#{richInplaceSelectBean.attributes['onlistkeydown'].value}"
onlistkeypress="#{richInplaceSelectBean.attributes['onlistkeypress'].value}"
onlistkeyup="#{richInplaceSelectBean.attributes['onlistkeyup'].value}"
@@ -80,6 +81,7 @@
onlistmouseout="#{richInplaceSelectBean.attributes['onlistmouseout'].value}"
onlistmouseover="#{richInplaceSelectBean.attributes['onlistmouseover'].value}"
onlistmouseup="#{richInplaceSelectBean.attributes['onlistmouseup'].value}"
+ onlistshow="#{richInplaceSelectBean.attributes['onlistshow'].value}"
onmousedown="#{richInplaceSelectBean.attributes['onmousedown'].value}"
onmousemove="#{richInplaceSelectBean.attributes['onmousemove'].value}"
onmouseout="#{richInplaceSelectBean.attributes['onmouseout'].value}"
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/componentToInclude.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/componentToInclude.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/componentToInclude.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/componentToInclude.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+ <h3><b>rich:tree</b></h3>
+
+ <p>
+ <rich:tree id="richTree"
+ nodeType="#{node.type}"
+ var="node"
+ value="#{treeRoot}"
+ selection="#{richTreeBean.selection}"
+ selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
+ toggleListener="#{richTreeListenerBean.processToggle}"
+
+ data="#{richTreeBean.attributes['data'].value}"
+ dir="#{richTreeBean.attributes['dir'].value}"
+ execute="#{richTreeBean.attributes['execute'].value}"
+ handleClass="#{richTreeBean.attributes['handleClass'].value}"
+ iconClass="#{richTreeBean.attributes['iconClass'].value}"
+ iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
+ iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
+ iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
+ immediate="#{richTreeBean.attributes['immediate'].value}"
+ keepSaved="#{richTreeBean.attributes['keepSaved'].value}"
+ labelClass="#{richTreeBean.attributes['labelClass'].value}"
+ lang="#{richTreeBean.attributes['lang'].value}"
+ limitRender="#{richTreeBean.attributes['limitRender'].value}"
+ nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
+ onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}"
+ onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}"
+ onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}"
+ onbegin="#{richTreeBean.attributes['onbegin'].value}"
+ onclick="#{richTreeBean.attributes['onclick'].value}"
+ oncomplete="#{richTreeBean.attributes['oncomplete'].value}"
+ ondblclick="#{richTreeBean.attributes['ondblclick'].value}"
+ onkeydown="#{richTreeBean.attributes['onkeydown'].value}"
+ onkeypress="#{richTreeBean.attributes['onkeypress'].value}"
+ onkeyup="#{richTreeBean.attributes['onkeyup'].value}"
+ onmousedown="#{richTreeBean.attributes['onmousedown'].value}"
+ onmousemove="#{richTreeBean.attributes['onmousemove'].value}"
+ onmouseout="#{richTreeBean.attributes['onmouseout'].value}"
+ onmouseover="#{richTreeBean.attributes['onmouseover'].value}"
+ onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
+ onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}"
+ onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}"
+ render="#{richTreeBean.attributes['render'].value}"
+ rendered="#{richTreeBean.attributes['rendered'].value}"
+ selectionType="#{richTreeBean.attributes['selectionType'].value}"
+ status="#{richTreeBean.attributes['status'].value}"
+ style="#{richTreeBean.attributes['style'].value}"
+ styleClass="#{richTreeBean.attributes['styleClass'].value}"
+ title="#{richTreeBean.attributes['title'].value}"
+ toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
+ toggleType="#{richTreeBean.attributes['toggleType'].value}"
+ >
+
+ <rich:treeNode type="country"
+ expanded="#{richTreeBean.expanded[node]}"
+
+ dir="#{richTreeNodeBean.attributes[0]['dir'].value}"
+ handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}"
+ iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}"
+ iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}"
+ iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}"
+ iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}"
+ immediate="#{richTreeNodeBean.attributes[0]['immediate'].value}"
+ labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}"
+ lang="#{richTreeNodeBean.attributes[0]['lang'].value}"
+ onbeforetoggle="#{richTreeNodeBean.attributes[0]['onbeforetoggle'].value}"
+ onclick="#{richTreeNodeBean.attributes[0]['onclick'].value}"
+ ondblclick="#{richTreeNodeBean.attributes[0]['ondblclick'].value}"
+ onkeydown="#{richTreeNodeBean.attributes[0]['onkeydown'].value}"
+ onkeypress="#{richTreeNodeBean.attributes[0]['onkeypress'].value}"
+ onkeyup="#{richTreeNodeBean.attributes[0]['onkeyup'].value}"
+ onmousedown="#{richTreeNodeBean.attributes[0]['onmousedown'].value}"
+ onmousemove="#{richTreeNodeBean.attributes[0]['onmousemove'].value}"
+ onmouseout="#{richTreeNodeBean.attributes[0]['onmouseout'].value}"
+ onmouseover="#{richTreeNodeBean.attributes[0]['onmouseover'].value}"
+ onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}"
+ ontoggle="#{richTreeNodeBean.attributes[0]['ontoggle'].value}"
+ rendered="#{richTreeNodeBean.attributes[0]['rendered'].value}"
+ style="#{richTreeNodeBean.attributes[0]['style'].value}"
+ styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}"
+ title="#{richTreeNodeBean.attributes[0]['title'].value}"
+ >
+ <f:facet name="handleLoading">
+ <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" />
+ </f:facet>
+ #{node.content.label}
+ </rich:treeNode>
+
+ <rich:treeNode type="company"
+ expanded="#{richTreeBean.expanded[node]}"
+
+ dir="#{richTreeNodeBean.attributes[1]['dir'].value}"
+ handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}"
+ iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}"
+ iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}"
+ iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}"
+ iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}"
+ immediate="#{richTreeNodeBean.attributes[1]['immediate'].value}"
+ labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}"
+ lang="#{richTreeNodeBean.attributes[1]['lang'].value}"
+ onbeforetoggle="#{richTreeNodeBean.attributes[1]['onbeforetoggle'].value}"
+ onclick="#{richTreeNodeBean.attributes[1]['onclick'].value}"
+ ondblclick="#{richTreeNodeBean.attributes[1]['ondblclick'].value}"
+ onkeydown="#{richTreeNodeBean.attributes[1]['onkeydown'].value}"
+ onkeypress="#{richTreeNodeBean.attributes[1]['onkeypress'].value}"
+ onkeyup="#{richTreeNodeBean.attributes[1]['onkeyup'].value}"
+ onmousedown="#{richTreeNodeBean.attributes[1]['onmousedown'].value}"
+ onmousemove="#{richTreeNodeBean.attributes[1]['onmousemove'].value}"
+ onmouseout="#{richTreeNodeBean.attributes[1]['onmouseout'].value}"
+ onmouseover="#{richTreeNodeBean.attributes[1]['onmouseover'].value}"
+ onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}"
+ ontoggle="#{richTreeNodeBean.attributes[1]['ontoggle'].value}"
+ rendered="#{richTreeNodeBean.attributes[1]['rendered'].value}"
+ style="#{richTreeNodeBean.attributes[1]['style'].value}"
+ styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}"
+ title="#{richTreeNodeBean.attributes[1]['title'].value}"
+ >
+ <f:facet name="handleLoading">
+ <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" />
+ </f:facet>
+
+ #{node.content.label}
+ </rich:treeNode>
+
+ <rich:treeNode type="cd"
+ expanded="#{richTreeBean.expanded[node]}"
+
+ dir="#{richTreeNodeBean.attributes[2]['dir'].value}"
+ handleClass="#{richTreeNodeBean.attributes[2]['handleClass'].value}"
+ iconClass="#{richTreeNodeBean.attributes[2]['iconClass'].value}"
+ iconCollapsed="#{richTreeNodeBean.attributes[2]['iconCollapsed'].value}"
+ iconExpanded="#{richTreeNodeBean.attributes[2]['iconExpanded'].value}"
+ iconLeaf="#{richTreeNodeBean.attributes[2]['iconLeaf'].value}"
+ immediate="#{richTreeNodeBean.attributes[2]['immediate'].value}"
+ labelClass="#{richTreeNodeBean.attributes[2]['labelClass'].value}"
+ lang="#{richTreeNodeBean.attributes[2]['lang'].value}"
+ onbeforetoggle="#{richTreeNodeBean.attributes[2]['onbeforetoggle'].value}"
+ onclick="#{richTreeNodeBean.attributes[2]['onclick'].value}"
+ ondblclick="#{richTreeNodeBean.attributes[2]['ondblclick'].value}"
+ onkeydown="#{richTreeNodeBean.attributes[2]['onkeydown'].value}"
+ onkeypress="#{richTreeNodeBean.attributes[2]['onkeypress'].value}"
+ onkeyup="#{richTreeNodeBean.attributes[2]['onkeyup'].value}"
+ onmousedown="#{richTreeNodeBean.attributes[2]['onmousedown'].value}"
+ onmousemove="#{richTreeNodeBean.attributes[2]['onmousemove'].value}"
+ onmouseout="#{richTreeNodeBean.attributes[2]['onmouseout'].value}"
+ onmouseover="#{richTreeNodeBean.attributes[2]['onmouseover'].value}"
+ onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}"
+ ontoggle="#{richTreeNodeBean.attributes[2]['ontoggle'].value}"
+ rendered="#{richTreeNodeBean.attributes[2]['rendered'].value}"
+ style="#{richTreeNodeBean.attributes[2]['style'].value}"
+ styleClass="#{richTreeNodeBean.attributes[2]['styleClass'].value}"
+ title="#{richTreeNodeBean.attributes[2]['title'].value}"
+ >
+ #{node.content.label}
+ </rich:treeNode>
+ </rich:tree>
+ </p>
+
+ <h3><b>rich:tree</b> - with default tree nodes</h3>
+ <div>(uses toString on TreeNode as content)</div>
+
+ <p>
+
+
+ <rich:tree id="richTreeDefaultNodes"
+ var="node"
+ value="#{treeRoot}"
+
+ dir="#{richTreeBean.attributes['dir'].value}"
+ lang="#{richTreeBean.attributes['lang'].value}"
+ onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}"
+ onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}"
+ onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}"
+ onbegin="#{richTreeBean.attributes['onbegin'].value}"
+ onclick="#{richTreeBean.attributes['onclick'].value}"
+ oncomplete="#{richTreeBean.attributes['oncomplete'].value}"
+ ondblclick="#{richTreeBean.attributes['ondblclick'].value}"
+ onkeydown="#{richTreeBean.attributes['onkeydown'].value}"
+ onkeypress="#{richTreeBean.attributes['onkeypress'].value}"
+ onkeyup="#{richTreeBean.attributes['onkeyup'].value}"
+ onmousedown="#{richTreeBean.attributes['onmousedown'].value}"
+ onmousemove="#{richTreeBean.attributes['onmousemove'].value}"
+ onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
+ onmouseout="#{richTreeBean.attributes['onmouseout'].value}"
+ onmouseover="#{richTreeBean.attributes['onmouseover'].value}"
+ onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}"
+ onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}"
+ rendered="#{richTreeBean.attributes['rendered'].value}"
+ selection="#{richTreeBean.selection}"
+ selectionType="#{richTreeBean.attributes['selectionType'].value}"
+ style="#{richTreeBean.attributes['style'].value}"
+ styleClass="#{richTreeBean.attributes['styleClass'].value}"
+ title="#{richTreeBean.attributes['title'].value}"
+ toggleType="#{richTreeBean.attributes['toggleType'].value}"
+ iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
+ iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
+ iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
+ handleClass="#{richTreeBean.attributes['handleClass'].value}"
+ iconClass="#{richTreeBean.attributes['iconClass'].value}"
+ labelClass="#{richTreeBean.attributes['labelClass'].value}"
+ nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
+ selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
+ toggleListener="#{richTreeListenerBean.processToggle}"
+ render="#{richTreeBean.attributes['render'].value}"
+ execute="#{richTreeBean.attributes['execute'].value}"
+ toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
+ >
+ </rich:tree>
+ </p>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -31,10 +31,18 @@
<ui:define name="links">
- <metamer:testPageLink id="simple" outcome="simple" value="Simple">
- The simple sample of <b>rich:tree</b> usage including all its attributes.
+ <metamer:testPageLink id="simpleSwingTreeNode" outcome="simpleSwingTreeNode" value="Simple - Swing Tree Node">
+ The simple sample of <b>rich:tree</b> with <b>javax.swing.tree.TreeNode</b>, usage including all its attributes.
</metamer:testPageLink>
+ <metamer:testPageLink id="simpleRichFacesTreeNode" outcome="simpleRichFacesTreeNode" value="Simple - RichFaces Tree Node">
+ The simple sample of <b>rich:tree</b> with <b>org.richfaces.model.TreeNode</b>, usage including all its attributes.
+ </metamer:testPageLink>
+
+ <metamer:testPageLink id="simpleRichFacesTreeDataModel" outcome="simpleRichFacesTreeDataModel" value="Simple - RichFaces Tree Data Model">
+ The simple sample of <b>rich:tree</b> with <b>org.richfaces.model.TreeDataModel</b>, usage including all its attributes.
+ </metamer:testPageLink>
+
<metamer:testPageLink id="treeAdaptors" outcome="treeAdaptors" value="Tree Adaptors">
The <b>rich:tree</b> with declarative model using <b>rich:treeModelRecursiveAdaptor</b> and <b>rich:treeModelAdaptor</b>.
</metamer:testPageLink>
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/outOfTemplateAfterToInclude.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/outOfTemplateAfterToInclude.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/outOfTemplateAfterToInclude.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/outOfTemplateAfterToInclude.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <a4j:commandButton id="expandAll" value="Expand All" action="#{richTreeBean.expandAll}" render="#{nestedComponentId}" />
+ <a4j:commandButton id="collapseAll" value="Collapse All" action="#{richTreeBean.collapseAll}" render="#{nestedComponentId}" />
+
+ <a4j:outputPanel id="panel" ajaxRendered="true">
+ <h:panelGrid columns="2">
+
+ <h:outputLabel value="Test Loading Facet:" />
+ <h:selectBooleanCheckbox id="loadingFacet" value="#{richTreeBean.testLoadingFacet}">
+ <a4j:ajax render="#{nestedComponentId}" />
+ </h:selectBooleanCheckbox>
+
+ <h:outputLabel value="Delayed Render (1sec):" />
+ <h:selectBooleanCheckbox value="#{richTreeBean.delayedRender}">
+ <a4j:ajax />
+ </h:selectBooleanCheckbox>
+
+ <h:outputLabel value="Selection:" />
+ <h:outputText id="selection" value="#{richTreeBean.selection}" />
+
+ <h:outputLabel value="Selection Change Event:" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}" />
+ <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}">
+ <h:outputLabel value="Client ID:" />
+ <h:outputText id="selectionEventClientId" value="#{richTreeListenerBean.treeSelectionChangeEvent.component.id}" />
+
+ <h:outputLabel value="New Selection:" />
+ <h:outputText id="selectionEventNewSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.newSelection}" />
+
+ <h:outputLabel value="Old Selection:" />
+ <h:outputText id="selectionEventOldSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.oldSelection}" />
+ </h:panelGrid>
+
+ <h:outputLabel value="Tree Toggle Event:" rendered="#{not empty richTreeListenerBean.treeToggleEvent}" />
+ <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeToggleEvent}">
+ <h:outputLabel value="Client ID:" />
+ <h:outputText id="toggleEventClientId" value="#{richTreeListenerBean.treeToggleEvent.component.id}" />
+
+ <h:outputLabel value="Collapsed:" />
+ <h:outputText id="toggleEventCollapsed" value="#{richTreeListenerBean.treeToggleEvent.collapsed}" />
+
+ <h:outputLabel value="Expanded:" />
+ <h:outputText id="toggleEventExpanded" value="#{richTreeListenerBean.treeToggleEvent.expanded}" />
+ </h:panelGrid>
+ </h:panelGrid>
+ </a4j:outputPanel>
+
+ <fieldset>
+ <legend>rich:tree</legend>
+ <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" />
+ </fieldset>
+ <fieldset>
+ <legend>rich:treeNode type="country"</legend>
+ <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="treeNode1Attributes" />
+ </fieldset>
+ <fieldset>
+ <legend>rich:treeNode type="company"</legend>
+ <metamer:attributes value="#{richTreeNodeBean.attributes[1]}" id="treeNode2Attributes" />
+ </fieldset>
+ <fieldset>
+ <legend>rich:treeNode type="cd"</legend>
+ <metamer:attributes value="#{richTreeNodeBean.attributes[2]}" id="treeNode3Attributes" />
+ </fieldset>
+
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -58,25 +58,25 @@
<rich:dragIndicator id="indicator" />
<p>
- <rich:tree value="#{richTreeBean.root}" nodeType="#{node.type}" var="node">
+ <rich:tree value="#{richTreeBean.richFacesTreeNodeRoot}" nodeType="#{node.type}" var="node">
<rich:treeNode type="country" title="Country node type" expanded="#{richTreeBean.expanded[node]}" >
<a4j:outputPanel layout="block">
<rich:dropTarget acceptedTypes="file" dropListener="#{richTreeBean.processDragging}" />
- <h:outputText value="#{node.name}" />
+ <h:outputText value="#{node.content.label}" />
</a4j:outputPanel>
</rich:treeNode>
<rich:treeNode type="company" title="Company node type" expanded="#{richTreeBean.expanded[node]}" >
<a4j:outputPanel layout="block">
<rich:dragSource type="file" dragIndicator="indicator" />
- <h:outputText value="#{node.name}" />
+ <h:outputText value="#{node.content.label}" />
</a4j:outputPanel>
</rich:treeNode>
<rich:treeNode type="cd" title="CD node type" expanded="#{richTreeBean.expanded[node]}" >
<a4j:outputPanel layout="block">
- <h:outputText value="#{node.artist} - #{node.title}" />
+ <h:outputText value="#{node.content.label}" />
</a4j:outputPanel>
</rich:treeNode>
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simple.xhtml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simple.xhtml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simple.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
- xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
-
- <!--
-JBoss, Home of Professional Open Source
-Copyright 2010-2011, Red Hat, Inc. and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
- <ui:composition template="/templates/template.xhtml">
- <ui:param name="componentId" value="richTree" />
-
- <ui:define name="view">
- <f:metadata>
- <f:viewParam name="templates" value="#{templateBean.templates}">
- <f:converter converterId="templatesListConverter" />
- </f:viewParam>
- <f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" />
- </f:metadata>
- </ui:define>
-
- <ui:define name="component">
-
- <h3><b>rich:tree</b></h3>
-
- <p>
- <rich:tree id="richTree"
- nodeType="#{node.type}"
- var="node"
- value="#{richTreeBean.root}"
- selection="#{richTreeBean.selection}"
- selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
- toggleListener="#{richTreeListenerBean.processToggle}"
-
- data="#{richTreeBean.attributes['data'].value}"
- dir="#{richTreeBean.attributes['dir'].value}"
- execute="#{richTreeBean.attributes['execute'].value}"
- handleClass="#{richTreeBean.attributes['handleClass'].value}"
- iconClass="#{richTreeBean.attributes['iconClass'].value}"
- iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
- iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
- iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
- immediate="#{richTreeBean.attributes['immediate'].value}"
- keepSaved="#{richTreeBean.attributes['keepSaved'].value}"
- labelClass="#{richTreeBean.attributes['labelClass'].value}"
- lang="#{richTreeBean.attributes['lang'].value}"
- limitRender="#{richTreeBean.attributes['limitRender'].value}"
- nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
- onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}"
- onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}"
- onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}"
- onbegin="#{richTreeBean.attributes['onbegin'].value}"
- onclick="#{richTreeBean.attributes['onclick'].value}"
- oncomplete="#{richTreeBean.attributes['oncomplete'].value}"
- ondblclick="#{richTreeBean.attributes['ondblclick'].value}"
- onkeydown="#{richTreeBean.attributes['onkeydown'].value}"
- onkeypress="#{richTreeBean.attributes['onkeypress'].value}"
- onkeyup="#{richTreeBean.attributes['onkeyup'].value}"
- onmousedown="#{richTreeBean.attributes['onmousedown'].value}"
- onmousemove="#{richTreeBean.attributes['onmousemove'].value}"
- onmouseout="#{richTreeBean.attributes['onmouseout'].value}"
- onmouseover="#{richTreeBean.attributes['onmouseover'].value}"
- onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
- onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}"
- onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}"
- render="#{richTreeBean.attributes['render'].value}"
- rendered="#{richTreeBean.attributes['rendered'].value}"
- selectionType="#{richTreeBean.attributes['selectionType'].value}"
- status="#{richTreeBean.attributes['status'].value}"
- style="#{richTreeBean.attributes['style'].value}"
- styleClass="#{richTreeBean.attributes['styleClass'].value}"
- title="#{richTreeBean.attributes['title'].value}"
- toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
- toggleType="#{richTreeBean.attributes['toggleType'].value}"
- >
-
- <rich:treeNode type="country"
- expanded="#{richTreeBean.expanded[node]}"
-
- dir="#{richTreeNodeBean.attributes[0]['dir'].value}"
- handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}"
- iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}"
- iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}"
- iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}"
- iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}"
- immediate="#{richTreeNodeBean.attributes[0]['immediate'].value}"
- labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}"
- lang="#{richTreeNodeBean.attributes[0]['lang'].value}"
- onbeforetoggle="#{richTreeNodeBean.attributes[0]['onbeforetoggle'].value}"
- onclick="#{richTreeNodeBean.attributes[0]['onclick'].value}"
- ondblclick="#{richTreeNodeBean.attributes[0]['ondblclick'].value}"
- onkeydown="#{richTreeNodeBean.attributes[0]['onkeydown'].value}"
- onkeypress="#{richTreeNodeBean.attributes[0]['onkeypress'].value}"
- onkeyup="#{richTreeNodeBean.attributes[0]['onkeyup'].value}"
- onmousedown="#{richTreeNodeBean.attributes[0]['onmousedown'].value}"
- onmousemove="#{richTreeNodeBean.attributes[0]['onmousemove'].value}"
- onmouseout="#{richTreeNodeBean.attributes[0]['onmouseout'].value}"
- onmouseover="#{richTreeNodeBean.attributes[0]['onmouseover'].value}"
- onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}"
- ontoggle="#{richTreeNodeBean.attributes[0]['ontoggle'].value}"
- rendered="#{richTreeNodeBean.attributes[0]['rendered'].value}"
- style="#{richTreeNodeBean.attributes[0]['style'].value}"
- styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}"
- title="#{richTreeNodeBean.attributes[0]['title'].value}"
- >
- <f:facet name="handleLoading">
- <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" />
- </f:facet>
- #{node.name}
- </rich:treeNode>
-
- <rich:treeNode type="company"
- expanded="#{richTreeBean.expanded[node]}"
-
- dir="#{richTreeNodeBean.attributes[1]['dir'].value}"
- handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}"
- iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}"
- iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}"
- iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}"
- iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}"
- immediate="#{richTreeNodeBean.attributes[1]['immediate'].value}"
- labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}"
- lang="#{richTreeNodeBean.attributes[1]['lang'].value}"
- onbeforetoggle="#{richTreeNodeBean.attributes[1]['onbeforetoggle'].value}"
- onclick="#{richTreeNodeBean.attributes[1]['onclick'].value}"
- ondblclick="#{richTreeNodeBean.attributes[1]['ondblclick'].value}"
- onkeydown="#{richTreeNodeBean.attributes[1]['onkeydown'].value}"
- onkeypress="#{richTreeNodeBean.attributes[1]['onkeypress'].value}"
- onkeyup="#{richTreeNodeBean.attributes[1]['onkeyup'].value}"
- onmousedown="#{richTreeNodeBean.attributes[1]['onmousedown'].value}"
- onmousemove="#{richTreeNodeBean.attributes[1]['onmousemove'].value}"
- onmouseout="#{richTreeNodeBean.attributes[1]['onmouseout'].value}"
- onmouseover="#{richTreeNodeBean.attributes[1]['onmouseover'].value}"
- onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}"
- ontoggle="#{richTreeNodeBean.attributes[1]['ontoggle'].value}"
- rendered="#{richTreeNodeBean.attributes[1]['rendered'].value}"
- style="#{richTreeNodeBean.attributes[1]['style'].value}"
- styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}"
- title="#{richTreeNodeBean.attributes[1]['title'].value}"
- >
- <f:facet name="handleLoading">
- <h:graphicImage value="/resources/images/loading.gif" rendered="#{richTreeBean.testLoadingFacet}" />
- </f:facet>
-
- #{node.name}
- </rich:treeNode>
-
- <rich:treeNode type="cd"
- expanded="#{richTreeBean.expanded[node]}"
-
- dir="#{richTreeNodeBean.attributes[2]['dir'].value}"
- handleClass="#{richTreeNodeBean.attributes[2]['handleClass'].value}"
- iconClass="#{richTreeNodeBean.attributes[2]['iconClass'].value}"
- iconCollapsed="#{richTreeNodeBean.attributes[2]['iconCollapsed'].value}"
- iconExpanded="#{richTreeNodeBean.attributes[2]['iconExpanded'].value}"
- iconLeaf="#{richTreeNodeBean.attributes[2]['iconLeaf'].value}"
- immediate="#{richTreeNodeBean.attributes[2]['immediate'].value}"
- labelClass="#{richTreeNodeBean.attributes[2]['labelClass'].value}"
- lang="#{richTreeNodeBean.attributes[2]['lang'].value}"
- onbeforetoggle="#{richTreeNodeBean.attributes[2]['onbeforetoggle'].value}"
- onclick="#{richTreeNodeBean.attributes[2]['onclick'].value}"
- ondblclick="#{richTreeNodeBean.attributes[2]['ondblclick'].value}"
- onkeydown="#{richTreeNodeBean.attributes[2]['onkeydown'].value}"
- onkeypress="#{richTreeNodeBean.attributes[2]['onkeypress'].value}"
- onkeyup="#{richTreeNodeBean.attributes[2]['onkeyup'].value}"
- onmousedown="#{richTreeNodeBean.attributes[2]['onmousedown'].value}"
- onmousemove="#{richTreeNodeBean.attributes[2]['onmousemove'].value}"
- onmouseout="#{richTreeNodeBean.attributes[2]['onmouseout'].value}"
- onmouseover="#{richTreeNodeBean.attributes[2]['onmouseover'].value}"
- onmouseup="#{richTreeNodeBean.attributes[0]['onmouseup'].value}"
- ontoggle="#{richTreeNodeBean.attributes[2]['ontoggle'].value}"
- rendered="#{richTreeNodeBean.attributes[2]['rendered'].value}"
- style="#{richTreeNodeBean.attributes[2]['style'].value}"
- styleClass="#{richTreeNodeBean.attributes[2]['styleClass'].value}"
- title="#{richTreeNodeBean.attributes[2]['title'].value}"
- >
- #{node.artist} - #{node.title}
- </rich:treeNode>
- </rich:tree>
- </p>
-
- <h3><b>rich:tree</b> - with default tree nodes</h3>
- <div>(uses toString on TreeNode as content)</div>
-
- <p>
-
-
- <rich:tree id="richTreeDefaultNodes"
- var="node"
- value="#{richTreeBean.root}"
-
- dir="#{richTreeBean.attributes['dir'].value}"
- lang="#{richTreeBean.attributes['lang'].value}"
- onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}"
- onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}"
- onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}"
- onbegin="#{richTreeBean.attributes['onbegin'].value}"
- onclick="#{richTreeBean.attributes['onclick'].value}"
- oncomplete="#{richTreeBean.attributes['oncomplete'].value}"
- ondblclick="#{richTreeBean.attributes['ondblclick'].value}"
- onkeydown="#{richTreeBean.attributes['onkeydown'].value}"
- onkeypress="#{richTreeBean.attributes['onkeypress'].value}"
- onkeyup="#{richTreeBean.attributes['onkeyup'].value}"
- onmousedown="#{richTreeBean.attributes['onmousedown'].value}"
- onmousemove="#{richTreeBean.attributes['onmousemove'].value}"
- onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
- onmouseout="#{richTreeBean.attributes['onmouseout'].value}"
- onmouseover="#{richTreeBean.attributes['onmouseover'].value}"
- onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}"
- onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}"
- rendered="#{richTreeBean.attributes['rendered'].value}"
- selection="#{richTreeBean.selection}"
- selectionType="#{richTreeBean.attributes['selectionType'].value}"
- style="#{richTreeBean.attributes['style'].value}"
- styleClass="#{richTreeBean.attributes['styleClass'].value}"
- title="#{richTreeBean.attributes['title'].value}"
- toggleType="#{richTreeBean.attributes['toggleType'].value}"
- iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
- iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
- iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
- handleClass="#{richTreeBean.attributes['handleClass'].value}"
- iconClass="#{richTreeBean.attributes['iconClass'].value}"
- labelClass="#{richTreeBean.attributes['labelClass'].value}"
- nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
- selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
- toggleListener="#{richTreeListenerBean.processToggle}"
- render="#{richTreeBean.attributes['render'].value}"
- execute="#{richTreeBean.attributes['execute'].value}"
- toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
- >
- </rich:tree>
- </p>
- </ui:define>
-
- <ui:define name="outOfTemplateAfter">
-
- <a4j:commandButton id="expandAll" value="Expand All" action="#{richTreeBean.expandAll}" render="#{nestedComponentId}" />
- <a4j:commandButton id="collapseAll" value="Collapse All" action="#{richTreeBean.collapseAll}" render="#{nestedComponentId}" />
-
- <a4j:outputPanel id="panel" ajaxRendered="true">
- <h:panelGrid columns="2">
-
- <h:outputLabel value="Test Loading Facet:" />
- <h:selectBooleanCheckbox id="loadingFacet" value="#{richTreeBean.testLoadingFacet}">
- <a4j:ajax render="#{nestedComponentId}" />
- </h:selectBooleanCheckbox>
-
- <h:outputLabel value="Delayed Render (1sec):" />
- <h:selectBooleanCheckbox value="#{richTreeBean.delayedRender}">
- <a4j:ajax />
- </h:selectBooleanCheckbox>
-
- <h:outputLabel value="Selection:" />
- <h:outputText id="selection" value="#{richTreeBean.selection}" />
-
- <h:outputLabel value="Selection Change Event:" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}" />
- <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeSelectionChangeEvent}">
- <h:outputLabel value="Client ID:" />
- <h:outputText id="selectionEventClientId" value="#{richTreeListenerBean.treeSelectionChangeEvent.component.id}" />
-
- <h:outputLabel value="New Selection:" />
- <h:outputText id="selectionEventNewSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.newSelection}" />
-
- <h:outputLabel value="Old Selection:" />
- <h:outputText id="selectionEventOldSelection" value="#{richTreeListenerBean.treeSelectionChangeEvent.oldSelection}" />
- </h:panelGrid>
-
- <h:outputLabel value="Tree Toggle Event:" rendered="#{not empty richTreeListenerBean.treeToggleEvent}" />
- <h:panelGrid columns="2" rendered="#{not empty richTreeListenerBean.treeToggleEvent}">
- <h:outputLabel value="Client ID:" />
- <h:outputText id="toggleEventClientId" value="#{richTreeListenerBean.treeToggleEvent.component.id}" />
-
- <h:outputLabel value="Collapsed:" />
- <h:outputText id="toggleEventCollapsed" value="#{richTreeListenerBean.treeToggleEvent.collapsed}" />
-
- <h:outputLabel value="Expanded:" />
- <h:outputText id="toggleEventExpanded" value="#{richTreeListenerBean.treeToggleEvent.expanded}" />
- </h:panelGrid>
- </h:panelGrid>
- </a4j:outputPanel>
-
- <fieldset>
- <legend>rich:tree</legend>
- <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" />
- </fieldset>
- <fieldset>
- <legend>rich:treeNode type="country"</legend>
- <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="treeNode1Attributes" />
- </fieldset>
- <fieldset>
- <legend>rich:treeNode type="company"</legend>
- <metamer:attributes value="#{richTreeNodeBean.attributes[1]}" id="treeNode2Attributes" />
- </fieldset>
- <fieldset>
- <legend>rich:treeNode type="cd"</legend>
- <metamer:attributes value="#{richTreeNodeBean.attributes[2]}" id="treeNode3Attributes" />
- </fieldset>
- </ui:define>
-
- </ui:composition>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeDataModel.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simpleRichFacesTreeDataModel.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeDataModel.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeDataModel.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richTree" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ <f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" />
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="component">
+ <ui:include src="/components/richTree/componentToInclude.xhtml">
+ <ui:param name="treeRoot" value="#{richTreeBean.richFacesTreeDataModelRoot}" />
+ </ui:include>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <ui:include src="/components/richTree/outOfTemplateAfterToInclude.xhtml" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeNode.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simpleRichFacesTreeNode.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeNode.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleRichFacesTreeNode.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richTree" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ <f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" />
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="component">
+ <ui:include src="/components/richTree/componentToInclude.xhtml">
+ <ui:param name="treeRoot" value="#{richTreeBean.richFacesTreeNodeRoot}" />
+ </ui:include>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <ui:include src="/components/richTree/outOfTemplateAfterToInclude.xhtml" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleSwingTreeNode.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simpleSwingTreeNode.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleSwingTreeNode.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/simpleSwingTreeNode.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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" xmlns:metamer="http://java.sun.com/jsf/composite/metamer"
+ xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+ <ui:composition template="/templates/template.xhtml">
+ <ui:param name="componentId" value="richTree" />
+
+ <ui:define name="view">
+ <f:metadata>
+ <f:viewParam name="templates" value="#{templateBean.templates}">
+ <f:converter converterId="templatesListConverter" />
+ </f:viewParam>
+ <f:event type="preRenderView" listener="#{richTreeBean.preRenderView}" />
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="component">
+ <ui:include src="/components/richTree/componentToInclude.xhtml">
+ <ui:param name="treeRoot" value="#{richTreeBean.swingTreeNodeRoot}" />
+ </ui:include>
+ </ui:define>
+
+ <ui:define name="outOfTemplateAfter">
+ <ui:include src="/components/richTree/outOfTemplateAfterToInclude.xhtml" />
+ </ui:define>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/error/404.xhtml 2011-12-01 13:43:26 UTC (rev 23019)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:rich="http://richfaces.org/rich"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010-2011, Red Hat, Inc. and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<h:head>
- <title>Error 404</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
-</h:head>
-
-<h:body>
- <h1 style="color: red;">Error 404: Not Found</h1>
-
- <p>
- <h:link id="goHomeLink" outcome="/index" value="Back to the Main Page" />
- </p>
-
-</h:body>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/error/404.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/404.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:rich="http://richfaces.org/rich"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<h:head>
+ <title>Error 404</title>
+ <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+</h:head>
+
+<h:body>
+ <h1 style="color: red;">Error 404: Not Found</h1>
+
+ <p>
+ <h:link id="goHomeLink" outcome="/index" value="Back to the Main Page" />
+ </p>
+
+</h:body>
+</html>
\ No newline at end of file
Deleted: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/error/500.xhtml 2011-12-01 13:43:26 UTC (rev 23019)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:rich="http://richfaces.org/rich"
- xmlns:ui="http://java.sun.com/jsf/facelets">
-
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010-2011, Red Hat, Inc. and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<h:head>
- <title>Error 500</title>
- <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
-</h:head>
-
-<h:body>
- <h1 style="color: red;">Error 500: Internal Server Error</h1>
-
- <p>
- <h:link id="goHomeLink" outcome="/index" value="Back to the Main Page" />
- </p>
-
-</h:body>
-</html>
\ No newline at end of file
Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml (from rev 23019, modules/tests/metamer/trunk/application/src/main/webapp/error/500.xhtml)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/error/500.xhtml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:rich="http://richfaces.org/rich"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<h:head>
+ <title>Error 500</title>
+ <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+</h:head>
+
+<h:body>
+ <h1 style="color: red;">Error 500: Internal Server Error</h1>
+
+ <p>
+ <h:link id="goHomeLink" outcome="/index" value="Back to the Main Page" />
+ </p>
+
+</h:body>
+</html>
\ No newline at end of file
Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -66,7 +66,7 @@
System.setOut(sysout);
}
- @Test
+ //@Test
public void testBeanSerialization() throws IOException, ClassNotFoundException, IllegalArgumentException,
IllegalAccessException {
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.1.0-M3-redhat-1</version>
+ <version>4.1.0-CR1-redhat-1</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/pom.xml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -25,10 +25,9 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-M3-redhat-1</version>
+ <version>4.1.0-CR1-redhat-1</version>
</parent>
- <groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest-source</artifactId>
<name>Metamer: RichFaces Testing Application - Functional Test Source</name>
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -102,8 +102,8 @@
@Inject
@Templates({ "plain", "richAccordion", "richDataTable", "richCollapsibleSubTable", "richExtendedDataTable",
- "richDataGrid", "richList", "richCollapsiblePanel", "richPanel", "richTabPanel", "richTogglePanel",
- "richPopupPanel", "a4jRegion", "a4jRepeat", "hDataTable", "hPanelGrid", "uiRepeat" })
+ "richDataGrid", "richList", "richCollapsiblePanel", "richTabPanel", "richPopupPanel", "a4jRegion", "a4jRepeat",
+ "hDataTable", "hPanelGrid", "uiRepeat" })
private TemplatesList template;
/**
@@ -227,8 +227,8 @@
}
/**
- * A helper method for testing attribute "style" or similar. It sets "background-color: yellow; font-size: 1.5em;" to the input
- * field and checks that it was changed on the page.
+ * A helper method for testing attribute "style" or similar. It sets "background-color: yellow; font-size: 1.5em;"
+ * to the input field and checks that it was changed on the page.
*
* @param element
* locator of tested element
@@ -243,7 +243,7 @@
AttributeLocator<?> styleAttr = element.getAttribute(Attribute.STYLE);
assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute style should contain \"" + value + "\"");
}
-
+
/**
* A helper method for testing attribute "style". It sets "background-color: yellow; font-size: 1.5em;" to the input
* field and checks that it was changed on the page.
@@ -258,15 +258,15 @@
}
/**
- * A helper method for testing attribute "class" or similar.
- * It sets "metamer-ftest-class" to the input field and checks that it was changed on the page.
+ * A helper method for testing attribute "class" or similar. It sets "metamer-ftest-class" to the input field and
+ * checks that it was changed on the page.
*
* @param element
* locator of tested element
* @param attribute
* name of the attribute that will be set (e.g. styleClass, headerClass, itemContentClass)
*/
- protected void testStyleClass(ExtendedLocator<JQueryLocator> element, BasicAttributes attribute) {
+ protected void testStyleClass(ExtendedLocator<JQueryLocator> element, BasicAttributes attribute) {
final String styleClass = "metamer-ftest-class";
basicAttributes.set(attribute, styleClass);
@@ -275,12 +275,10 @@
assertTrue(selenium.isElementPresent(element));
assertFalse(selenium.isElementPresent(elementWhichHasntThatClass));
}
-
+
/**
- * A helper method for testing attribute "class".
- * It sets "metamer-ftest-class" to the input field and checks that it was changed on the page.
- * This method is wrapping
- * {@link #testStyleClass(ExtendedLocator, BasicAttributes)}
+ * A helper method for testing attribute "class". It sets "metamer-ftest-class" to the input field and checks that
+ * it was changed on the page. This method is wrapping {@link #testStyleClass(ExtendedLocator, BasicAttributes)}
*
* @param element
* locator of tested element
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -52,7 +52,8 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-9665")// </editor-fold>
+ @IssueTracking("https://issues.jboss.org/browse/RF-9665")
+ // </editor-fold>
public void testSimpleClickUnicode() {
testClick(button, "ľščťžýáíéúôň фывацукйешгщь");
}
@@ -112,7 +113,7 @@
testFullPageRefresh(button);
}
- @Test
+ @Test(groups = { "4.Future" })
@IssueTracking("https://issues.jboss.org/browse/RF-11341")
public void testRerenderAll() {
testRerenderAll(button);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestCounter.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestCounter.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestCounter.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -35,7 +35,6 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-@Test(enabled = false)
public class TestCounter extends AbstractPushTest {
private static final long SIMPLE_INTERVAL = 2500;
@@ -52,7 +51,7 @@
* Validates that counter is changed between iterations.
* </p>
*/
- @Test
+ @Test(enabled = false)
public void testSimple() throws HttpException, IOException {
pushAttributes.setInterval(SIMPLE_INTERVAL);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestInterval.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestInterval.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestInterval.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -42,7 +42,6 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-@Test(enabled = false)
public class TestInterval extends AbstractPushTest {
private static final int DEFAULT_COUNTER_STEP = 2;
@@ -79,7 +78,7 @@
* Then repeat push and wait 6 times with 1 event triggered and 5 fast events triggered in sequence.
* </p>
*/
- @Test
+ @Test(enabled = false)
@Use(field = "interval", ints = { 1000 })
public void testClientAllTemplates() throws HttpException, IOException {
testClient();
@@ -103,7 +102,7 @@
* Then repeat push and wait 6 times with 1 event triggered and 5 fast events triggered in sequence.
* </p>
*/
- @Test
+ @Test(enabled = false)
@Use(field = "interval", ints = { 500, 5000 })
@Templates(value = "plain")
public void testClientDifferentIntervals() throws HttpException, IOException {
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -33,7 +33,8 @@
import org.jboss.test.selenium.encapsulated.JavaScript;
import org.jboss.test.selenium.request.RequestType;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
@@ -49,11 +50,16 @@
return buildUrl(contextPath, "faces/components/a4jStatus/instantAttributes.xhtml");
}
- @BeforeMethod
+ @BeforeClass
public void setupAttributes() {
statusAttributes.setRequestType(RequestType.XHR);
}
+ @AfterClass
+ public void teardownAttributes() {
+ statusAttributes.setRequestType(RequestType.HTTP);
+ }
+
@Test
@IssueTracking("https://issues.jboss.org/browse/RFPL-1516")
public void testOnStart() {
@@ -70,15 +76,16 @@
selenium.click(button1);
selenium.waitForCondition(js("window.metamer == " + i));
getCurrentXHRHalter().complete();
-
+
// FIXME workaround
waitFor(1000);
}
XHRHalter.disable();
}
- @Test
- @IssueTracking({ "https://issues.jboss.org/browse/RF-9118", "http://java.net/jira/browse/JAVASERVERFACES_SPEC_PUBLIC-1024" })
+ @Test(groups = { "4.Future" })
+ @IssueTracking({ "https://issues.jboss.org/browse/RF-9118",
+ "http://java.net/jira/browse/JAVASERVERFACES_SPEC_PUBLIC-1024" })
public void testOnError() {
for (int i = 0; i < 2; i++) {
statusAttributes.set(onerror, alert.parametrize("error" + i));
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/abstractions/DataTableFilteringTest.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -48,7 +48,7 @@
private static final String[] FILTER_NAMES = new String[] { "ivan", "Гог", null, "Š" };
private static final String[] FILTER_TITLES = new String[] { "Director", null, "CEO" };
private static final Integer[] FILTER_NUMBER_OF_KIDS = new Integer[] { 2, 100, 0, 5 };
-
+
JQueryLocator selectSex = jq("select");
JQueryLocator inputName = jq("input");
JQueryLocator inputTitle = jq("input");
@@ -56,11 +56,11 @@
JQueryLocator inputNumberOfKids2 = jq("input");
FilteringDataTable filtering = new FilteringDataTable();
-
+
private ExpectedEmployee filterEmployee;
private List<Employee> expectedEmployees;
private int rows;
-
+
@BeforeMethod
public void setup() {
filterEmployee = new ExpectedEmployee();
@@ -137,7 +137,7 @@
filtering.selectName("an");
filterEmployee.name = "an";
-
+
expectedEmployees = filter(EMPLOYEES, getFilter());
dataScroller2.gotoLastPage();
@@ -148,11 +148,11 @@
assertEquals(dataScroller2.getCurrentPage(), lastPage);
assertTrue(dataScroller2.isLastPage());
verifyPageContent(lastPage);
-
+
dataScroller2.gotoFirstPage();
verifyPageContent(1);
}
-
+
public void testFullPageRefresh() {
dataScroller2.setLastPage(dataScroller2.obtainLastPage());
dataScroller2.gotoFirstPage();
@@ -160,7 +160,7 @@
filtering.selectName("an");
filterEmployee.name = "an";
-
+
expectedEmployees = filter(EMPLOYEES, getFilter());
dataScroller2.gotoLastPage();
@@ -171,7 +171,7 @@
assertEquals(dataScroller2.getCurrentPage(), lastPage);
assertTrue(dataScroller2.isLastPage());
verifyPageContent(lastPage);
-
+
dataScroller2.gotoFirstPage();
verifyPageContent(1);
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -42,141 +42,138 @@
* @version $Revision$
*/
public class Autocomplete implements Model {
-
+
private static final String KEY_UP = "38";
private static final String KEY_DOWN = "40";
AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
JQueryLocator input = pjq("input.rf-au-inp[id$=autocompleteInput]");
-
+
JQueryLocator items = jq("div.rf-au-lst-cord[id$=autocompleteList] div[id$=autocompleteItems]");
JQueryLocator selection = items.getDescendant(jq("div.rf-au-itm-sel"));
JQueryLocator option = jq("div.rf-au-itm");
JQueryLocator labeledOption = jq("div.rf-au-opt:contains('{0}')");
-
+
public void typeKeys(String keys) {
- for (int i = 0; i < keys.length(); i++) {
- final String key = String.valueOf(keys.charAt(i));
+ for (int i = 0; i < keys.length(); i++) {
+ final String key = String.valueOf(keys.charAt(i));
selenium.focus(input);
selenium.keyPress(input, key);
- selenium.fireEvent(input, Event.KEYDOWN);
- }
+ selenium.fireEvent(input, Event.KEYDOWN);
+ }
}
-
+
public void type(String value) {
- selenium.type(input, value);
+ selenium.type(input, value);
selenium.fireEvent(input, Event.BLUR);
}
-
+
public void confirmByKeys() {
- pressEnter();
+ selenium.fireEvent(input, Event.FOCUS);
+ pressEnter();
}
-
+
public void selectByKeys(String label) {
- int labeledIndex = getLabeledOptionIndex(label);
- while (getSelectedOptionIndex() < labeledIndex) {
+ int labeledIndex = getLabeledOptionIndex(label);
+ while (getSelectedOptionIndex() < labeledIndex) {
pressDown();
- }
- while (getSelectedOptionIndex() > labeledIndex) {
+ }
+ while (getSelectedOptionIndex() > labeledIndex) {
pressUp();
- }
+ }
}
-
+
public boolean isLabeledOptionAvailable(String label) {
- return selenium.isElementPresent(getLabeledOption(label));
+ return selenium.isElementPresent(getLabeledOption(label));
}
-
+
public int getLabeledOptionIndex(String label) {
- String index = selenium.getEval(jqScript(getLabeledOption(label),
- "index()"));
- return Integer.valueOf(index);
+ String index = selenium.getEval(jqScript(getLabeledOption(label), "index()"));
+ return Integer.valueOf(index);
}
-
+
public int getSelectedOptionIndex() {
- JavaScript script = jqScript(option, "index({0})").parametrize(
- jqObject(selection));
- String index = selenium.getEval(script);
- return Integer.valueOf(index);
+ JavaScript script = jqScript(option, "index({0})").parametrize(jqObject(selection));
+ String index = selenium.getEval(script);
+ return Integer.valueOf(index);
}
-
+
public String getSelectedOptionText() {
- return selenium.getText(selection);
+ return selenium.getText(selection);
}
-
+
public String getInputText() {
- return selenium.getValue(input);
+ return selenium.getValue(input);
}
-
+
public void clearInputValue() {
selenium.type(input, "");
- // selenium.fireEvent(input, Event.KEYUP);
- // selenium.fireEvent(input, Event.BLUR);
selenium.focus(input);
}
-
+
private JQueryLocator getLabeledOption(String label) {
- return labeledOption.format(label);
+ return labeledOption.format(label);
}
-
+
public void pressBackspace() {
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_BACK_SPACE));
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_BACK_SPACE));
}
-
+
public void pressUp() {
- selenium.keyDown(input, KEY_UP);
+ selenium.keyDown(input, KEY_UP);
}
-
+
public void pressDown() {
- selenium.keyDown(input, KEY_DOWN);
+ selenium.keyDown(input, KEY_DOWN);
}
-
+
public void pressEnter() {
- selenium.keyDownNative(Integer.toString(KeyEvent.VK_ENTER));
+ selenium.keyPressNative(Integer.toString(KeyEvent.VK_ENTER));
}
-
+
public void pressLeft() {
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT));
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT));
}
-
+
public void pressRight() {
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT));
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT));
}
-
+
public void pressDelete() {
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_DELETE));
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_DELETE));
}
-
+
public void textSelectionLeft(int size) {
- selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT));
- for (int i = 0; i < size; i++) {
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT));
- }
- selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT));
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT));
+ for (int i = 0; i < size; i++) {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT));
+ }
+ selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT));
}
-
+
public void textSelectionRight(int size) {
- selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT));
- for (int i = 0; i < size; i++) {
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT));
- }
- selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT));
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT));
+ for (int i = 0; i < size; i++) {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT));
+ }
+ selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT));
}
-
+
public void textSelectAll() {
- selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL));
- selenium.keyPressNative(String.valueOf(KeyEvent.VK_A));
- selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL));
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL));
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_A));
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL));
}
-
- public boolean isCompletionVisible() {
- if (!selenium.isElementPresent(items)) {
- return false;
- }
- return selenium.isVisible(items);
+
+ public boolean isCompletionVisible() {
+ if (!selenium.isElementPresent(items)) {
+ return false;
+ }
+ return selenium.isVisible(items);
}
-
+
public void waitForCompletionVisible() {
- WAIT_GUI.until(ELEMENT_PRESENT.locator(option));
+ WAIT_GUI.until(ELEMENT_PRESENT.locator(option));
}
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -24,6 +24,7 @@
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
import org.jboss.test.selenium.framework.AjaxSelenium;
import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
@@ -35,6 +36,7 @@
* Provides DataScroller control methods.
*
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
* @version $Revision$
*/
public class DataScroller extends AbstractModel<JQueryLocator> {
@@ -49,11 +51,27 @@
ReferencedLocator<JQueryLocator> firstPageButton = ref(root, "> .rf-ds-btn-first");
ReferencedLocator<JQueryLocator> fastRewindButton = ref(root, "> .rf-ds-btn-fastrwd");
ReferencedLocator<JQueryLocator> fastForwardButton = ref(root, "> .rf-ds-btn-fastfwd");
+ ReferencedLocator<JQueryLocator> nextButton = ref(root, "> .rf-ds-btn-next");
+ ReferencedLocator<JQueryLocator> previousButton = ref(root, "> .rf-ds-btn-prev");
+ ReferencedLocator<JQueryLocator> rewindButton = ref(root, "> .rf-ds-btn-fastfwd");
ReferencedLocator<JQueryLocator> lastPageButton = ref(root, "> .rf-ds-btn-last");
ReferencedLocator<JQueryLocator> firstVisiblePage = ref(root, "> .rf-ds-nmb-btn:first");
ReferencedLocator<JQueryLocator> lastVisiblePage = ref(root, "> .rf-ds-nmb-btn:last");
ReferencedLocator<JQueryLocator> currentPage = ref(root, "> .rf-ds-act");
+
+ // buttons with direct operation bound to rich:componentControll
+ JQueryLocator firstJsApiBtn = jq("input[id$=buttonStpFirst{0}]");
+ JQueryLocator previousJsApiBtn = jq("input[id$=buttonStpPrev{0}]");
+ JQueryLocator nextJsApiBtn = jq("input[id$=buttonStpNext{0}]");
+ JQueryLocator lastJsApiBtn = jq("input[id$=buttonStpLast{0}]");
+
+ // buttons with "switchToPage" action bound to rich:componentControll and
+ // operation specified by param
+ JQueryLocator firstStpJsApiBtn = jq("input[id$=buttonStpFirst{0}]");
+ JQueryLocator previousStpJsApiBtn = jq("input[id$=buttonStpPrev{0}]");
+ JQueryLocator nextStpJsApiBtn = jq("input[id$=buttonStpNext{0}]");
+ JQueryLocator lastStpJsApiBtn = jq("input[id$=buttonStpLast{0}]");
Integer fastStep = null;
Integer lastPage = null;
@@ -197,7 +215,7 @@
}
int startPage = getCurrentPage();
clickLastPageButton();
- int lastPage = getCurrentPage();
+ lastPage = getCurrentPage();
if (startPage == 1) {
clickFirstPageButton();
} else {
@@ -212,15 +230,43 @@
}
return integer(selenium.getText(currentPage));
}
-
+
+ public boolean isFastForwardButtonPresent() {
+ return selenium.isElementPresent(fastForwardButton);
+ }
+
+ public boolean isFastRewindButtonPresent() {
+ return selenium.isElementPresent(fastRewindButton);
+ }
+
public boolean isFirstPage() {
return getCurrentPage() == 1;
}
+ public boolean isFirstPageButtonPresent() {
+ return selenium.isElementPresent(firstPageButton);
+ }
+
public boolean isLastPage() {
return getCurrentPage() == getLastVisiblePage();
}
+ public boolean isLastPageButtonPresent() {
+ return selenium.isElementPresent(lastPageButton);
+ }
+
+ public boolean isNextButtonPresent() {
+ return selenium.isElementPresent(previousButton);
+ }
+
+ public boolean isPreviousButtonPresent() {
+ return selenium.isElementPresent(previousButton);
+ }
+
+ public boolean isPresent() {
+ return selenium.isElementPresent(root.getLocator()) && selenium.isDisplayed(root.getLocator());
+ }
+
public static int integer(String string) {
return Integer.valueOf(string);
}
@@ -244,4 +290,46 @@
public void clickFastRewind() {
guardXhr(selenium).click(fastRewindButton);
}
+
+ public void clickStepForward() {
+ guardXhr(selenium).click(nextButton);
+ }
+
+ public void clickStepPrevious() {
+ guardXhr(selenium).click(previousButton);
+ }
+
+ // actions performed on buttons with JS API operation
+
+ public void clickJsApiFirst(int scrollerNo) {
+ guardXhr(selenium).click(firstJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiStpFirst(int scrollerNo) {
+ guardXhr(selenium).click(firstStpJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiPrevious(int scrollerNo) {
+ guardXhr(selenium).click(previousJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiStpPrevious(int scrollerNo) {
+ guardXhr(selenium).click(previousStpJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiNext(int scrollerNo) {
+ guardXhr(selenium).click(nextJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiStpNext(int scrollerNo) {
+ guardXhr(selenium).click(nextStpJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiLast(int scrollerNo) {
+ guardXhr(selenium).click(lastJsApiBtn.format(scrollerNo));
+ }
+
+ public void clickJsApiStpLast(int scrollerNo) {
+ guardXhr(selenium).click(lastStpJsApiBtn.format(scrollerNo));
+ }
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/OrderingList.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -36,11 +36,11 @@
*/
public class OrderingList implements Model {
- private final JQueryLocator buttonBottom = jq("button.rf-ord-down-bottom");
- private final JQueryLocator buttonDown = jq("button.rf-ord-down");
- private final JQueryLocator buttonTop = jq("button.rf-ord-up-top");
+ private final JQueryLocator buttonBottom = jq("button.rf-ord-dn-bt");
+ private final JQueryLocator buttonDown = jq("button.rf-ord-dn");
+ private final JQueryLocator buttonTop = jq("button.rf-ord-up-tp");
private final JQueryLocator buttonUp = jq("button.rf-ord-up");
- private final JQueryLocator header = pjq("thead.rf-ord-lst-header > tr");
+ private final JQueryLocator header = pjq("thead.rf-ord-lst-hdr > tr");
private final JQueryLocator item = pjq("tbody[id$=orderingListItems] > tr.rf-ord-opt");
private final JQueryLocator itemSelected = pjq("tbody[id$=orderingListItems] > tr.rf-ord-opt.rf-ord-sel");
private final JQueryLocator list = pjq("div[id$=orderingList] div.rf-ord-lst-dcrtn");
@@ -50,65 +50,66 @@
private int numberOfItems = -1;
private int numberOfColumns = -1;
private final AjaxSelenium selenium;
-
+
public OrderingList() {
this(AjaxSeleniumProxy.getInstance());
}
-
+
public OrderingList(AjaxSelenium selenium) {
Validate.notNull(selenium);
this.selenium = selenium;
}
-
+
public JQueryLocator getHeader() {
return header;
}
-
+
public int getIndexOfSelectedItem() {
if (!isItemSelected()) {
throw new IllegalStateException("There is no selected item.");
}
return getNumberOfItems() - selenium.getCount(jq(itemSelected.getRawLocator() + " ~ tr")) - 1;
}
-
+
public JQueryLocator getItem(int index) {
if (index < 0 || index >= getNumberOfItems()) {
throw new IndexOutOfBoundsException("The index <" + index + "> is out of the range [0, "
+ getNumberOfItems() + "].");
}
return jq(item.getRawLocator() + ":eq(" + index + ")");
- }
-
+ }
+
public JQueryLocator getItemColumn(int indexItem, int indexColumn) {
if (indexColumn < 0 || indexColumn >= getNumberOfColumns()) {
- throw new IndexOutOfBoundsException("The index of column <" + indexColumn + "> is out of the range [0, " + getNumberOfColumns() + "]");
- }
- return jq(getItem(indexItem).getRawLocator() + " > .rf-ord-cell:eq(" + indexColumn + ")");
+ throw new IndexOutOfBoundsException("The index of column <" + indexColumn + "> is out of the range [0, "
+ + getNumberOfColumns() + "]");
+ }
+ return jq(getItem(indexItem).getRawLocator() + " > .rf-ord-c:eq(" + indexColumn + ")");
}
-
+
public String getItemColumnValue(int indexItem, int indexColumn) {
return selenium.getText(getItemColumn(indexItem, indexColumn));
}
-
+
public JQueryLocator getList() {
return list;
}
-
+
public JQueryLocator getListArea() {
return listArea;
}
-
+
public JQueryLocator getLocator() {
return orderingList;
}
-
+
public int getNumberOfColumns() {
if (numberOfColumns == -1) {
- numberOfColumns = selenium.getCount(jq(getItem(0).getRawLocator() + " > .rf-ord-cell"));
+ numberOfColumns = selenium.getCount(jq(getItem(0).getRawLocator() + " > .rf-ord-c"));
}
return numberOfColumns;
}
-
+
public int getNumberOfItems() {
if (numberOfItems == -1) {
numberOfItems = selenium.getCount(item);
@@ -118,82 +119,83 @@
public JQueryLocator getScrollableArea() {
return scrollableArea;
- }
-
+ }
+
public boolean isButtonBottomEnabled() {
return isButtonEnabled(buttonBottom);
}
public boolean isButtonDownEnabled() {
return isButtonEnabled(buttonDown);
- }
-
+ }
+
public boolean isButtonTopEnabled() {
return isButtonEnabled(buttonTop);
}
-
+
public boolean isButtonUpEnabled() {
return isButtonEnabled(buttonUp);
- }
+ }
public boolean isButtonBottomPresent() {
return selenium.isElementPresent(buttonBottom);
}
-
+
public boolean isButtonDownPresent() {
return selenium.isElementPresent(buttonDown);
- }
-
+ }
+
public boolean isButtonTopPresent() {
return selenium.isElementPresent(buttonTop);
- }
+ }
public boolean isButtonUpPresent() {
return selenium.isElementPresent(buttonUp);
- }
-
+ }
+
public boolean isItemSelected() {
return selenium.isElementPresent(itemSelected);
}
-
+
public boolean isOrderingListPresent() {
return selenium.isElementPresent(orderingList);
}
-
+
public void moveBottom() {
move(buttonBottom);
}
-
+
public void moveDown() {
move(buttonDown);
}
-
+
public void moveTop() {
move(buttonTop);
- }
-
+ }
+
public void moveUp() {
move(buttonUp);
- }
-
+ }
+
public void selectItem(int index) {
selenium.mouseDown(getItem(index));
selenium.mouseUp(getItem(index));
selenium.click(getItem(index));
- }
-
+ }
+
private boolean isButtonEnabled(JQueryLocator button) {
return !selenium.isElementPresent(jq(button.getRawLocator() + ".rf-ord-btn-dis"));
}
-
+
private void move(JQueryLocator button) {
if (!selenium.isElementPresent(itemSelected)) {
throw new IllegalStateException("No item is selected, so the moving action can't be proceeded.");
- }
+ }
if (!isButtonEnabled(button)) {
- throw new IllegalStateException("The moving action can't be proceeded because the moving button is disabled.");
+ throw new IllegalStateException(
+ "The moving action can't be proceeded because the moving button is disabled.");
}
selenium.click(button);
}
-
+
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AbstractAutocompleteTest.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AbstractAutocompleteTest.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AbstractAutocompleteTest.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -35,7 +35,7 @@
*/
public abstract class AbstractAutocompleteTest extends AbstractMetamerTest {
- private Autocomplete autocomplete = new Autocomplete();
+ Autocomplete autocomplete = new Autocomplete();
List<Capital> capitals = Model.unmarshallCapitals();
protected Autocomplete getAutocomplete() {
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -36,8 +36,7 @@
converter,
converterMessage,
disabled,
- fetchValue,
- filterFunction,
+ fetchValue,
immediate,
inputClass,
layout,
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteAttributes.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteAttributes.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -28,6 +28,7 @@
import java.net.URL;
import org.jboss.test.selenium.locator.JQueryLocator;
+import org.richfaces.tests.metamer.ftest.annotations.Templates;
import org.testng.annotations.Test;
/**
@@ -37,30 +38,40 @@
private static final JQueryLocator PHASE_FORMAT = jq("div#phasesPanel li:eq({0})");
private static final String PHASE_LISTENER_LOG_FORMAT = "*1 value changed: {0} -> {1}";
+
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/richAutocomplete/autocomplete.xhtml");
}
@Test
+ @Templates(exclude = { "richPopupPanel" })
public void testValueChangeListener() {
- getAutocomplete().type("something");
+ getAutocomplete().typeKeys("something");
getAutocomplete().confirmByKeys();
// valueChangeListener output as 4th record
- waitGui
- .failWith("Expected <" + format(PHASE_LISTENER_LOG_FORMAT, "null", "something") + ">, found <" + selenium.getText(PHASE_FORMAT.format(3)) + ">")
- .until(textEquals.locator(PHASE_FORMAT.format(3)).text(
- format(PHASE_LISTENER_LOG_FORMAT, "null", "something"))
- );
-
- getAutocomplete().type("something else");
+ waitFor(2000);
+ waitGui.failWith(
+ "Expected <" + format(PHASE_LISTENER_LOG_FORMAT, "null", "something") + ">, found <"
+ + selenium.getText(PHASE_FORMAT.format(3)) + ">").until(
+ textEquals.locator(PHASE_FORMAT.format(3)).text(format(PHASE_LISTENER_LOG_FORMAT, "null", "something")));
+
+ getAutocomplete().clearInputValue();
+ getAutocomplete().typeKeys("something else");
getAutocomplete().confirmByKeys();
// valueChangeListener output as 4th record
- waitGui
- .failWith("Expected <" + format(PHASE_LISTENER_LOG_FORMAT, "something", "something else") + ">, found <" + selenium.getText(PHASE_FORMAT.format(3)) + ">")
- .until(textEquals.locator(PHASE_FORMAT.format(3)).text(
- format(PHASE_LISTENER_LOG_FORMAT, "something", "something else"))
- );
+ waitFor(2000);
+ waitGui.failWith(
+ "Expected <" + format(PHASE_LISTENER_LOG_FORMAT, "something", "something else") + ">, found <"
+ + selenium.getText(PHASE_FORMAT.format(3)) + ">").until(
+ textEquals.locator(PHASE_FORMAT.format(3)).text(
+ format(PHASE_LISTENER_LOG_FORMAT, "something", "something else")));
}
-
+
+ @Test(groups = { "4.Future" })
+ @Templates(value = { "richPopupPanel" })
+ public void testValueChangeListenerInPopupPanel() {
+ testValueChangeListener();
+ }
+
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteByKeys.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -68,6 +68,7 @@
if (selectFirst == null) {
selectFirst = false;
}
+ autocomplete.clearInputValue();
}
@Test
Copied: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFiltering.java (from rev 23019, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFiltering.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFiltering.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFiltering.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,42 @@
+/**
+ *
+ */
+package org.richfaces.tests.metamer.ftest.richAutocomplete;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.autocompleteAttributes;
+import static org.richfaces.tests.metamer.ftest.richAutocomplete.AutocompleteAttributes.clientFilterFunction;
+import static org.richfaces.tests.metamer.ftest.richAutocomplete.AutocompleteAttributes.mode;
+import static org.testng.Assert.assertTrue;
+
+import java.net.URL;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author jjamrich
+ *
+ */
+public class TestAutocompleteFiltering extends AbstractAutocompleteTest {
+
+ private static final String CLIENT_FILTER_FUNCTION_NAME = "customClientFilterFunction";
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richAutocomplete/filtering.xhtml");
+ }
+
+ @Test
+ public void testClientFilterFunction() {
+ autocompleteAttributes.set(mode, "client");
+ autocompleteAttributes.set(clientFilterFunction, CLIENT_FILTER_FUNCTION_NAME);
+
+ autocomplete.typeKeys("No");
+
+ assertTrue(autocomplete.isLabeledOptionAvailable("Springfield of Illinois"));
+ assertTrue(autocomplete.isLabeledOptionAvailable("Raleigh of North Carolina"));
+ assertTrue(autocomplete.isLabeledOptionAvailable("Bismarck of North Dakota"));
+
+ }
+
+}
Copied: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java (from rev 23019, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteFormatting.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richAutocomplete;
+
+import static org.jboss.test.selenium.RequestTypeModelGuard.guardXhr;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.autocompleteAttributes;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.utils.URLUtils;
+import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
+import org.richfaces.tests.metamer.bean.Model;
+import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.model.Autocomplete;
+import org.richfaces.tests.metamer.model.Capital;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Test for example with formatted suggestions on page faces/components/richAutocomplete/autocomplete.xhtml
+ *
+ * @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
+ *
+ * @version $Revision$
+ */
+public class TestAutocompleteFormatting extends AbstractMetamerTest {
+
+ Autocomplete autocomplete = new Autocomplete();
+ StringBuilder partialInput;
+
+ List<Capital> capitals = Model.unmarshallCapitals();
+
+ @Inject
+ @Use(booleans = { true, false })
+ Boolean autofill;
+
+ @Inject
+ @Use(booleans = { true, false })
+ Boolean selectFirst;
+
+ @Override
+ public URL getTestUrl() {
+ return URLUtils.buildUrl(contextPath, "faces/components/richAutocomplete/fetchValueAttr.xhtml");
+ }
+
+ @BeforeMethod
+ public void prepareProperties() {
+ autocompleteAttributes.set(AutocompleteAttributes.autofill, autofill);
+ autocompleteAttributes.set(AutocompleteAttributes.selectFirst, selectFirst);
+ if (autofill == null) {
+ autofill = false;
+ }
+ if (selectFirst == null) {
+ selectFirst = false;
+ }
+ autocomplete.clearInputValue();
+ }
+
+ /**
+ * This should test combination of @var and @fetchValue attributes of autocomplete
+ */
+ @Test
+ public void testFormatting() {
+ assertFalse(autocomplete.isCompletionVisible());
+ typePrefix("ala");
+ assertTrue(autocomplete.isCompletionVisible());
+ confirm();
+ assertFalse(autocomplete.isCompletionVisible());
+ assertTrue(autocomplete.getInputText().toLowerCase().startsWith(getExpectedStateForPrefix().toLowerCase()));
+ }
+
+ @Test
+ public void testLayout() {
+
+ JQueryLocator suggestionsGridDiv = new JQueryLocator("div.rf-au-lst-scrl > div[id$=autocompleteItems] > div:contains({0})");
+ JQueryLocator suggestionsList = new JQueryLocator("div.rf-au-lst-scrl > ul[id$=autocompleteItems] > li:contains({0})");
+ JQueryLocator suggestionsTable = new JQueryLocator("div.rf-au-lst-scrl > table[id$=autocompleteItems] tr>td:contains({0})");
+
+ verifyLayout("div", suggestionsGridDiv);
+
+ verifyLayout("grid", suggestionsGridDiv);
+
+ verifyLayout("list", suggestionsList);
+
+ verifyLayout("table", suggestionsTable);
+
+ }
+
+ private void verifyLayout(String layout, JQueryLocator suggestionLocatorFormat) {
+
+ autocompleteAttributes.set(AutocompleteAttributes.layout, layout);
+
+ autocomplete.typeKeys("Co");
+
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("Colorado")));
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("[Denver]")));
+
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("Connecticut")));
+ assertTrue(selenium.isElementPresent(suggestionLocatorFormat.format("[Hartford]")));
+ }
+
+ public void typePrefix(String wholeInput) {
+ partialInput = new StringBuilder(autocomplete.getInputText());
+
+ for (int i = 0; i < wholeInput.length(); i++) {
+ String chr = String.valueOf(wholeInput.charAt(i));
+
+ guardXhr(autocomplete).typeKeys(chr);
+ partialInput.append(chr);
+
+ assertEquals(autocomplete.getInputText(), getExpectedStateForPrefix());
+ assertEquals(autocomplete.getSelectedOptionIndex(), getExpectedSelectedOptionIndex());
+ }
+ }
+
+ public String getExpectedStateForPrefix() {
+ if (selectFirst && autofill && partialInput.length() > 0) {
+ return getStatesByPrefix(partialInput.toString()).get(0).toLowerCase();
+ }
+
+ return partialInput.toString();
+ }
+
+ public String getExpectedCompletionForPrefix() {
+ if (selectFirst && autofill && partialInput.length() > 0) {
+ return getCompletionByPrefix(partialInput.toString()).get(0).toLowerCase();
+ }
+
+ return partialInput.toString();
+ }
+
+ public List<String> getStatesByPrefix(String prefix) {
+ List<String> states = new LinkedList<String>();
+
+ for (Capital cap : capitals) {
+ if (cap.getState().toLowerCase().startsWith(prefix)) {
+ states.add(cap.getState());
+ }
+ }
+
+ return states;
+ }
+
+ public List<String> getCompletionByPrefix(String prefix) {
+ List<String> states = new LinkedList<String>();
+
+ for (Capital cap : capitals) {
+ if (cap.getState().toLowerCase().startsWith(prefix)) {
+ states.add(cap.getState() + " [" + cap.getName() + "]");
+ }
+ }
+
+ return states;
+ }
+
+ public int getExpectedSelectedOptionIndex() {
+ return (selectFirst && partialInput.length() > 0) ? 0 : -1;
+ }
+
+ public void confirm() {
+ autocomplete.confirmByKeys();
+ autocomplete.waitForCompletionVisible();
+ }
+
+ public Boolean getAutofill() {
+ return autofill;
+ }
+
+ public void setAutofill(Boolean autofill) {
+ this.autofill = autofill;
+ }
+
+ public Boolean getSelectFirst() {
+ return selectFirst;
+ }
+
+ public void setSelectFirst(Boolean selectFirst) {
+ this.selectFirst = selectFirst;
+ }
+}
+
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -318,7 +318,7 @@
testTitle(panel);
}
- @Test
+ @Test(groups = { "4.Future" })
@IssueTracking("https://issues.jboss.org/browse/RF-11568")
public void testToggleListener() {
String reqTime = selenium.getText(time);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableFacets.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -63,7 +63,6 @@
JQueryLocator noDataFacet = pjq("table[id$=richDataTable] > tbody.rf-cst:eq(0) > tr.rf-cst-nd > td.rf-cst-nd-c");
assertTrue(selenium.isElementPresent(noDataFacet));
- assertFalse(selenium.isVisible(noDataFacet));
assertTrue(selenium.getText(noDataFacet).isEmpty());
dataTableFacets.set(noData, SAMPLE_STRING);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableScroller.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -87,7 +87,7 @@
secondDataScroller.setLastPage(secondDataScroller.obtainLastPage());
}
- @Test
+ @Test(groups = { "4.Future" })
@Use(field = "expandMode", enumeration = true)
@IssueTracking("https://issues.jboss.org/browse/RF-11301")
public void testScroller() {
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsibleSubTable/TestCollapsibleSubTableSorting.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -49,7 +49,7 @@
* @version $Revision$
*/
public class TestCollapsibleSubTableSorting extends AbstractCollapsibleSubTableTest {
-
+
@Inject
@Use(enumeration = true)
SortMode sortMode;
@@ -57,6 +57,7 @@
int rows = 0;
List<Column> sortPriority = new LinkedList<Column>();
+
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/richCollapsibleSubTable/sorting-using-column.xhtml");
@@ -68,7 +69,7 @@
Column.resetAll();
}
- @Test
+ @Test(groups = { "4.Future" })
@IssueTracking("https://issues.jboss.org/browse/RF-11302")
public void testSorting() {
collapsibleSubTabAttributes.set(CollapsibleSubTableAttributes.rows, rows);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/AbstractColumnSortingTest.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -67,5 +67,7 @@
assertEquals(actualCapital.getName(), expectedCapital.getName());
assertEquals(actualCapital.getState(), expectedCapital.getState());
}
+
+ columnAttributes.setRequestType(RequestType.HTTP);
}
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnComparator.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -31,7 +31,6 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-@Test
public class TestColumnComparator extends AbstractColumnSortingTest {
@Override
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnFiltering.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -49,12 +49,12 @@
JQueryLocator tableWithFilter = pjq("table.rf-dt[id$=richDataTable1]");
JQueryLocator tableWithFilterExpression = pjq("table.rf-dt[id$=richDataTable2]");
RichColumnBean richColumnBean = new RichColumnBean();
-
+
@Override
public URL getTestUrl() {
return buildUrl(contextPath, "faces/components/richColumn/filtering.xhtml");
}
-
+
@Test
public void testFilterAttribute() {
model.setRoot(tableWithFilter);
@@ -88,7 +88,7 @@
assertEqualsCapitals(actualCapitals, expectedCapitals);
}
}
-
+
private void assertEqualsCapitals(Collection<Capital> actualCapitals, Collection<Capital> expectedCapitals) {
assertEquals(actualCapitals.size(), expectedCapitals.size());
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSimple.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -31,6 +31,7 @@
import java.net.URL;
import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.request.RequestType;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richColumn/TestColumnSorting.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -31,7 +31,6 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-@Test
public class TestColumnSorting extends AbstractColumnSortingTest {
@Override
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/DataScrollerAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -29,7 +29,25 @@
*/
public enum DataScrollerAttributes implements AttributeEnum {
+ boundaryControls,
+ data,
+ execute,
+ fastControls,
fastStep,
- maxPages
+ lastPageMode,
+ limitRender,
+ maxPages,
+ onbeforedomupdate,
+ onbegin,
+ oncomplete,
+ page,
+ render,
+ rendered,
+ renderIfSinglePage,
+ status,
+ stepControls,
+ style,
+ styleClass,
+ title
}
Copied: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java (from rev 23019, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestDataScrollerAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,367 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richDataScroller;
+
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import java.net.URL;
+import java.util.Arrays;
+
+import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
+import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.abstractions.DataTableAttributes;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.attributes.Attributes;
+import org.richfaces.tests.metamer.ftest.model.DataScroller;
+import org.testng.annotations.Test;
+
+/**
+ * Test the functionality of switching pages using DataScroller bound to DataTable.
+ *
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+@Use(field = "scroller", value = {"scrollerOutsideTable", "scrollerInsideTable"})
+public class TestDataScrollerAttributes extends AbstractMetamerTest {
+
+ private final Attributes<DataScrollerAttributes> attributes = new Attributes<DataScrollerAttributes>(pjq("table[id$='attributes']"));
+ private final Attributes<DataTableAttributes> tableAttributes = new Attributes<DataTableAttributes>(pjq("table[id$='tableAttributes']"));
+
+ @Inject
+ private DataScroller scroller;
+
+ private DataScroller scrollerOutsideTable = PaginationTester.DATA_SCROLLER_OUTSIDE_TABLE;
+ private DataScroller scrollerInsideTable = PaginationTester.DATA_SCROLLER_IN_TABLE_FOOTER;
+
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richDataScroller/simple.xhtml");
+ }
+
+ @Test
+ public void testBoundaryControls() {
+ // init - show
+ assertTrue(getScroller().isFirstPageButtonPresent(), "The first button should be present.");
+ assertTrue(getScroller().isLastPageButtonPresent(), "The last button should be present.");
+ // hide
+ getAttributes().set(DataScrollerAttributes.boundaryControls, "hide");
+ assertFalse(getScroller().isFirstPageButtonPresent(), "The first button shouldn't be present.");
+ assertFalse(getScroller().isLastPageButtonPresent(), "The last button shouldn't be present.");
+ }
+
+ @Test
+ public void testData() {
+ // attributes
+ getAttributes().set(DataScrollerAttributes.data, "RichFaces");
+ getAttributes().set(DataScrollerAttributes.oncomplete, "data = event.data");
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check
+ String data = selenium.getEval(new JavaScript("window.data"));
+ assertEquals(data, "RichFaces", "Data sent with ajax request");
+ }
+
+ @Test
+ public void testEvents() throws InterruptedException {
+ // set event attributes
+ getAttributes().set(DataScrollerAttributes.onbeforedomupdate, "metamerEvents += \"beforedomupdate \"");
+ getAttributes().set(DataScrollerAttributes.onbegin, "metamerEvents += \"begin \"");
+ getAttributes().set(DataScrollerAttributes.oncomplete, "metamerEvents += \"complete \"");
+ // reset events
+ selenium.getEval(new JavaScript("window.metamerEvents = \"\";"));
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check events
+ String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" ");
+ assertEquals(events.length, 3, "3 events should be fired, found events are " + Arrays.toString(events) + ".");
+ assertEquals(events[0], "begin", "Attribute onbegin doesn't work, found events are " + Arrays.toString(events) + ".");
+ assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work, found events are " + Arrays.toString(events) + ".");
+ assertEquals(events[2], "complete", "Attribute oncomplete doesn't work, found events are " + Arrays.toString(events) + ".");
+ }
+
+ @Test
+ public void testExecute() {
+ // attributes
+ getAttributes().set(DataScrollerAttributes.execute, "executeChecker");
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check
+ JQueryLocator logItems = jq("ul.phases-list li:eq({0})");
+ for (int i = 0; i < 6; i++) {
+ if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) {
+ return;
+ }
+ }
+ fail("Attribute execute does not work");
+ }
+
+ @Test
+ public void testFastControls() {
+ // init - show
+ assertTrue(getScroller().isFastForwardButtonPresent(), "The fast forward button should be present.");
+ assertTrue(getScroller().isFastRewindButtonPresent(), "The fast rewind button should be present.");
+ // hide
+ getAttributes().set(DataScrollerAttributes.fastControls, "hide");
+ assertFalse(getScroller().isFastForwardButtonPresent(), "The fast forward button shouldn't be present.");
+ assertFalse(getScroller().isFastRewindButtonPresent(), "The fast rewind button shouldn't be present.");
+ }
+
+ @Test
+ public void testFastStep() {
+ getAttributes().set(DataScrollerAttributes.fastStep, 3);
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 4, "After clicking on the fast forward button, the current page doesn't match.");
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastRewind();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 1, "After clicking on the fast rewind button, the current page doesn't match.");
+ }
+
+ @Test
+ public void testLastPageMode() {
+ retrieveRequestTime.initializeValue();
+ getScroller().clickLastPageButton();
+ waitGui.waitForChange(retrieveRequestTime);
+ // init - short
+ assertEquals(getNumberOfRows(), 5, "Attribute lastPageMode doesn't work. The number of rows doesn't match, when the value is set to <short>");
+ // full
+ getAttributes().set(DataScrollerAttributes.lastPageMode, "full");
+ assertEquals(getNumberOfRows(), 9, "Attribute lastPageMode doesn't work. The number of rows doesn't match, when the value is set to <full>");
+ }
+
+ @Test
+ public void testLimitRender() {
+ // false
+ getAttributes().set(DataScrollerAttributes.limitRender, false);
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui
+ .failWith("The panel hasn't been rerendered despite of the fact the attribute 'limitRender' is set to <false>.")
+ .waitForChange(retrieveRequestTime);
+ // true
+ getAttributes().set(DataScrollerAttributes.limitRender, false);
+ String timeBefore = retrieveRequestTime.getValue();
+ getScroller().clickFastRewind();
+ waitModel
+ .until(new SeleniumCondition() {
+ @Override
+ public boolean isTrue() {
+ return getScroller().getCurrentPage() == 1;
+ }
+ });
+ String timeAfter = retrieveRequestTime.getValue();
+ assertEquals(timeAfter, timeBefore, "The panel hasn been rerendered despite of the fact the attribute 'limitRender' is set to <true>.");
+
+ }
+
+ @Test
+ public void testMaxPages() {
+ // init - 10
+ assertEquals(getScroller().getCountOfVisiblePages(), 6 /* it means - all pages */, "The number of visible pages doesn't match.");
+ // smaller number
+ getAttributes().set(DataScrollerAttributes.maxPages, 3);
+ assertEquals(getScroller().getCountOfVisiblePages(), 3, "The number of visible pages doesn't match.");
+ }
+
+ @Test
+ public void testPage() {
+ getAttributes().set(DataScrollerAttributes.page, 4);
+ assertEquals(getScroller().getCurrentPage(), 4, "The number of current page doesn't match.");
+ }
+
+ @Test
+ public void testRendered() {
+ getAttributes().set(DataScrollerAttributes.rendered, false);
+ assertFalse(getScroller().isPresent(), "The data scroller shouldn't be present.");
+ }
+
+ @Test
+ public void testRenderIfSinglePage() {
+ // prepare
+ getTableAttributes().set(DataTableAttributes.rows, 200);
+ // init - true
+ assertTrue(getScroller().isPresent(), "The attribute 'renderIfSinglePage' doesn't work.");
+ // false
+ getAttributes().set(DataScrollerAttributes.renderIfSinglePage, false);
+ assertFalse(getScroller().isPresent(), "The attribute 'renderIfSinglePage' doesn't work.");
+ }
+
+ @Test
+ public void testStatus() {
+ // prepare
+ getAttributes().set(DataScrollerAttributes.status, "statusChecker");
+ String statusBefore = selenium.getText(statusChecker);
+ // action
+ retrieveRequestTime.initializeValue();
+ getScroller().clickFastForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ // check
+ String statusAfter = selenium.getText(statusChecker);
+ assertNotEquals(statusAfter, statusBefore, "The status attribute doesn't work.");
+ }
+
+ @Test
+ public void testStepControls() {
+ // init - show
+ assertTrue(getScroller().isNextButtonPresent(), "The next button should be present.");
+ assertTrue(getScroller().isPreviousButtonPresent(), "The previous button should be present.");
+ // hide
+ getAttributes().set(DataScrollerAttributes.stepControls, "hide");
+ assertFalse(getScroller().isNextButtonPresent(), "The next button shouldn't be present.");
+ assertFalse(getScroller().isPreviousButtonPresent(), "The previous button shouldn't be present.");
+ }
+
+ /**
+ * Test simple step forward and step back buttons on dataScroller
+ */
+ @Test
+ public void testStep() {
+ retrieveRequestTime.initializeValue();
+ // 2 times move forward by basic step
+ getScroller().clickStepForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 2, "After clicking on the step next button, the current page doesn't match.");
+ getScroller().clickStepForward();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 3, "After clicking on the step next button, the current page doesn't match.");
+ // then move backward by basic step back
+ retrieveRequestTime.initializeValue();
+ getScroller().clickStepPrevious();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 2, "After clicking on the step previous button, the current page doesn't match.");
+ getScroller().clickStepPrevious();
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 1, "After clicking on the step previous button, the current page doesn't match.");
+ }
+
+ /**
+ * Test buttons with scroller JS API binding
+ */
+ @Test
+ public void testJsApi() {
+ verifyJsApi(1);
+ verifyJsApi(2);
+ }
+
+ /**
+ * Test buttons with scroller JS API binding, using switchToPage operation
+ */
+ @Test
+ public void testJsApiStp() {
+ verifyJsApiStp(1);
+ verifyJsApiStp(2);
+ }
+
+ @Test
+ public void testStyle() {
+ super.testStyle(getScroller());
+ }
+
+ @Test
+ public void testStyleClass() {
+ super.testStyleClass(getScroller());
+ }
+
+ @Test
+ public void testTitle() {
+ super.testTitle(getScroller());
+ }
+
+ private Attributes<DataScrollerAttributes> getAttributes() {
+ return attributes;
+ }
+
+ private int getNumberOfRows() {
+ return selenium.getCount(pjq("*.rf-dt tbody tr.rf-dt-r"));
+ }
+
+ private DataScroller getScroller() {
+ return scroller;
+ }
+
+ private Attributes<DataTableAttributes> getTableAttributes() {
+ return tableAttributes;
+ }
+
+ private void verifyJsApi(int scrollerNo) {
+ retrieveRequestTime.initializeValue();
+ getScroller().clickJsApiLast(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 6,
+ "After clicking on the step last button (JS API), the current page doesn't match.");
+
+ getScroller().clickJsApiFirst(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 1,
+ "After clicking on the step first button (JS API), the current page doesn't match.");
+
+ getScroller().clickJsApiNext(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 2,
+ "After clicking on the step next button (JS API), the current page doesn't match.");
+
+ getScroller().clickJsApiNext(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 3,
+ "After clicking on the step next button (JS API), the current page doesn't match.");
+ }
+
+ private void verifyJsApiStp(int scrollerNo) {
+ retrieveRequestTime.initializeValue();
+ getScroller().clickJsApiStpLast(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 6,
+ "After clicking on the step last button (JS API), the current page doesn't match.");
+
+ getScroller().clickJsApiStpFirst(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 1,
+ "After clicking on the step first button (JS API), the current page doesn't match.");
+
+ getScroller().clickJsApiStpNext(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 2,
+ "After clicking on the step next button (JS API), the current page doesn't match.");
+
+ getScroller().clickJsApiStpNext(scrollerNo);
+ waitGui.waitForChange(retrieveRequestTime);
+ assertEquals(getScroller().getCurrentPage(), 3,
+ "After clicking on the step next button (JS API), the current page doesn't match.");
+ }
+}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataTable/TestDataTableSortingUsingComponentControl.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataTable/TestDataTableSortingUsingComponentControl.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataTable/TestDataTableSortingUsingComponentControl.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -35,6 +35,7 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
+@IssueTracking("https://issues.jboss.org/browse/RF-11359")
public class TestDataTableSortingUsingComponentControl extends DataTableSortingTest {
@Override
@@ -47,19 +48,19 @@
model = new DataTable(pjq("table.rf-dt[id$=richDataTable]"));
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingle() {
super.testSortModeSingle();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingleReverse() {
super.testSortModeSingleReverse();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingleDoesntRememberOrder() {
super.testSortModeSingleDoesntRememberOrder();
@@ -73,25 +74,25 @@
super.testSortModeSingleRerenderAll();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingleFullPageRefresh() {
super.testSortModeSingleFullPageRefresh();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMulti() {
super.testSortModeMulti();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMultiReverse() {
super.testSortModeMultiReverse();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMultiReplacingOldOccurences() {
super.testSortModeMultiReplacingOldOccurences();
@@ -105,7 +106,7 @@
super.testSortModeMultiRerenderAll();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMultiFullPageRefresh() {
super.testSortModeMultiFullPageRefresh();
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -111,7 +111,8 @@
assertTrue(selenium.belongsClass(fileMenu, "rf-ddm-dis"), "Menu should have class \"rf-ddm-dis\".");
assertTrue(selenium.isElementPresent(icon), "Icon should be present on the page.");
assertFalse(selenium.isElementPresent(fileMenuLabel), "File menu should have a disabled label.");
- assertTrue(selenium.isElementPresent(pjq("div[id$=menu1] div.rf-ddm-lbl-dis")), "File menu should have a disabled label.");
+ assertTrue(selenium.isElementPresent(pjq("div[id$=menu1] div.rf-ddm-lbl-dis")),
+ "File menu should have a disabled label.");
}
@Test
@@ -183,10 +184,12 @@
selenium.mouseOver(fileMenuLabel);
selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()"));
- waitGui.interval(2000).withDelay(true).failWith("Menu group was not opened.").until(isDisplayed.locator(groupList));
+ waitGui.interval(2000).withDelay(true).failWith("Menu group was not opened.")
+ .until(isDisplayed.locator(groupList));
selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseleave()"));
- waitGui.failWith("Attribute ongrouphide does not work correctly").until(new EventFiredCondition(new Event("grouphide")));
+ waitGui.failWith("Attribute ongrouphide does not work correctly").until(
+ new EventFiredCondition(new Event("grouphide")));
}
@Test
@@ -198,7 +201,8 @@
selenium.getEval(new JavaScript("window.jQuery('" + group.getRawLocator() + "').mouseenter()"));
waitGui.interval(2000).withDelay(true).failWith("Menu group was not opened.").until(isDisplayed.locator(group));
- waitGui.failWith("Attribute ongroupshow does not work correctly").until(new EventFiredCondition(new Event("groupshow")));
+ waitGui.failWith("Attribute ongroupshow does not work correctly").until(
+ new EventFiredCondition(new Event("groupshow")));
}
@Test
@@ -269,15 +273,16 @@
@Test
public void testPopupWidth() {
- assertEquals(selenium.getStyle(fileMenuList, CssProperty.WIDTH), "250px", "Default width of menu");
+ final CssProperty minWidth = new CssProperty("min-width");
+ assertEquals(selenium.getStyle(fileMenuList, minWidth), "250px", "Default width of menu");
selenium.type(pjq("input[id$=popupWidthInput]"), "150");
selenium.waitForPageToLoad();
- assertEquals(selenium.getStyle(fileMenuList, CssProperty.WIDTH), "150px", "Width of menu");
+ assertEquals(selenium.getStyle(fileMenuList, minWidth), "150px", "Width of menu");
selenium.type(pjq("input[id$=popupWidthInput]"), "423");
selenium.waitForPageToLoad();
- assertEquals(selenium.getStyle(fileMenuList, CssProperty.WIDTH), "423px", "Width of menu");
+ assertEquals(selenium.getStyle(fileMenuList, minWidth), "423px", "Width of menu");
}
@Test
@@ -296,7 +301,8 @@
selenium.mouseOver(fileMenuLabel);
assertFalse(selenium.isDisplayed(fileMenuList), "Menu should not be expanded.");
- waitGui.interval(3000).withDelay(true).failWith("Menu was not opened.").until(isDisplayed.locator(fileMenuList));
+ waitGui.interval(3000).withDelay(true).failWith("Menu was not opened.")
+ .until(isDisplayed.locator(fileMenuList));
}
@Test
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/EditorAttributes.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/EditorAttributes.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/EditorAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -35,11 +35,16 @@
immediate,
lang,
height,
+ onblur,
+ onchange,
+ ondirty,
+ onfocus,
oninit,
readonly,
rendered,
required,
requiredMessage,
+ skin,
style,
styleClass,
toolbar,
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -5,14 +5,26 @@
import static java.text.MessageFormat.format;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.editorAttributes;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.immediate;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.lang;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.readonly;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.rendered;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.required;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.requiredMessage;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.skin;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.styleClass;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.title;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.toolbar;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.value;
+import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.width;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.editorAttributes;
-import static org.richfaces.tests.metamer.ftest.richEditor.EditorAttributes.*;
import java.net.URL;
+import org.jboss.test.selenium.css.CssProperty;
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.encapsulated.FrameLocator;
import org.jboss.test.selenium.locator.Attribute;
@@ -43,8 +55,7 @@
private JQueryLocator validationMsgLoc = pjq("span.rf-msgs-sum");
private JQueryLocator editorToolbarGroup = jq("span.cke_toolbar");
-
- private Attribute styleAttribute = new Attribute("style");
+
private Attribute langAttribute = new Attribute("lang");
public enum toolbarGroup {
@@ -143,6 +154,19 @@
return currentText;
}
+ /**
+ * Simplified method to verify skin influence editor's class attribute.
+ * Choosen skin should be present as cke_skin_{@skinName} class
+ * in editor's container @@class attribute
+ * @param skinName
+ */
+ private void verifySkin(String skinName) {
+ editorAttributes.set(skin, skinName);
+ String editorClass = selenium.getAttribute(editor.getAttribute(new Attribute("class")));
+ assertTrue(editorClass.contains("cke_skin_" + skinName),
+ "Seems that skin '" + skinName + "' didn't influence editor's @class attribute!");
+ }
+
@Test
public void testValueChangeListener(){
verifyValueChangeListener(hSubmit);
@@ -157,9 +181,10 @@
editorAttributes.set(EditorAttributes.height, height);
// height style is set for area used as editor canvas (not for whole editor component)
- String style = selenium.getAttribute(
- editor.getDescendant(jq("table.cke_editor tr:eq(1) td")).getAttribute(styleAttribute));
-
+ // String style = selenium.getAttribute(
+ // editor.getDescendant(jq("table.cke_editor tr:eq(1) td")).getAttribute(styleAttribute));
+ String style = selenium.getStyle(
+ editor.getDescendant(jq("table.cke_editor tr:eq(1) td")), CssProperty.HEIGHT);
assertTrue(style != null && style.contains(height));
}
@@ -200,6 +225,11 @@
}
@Test
+ public void testOnDirty() {
+ testFireEvent(new Event("dirty"), editorTextArea);
+ }
+
+ @Test
public void testOnChange() {
testFireEvent(Event.CHANGE, editorTextArea);
}
@@ -263,6 +293,14 @@
}
@Test
+ public void testSkin() {
+ verifySkin("kama");
+ verifySkin("office2003");
+ verifySkin("richfaces");
+ verifySkin("v2");
+ }
+
+ @Test
public void testStyle() {
final AttributeLocator<?> styleAttr = editor.getAttribute(Attribute.STYLE);
@@ -353,7 +391,7 @@
String STYLE_WIDTH = "345px";
editorAttributes.set(width, STYLE_WIDTH);
- String styleAttr = selenium.getAttribute(editor.getAttribute(styleAttribute));
+ String styleAttr = selenium.getStyle(editor, CssProperty.WIDTH);
assertTrue(styleAttr != null && styleAttr.contains(STYLE_WIDTH), "Style attribute should contain width value");
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSortingUsingComponentControl.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSortingUsingComponentControl.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestExtendedDataTableSortingUsingComponentControl.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -35,6 +35,7 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
+@IssueTracking("https://issues.jboss.org/browse/RF-11359")
public class TestExtendedDataTableSortingUsingComponentControl extends DataTableSortingTest {
@Override
@@ -47,19 +48,19 @@
model = new ExtendedDataTable(pjq("div.rf-edt[id$=richEDT]"));
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingle() {
super.testSortModeSingle();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingleReverse() {
super.testSortModeSingleReverse();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingleDoesntRememberOrder() {
super.testSortModeSingleDoesntRememberOrder();
@@ -73,25 +74,25 @@
super.testSortModeSingleRerenderAll();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeSingleFullPageRefresh() {
super.testSortModeSingleFullPageRefresh();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMulti() {
super.testSortModeMulti();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMultiReverse() {
super.testSortModeMultiReverse();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMultiReplacingOldOccurences() {
super.testSortModeMultiReplacingOldOccurences();
@@ -105,7 +106,7 @@
super.testSortModeMultiRerenderAll();
}
- @Test
+ @Test(groups = { "4.Future" })
@Override
public void testSortModeMultiFullPageRefresh() {
super.testSortModeMultiFullPageRefresh();
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFunctions/TestClientFunctions.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -57,7 +57,7 @@
@Test
@Templates(exclude = { "a4jRepeat", "richCollapsibleSubTable", "richDataGrid", "richDataTable",
- "richExtendedDataTable", "richList" })
+ "richExtendedDataTable", "richList", "hDataTable", "uiRepeat" })
public void testFunctions() {
String clientId = selenium.getText(clientIdOutput);
assertNotNull(clientId, "Function clientId() doesn't work.");
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -178,6 +178,7 @@
selenium.mouseDown(left);
assertTrue(selenium.belongsClass(left, value), "decreaseSelectedClass does not work");
+ waitFor(500); // FIXME workaround
}
@Test
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderFAjax.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -26,6 +26,7 @@
import java.net.URL;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.Templates;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -90,8 +91,15 @@
@Test
@Override
- @IssueTracking("https://issues.jboss.org/browse/RF-11314")
+ @Templates(exclude = { "richAccordion", "richPopupPanel" })
public void testClick() {
super.testClick();
}
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking("https://issues.jboss.org/browse/RF-11314")
+ @Templates(value = { "richAccordion", "richPopupPanel" })
+ public void testClickInAccordionPopupPanel() {
+ super.testClick();
+ }
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderWithJSR303.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderWithJSR303.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderWithJSR303.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -178,6 +178,7 @@
}
@Test
+ @Templates(exclude = { "richPopupPanel" })
public void testSlideToNegative() {
setAllCorrect();
@@ -185,6 +186,16 @@
waitGui.until(TextContainsCondition.getInstance().locator(msgFormat.format(ID.CUSTOM.val())).text(MSG_CUSTOM));
}
+ @Test(groups = { "4.Future" })
+ @IssueTracking("https://issues.jboss.org/browse/RF-11314")
+ @Templates(value = { "richPopupPanel" })
+ public void testSlideToNegativeInPopupPanel() {
+ setAllCorrect();
+
+ selenium.mouseDownAt(sliderFormat.format(ID.CUSTOM.val()), new Point(POSITION.LESS_THAN_ZERO.val(), 0));
+ waitGui.until(TextContainsCondition.getInstance().locator(msgFormat.format(ID.CUSTOM.val())).text(MSG_CUSTOM));
+ }
+
@Test
@Templates(exclude = { "a4jRegion" })
public void testAllCorrect() {
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestScroller.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestScroller.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestScroller.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -44,6 +44,8 @@
int lastPage = dataScroller.obtainLastPage();
dataScroller.setLastPage(lastPage);
paginationTester.initializeTestedPages(lastPage);
+
+ dataScroller.setFastStep(1);
}
@Test
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -65,12 +65,12 @@
/**
* error message locator
*/
- protected final JQueryLocator notifyError = jq("div.rf-ntf-error");
+ protected final JQueryLocator notifyError = jq("div.rf-ntf-err");
/**
* fatal message locator
*/
- protected final JQueryLocator notifyFatal = jq("div.rf-ntf-fatal");
+ protected final JQueryLocator notifyFatal = jq("div.rf-ntf-ftl");
/**
* history of notifies and notify messages
@@ -90,12 +90,12 @@
/**
* info message locator
*/
- protected final JQueryLocator notifyInfo = jq("div.rf-ntf-info");
+ protected final JQueryLocator notifyInfo = jq("div.rf-ntf-inf");
/**
* warn message locator
*/
- protected final JQueryLocator notifyWarn = jq("div.rf-ntf-warn");
+ protected final JQueryLocator notifyWarn = jq("div.rf-ntf-wrn");
/**
* It closes a message defined by the given locator
@@ -151,7 +151,7 @@
* @return the detail locator
*/
protected JQueryLocator getDetail(JQueryLocator message) {
- return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-txt");
+ return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-det");
}
/**
@@ -180,7 +180,7 @@
* @return the summary locator
*/
protected JQueryLocator getSummary(JQueryLocator message) {
- return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-tl");
+ return jq(notify.getRawLocator() + " > div.rf-ntf-cnt > div.rf-ntf-sum");
}
/**
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -103,7 +103,9 @@
showButton,
sourceCaption,
style,
- styleClass,
+ styleClass,
+ switchByClick,
+ switchByDblClick,
targetCaption,
upText,
upTopText,
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -59,13 +59,13 @@
private JQueryLocator a4jSubmit = pjq("input[id$=a4jButton]");
private JQueryLocator pickListTop = pjq("div.rf-pick[id$=pickList]");
- private JQueryLocator pickListSource = pjq("div.rf-pick-source div.rf-pick-lst-dcrtn"); // this locator works for
+ private JQueryLocator pickListSource = pjq("div.rf-pick-src div.rf-pick-lst-dcrtn"); // this locator works for
// sourcemouseover event
- private JQueryLocator pickListTarget = pjq("div.rf-pick-target div.rf-pick-lst-dcrtn");
+ private JQueryLocator pickListTarget = pjq("div.rf-pick-tgt div.rf-pick-lst-dcrtn");
private JQueryLocator output = pjq("span[id$=output]");
private JQueryLocator pickListMsgBox = pjq("span.rf-msg-err[id$=pickList] > span.rf-msg-det");
- private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTargetList] > div.rf-pick-target-caption");
- private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSourceList] > div.rf-pick-source-caption");
+ private JQueryLocator targetCaptionLocator = pjq("div[id$=pickListTargetList] > div.rf-pick-tgt-cptn");
+ private JQueryLocator sourceCaptionLocator = pjq("div[id$=pickListSourceList] > div.rf-pick-src-cptn");
private JQueryLocator pickListCtrl = pjq("div.rf-pick-lst-scrl");
private JQueryLocator pickListOrderingControlsContainer = pjq("table[id$=pickListTarget] td:eq(1)");
@@ -1020,5 +1020,33 @@
+ classAfterSelect);
}
+
+ /**
+ * Verify switchByClick attribute
+ */
+ @Test
+ public void testSwitchByClick() {
+ String itemLabel = "Colorado";
+
+ pickListAttributes.set(switchByClick, Boolean.TRUE);
+ selenium.click(pickListSrcItemByText.format(itemLabel));
+
+ // verify that item "added" to target list really appears in target (staging) container.
+ waitModel.until(elementPresent.locator(pickListTrgtItemStageByText.format(itemLabel)));
+ }
+
+ /**
+ * Verify switchByDblClick attribute
+ */
+ @Test
+ public void testSwitchByDblClick() {
+ String itemLabel = "Delaware";
+
+ pickListAttributes.set(switchByDblClick, Boolean.TRUE);
+ selenium.doubleClick(pickListSrcItemByText.format(itemLabel));
+
+ // verify that item "added" to target list really appears in target (staging) container.
+ waitModel.until(elementPresent.locator(pickListTrgtItemStageByText.format(itemLabel)));
+ }
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -74,7 +74,7 @@
return buildUrl(contextPath, "faces/components/richTab/simple.xhtml");
}
- @Test
+ @Test(groups = { "4.2" })
@IssueTracking("https://issues.jboss.org/browse/RF-11427")
public void testAction() {
retrieveRequestTime.initializeValue();
@@ -85,12 +85,11 @@
selenium.click(pjq("input[id$=prevTabButton]"));
waitAjax.waitForChange(retrieveRequestTime);
- waitGui.failWith(
- "Expected <" + ACTION_LOG + ">, found <" + selenium.getText(PHASE_FORMAT.format(6)) + ">").until(
- textEquals.locator(PHASE_FORMAT.format(6)).text(ACTION_LOG));
+ waitGui.failWith("Expected <" + ACTION_LOG + ">, found <" + selenium.getText(PHASE_FORMAT.format(6)) + ">")
+ .until(textEquals.locator(PHASE_FORMAT.format(6)).text(ACTION_LOG));
}
-
- @Test
+
+ @Test(groups = { "4.2" })
@IssueTracking("https://issues.jboss.org/browse/RF-11427")
public void testActionListener() {
retrieveRequestTime.initializeValue();
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -106,14 +106,15 @@
// tab switch work at least with "client" option
selenium.click(switchTypeFormat.format(SWITCH_TYPE_CLIENT));
+ selenium.waitForPageToLoad();
System.out.println("testSwitchTypeAjax: tab count: " + selenium.getCount(tabsCount));
-
- for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - 1; i >= STATIC_TAB_COUNT; i--) {
- selenium.click(inactiveHeadersFormat.format(i + 1));
- waitGui.failWith("Tab " + (i + 1) + " doesn't display correct content.").until(
- textEquals.text("Content of dynamicaly created tab" + (i + 1))
- .locator(itemContentsFormat.format(i + 1)));
+
+ for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT; i > STATIC_TAB_COUNT; i--) {
+ selenium.click(inactiveHeadersFormat.format(i));
+ waitGui.failWith("Tab " + i + " doesn't display correct content.").until(
+ textEquals.text("Content of dynamicaly created tab" + i)
+ .locator(itemContentsFormat.format(i)));
}
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -227,6 +227,16 @@
}
@Test
+ public void testStyle() {
+ super.testStyle(toolbar);
+ }
+
+ @Test
+ public void testStyleClass() {
+ super.testStyleClass(toolbar);
+ }
+
+ @Test
public void testWidth() {
AttributeLocator attr = toolbar.getAttribute(Attribute.WIDTH);
assertTrue(selenium.isAttributePresent(attr), "Attribute width should be present.");
Copied: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java (from rev 23019, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java)
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java (rev 0)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/AbstractTestTree.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010-2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richTree;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+
+import java.net.URL;
+
+import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+
+/**
+ * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a>
+ */
+public class AbstractTestTree extends AbstractMetamerTest {
+
+ @Inject
+ @Use(strings = {"simpleSwingTreeNode", "simpleRichFacesTreeNode", "simpleRichFacesTreeDataModel"})
+ private String sample;
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richTree/" + sample + ".xhtml");
+ }
+
+}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreePhases.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreePhases.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreePhases.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -21,14 +21,10 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richTree;
-import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.treeAttributes;
-import java.net.URL;
-
import javax.faces.event.PhaseId;
-import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.BeforeMethod;
@@ -38,18 +34,13 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-public class TestTreePhases extends AbstractMetamerTest {
+public class TestTreePhases extends AbstractTestTree {
@Inject
@Use(booleans = { true, false })
Boolean immediate;
private TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]"));
- @Override
- public URL getTestUrl() {
- return buildUrl(contextPath, "faces/components/richTree/simple.xhtml");
- }
-
@BeforeMethod
public void initialize() {
treeAttributes.set(TreeAttributes.immediate, immediate);
@@ -57,8 +48,8 @@
@Test
public void testPhasesSelection() {
- tree.getNode(2).expand();
- tree.getNode(2).getNode(3).select();
+ tree.getNode(4).expand();
+ tree.getNode(4).getNode(3).select();
phaseInfo.assertPhases(PhaseId.ANY_PHASE);
phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "selection change listener invoked");
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSelection.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -23,13 +23,11 @@
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
-import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.treeAttributes;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.treeAttributes;
-import java.net.URL;
import java.util.Arrays;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,7 +36,6 @@
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.utils.text.SimplifiedFormat;
import org.richfaces.component.SwitchType;
-import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.BeforeMethod;
@@ -49,10 +46,10 @@
* @version $Revision$
*/
@Use(field = "selectionPaths", value = "")
-public class TestTreeSelection extends AbstractMetamerTest {
+public class TestTreeSelection extends AbstractTestTree {
- protected Integer[][] selectionPaths = new Integer[][] {{2, 3}, {3, 4}, {4, 1, 1}, {4}, {4, 1},
- {1, 5 }, {2, 3, 3 } };
+ protected Integer[][] selectionPaths = new Integer[][] {{4, 3}, {1, 4}, {2, 1, 1}, {2}, {2, 1},
+ {3, 5 }, {4, 10, 3 } };
protected TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]"));
protected TreeNodeModel treeNode;
@@ -69,12 +66,6 @@
JQueryLocator newSelection = jq("span[id$=selectionEventNewSelection]");
JQueryLocator oldSelection = jq("span[id$=selectionEventOldSelection]");
-
- @Override
- public URL getTestUrl() {
- return buildUrl(contextPath, "faces/components/richTree/simple.xhtml");
- }
-
@BeforeMethod
public void testInitialize() {
treeAttributes.set(TreeAttributes.selectionType, selectionType);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -36,11 +36,7 @@
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guard;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr;
import static org.jboss.test.selenium.locator.LocatorFactory.jq;
-import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format;
-import static org.richfaces.tests.metamer.ftest.BasicAttributes.handleClass;
-import static org.richfaces.tests.metamer.ftest.BasicAttributes.iconClass;
-import static org.richfaces.tests.metamer.ftest.BasicAttributes.labelClass;
import static org.richfaces.tests.metamer.ftest.BasicAttributes.nodeClass;
import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.treeAttributes;
import static org.richfaces.tests.metamer.ftest.richTree.TreeAttributes.data;
@@ -59,8 +55,6 @@
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
-import java.net.URL;
-
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.locator.Attribute;
@@ -71,9 +65,9 @@
import org.jboss.test.selenium.request.RequestType;
import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
import org.richfaces.component.SwitchType;
-import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
+import org.richfaces.tests.metamer.ftest.annotations.Templates;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
@@ -81,7 +75,7 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-public class TestTreeSimple extends AbstractMetamerTest {
+public class TestTreeSimple extends AbstractTestTree {
private static final String IMAGE_URL = "/resources/images/loading.gif";
@@ -109,11 +103,6 @@
JQueryLocator expandAll = jq("input:submit[id$=expandAll]");
JQueryLocator loadingFacet = jq("input:checkbox[id$=loadingFacet]");
- @Override
- public URL getTestUrl() {
- return buildUrl(contextPath, "faces/components/richTree/simple.xhtml");
- }
-
@Test
public void testData() {
treeAttributes.set(data, "RichFaces 4");
@@ -254,7 +243,7 @@
}
@Test
- @IssueTracking("https://issues.jboss.org/browse/RF-11319")
+ @Templates(exclude = "a4jRegion")
public void testSelectionClientSideEvents() {
String[] events = new String[] { "beforeselectionchange", "begin", "beforedomupdate", "complete",
"selectionchange" };
@@ -263,6 +252,17 @@
testRequestEventsAfter(events);
}
+ @Test(groups = { "4.Future" })
+ @IssueTracking("https://issues.jboss.org/browse/RF-11319")
+ @Templates(value = "a4jRegion")
+ public void testSelectionClientSideEventsInRegion() {
+ String[] events = new String[] { "beforeselectionchange", "begin", "beforedomupdate", "complete",
+ "selectionchange" };
+ testRequestEventsBefore(events);
+ tree.getNode(1).select();
+ testRequestEventsAfter(events);
+ }
+
@Test(groups = "4.Future")
@IssueTracking("https://issues.jboss.org/browse/RF-10265")
public void testToggleClientSideEvents() {
@@ -359,8 +359,8 @@
XHRHalter xhrHalter = null;
- for (int index : new int[] { 2, 3 }) {
- treeNode = (index == 2) ? tree.getNode(index) : treeNode.getNode(index);
+ for (int index : new int[] { 1, 2 }) {
+ treeNode = (index == 1) ? tree.getNode(index) : treeNode.getNode(index);
assertFalse(treeNode.getHandleLoading().isVisible());
assertTrue(treeNode.getHandle().isCollapsed());
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeToggling.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -21,18 +21,14 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.richTree;
-import static org.jboss.test.selenium.locator.LocatorFactory.jq;
-import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.treeAttributes;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
-import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.treeAttributes;
-import java.net.URL;
import java.util.Deque;
import java.util.LinkedList;
import org.richfaces.component.SwitchType;
-import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.BeforeMethod;
@@ -42,11 +38,11 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-public class TestTreeToggling extends AbstractMetamerTest {
+public class TestTreeToggling extends AbstractTestTree {
private static final int TOP_LEVEL_NODES = 4;
- protected int[][] paths = new int[][] {{3, 2, 1 }, {2, 4, 1 }};
+ protected int[][] paths = new int[][] {{1, 2, 1 }, {4, 4, 1 }};
@Inject
@Use(enumeration = true)
@@ -55,11 +51,6 @@
private TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]"));
private TreeNodeModel treeNode;
- @Override
- public URL getTestUrl() {
- return buildUrl(contextPath, "faces/components/richTree/simple.xhtml");
- }
-
@BeforeMethod
public void verifyInitialState() {
treeAttributes.set(TreeAttributes.toggleType, toggleType);
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -104,7 +104,7 @@
@Override
public URL getTestUrl() {
- return buildUrl(contextPath, "faces/components/richTree/simple.xhtml");
+ return buildUrl(contextPath, "faces/components/richTree/simpleSwingTreeNode.xhtml");
}
@Test
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/AbstractValidatorsTest.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/AbstractValidatorsTest.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/AbstractValidatorsTest.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -28,53 +28,61 @@
import org.jboss.test.selenium.locator.JQueryLocator;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
-import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.BeforeClass;
/**
* Abstract class with selenium test for validators
- *
+ *
* @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
* @version $Revision$
*/
public abstract class AbstractValidatorsTest extends AbstractMetamerTest {
-
-
+
private enum ID {
- /** Boolean, true */ assertTrue,
- /** Boolean false */ assertFalse,
- /** Decimal from 2.5 to 9.688 */ decimalMinMax,
- /** Decimal 3 digits and 4 fract */ digits ,
- /** Integer max 10 */ max,
- /** Integer min 2 */ min,
- /** Integer from 2 to 10 */ minMax,
- /** Text, not empty */ notEmpty,
- /** Text, not null */ notNull,
- /** Text, pattern '[a-z].*' */ pattern,
- /** custom validator */ custom,
- /** custom regExp validator */ regexp,
- /** date past */ past,
- /** date future */ future,
- /** String size from 2 to 4 */ stringSize,
- /** Selection size */ size
+ /** Boolean, true */
+ assertTrue,
+ /** Boolean false */
+ assertFalse,
+ /** Decimal from 2.5 to 9.688 */
+ decimalMinMax,
+ /** Decimal 3 digits and 4 fract */
+ digits,
+ /** Integer max 10 */
+ max,
+ /** Integer min 2 */
+ min,
+ /** Integer from 2 to 10 */
+ minMax,
+ /** Text, not empty */
+ notEmpty,
+ /** Text, not null */
+ notNull,
+ /** Text, pattern '[a-z].*' */
+ pattern,
+ /** custom validator */
+ custom,
+ /** custom regExp validator */
+ regexp,
+ /** date past */
+ past,
+ /** date future */
+ future,
+ /** String size from 2 to 4 */
+ stringSize,
+ /** Selection size */
+ size
}
-
+
private Map<ID, String> messages = new HashMap<AbstractValidatorsTest.ID, String>();
-
private Map<ID, Object> wrongValue = new HashMap<AbstractValidatorsTest.ID, Object>();
-
private JQueryLocator inputFormat = pjq("input[id$=:{0}]");
-
private JQueryLocator setWrongBtn = pjq("input[id$=setWrongValuesButton]");
private JQueryLocator setCorrectBtn = pjq("input[id$=setCorrectValuesButton]");
-
private JQueryLocator hCommandBtn = pjq("input[id$=hButton]");
private JQueryLocator a4jCommandBtn = pjq("input[id$=a4jButton]");
-
private JQueryLocator selectionItem = pjq("table[id$=:size] tr > td > input[value={0}]");
-
private JQueryLocator msgFormat = pjq("span[id$={0}Msg] span.rf-msg-det");
-
+
@BeforeClass
public void init() {
messages.put(ID.assertTrue, "must be true");
@@ -92,8 +100,8 @@
messages.put(ID.past, "must be in the past");
messages.put(ID.future, "must be in the future");
messages.put(ID.stringSize, "size must be between 2 and 4");
- messages.put(ID.size, "???????"); // RF-11035
-
+ messages.put(ID.size, "size must be between 2 and 4"); // RF-11035
+
wrongValue.put(ID.assertTrue, Boolean.FALSE);
wrongValue.put(ID.assertFalse, Boolean.TRUE);
wrongValue.put(ID.decimalMinMax, "10.688");
@@ -106,21 +114,21 @@
wrongValue.put(ID.pattern, "@@@");
wrongValue.put(ID.custom, "@@@");
wrongValue.put(ID.regexp, "@@@");
-
+
SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy");
long offset = 24 * 60 * 60 * 1000; // more than 24 hours to get correct past date
wrongValue.put(ID.past, sdf.format(new Date(System.currentTimeMillis() + offset)));
wrongValue.put(ID.future, sdf.format(new Date(System.currentTimeMillis() - offset)));
-
+
wrongValue.put(ID.stringSize, "JSF 2");
wrongValue.put(ID.size, "F"); // RF-11035
}
public void verifyAllWrongWithAjaxSubmit() {
selenium.click(setWrongBtn);
-
+
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.assertTrue)).text(messages.get(ID.assertTrue)));
waitGui.until(textEquals.locator(msgFormat.format(ID.assertFalse)).text(messages.get(ID.assertFalse)));
waitGui.until(textEquals.locator(msgFormat.format(ID.decimalMinMax)).text(messages.get(ID.decimalMinMax)));
@@ -132,7 +140,7 @@
waitGui.until(textEquals.locator(msgFormat.format(ID.notNull)).text(messages.get(ID.notNull)));
waitGui.until(textEquals.locator(msgFormat.format(ID.pattern)).text(messages.get(ID.pattern)));
waitGui.until(textEquals.locator(msgFormat.format(ID.custom)).text(messages.get(ID.custom)));
-
+
if (selenium.isElementPresent(inputFormat.format(ID.regexp))) {
// regExp validator isn't present in JSR303 validation
waitGui.until(textEquals.locator(msgFormat.format(ID.regexp)).text(messages.get(ID.regexp)));
@@ -143,13 +151,12 @@
// TODO JJa 2011-06-06: remove comment when fixed issue with manyCheckbox validation
// waitGui.until(textEquals.locator(msgFormat.format(ID.size)).text(messages.get(ID.size)));
}
-
- @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
+
public void verifyAllWrongWithJSFSubmit() {
- selenium.click(setCorrectBtn);
-
+ selenium.click(setWrongBtn);
+
selenium.click(hCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.assertTrue)).text(messages.get(ID.assertTrue)));
waitGui.until(textEquals.locator(msgFormat.format(ID.assertFalse)).text(messages.get(ID.assertFalse)));
waitGui.until(textEquals.locator(msgFormat.format(ID.decimalMinMax)).text(messages.get(ID.decimalMinMax)));
@@ -171,235 +178,233 @@
waitGui.until(textEquals.locator(msgFormat.format(ID.stringSize)).text(messages.get(ID.stringSize)));
waitGui.until(textEquals.locator(msgFormat.format(ID.size)).text(messages.get(ID.size)));
}
-
+
/**
* Boolean input, verify true
*/
public void verifyBooleanTrue() {
-
+
selenium.click(setCorrectBtn);
-
+
// checkBoolean to true
selenium.check(inputFormat.format(ID.assertTrue), (Boolean) wrongValue.get(ID.assertTrue));
-
+
// guardNoRequest(selenium).click(a4jCommandBtn);
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.assertTrue)).text(messages.get(ID.assertTrue)));
}
-
+
/**
* Boolean input, verify false
*/
public void verifyBooleanFalse() {
-
+
selenium.click(setCorrectBtn);
-
+
// checkBoolean to false
selenium.check(inputFormat.format(ID.assertFalse), (Boolean) wrongValue.get(ID.assertFalse));
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.assertFalse)).text(messages.get(ID.assertFalse)));
}
-
+
/**
* Decimal input, verify from 2.5 to 9.688
*/
protected void verifyDecimalMinMax() {
-
+
selenium.click(setCorrectBtn);
-
+
// Decimal input
selenium.type(inputFormat.format(ID.decimalMinMax), wrongValue.get(ID.decimalMinMax).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.decimalMinMax)).text(messages.get(ID.decimalMinMax)));
}
-
+
/**
* Decimal input, verify digits
*/
protected void verifyDecimalDigits() {
-
+
selenium.click(setCorrectBtn);
-
+
// decimal input digits
selenium.type(inputFormat.format(ID.digits), wrongValue.get(ID.digits).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.decimalMinMax)).text(messages.get(ID.decimalMinMax)));
}
-
+
/**
* Integer input, verify max
*/
protected void verifyMax() {
-
+
selenium.click(setCorrectBtn);
-
+
// integer input max
selenium.type(inputFormat.format(ID.max), wrongValue.get(ID.max).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.max)).text(messages.get(ID.max)));
}
-
+
/**
* Integer input, verify min
*/
protected void verifyMin() {
-
+
selenium.click(setCorrectBtn);
-
+
// integer input min
selenium.type(inputFormat.format(ID.min), wrongValue.get(ID.min).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.min)).text(messages.get(ID.min)));
}
-
+
/**
* Integer input, verify min max
*/
protected void verifyMinMax() {
-
+
selenium.click(setCorrectBtn);
-
+
// integer input min and max
selenium.type(inputFormat.format(ID.minMax), wrongValue.get(ID.minMax).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.minMax)).text(messages.get(ID.minMax)));
}
-
+
/**
* Integer input, verify not empty
*/
protected void verifyNotEmpty() {
-
+
selenium.click(setCorrectBtn);
-
+
// string input not empty
selenium.type(inputFormat.format(ID.notEmpty), wrongValue.get(ID.notEmpty).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.notEmpty)).text(messages.get(ID.notEmpty)));
}
-
+
/**
* Integer input, verify not null
*/
protected void verifyNotNull() {
-
+
selenium.click(setCorrectBtn);
-
+
// string input not null
selenium.type(inputFormat.format(ID.notNull), "");
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.notNull)).text(messages.get(ID.notNull)));
}
-
+
/**
* Integer input, verify string pattern
*/
protected void verifyPattern() {
-
+
selenium.click(setCorrectBtn);
-
+
// string input custom pattern
selenium.type(inputFormat.format(ID.pattern), wrongValue.get(ID.pattern).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.pattern)).text(messages.get(ID.pattern)));
}
-
+
/**
* Integer input, verify custom string
*/
protected void verifyCustom() {
-
+
selenium.click(setCorrectBtn);
-
+
// string input custom string
selenium.type(inputFormat.format(ID.custom), wrongValue.get(ID.custom).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.custom)).text(messages.get(ID.custom)));
}
-
+
/**
* Integer input, verify regExp
*/
protected void verifyRegExp() {
-
+
selenium.click(setCorrectBtn);
-
+
// string input regExp pattern
selenium.type(inputFormat.format(ID.regexp), wrongValue.get(ID.regexp).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.regexp)).text(messages.get(ID.regexp)));
}
-
+
/**
* Integer input, verify date in past
*/
protected void verifyDatePast() {
-
+
selenium.click(setCorrectBtn);
-
+
// date input past
selenium.type(inputFormat.format(ID.past), wrongValue.get(ID.past).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.past)).text(messages.get(ID.past)));
}
-
+
/**
* Integer input, verify date in future
*/
protected void verifyDateFuture() {
-
+
selenium.click(setCorrectBtn);
-
+
// date input future
selenium.type(inputFormat.format(ID.future), wrongValue.get(ID.future).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.future)).text(messages.get(ID.future)));
}
-
+
/**
* Integer input, verify string size
*/
protected void verifyStringSize() {
-
+
selenium.click(setCorrectBtn);
-
+
// string input string size
selenium.type(inputFormat.format(ID.stringSize), wrongValue.get(ID.stringSize).toString());
selenium.click(a4jCommandBtn);
-
+
waitGui.until(textEquals.locator(msgFormat.format(ID.stringSize)).text(messages.get(ID.stringSize)));
}
-
+
/**
* Integer input, verify selection size
*/
- @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
protected void verifySelectionSize() {
-
+
selenium.click(setCorrectBtn);
selenium.click(setWrongBtn);
-
+
// many checkBox input selection size
// selenium.type(inputFormat.format(ID.size), wrongValue.get(ID.size).toString());
selenium.check(selectionItem.format(wrongValue.get(ID.size)), true);
-
+
selenium.click(a4jCommandBtn);
-
waitGui.until(textEquals.locator(msgFormat.format(ID.size)).text(messages.get(ID.size)));
}
-
+
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsCSV.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsCSV.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsCSV.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -24,11 +24,12 @@
import java.net.URL;
import org.jboss.test.selenium.utils.URLUtils;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
* Selenium tests for page faces/components/richValidator/csv.xhtml
- *
+ *
* @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
* @version $Revision$
*/
@@ -38,88 +39,90 @@
public URL getTestUrl() {
return URLUtils.buildUrl(contextPath, "faces/components/richValidator/csv.xhtml");
}
-
+
@Test
public void testAllWrong() {
verifyAllWrongWithAjaxSubmit();
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
public void testAllWrongJSF() {
verifyAllWrongWithJSFSubmit();
}
-
+
@Test
public void testBooleanTrue() {
verifyBooleanTrue();
}
-
+
@Test
public void testBooleanFalse() {
verifyBooleanFalse();
}
-
+
@Test
public void testDecimalMinMax() {
verifyDecimalMinMax();
}
-
+
@Test
public void testIntegerMax() {
verifyMax();
}
-
+
@Test
public void testIntegerMin() {
verifyMin();
}
-
+
@Test
public void testIntegerMinMax() {
verifyMinMax();
}
-
+
@Test
public void testTextNotEmpty() {
verifyNotEmpty();
}
-
+
@Test
public void testTextNotNull() {
verifyNotNull();
}
-
+
@Test
public void testTextPattern() {
verifyPattern();
}
-
+
@Test
public void testTextCustomPattern() {
verifyCustom();
}
-
+
@Test
public void testTextRegExp() {
verifyRegExp();
}
-
+
@Test
public void testDatePast() {
verifyDatePast();
}
-
+
@Test
public void testDateFuture() {
verifyDateFuture();
}
-
+
@Test
public void testStringSize() {
verifyStringSize();
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
public void testSelectionSize() {
verifySelectionSize();
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsJSR303.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsJSR303.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsJSR303.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -24,11 +24,12 @@
import java.net.URL;
import org.jboss.test.selenium.utils.URLUtils;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
* Selenium tests for page faces/components/richValidator/jsr303.xhtml
- *
+ *
* @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
* @version $Revision$
*/
@@ -38,83 +39,85 @@
public URL getTestUrl() {
return URLUtils.buildUrl(contextPath, "faces/components/richValidator/jsr303.xhtml");
}
-
+
@Test
public void testAllWrong() {
verifyAllWrongWithAjaxSubmit();
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
public void testAllWrongJSF() {
verifyAllWrongWithJSFSubmit();
}
-
+
@Test
public void testBooleanTrue() {
verifyBooleanTrue();
}
-
+
@Test
public void testBooleanFalse() {
verifyBooleanFalse();
}
-
+
@Test
public void testDecimalMinMax() {
verifyDecimalMinMax();
}
-
+
@Test
public void testIntegerMax() {
verifyMax();
}
-
+
@Test
public void testIntegerMin() {
verifyMin();
}
-
+
@Test
public void testIntegerMinMax() {
verifyMinMax();
}
-
+
@Test
public void testTextNotEmpty() {
verifyNotEmpty();
}
-
+
@Test
public void testTextNotNull() {
verifyNotNull();
}
-
+
@Test
public void testTextPattern() {
verifyPattern();
}
-
+
@Test
public void testTextCustomPattern() {
verifyCustom();
}
-
+
@Test
public void testDatePast() {
verifyDatePast();
}
-
+
@Test
public void testDateFuture() {
verifyDateFuture();
}
-
+
@Test
public void testStringSize() {
verifyStringSize();
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
public void testSelectionSize() {
verifySelectionSize();
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidator.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidator.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidator.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -24,11 +24,12 @@
import java.net.URL;
import org.jboss.test.selenium.utils.URLUtils;
+import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
import org.testng.annotations.Test;
/**
* Selenium tests for page faces/components/richValidator/wrapping.xhtml
- *
+ *
* @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
* @version $Revision$
*/
@@ -39,83 +40,85 @@
public URL getTestUrl() {
return URLUtils.buildUrl(contextPath, "faces/components/richValidator/wrapping.xhtml");
}
-
+
@Test
public void testAllWrong() {
verifyAllWrongWithAjaxSubmit();
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
public void testAllWrongJSF() {
verifyAllWrongWithJSFSubmit();
}
-
+
@Test
public void testBooleanTrue() {
verifyBooleanTrue();
}
-
+
@Test
public void testBooleanFalse() {
verifyBooleanFalse();
}
-
+
@Test
public void testDecimalMinMax() {
verifyDecimalMinMax();
}
-
+
@Test
public void testIntegerMax() {
verifyMax();
}
-
+
@Test
public void testIntegerMin() {
verifyMin();
}
-
+
@Test
public void testIntegerMinMax() {
verifyMinMax();
}
-
+
@Test
public void testTextNotEmpty() {
verifyNotEmpty();
}
-
+
@Test
public void testTextNotNull() {
verifyNotNull();
}
-
+
@Test
public void testTextPattern() {
verifyPattern();
}
-
+
@Test
public void testTextCustomPattern() {
verifyCustom();
}
-
+
@Test
public void testDatePast() {
verifyDatePast();
}
-
+
@Test
public void testDateFuture() {
verifyDateFuture();
}
-
+
@Test
public void testStringSize() {
verifyStringSize();
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
+ @IssueTracking(value = "https://issues.jboss.org/browse/RF-11035")
public void testSelectionSize() {
verifySelectionSize();
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java 2011-12-01 14:40:21 UTC (rev 23021)
@@ -35,15 +35,14 @@
/**
* Selenium tests for page faces/components/richValidator/single.xhtml
*
- * Test no-request handling client side validation.
- * Validation for min is done by javax.validation.constraints.Min, and this should completely
- * handle validation on client side.
- *
+ * Test no-request handling client side validation. Validation for min is done by javax.validation.constraints.Min, and
+ * this should completely handle validation on client side.
+ *
* @author <a href="mailto:jjamrich@redhat.com">Jan Jamrich</a>
* @version $Revision$
*/
public class TestWrappingValidatorSingle extends AbstractValidatorsTest {
-
+
private JQueryLocator input = pjq("input[id$=:min]");
private JQueryLocator setCorrectValBtn = pjq("input[id$=setCorrectValuesButton]");
private JQueryLocator a4jSubmitBtn = pjq("input[id$=a4jButton]");
@@ -54,34 +53,34 @@
public URL getTestUrl() {
return URLUtils.buildUrl(contextPath, "faces/components/richValidator/single.xhtml");
}
-
- @Test
+
+ @Test(groups = { "4.Future" })
@IssueTracking("https://issues.jboss.org/browse/RF-11576")
public void testIntegerMin() {
selenium.click(setCorrectValBtn);
-
+
// integer input min
selenium.type(input, "1");
guardNoRequest(selenium).click(a4jSubmitBtn);
-
+
waitGui.until(textEquals.locator(msg).text("must be greater than or equal to 2"));
}
-
+
/**
* Check validation on input after blur event fired and no XHR request as well
- *
+ *
*/
@Test
public void testValidateOnBlur() {
selenium.click(setCorrectValBtn);
-
+
// integer input min
- selenium.type(input , "1");
-
+ selenium.type(input, "1");
+
// no request (HTTP neither XHR) should be sent if validation fails
guardNoRequest(selenium).fireEvent(input, Event.BLUR);
-
+
waitModel.until(textEquals.locator(msg).text("must be greater than or equal to 2"));
}
-
+
}
Modified: modules/tests/metamer/branches/wfk2-product-branch/pom.xml
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/pom.xml 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/pom.xml 2011-12-01 14:40:21 UTC (rev 23021)
@@ -24,14 +24,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.examples</groupId>
- <artifactId>richfaces-example-parent</artifactId>
- <version>4.1.0.20111014-M3</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>11-redhat-1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.1.0-M3-redhat-1</version>
+ <version>4.1.0-CR1-redhat-1</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -86,7 +86,7 @@
<repositories>
<repository>
- <id>jboss-qa-releases-repository</id>
+ <id>jboss-qa-releases</id>
<url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url>
<releases>
<updatePolicy>never</updatePolicy>
@@ -123,8 +123,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.1.0-M3-redhat-1</version.richfaces>
+ <richfaces.checkstyle.version>3</richfaces.checkstyle.version>
+ <version.richfaces>4.1.0-CR1-redhat-1</version.richfaces>
</properties>
<dependencyManagement>
@@ -191,6 +191,100 @@
</plugins>
</pluginManagement>
</build>
+
+ <profiles>
+ <!--
+ The following profiles determine the JSF api/impl
+ combinations that will be used in the project builds.
+
+ -Djsf_profile=<profile-name> on the mvn command line
+ -->
+ <profile>
+ <id>jsf_ri</id>
+ <activation>
+ <property>
+ <name>!jsf_profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>javax.faces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.faces</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jsf_jboss</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>jboss</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>myfaces</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>jbas7</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>jbas7</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${com.sun.faces.impl.version.jboss}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: modules/tests/metamer/branches/wfk2-product-branch/release.sh
===================================================================
--- modules/tests/metamer/branches/wfk2-product-branch/release.sh 2011-12-01 14:34:14 UTC (rev 23020)
+++ modules/tests/metamer/branches/wfk2-product-branch/release.sh 2011-12-01 14:40:21 UTC (rev 23021)
@@ -3,7 +3,7 @@
echo "Project defines following version of RichFaces: ${RICHFACES_VERSION}"
echo $RICHFACES_VERSION | egrep -q '\-SNAPSHOT$' && { echo "The project cannot depend on SNAPSHOT version, correct the version first and try again."; exit 2; }
-perl -e 'open (FILE, "<", "pom.xml"); local $/; $file=<FILE>; close (FILE); if ($file !~ m#\>'$RICHFACES_VERSION'\<\/version\>\s+\<\/parent\>#sg) { exit 1 }' || { echo "The project parent have to be same version like RichFaces version"; exit 3; }
+#perl -e 'open (FILE, "<", "pom.xml"); local $/; $file=<FILE>; close (FILE); if ($file !~ m#\>'$RICHFACES_VERSION'\<\/version\>\s+\<\/parent\>#sg) { exit 1 }' || { echo "The project parent have to be same version like RichFaces version"; exit 3; }
echo "Is this version correct?"
read -p 'Press ENTER to continue or Ctrl+C for exit...'
read -p 'Enter release version: ' RELEASE
13 years
- 1
- 0
JBoss Rich Faces SVN: r23020 - modules/tests/metamer/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: ppitonak(a)redhat.com
Date: 2011-12-01 09:34:14 -0500 (Thu, 01 Dec 2011)
New Revision: 23020
Modified:
modules/tests/metamer/trunk/pom.xml
Log:
RichFaces upgraded to 4.1.0.CR2
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-12-01 13:43:26 UTC (rev 23019)
+++ modules/tests/metamer/trunk/pom.xml 2011-12-01 14:34:14 UTC (rev 23020)
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>3</richfaces.checkstyle.version>
- <version.richfaces>4.1.0-SNAPSHOT</version.richfaces>
+ <version.richfaces>4.1.0.CR2</version.richfaces>
</properties>
<dependencyManagement>
13 years
- 1
- 0
JBoss Rich Faces SVN: r23019 - modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: jpapouse
Date: 2011-12-01 08:43:26 -0500 (Thu, 01 Dec 2011)
New Revision: 23019
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
Log:
RFPL-1870: added onlisthide and onlistshow attributes into rich:inplaceSelect samples
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-12-01 11:54:35 UTC (rev 23018)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/fAjax.xhtml 2011-12-01 13:43:26 UTC (rev 23019)
@@ -72,6 +72,7 @@
onkeyup="#{richInplaceSelectBean.attributes['onkeyup'].value}"
onlistclick="#{richInplaceSelectBean.attributes['onlistclick'].value}"
onlistdblclick="#{richInplaceSelectBean.attributes['onlistdblclick'].value}"
+ onlisthide="#{richInplaceSelectBean.attributes['onlisthide'].value}"
onlistkeydown="#{richInplaceSelectBean.attributes['onlistkeydown'].value}"
onlistkeypress="#{richInplaceSelectBean.attributes['onlistkeypress'].value}"
onlistkeyup="#{richInplaceSelectBean.attributes['onlistkeyup'].value}"
@@ -80,6 +81,7 @@
onlistmouseout="#{richInplaceSelectBean.attributes['onlistmouseout'].value}"
onlistmouseover="#{richInplaceSelectBean.attributes['onlistmouseover'].value}"
onlistmouseup="#{richInplaceSelectBean.attributes['onlistmouseup'].value}"
+ onlistshow="#{richInplaceSelectBean.attributes['onlistshow'].value}"
onmousedown="#{richInplaceSelectBean.attributes['onmousedown'].value}"
onmousemove="#{richInplaceSelectBean.attributes['onmousemove'].value}"
onmouseout="#{richInplaceSelectBean.attributes['onmouseout'].value}"
Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-12-01 11:54:35 UTC (rev 23018)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2011-12-01 13:43:26 UTC (rev 23019)
@@ -72,6 +72,7 @@
onkeyup="#{richInplaceSelectBean.attributes['onkeyup'].value}"
onlistclick="#{richInplaceSelectBean.attributes['onlistclick'].value}"
onlistdblclick="#{richInplaceSelectBean.attributes['onlistdblclick'].value}"
+ onlisthide="#{richInplaceSelectBean.attributes['onlisthide'].value}"
onlistkeydown="#{richInplaceSelectBean.attributes['onlistkeydown'].value}"
onlistkeypress="#{richInplaceSelectBean.attributes['onlistkeypress'].value}"
onlistkeyup="#{richInplaceSelectBean.attributes['onlistkeyup'].value}"
@@ -80,6 +81,7 @@
onlistmouseout="#{richInplaceSelectBean.attributes['onlistmouseout'].value}"
onlistmouseover="#{richInplaceSelectBean.attributes['onlistmouseover'].value}"
onlistmouseup="#{richInplaceSelectBean.attributes['onlistmouseup'].value}"
+ onlistshow="#{richInplaceSelectBean.attributes['onlistshow'].value}"
onmousedown="#{richInplaceSelectBean.attributes['onmousedown'].value}"
onmousemove="#{richInplaceSelectBean.attributes['onmousemove'].value}"
onmouseout="#{richInplaceSelectBean.attributes['onmouseout'].value}"
13 years
- 1
- 0