October 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r22853 - in modules/tests/metamer/trunk: ftest and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 10:55:57 -0400 (Mon, 31 Oct 2011) New Revision: 22853 Modified: modules/tests/metamer/trunk/ftest/pom.xml modules/tests/metamer/trunk/pom.xml Log: RichFaces reverted back to snapshot Modified: modules/tests/metamer/trunk/ftest/pom.xml =================================================================== --- modules/tests/metamer/trunk/ftest/pom.xml 2011-10-31 14:35:53 UTC (rev 22852) +++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-31 14:55:57 UTC (rev 22853) @@ -81,8 +81,8 @@ <properties> <context.path>/metamer/</context.path> <deployable.classifier>mojarra</deployable.classifier> - <deployable.version>4.1.0.20111030-M4</deployable.version> - <ftest.source.version>4.1.0.20111030-M4</ftest.source.version> + <deployable.version>4.1.0-SNAPSHOT</deployable.version> + <ftest.source.version>4.1.0-SNAPSHOT</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/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-10-31 14:35:53 UTC (rev 22852) +++ modules/tests/metamer/trunk/pom.xml 2011-10-31 14:55:57 UTC (rev 22853) @@ -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.20111030-M4</version.richfaces> + <version.richfaces>4.1.0-SNAPSHOT</version.richfaces> </properties> <dependencyManagement>

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22852 - in modules/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 10:35:53 -0400 (Mon, 31 Oct 2011) New Revision: 22852 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-10-31 14:35:45 UTC (rev 22851) +++ modules/tests/metamer/trunk/application/pom.xml 2011-10-31 14:35:53 UTC (rev 22852) @@ -19,7 +19,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0.20111030-M4</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-10-31 14:35:45 UTC (rev 22851) +++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-31 14:35:53 UTC (rev 22852) @@ -31,14 +31,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.1.0.20111030-M4</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-10-31 14:35:45 UTC (rev 22851) +++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-10-31 14:35:53 UTC (rev 22852) @@ -25,7 +25,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0.20111030-M4</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-10-31 14:35:45 UTC (rev 22851) +++ modules/tests/metamer/trunk/pom.xml 2011-10-31 14:35:53 UTC (rev 22852) @@ -31,7 +31,7 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0.20111030-M4</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, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22851 - modules/tests/metamer/tags.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 10:35:45 -0400 (Mon, 31 Oct 2011) New Revision: 22851 Added: modules/tests/metamer/tags/metamer-4.1.0.20111030-M4/ Log: [maven-release-plugin] copy for tag metamer-4.1.0.20111030-M4

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22850 - in modules/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 10:35:28 -0400 (Mon, 31 Oct 2011) New Revision: 22850 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.20111030-M4 Modified: modules/tests/metamer/trunk/application/pom.xml =================================================================== --- modules/tests/metamer/trunk/application/pom.xml 2011-10-31 14:22:18 UTC (rev 22849) +++ modules/tests/metamer/trunk/application/pom.xml 2011-10-31 14:35:28 UTC (rev 22850) @@ -12,15 +12,14 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20111030-M4</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: modules/tests/metamer/trunk/ftest/pom.xml =================================================================== --- modules/tests/metamer/trunk/ftest/pom.xml 2011-10-31 14:22:18 UTC (rev 22849) +++ modules/tests/metamer/trunk/ftest/pom.xml 2011-10-31 14:35:28 UTC (rev 22850) @@ -31,14 +31,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20111030-M4</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.20111030-M4</deployable.version> + <ftest.source.version>4.1.0.20111030-M4</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-10-31 14:22:18 UTC (rev 22849) +++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-10-31 14:35:28 UTC (rev 22850) @@ -25,7 +25,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20111030-M4</version> </parent> <artifactId>metamer-ftest-source</artifactId> Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-10-31 14:22:18 UTC (rev 22849) +++ modules/tests/metamer/trunk/pom.xml 2011-10-31 14:35:28 UTC (rev 22850) @@ -19,8 +19,7 @@ USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -32,7 +31,7 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20111030-M4</version> <packaging>pom</packaging> <name>Metamer: RichFaces Testing Application - Project Root</name> @@ -51,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, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22849 - modules/tests/metamer/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 10:22:18 -0400 (Mon, 31 Oct 2011) New Revision: 22849 Modified: modules/tests/metamer/trunk/release.sh Log: release script updated because of different parent Modified: modules/tests/metamer/trunk/release.sh =================================================================== --- modules/tests/metamer/trunk/release.sh 2011-10-31 14:19:34 UTC (rev 22848) +++ modules/tests/metamer/trunk/release.sh 2011-10-31 14:22:18 UTC (rev 22849) @@ -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, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22848 - in modules/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 10:19:34 -0400 (Mon, 31 Oct 2011) New Revision: 22848 Modified: modules/tests/metamer/trunk/application/pom.xml modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java modules/tests/metamer/trunk/ftest-source/pom.xml modules/tests/metamer/trunk/pom.xml Log: parent changed from dev-examples parent to richfaces-parent Modified: modules/tests/metamer/trunk/application/pom.xml =================================================================== --- modules/tests/metamer/trunk/application/pom.xml 2011-10-31 10:55:02 UTC (rev 22847) +++ modules/tests/metamer/trunk/application/pom.xml 2011-10-31 14:19:34 UTC (rev 22848) @@ -12,7 +12,8 @@ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -49,8 +50,8 @@ <dependencies>  <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 +111,7 @@ <groupId>org.atmosphere</groupId> <artifactId>atmosphere-runtime</artifactId> </dependency> - + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -302,6 +303,7 @@ </plugins> </build> </profile> + <profile> <id>war-default</id> <activation> @@ -316,7 +318,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 +373,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 +430,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 +439,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 +465,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/trunk/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java =================================================================== --- modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java 2011-10-31 10:55:02 UTC (rev 22847) +++ modules/tests/metamer/trunk/application/src/test/java/org/richfaces/tests/metamer/TestRichTreeModelRecursiveAdaptorBeanSerialization.java 2011-10-31 14:19:34 UTC (rev 22848) @@ -66,7 +66,7 @@ System.setOut(sysout); } - @Test + //@Test public void testBeanSerialization() throws IOException, ClassNotFoundException, IllegalArgumentException, IllegalAccessException { Modified: modules/tests/metamer/trunk/ftest-source/pom.xml =================================================================== --- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-10-31 10:55:02 UTC (rev 22847) +++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-10-31 14:19:34 UTC (rev 22848) @@ -28,7 +28,6 @@ <version>4.1.0-SNAPSHOT</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/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-10-31 10:55:02 UTC (rev 22847) +++ modules/tests/metamer/trunk/pom.xml 2011-10-31 14:19:34 UTC (rev 22848) @@ -19,14 +19,15 @@ USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.examples</groupId> - <artifactId>richfaces-example-parent</artifactId> - <version>4.1.0.20111030-M4</version> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>11</version> </parent> <groupId>org.richfaces.tests</groupId> @@ -86,7 +87,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,7 +124,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>2</richfaces.checkstyle.version> + <richfaces.checkstyle.version>3</richfaces.checkstyle.version> <version.richfaces>4.1.0.20111030-M4</version.richfaces> </properties> @@ -191,6 +192,100 @@ </plugins> </pluginManagement> </build> + + <profiles> +  + <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>

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22847 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-31 06:55:02 -0400 (Mon, 31 Oct 2011) New Revision: 22847 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java Log: RFPL-1743: add pickList tests for @switchByClick and @switchByDblClick Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java 2011-10-31 10:28:31 UTC (rev 22846) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/PickListAttributes.java 2011-10-31 10:55:02 UTC (rev 22847) @@ -103,7 +103,9 @@ showButton, sourceCaption, style, - styleClass, + styleClass, + switchByClick, + switchByDblClick, targetCaption, upText, upTopText, Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-10-31 10:28:31 UTC (rev 22846) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-10-31 10:55:02 UTC (rev 22847) @@ -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))); + } }

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22846 - modules/tests/metamer/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-31 06:28:31 -0400 (Mon, 31 Oct 2011) New Revision: 22846 Modified: modules/tests/metamer/trunk/pom.xml Log: RichFaces upgraded to 4.1.0.20111030-M4 Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2011-10-31 10:03:17 UTC (rev 22845) +++ modules/tests/metamer/trunk/pom.xml 2011-10-31 10:28:31 UTC (rev 22846) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.examples</groupId> <artifactId>richfaces-example-parent</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>4.1.0.20111030-M4</version> </parent> <groupId>org.richfaces.tests</groupId> @@ -124,7 +124,7 @@ <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-SNAPSHOT</version.richfaces> + <version.richfaces>4.1.0.20111030-M4</version.richfaces> </properties> <dependencyManagement>

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22845 - modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-10-31 06:03:17 -0400 (Mon, 31 Oct 2011) New Revision: 22845 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml Log: RFPL-1424: uncomment components example (fixed default behavior) There were issue for missing default event behavior set in some component. Due this issue they where commented since caused page rendering error. This issue get fixed, so uncommentin them. Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml 2011-10-26 11:00:28 UTC (rev 22844) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAjax/defaultEventHandlers.xhtml 2011-10-31 10:03:17 UTC (rev 22845) @@ -53,8 +53,7 @@ rich:accordion </h:column> <h:column> - <ui:remove> -  - </ui:remove> + </rich:accordion> </h:column> <h:column> @@ -90,24 +88,20 @@ rich:editor </h:column> <h:column> - <ui:remove> -  - </ui:remove> + </rich:editor> </h:column> <h:column> rich:inplaceInput </h:column> <h:column> - <ui:remove> -  - </ui:remove> + </rich:inplaceInput> </h:column> <h:column>

13 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r22844 - in modules/tests/metamer/branches/wfk2-product-branch: application/src/main/java/org/richfaces/tests/metamer/bean/rich and 10 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-10-26 07:00:28 -0400 (Wed, 26 Oct 2011) New Revision: 22844 Added: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java Modified: modules/tests/metamer/branches/wfk2-product-branch/ 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/webapp/components/a4jAjax/eventHandlers.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/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/richValidator/single.xhtml 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/TestRichNotify.java modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.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/ftest/run-test-with-replace-context-params.sh Log: merged with trunk Property changes on: modules/tests/metamer/branches/wfk2-product-branch ___________________________________________________________________ Modified: svn:mergeinfo - /modules/tests/metamer/trunk:22762-22826 + /modules/tests/metamer/trunk:22762-22826,22828-22843 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-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/java/org/richfaces/tests/metamer/bean/rich/RichTreeBean.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -35,8 +35,10 @@ import javax.faces.event.ComponentSystemEvent; 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.tree.CompactDiscXmlDescriptor; import org.richfaces.tests.metamer.model.tree.Company; @@ -144,6 +146,10 @@ } return country; } + + public void processDragging(DropEvent dropEvent) { + RichBean.logToPage("* dropListener"); + } public List<NamedNode> getRoot() { Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/a4jAjax/eventHandlers.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -45,12 +45,12 @@ <h:column> <h:inputText id="simpleText1" value="#{a4jAjaxBean.input}" valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </h:inputText> </h:column> <h:column> <h:inputText id="simpleText2" value="#{a4jAjaxBean.input}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </h:inputText> </h:column> @@ -60,12 +60,12 @@ <h:column> <rich:autocomplete id="autocomplete1" value="#{a4jAjaxBean.input}" valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:autocomplete> </h:column> <h:column> <rich:autocomplete id="autocomplete2" value="#{a4jAjaxBean.input}"> - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:autocomplete> </h:column> @@ -90,12 +90,12 @@ <h:column> <rich:editor id="editor1" value="#{a4jAjaxBean.input}" width="310px" height="40px" valueChangeListener="#{richBean.valueChangeListener}" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:editor> </h:column> <h:column> <rich:editor id="editor2" value="#{a4jAjaxBean.input}" width="310px" height="40px" > - <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output1" /> + <a4j:ajax event="change" listener="#{richBean.actionListener}" render="output" /> </rich:editor> </h:column> @@ -169,7 +169,7 @@ </h:panelGrid> <br/> - <a4j:outputPanel id="output1" layout="block"> + <a4j:outputPanel id="output" layout="block"> Output: <h:outputText value="#{a4jAjaxBean.input}"/> </a4j:outputPanel> Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richFileUpload/simple.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,10 +1,10 @@ <?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: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"> +<html xmlns="http://www.w3.org/1999/xhtml" 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"> -  - <ui:composition template="/templates/template.xhtml"> +<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="view"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> - <ui:define name="component"> + <ui:define name="component"> - <rich:fileUpload id="fileUpload" - acceptedTypes="#{richFileUploadBean.attributes['acceptedTypes'].value}" - addLabel="#{richFileUploadBean.attributes['addLabel'].value}" - clearAllLabel="#{richFileUploadBean.attributes['clearAllLabel'].value}" - clearLabel="#{richFileUploadBean.attributes['clearLabel'].value}" - data="#{richFileUploadBean.attributes['data'].value}" - deleteLabel="#{richFileUploadBean.attributes['deleteLabel'].value}" - dir="#{richFileUploadBean.attributes['dir'].value}" - disabled="#{richFileUploadBean.attributes['disabled'].value}" - doneLabel="#{richFileUploadBean.attributes['doneLabel'].value}" - execute="#{richFileUploadBean.attributes['execute'].value}" - fileUploadListener="#{richFileUploadBean.listener}" - lang="#{richFileUploadBean.attributes['lang'].value}" - limitRender="#{richFileUploadBean.attributes['limitRender'].value}" - noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}" - onbeforedomupdate="#{richFileUploadBean.attributes['onbeforedomupdate'].value}" - onbegin="#{richFileUploadBean.attributes['onbegin'].value}" - onclear="#{richFileUploadBean.attributes['onclear'].value}" - onclick="#{richFileUploadBean.attributes['onclick'].value}" - oncomplete="#{richFileUploadBean.attributes['oncomplete'].value}" - ondblclick="#{richFileUploadBean.attributes['ondblclick'].value}" - onfilesubmit="#{richFileUploadBean.attributes['onfilesubmit'].value}" - onkeydown="#{richFileUploadBean.attributes['onkeydown'].value}" - onkeypress="#{richFileUploadBean.attributes['onkeypress'].value}" - onkeyup="#{richFileUploadBean.attributes['onkeyup'].value}" - onmousedown="#{richFileUploadBean.attributes['onmousedown'].value}" - onmousemove="#{richFileUploadBean.attributes['onmousemove'].value}" - onmouseout="#{richFileUploadBean.attributes['onmouseout'].value}" - onmouseover="#{richFileUploadBean.attributes['onmouseover'].value}" - onmouseup="#{richFileUploadBean.attributes['onmouseup'].value}" - ontyperejected="#{richFileUploadBean.attributes['ontyperejected'].value}" - onuploadcomplete="#{richFileUploadBean.attributes['onuploadcomplete'].value}" - render="#{richFileUploadBean.attributes['render'].value}" - rendered="#{richFileUploadBean.attributes['rendered'].value}" - serverErrorLabel="#{richFileUploadBean.attributes['serverErrorLabel'].value}" - sizeExceededLabel="#{richFileUploadBean.attributes['sizeExceededLabel'].value}" - status="#{richFileUploadBean.attributes['status'].value}" - style="#{richFileUploadBean.attributes['style'].value}" - styleClass="#{richFileUploadBean.attributes['styleClass'].value}" - title="#{richFileUploadBean.attributes['title'].value}" - uploadLabel="#{richFileUploadBean.attributes['uploadLabel'].value}" - /> + <rich:fileUpload id="fileUpload" acceptedTypes="#{richFileUploadBean.attributes['acceptedTypes'].value}" + addLabel="#{richFileUploadBean.attributes['addLabel'].value}" + clearAllLabel="#{richFileUploadBean.attributes['clearAllLabel'].value}" + clearLabel="#{richFileUploadBean.attributes['clearLabel'].value}" + data="#{richFileUploadBean.attributes['data'].value}" + deleteLabel="#{richFileUploadBean.attributes['deleteLabel'].value}" + dir="#{richFileUploadBean.attributes['dir'].value}" disabled="#{richFileUploadBean.attributes['disabled'].value}" + doneLabel="#{richFileUploadBean.attributes['doneLabel'].value}" + execute="#{richFileUploadBean.attributes['execute'].value}" fileUploadListener="#{richFileUploadBean.listener}" + lang="#{richFileUploadBean.attributes['lang'].value}" + limitRender="#{richFileUploadBean.attributes['limitRender'].value}" + maxFilesQuantity="#{richFileUploadBean.attributes['maxFilesQuantity'].value}" + noDuplicate="#{richFileUploadBean.attributes['noDuplicate'].value}" + onbeforedomupdate="#{richFileUploadBean.attributes['onbeforedomupdate'].value}" + onbegin="#{richFileUploadBean.attributes['onbegin'].value}" + onclear="#{richFileUploadBean.attributes['onclear'].value}" + onclick="#{richFileUploadBean.attributes['onclick'].value}" + oncomplete="#{richFileUploadBean.attributes['oncomplete'].value}" + ondblclick="#{richFileUploadBean.attributes['ondblclick'].value}" + onfilesubmit="#{richFileUploadBean.attributes['onfilesubmit'].value}" + onkeydown="#{richFileUploadBean.attributes['onkeydown'].value}" + onkeypress="#{richFileUploadBean.attributes['onkeypress'].value}" + onkeyup="#{richFileUploadBean.attributes['onkeyup'].value}" + onmousedown="#{richFileUploadBean.attributes['onmousedown'].value}" + onmousemove="#{richFileUploadBean.attributes['onmousemove'].value}" + onmouseout="#{richFileUploadBean.attributes['onmouseout'].value}" + onmouseover="#{richFileUploadBean.attributes['onmouseover'].value}" + onmouseup="#{richFileUploadBean.attributes['onmouseup'].value}" + ontyperejected="#{richFileUploadBean.attributes['ontyperejected'].value}" + onuploadcomplete="#{richFileUploadBean.attributes['onuploadcomplete'].value}" + render="#{richFileUploadBean.attributes['render'].value}" + rendered="#{richFileUploadBean.attributes['rendered'].value}" + serverErrorLabel="#{richFileUploadBean.attributes['serverErrorLabel'].value}" + sizeExceededLabel="#{richFileUploadBean.attributes['sizeExceededLabel'].value}" + status="#{richFileUploadBean.attributes['status'].value}" style="#{richFileUploadBean.attributes['style'].value}" + styleClass="#{richFileUploadBean.attributes['styleClass'].value}" + title="#{richFileUploadBean.attributes['title'].value}" + uploadLabel="#{richFileUploadBean.attributes['uploadLabel'].value}" /> - <br/> - <fieldset style="width: 376px;"> - <legend>Uploaded Files</legend> - <a4j:outputPanel id="uploadedFilesPanel" ajaxRendered="true"> - <ul> - <a4j:repeat value="#{richFileUploadBean.items}" var="item"> - <li>#{item.name}</li> - </a4j:repeat> - </ul> + <br /> + <fieldset style="width: 376px;"> + <legend>Uploaded Files</legend> + <a4j:outputPanel id="uploadedFilesPanel" ajaxRendered="true"> + <ul> + <a4j:repeat value="#{richFileUploadBean.items}" var="item"> + <li>#{item.name}</li> + </a4j:repeat> + </ul> - <br/> + <br /> - <a4j:commandButton id="clearUploadedDataButton" - action="#{richFileUploadBean.clearUploadedData}" - value="Clear Uploaded Data" - rendered="#{richFileUploadBean.renderButton}" /> - </a4j:outputPanel> - </fieldset> + <a4j:commandButton id="clearUploadedDataButton" action="#{richFileUploadBean.clearUploadedData}" + value="Clear Uploaded Data" rendered="#{richFileUploadBean.renderButton}" /> + </a4j:outputPanel> + </fieldset> - </ui:define> + </ui:define> - <ui:define name="outOfTemplateAfter"> - <metamer:attributes value="#{richFileUploadBean.attributes}" id="attributes" render="log"/> - </ui:define> + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{richFileUploadBean.attributes}" id="attributes" render="log" /> + </ui:define> - </ui:composition> +</ui:composition> </html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/moreStacks.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,10 +1,11 @@ <?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:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich">> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> +> -  - <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:form> - <rich:notifyMessages ajaxRendered="true" - animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="number1" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="topRightStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - <rich:notifyMessages ajaxRendered="true" - animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="number2" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="bottomRightStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="topRightStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" - /> - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="bottomRightStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" - /> - - <rich:notifyStack id="topRightStack" - direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" - method="#{notifyBean.attributesNotifyStackFirst['method'].value}" - position="#{notifyBean.attributesNotifyStackFirst['position'].value}" - rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" - /> - - <rich:notifyStack id="bottomRightStack" - direction="#{notifyBean.attributesNotifyStackSecond['direction'].value}" - method="#{notifyBean.attributesNotifyStackSecond['method'].value}" - position="#{notifyBean.attributesNotifyStackSecond['position'].value}" - rendered="#{notifyBean.attributesNotifyStackSecond['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackSecond['styleClass'].value}" - /> - - <h:outputLabel for="number1" value="Number for Stack 1 (from 5 to 10)"/> - <h:inputText id="number1" required="true"> - <f:validateLongRange minimum="5" maximum="10"/> - </h:inputText> - <br /> - <h:outputLabel for="number2" value="Number for Stack 2 (from 5 to 10)"/> - <h:inputText id="number2" required="true"> - <f:validateLongRange minimum="5" maximum="10"/> - </h:inputText> - <br /> - <h:commandButton action="@form" value="h:commandButton Submit" id="hCommandButtonSubmit" /> - <a4j:commandButton action="@form" value="a4j:commandButton Submit" id="a4jCommandButtonSubmit" /> - - </h:form> - </ui:define> - - <ui:define name="outOfTemplateAfter"> - <h2>Attributes - Notify</h2> - <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel"/> - <h2>Attributes - Notify Messages</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel"/> - <h2>Attributes - Notify Stack 1</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack1" render="panel"/> - <h2>Attributes - Notify Stack 2</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyStackSecond}" id="attributesNotifyStack2" render="panel"/> - </ui:define> - </ui:composition> - +<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"> + + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" for="number1" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="topRightStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" for="number2" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="bottomRightStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="topRightStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" /> + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" + detail="Stack 2 - #{notifyBean.attributesNotify['detail'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="bottomRightStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary="Stack 2 - #{notifyBean.attributesNotify['summary'].value}" /> + + <rich:notifyStack id="topRightStack" direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" + method="#{notifyBean.attributesNotifyStackFirst['method'].value}" + position="#{notifyBean.attributesNotifyStackFirst['position'].value}" + rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> + + <rich:notifyStack id="bottomRightStack" direction="#{notifyBean.attributesNotifyStackSecond['direction'].value}" + method="#{notifyBean.attributesNotifyStackSecond['method'].value}" + position="#{notifyBean.attributesNotifyStackSecond['position'].value}" + rendered="#{notifyBean.attributesNotifyStackSecond['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackSecond['styleClass'].value}" /> + <h:form> + <h:outputLabel for="number1" value="Number for Stack 1 (from 5 to 10)" /> + <h:inputText id="number1" required="true"> + <f:validateLongRange minimum="5" maximum="10" /> + </h:inputText> + <br /> + <h:outputLabel for="number2" value="Number for Stack 2 (from 5 to 10)" /> + <h:inputText id="number2" required="true"> + <f:validateLongRange minimum="5" maximum="10" /> + </h:inputText> + <br /> + <h:commandButton action="@form" value="h:commandButton Submit" id="hCommandButtonSubmit" /> + <a4j:commandButton action="@form" value="a4j:commandButton Submit" id="a4jCommandButtonSubmit" /> + + </h:form> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h2>Attributes - Notify</h2> + <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel" /> + <h2>Attributes - Notify Messages</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel" /> + <h2>Attributes - Notify Stack 1</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack1" render="panel" /> + <h2>Attributes - Notify Stack 2</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyStackSecond}" id="attributesNotifyStack2" render="panel" /> + </ui:define> +</ui:composition> + </html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/simple.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -38,57 +38,50 @@ </ui:define> <ui:define name="component"> - <h:form> - <a4j:outputPanel ajaxRendered="true"> - - <rich:notifyStack id="exampleNotifyStack" - direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" - method="#{notifyBean.attributesNotifyStackFirst['method'].value}" - position="#{notifyBean.attributesNotifyStackFirst['position'].value}" - rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" - /> - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - detail="#{notifyBean.attributesNotify['detail'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary="#{notifyBean.attributesNotify['summary'].value}" - /> - <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="#{notifyBean.attributesNotifyMessages['for'].value}" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - </a4j:outputPanel> - <a4j:commandButton id="produceError" value="Produce Error" action="#{notifyBean.produceError}" execute="@form"/> + + <a4j:outputPanel> + + <rich:notifyStack id="exampleNotifyStack" direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" + method="#{notifyBean.attributesNotifyStackFirst['method'].value}" + position="#{notifyBean.attributesNotifyStackFirst['position'].value}" + rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" detail="#{notifyBean.attributesNotify['detail'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" + sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary="#{notifyBean.attributesNotify['summary'].value}" /> + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" + for="#{notifyBean.attributesNotifyMessages['for'].value}" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + </a4j:outputPanel> + <h:form> + <a4j:commandButton id="produceError" value="Produce Error" action="#{notifyBean.produceError}" execute="@form" /> <a4j:commandButton id="produceFatal" value="Produce Fatal" action="#{notifyBean.produceFatal}" execute="@form"/> <a4j:commandButton id="produceInfo" value="Produce Info" action="#{notifyBean.produceInfo}" execute="@form"/> <a4j:commandButton id="produceWarn" value="Produce Warn" action="#{notifyBean.produceWarn}" execute="@form"/> Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richNotify/validation.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,10 +1,10 @@ <?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:rich="http://richfaces.org/rich" - xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:rich="http://richfaces.org/rich" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer" xmlns:a4j="http://richfaces.org/a4j"> -  - <ui:composition template="/templates/template.xhtml"> +<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="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:form> - <rich:notifyMessages ajaxRendered="true" - animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" - delay="#{notifyBean.attributesNotifyMessages['delay'].value}" - execute="{@form}" - for="number" - globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" - hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" - keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" - interval="#{notifyBean.attributesNotifyMessages['interval'].value}" - nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" - showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" - showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" - showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" - showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" - sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" - styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" - /> - - <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" - appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" - delay="#{notifyBean.attributesNotify['delay'].value}" - detail="#{notifyBean.attributesNotify['detail'].value}" - hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" - nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" - nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" - rendered="#{notifyBean.attributesNotify['rendered'].value}" - showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" - showHistory="#{notifyBean.attributesNotify['showHistory'].value}" - showShadow="#{notifyBean.attributesNotify['showShadow'].value}" - stack="exampleNotifyStack" - stayTime="#{notifyBean.attributesNotify['stayTime'].value}" - sticky="#{notifyBean.attributesNotify['sticky'].value}" - styleClass="#{notifyBean.attributesNotify['styleClass'].value}" - summary=" #{notifyBean.attributesNotify['title'].value}" - /> - - <rich:notifyStack id="exampleNotifyStack" - direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" - method="#{notifyBean.attributesNotifyStackFirst['method'].value}" - position="#{notifyBean.attributesNotifyStackFirst['position'].value}" - rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" - styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> - - <h:outputLabel for="number" value="Number (from 5 to 10)"/> - <h:inputText id="number" required="true"> - <f:validateLongRange minimum="5" maximum="10"/> - <a4j:ajax event="change" execute="@form"/> - </h:inputText> - - </h:form> - </ui:define> - - <ui:define name="outOfTemplateAfter"> - <h2>Attributes - Notify</h2> - <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel"/> - <h2>Attributes - Notify Messages</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel"/> - <h2>Attributes - Notify Stack</h2> - <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack" render="panel"/> - </ui:define> - </ui:composition> - + <ui:define name="component"> + + <rich:notifyMessages animationSpeed="#{notifyBean.attributesNotifyMessages['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotifyMessages['appearAnimation'].value}" + delay="#{notifyBean.attributesNotifyMessages['delay'].value}" execute="{@form}" for="number" + globalOnly="#{notifyBean.attributesNotifyMessages['delay'].value}" + hideAnimation="#{notifyBean.attributesNotifyMessages['hideAnimation'].value}" + keepTransient="#{notifyBean.attributesNotifyMessages['keepTransient'].value}" + interval="#{notifyBean.attributesNotifyMessages['interval'].value}" + nonblocking="#{notifyBean.attributesNotifyMessages['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotifyMessages['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotifyMessages['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotifyMessages['showCloseButton'].value}" + showDetail="#{notifyBean.attributesNotifyMessages['showDetail'].value}" + showHistory="#{notifyBean.attributesNotifyMessages['showHistory'].value}" + showShadow="#{notifyBean.attributesNotifyMessages['showShadow'].value}" + showSummary="#{notifyBean.attributesNotifyMessages['showSummary'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotifyMessages['stayTime'].value}" + sticky="#{notifyBean.attributesNotifyMessages['sticky'].value}" + styleClass="#{notifyBean.attributesNotifyMessages['styleClass'].value}" /> + + <rich:notify animationSpeed="#{notifyBean.attributesNotify['animationSpeed'].value}" + appearAnimation="#{notifyBean.attributesNotify['appearAnimation'].value}" + delay="#{notifyBean.attributesNotify['delay'].value}" detail="#{notifyBean.attributesNotify['detail'].value}" + hideAnimation="#{notifyBean.attributesNotify['hideAnimation'].value}" + nonblocking="#{notifyBean.attributesNotify['nonBlocking'].value}" + nonblockingOpacity="#{notifyBean.attributesNotify['nonBlockingOpacity'].value}" + rendered="#{notifyBean.attributesNotify['rendered'].value}" + showCloseButton="#{notifyBean.attributesNotify['showCloseButton'].value}" + showHistory="#{notifyBean.attributesNotify['showHistory'].value}" + showShadow="#{notifyBean.attributesNotify['showShadow'].value}" stack="exampleNotifyStack" + stayTime="#{notifyBean.attributesNotify['stayTime'].value}" sticky="#{notifyBean.attributesNotify['sticky'].value}" + styleClass="#{notifyBean.attributesNotify['styleClass'].value}" + summary=" #{notifyBean.attributesNotify['title'].value}" /> + + <rich:notifyStack id="exampleNotifyStack" direction="#{notifyBean.attributesNotifyStackFirst['direction'].value}" + method="#{notifyBean.attributesNotifyStackFirst['method'].value}" + position="#{notifyBean.attributesNotifyStackFirst['position'].value}" + rendered="#{notifyBean.attributesNotifyStackFirst['rendered'].value}" + styleClass="#{notifyBean.attributesNotifyStackFirst['styleClass'].value}" /> + <h:form> + <h:outputLabel for="number" value="Number (from 5 to 10)" /> + <h:inputText id="number" required="true"> + <f:validateLongRange minimum="5" maximum="10" /> + <a4j:ajax event="change" execute="@form" /> + </h:inputText> + + </h:form> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <h2>Attributes - Notify</h2> + <metamer:attributes value="#{notifyBean.attributesNotify}" id="attributesNotify" render="panel" /> + <h2>Attributes - Notify Messages</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyMessages}" id="attributesNotifyMessages" render="panel" /> + <h2>Attributes - Notify Stack</h2> + <metamer:attributes value="#{notifyBean.attributesNotifyStackFirst}" id="attributesNotifyStack" render="panel" /> + </ui:define> +</ui:composition> + </html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richPickList/simple.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -112,6 +112,8 @@ sourceCaption="#{richPickListBean.attributes['sourceCaption'].value}" style="#{richPickListBean.attributes['style'].value}" styleClass="#{richPickListBean.attributes['styleClass'].value}" + switchByClick="#{richPickListBean.attributes['switchByClick'].value}" + switchByDblClick="#{richPickListBean.attributes['switchByDblClick'].value}" targetCaption="#{richPickListBean.attributes['targetCaption'].value}" upText="#{richPickListBean.attributes['upText'].value}" upTopText="#{richPickListBean.attributes['upTopText'].value}" 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-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/list.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -38,6 +38,11 @@ <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> + + <metamer:testPageLink id="rf-10994" outcome="rf-10994" value="RF-10994"> + The simple sample of <b>rich:tree</b> and <b>DnD</b> simulation issue + <a href="https://issues.jboss.org/browse/RF-10994" target="_blank">RF-10994</a> + </metamer:testPageLink> </ui:define> Copied: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml (from rev 22843, modules/tests/metamer/trunk/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 (rev 0) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richTree/rf-10994.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -0,0 +1,97 @@ +<?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:metamer="http://java.sun.com/jsf/composite/metamer"> + +  + + <ui:composition template="/templates/template.xhtml"> + <ui:param name="componentId" value="rich:tree with DnD" /> + + <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"> + <h:outputStylesheet library="css" name="richDragAndDrop.css" /> + </ui:define> + + <ui:define name="component"> + + <h3><b>JIRA <a href="https://issues.jboss.org/browse/RF-10994">RF-10994</a> simulation</b></h3> + + <p><i>Tree by default using ajax mode. So when you expanding nodes -leafs which getting loaded should be draggable.<br/> + But there is no draggable script resource so you could see JS errors instead saying that Draggable si not a constructor.<br/> + If change toggleType to client - works fine. + If add any draggable component to the page - it also starts works as scripts already inplace. + </i></p> + + <rich:dragIndicator id="indicator" /> + + <p> + <rich:tree value="#{richTreeBean.root}" 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}" /> + </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}" /> + </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}" /> + </a4j:outputPanel> + </rich:treeNode> + + </rich:tree> + </p> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + + <fieldset> + <legend>DnD in rich:tree</legend> + <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" /> + </fieldset> + + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/application/src/main/webapp/components/richValidator/single.xhtml 2011-10-26 11:00:28 UTC (rev 22844) @@ -48,59 +48,11 @@ <ui:define name="component"> <script type="text/javascript"> function setCorrectValues() { - var today = new Date(); - var inPast = new Date(today.getTime() - 4 * 24 * 3600 * 1000); - var inFuture = new Date(today.getTime() + 4 * 24 * 3600 * 1000); - - $('input[id$=assertTrue]')[0].checked = true; - $('input[id$=assertFalse]')[0].checked = false; - $('input[id$=decimalMinMax]').val('3'); - $('input[id$=digits]').val('2.567'); - $('input[id$=max]').val('9'); - $('input[id$=min]').val('4'); - $('input[id$=minMax]').val('4'); - $('input[id$=notEmpty]').val('RichFaces 4'); - $('input[id$=notNull]').val('RichFaces 4'); - $('input[id$=pattern]').val('richFaces 4'); - $('input[id$=regexp]').val('100'); - $('input[id$=custom]').val('RichFaces'); - $('input[id$=past]').val(inPast.format("d mmm yyyy")); - $('input[id$=future]').val(inFuture.format("d mmm yyyy")); - $('input[id$=stringSize]').val('JSF'); - $('input[value=A]')[0].checked=true - $('input[value=B]')[0].checked=true - $('input[value=C]')[0].checked=false - $('input[value=D]')[0].checked=false - $('input[value=E]')[0].checked=false - $('input[value=F]')[0].checked=false + $('input[id$=min]').val('4'); } - function setWrongValues() { - var today = new Date(); - var inPast = new Date(today.getTime() - 4 * 24 * 3600 * 1000); - var inFuture = new Date(today.getTime() + 4 * 24 * 3600 * 1000); - - $('input[id$=assertTrue]')[0].checked = false; - $('input[id$=assertFalse]')[0].checked = true; - $('input[id$=decimalMinMax]').val('10.668'); - $('input[id$=digits]').val('15.627123'); - $('input[id$=max]').val('122'); - $('input[id$=min]').val('-544'); - $('input[id$=minMax]').val('-5'); - $('input[id$=notEmpty]').val(''); - $('input[id$=notNull]').val(''); - $('input[id$=pattern]').val('@@@'); - $('input[id$=regexp]').val('@@@'); - $('input[id$=custom]').val('@@@'); - $('input[id$=past]').val(inFuture.format("d mmm yyyy")); - $('input[id$=future]').val(inPast.format("d mmm yyyy")); - $('input[id$=stringSize]').val('JSF 2'); - $('input[value=A]')[0].checked=false - $('input[value=B]')[0].checked=false - $('input[value=C]')[0].checked=false - $('input[value=D]')[0].checked=false - $('input[value=E]')[0].checked=false - $('input[value=F]')[0].checked=true + function setWrongValues() { + $('input[id$=min]').val('1'); } </script> @@ -108,8 +60,10 @@ <input id="setWrongValuesButton" type="button" value="set wrong values" onclick="setWrongValues()"/> <h:panelGrid columns="3"> - - <rich:validator data="#{richValidatorBean.attributes['data'].value}" + + <h:outputLabel for="min" value="#{minBean.description}" /> + <h:inputText id="min" value="#{minBean.value}" label="#{minBean.label}" converter="#{minBean.converter}"> + <rich:validator data="#{richValidatorBean.attributes['data'].value}" disabled="#{richValidatorBean.attributes['disabled'].value}" immediate="#{richValidatorBean.attributes['immediate'].value}" onbeforedomupdate="#{richValidatorBean.attributes['onbeforedomupdate'].value}" @@ -119,14 +73,9 @@ onerror="#{richValidatorBean.attributes['onerror'].value}" queueId="#{richValidatorBean.attributes['queueId'].value}" status="#{richValidatorBean.attributes['status'].value}" - > - - <h:outputLabel for="min" value="#{minBean.description}" /> - <h:inputText id="min" value="#{minBean.value}" label="#{minBean.label}" converter="#{minBean.converter}" /> + event="blur" /> + </h:inputText> <rich:message id="minMsg" for="min" /> - - - </rich:validator> </h:panelGrid> Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest/pom.xml 2011-10-26 11:00:28 UTC (rev 22844) @@ -447,6 +447,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.enabled</name> + <value>true</value> </property> </activation> <build> @@ -465,7 +466,7 @@ <artifactItem> <groupId>org.richfaces.tests</groupId> <artifactId>metamer</artifactId> - <version>4.1.0-SNAPSHOT</version> + <version>${deployable.version}</version> <type>war</type> <classifier>${deployable.classifier}</classifier> <overWrite>true</overWrite> @@ -488,6 +489,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.enabled</name> + <value>true</value> </property> </activation> <build> @@ -526,6 +528,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.compressedStages</name> + <value>true</value> </property> </activation> <build> @@ -563,6 +566,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.packedStages</name> + <value>true</value> </property> </activation> <build> @@ -600,6 +604,7 @@ <activation> <property> <name>org.richfaces.resourceMapping.enabled</name> + <value>true</value> </property> </activation> <build> Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest/run-test-with-replace-context-params.sh 2011-10-26 11:00:28 UTC (rev 22844) @@ -1,2 +1,12 @@ #!/bin/bash -mvn clean package -Pjboss6x-mojarra -Dtemplates=plain -DcontainerId=jboss6x -Dcargo.jvmargs.additional=-Xmx1536m -Dcontainer.installer.url=file:///media/velkyDisk/Download/jboss-as-distribution-6.0.0.Final.zip -Dorg.richfaces.resourceMapping.enabled -Dorg.richfaces.resourceMapping.packedStages -Dorg.richfaces.resourceMapping.compressedStages -Dbrowser="*chrome /opt/firefox-3.5.5/firefox-bin" -Dtest=TestRichMenuItem -Ddeployable.location=$PWD/target/metamer-updated-jee6.war +mvn clean package -Pjboss6x-mojarra \ +-Dtemplates=plain \ +-DcontainerId=jboss6x \ +-Dcargo.jvmargs.additional=-Xmx1536m \ +-Dcontainer.installer.url=file:///media/velkyDisk/Download/jboss-as-distribution-6.0.0.Final.zip \ +-Dorg.richfaces.resourceMapping.enabled=true \ +-Dorg.richfaces.resourceMapping.packedStages=true \ +-Dorg.richfaces.resourceMapping.compressedStages=true \ +-Dbrowser="*chrome /opt/firefox-3.5.5/firefox-bin" \ +-Ddeployable.location=target/metamer-updated-jee6.war \ +-Dtest=TestRichMenuItem 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-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/AbstractRichNotifyTest.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -53,6 +53,11 @@ protected final Attributes<NotifyStackAttributes> attributesStack = new Attributes<NotifyStackAttributes>(pjq("table.attributes[id$=attributesNotifyStack]")); /** + * attributes for test + */ + protected final Attributes<NotifyTestAttributes> attributesTest = new Attributes<NotifyTestAttributes>(pjq("table.attributes[id$=attributesBean]")); + + /** * notify locator which matches on all notifies and messages */ protected final JQueryLocator notify = jq("div.rf-ntf"); Copied: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java (from rev 22843, modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java) =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java (rev 0) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/NotifyTestAttributes.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -0,0 +1,35 @@ +/******************************************************************************* + * 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.richNotify; + +import org.richfaces.tests.metamer.ftest.attributes.AttributeEnum; + +/** + * @author <a href="mailto:jpapouse@redhat.com">Jan Papousek</a> + */ +public enum NotifyTestAttributes implements AttributeEnum { + + messageCount, + messageDetail, + messageText + +} Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richNotify/TestRichNotify.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -32,12 +32,11 @@ import java.util.Map; import org.jboss.test.selenium.css.CssProperty; -import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.NegationCondition; import org.jboss.test.selenium.waiting.selenium.SeleniumCondition; import org.richfaces.tests.metamer.bean.rich.RichNotifyBean; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; +import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -105,52 +104,33 @@ attributesNotify.set(NotifyAttributes.showHistory, true); assertTrue(selenium.isElementPresent(notifyHistory), "The showHistory is set to <true> and one notify is present, but there is no history menu."); close(notify); - produceMessage(notifyError, "Error", 1); - close(notify); - close(notify); // click on the All button in history menu selenium.click(notifyHistoryAll); - waitModel - .failWith("After clicking on <All> in history menu there should be all notifies. Expected <2>, found <" + getNumberOfNotifies() + ">") - .until(new SeleniumCondition() { - @Override - public boolean isTrue() { - return getNumberOfNotifies() == 2; - } - }); + waitGui + .failWith("After clicking on <All> in history menu there should be all notifies.") + .until(elementPresent.locator(notify)); close(notify); - close(notify); // click on the Last button in the history menu selenium.click(notifyHistoryLast); waitModel - .failWith("After clicking on <Last> in history menu there should be last notify. Expected <1>, found <" + getNumberOfNotifies() + ">") - .until(new SeleniumCondition() { - @Override - public boolean isTrue() { - return getNumberOfNotifies() == 1; - } - }); + .failWith("After clicking on <Last> in history menu there should be last notify.") + .until(elementPresent.locator(notify)); } @Test public void testAttributesStayTime() { // stayTime is set to a very high number - close(notify); - produceMessage(notifyError, "Error", 1); - close(notifyError); delay(1000); assertTrue(selenium.isElementPresent(notify), "The stayTime is set to very high number and after some little delay the notify is not present."); // set the stayTime to <500> attributesNotify.set(NotifyAttributes.stayTime, 500); - produceMessage(notifyError, "Error", 1); - close(notifyError); // wait for <1000> delay(1000); assertFalse(selenium.isElementPresent(notify), "The stayTime is set to 500 but after some delay the notify is still present."); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11433") + @RegressionTest("https://issues.jboss.org/browse/RF-11433") public void testAttributeSticky() { // set the stayTime to <0> attributesNotify.set(NotifyAttributes.stayTime, 0); @@ -159,7 +139,7 @@ waitGui .failWith("The stayTime is set to <0> and sticky to <false>, so the notify shouldn't be present.") .until(NegationCondition.getInstance().condition(elementPresent.locator(notify))); - // produce messages and notifies and close messages + // produce messages and close them for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); close(messages.get(type)); @@ -172,20 +152,14 @@ waitGui .failWith("The stayTime is set to <0> and sticky to <true>, so the notify should be present.") .until(elementPresent.locator(notify)); - closeAll(notify); - // produce messages and notifies and close messages + // produce messages and close them for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); close(messages.get(type)); } - waitModel - .failWith("The stayTime is set to <0> and sticky to <true>, so the notifies should be present.") - .until(new SeleniumCondition() { - @Override - public boolean isTrue() { - return selenium.getCount(notify) == messages.size(); - } - }); + waitGui + .failWith("The stayTime is set to <0> and sticky to <true>, so the notify should be present.") + .until(elementPresent.locator(notify)); } @Test @@ -251,17 +225,16 @@ @Test public void testAttributeMessagesShowHistory() { // check whether the history isn't present (showHistory is set to <false>) - close(notify); assertFalse(selenium.isElementPresent(notifyHistory), "The showHistory is set to <false> and there shouldn't be any history menu."); // set the showHistory to <true> attributesMessages.set(NotifyMessagesAttributes.showHistory, true); + close(notify); // check whether the history isn't displayed (there is no message in the history) assertFalse(selenium.isElementPresent(notifyHistory), "The showHistory is set to <true>, but there is no message, so there shouldn't be any history menu."); // produce messages and close them for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); - close(notify); - close(notify); + close(messages.get(type)); } // click on All button in the history menu selenium.click(notifyHistoryAll); @@ -361,21 +334,21 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11433") + @RegressionTest("https://issues.jboss.org/browse/RF-11433") public void testCloseAndProduceNotify() { // check closing the notify close(notify); waitGui .failWith("After closing notify message the message is stil present.") .until(NegationCondition.getInstance().condition(elementPresent.locator(notify))); - // check producing notifies + // check notify is not produced for(String type : messages.keySet()) { produceMessage(messages.get(type), type, 1); close(messages.get(type)); } waitGui - .failWith("After producing messages the correct number of notifies isn't present. Expected <" + messages.size() + ">, was <" + selenium.getCount(notify) + ">") - .until(countEquals.locator(notify).count(messages.size())); + .failWith("After producing messages there should be no notify. Expected <0>, was <" + selenium.getCount(notify) + ">") + .until(countEquals.locator(notify).count(0)); } @Test @@ -387,19 +360,16 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11433") + @RegressionTest("https://issues.jboss.org/browse/RF-11433") public void testProduceMoreMessages() { // set the messageCount to <testedNumber> int testedNumber = 3; - selenium.type(pjq("input[name*=messageCountInput]"), testedNumber + ""); - selenium.fireEvent(pjq("input[name*=messageCountInput]"), Event.BLUR); - selenium.waitForPageToLoad(); + attributesTest.set(NotifyTestAttributes.messageCount, testedNumber); close(notify); for(String type : messages.keySet()) { produceMessage(messages.get(type), type, testedNumber); - assertEquals(getNumberOfNotifies(), 1, "Number of produced messages has been set to <" + testedNumber + "> but number of notifies should be still <1>."); + assertEquals(getNumberOfNotifies(), 0, "Number of produced messages has been set to <" + testedNumber + "> but number of notifies should be still <0>."); closeAll(messages.get(type)); - close(notify); } } } Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/AbstractOrderingListTest.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -42,6 +42,8 @@ private JQueryLocator requestTime = jq("span#requestTime"); + private JQueryLocator phaseListenerFormat = jq("div#phasesPanel li:eq({0})"); + private JQueryLocator submitButton = pjq("input[id$=submitButton]"); protected static final Attributes<OrderingListAttributes> ATTRIBUTES = new Attributes<OrderingListAttributes>(); @@ -71,6 +73,10 @@ return orderingList; } + protected JQueryLocator getPhaseListener(int index) { + return phaseListenerFormat.format(index); + } + protected void moveBottom() { int beforeIndex = orderingList.getIndexOfSelectedItem(); String stateA = orderingList.getItemColumnValue(beforeIndex, 0); @@ -139,7 +145,6 @@ } protected void submit() { - String timeBefore = selenium.getText(requestTime); selenium.click(submitButton); selenium.waitForPageToLoad(); } Modified: modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java =================================================================== --- modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java 2011-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richOrderingList/TestOrderingListAttributes.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -240,9 +240,13 @@ super.testStyle(getOrderingList().getLocator()); } - @Test(enabled=false) + @Test public void testValueChangeListener() { - + getOrderingList().selectItem(0); + getOrderingList().moveBottom(); + submit(); + assertTrue(selenium.isElementPresent(getPhaseListener(3))); + assertTrue(selenium.getText(getPhaseListener(3)).contains("*3 value changed")); } private void testSizeCssProperty(JQueryLocator element, OrderingListAttributes attribute, CssProperty cssProperty) { 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-10-26 10:50:43 UTC (rev 22843) +++ modules/tests/metamer/branches/wfk2-product-branch/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestWrappingValidatorSingle.java 2011-10-26 11:00:28 UTC (rev 22844) @@ -22,9 +22,12 @@ package org.richfaces.tests.metamer.ftest.richValidator; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import java.net.URL; +import org.jboss.test.selenium.dom.Event; +import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.utils.URLUtils; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.Test; @@ -40,6 +43,11 @@ * @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]"); + private JQueryLocator msg = pjq("span[id$=minMsg] span.rf-msg-err"); /** component page locator */ @Override @@ -48,16 +56,32 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-11139") + @IssueTracking("https://issues.jboss.org/browse/RF-11576") public void testIntegerMin() { - selenium.click(pjq("input[id$=setCorrectValuesButton]")); + selenium.click(setCorrectValBtn); // integer input min - selenium.type(pjq("input[id$=:min]"), "-544"); - guardNoRequest(selenium).click(pjq("input[id$=a4jButton]")); + selenium.type(input, "1"); + guardNoRequest(selenium).click(a4jSubmitBtn); - waitGui.until(textEquals.locator(pjq("span[id$=minMsg] span.rf-msg-det")) - .text("must be greater than or equal to 2")); + 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"); + + // 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")); + } + }

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits October 2011