richfaces-svn-commits August 2010

richfaces-svn-commits@lists.jboss.org

1 participants
734 discussions

JBoss Rich Faces SVN: r18601 - in branches/RF-9040_build_updated_m2: ui and 12 other directories.

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

Author: jbalunas(a)redhat.com Date: 2010-08-12 16:16:31 -0400 (Thu, 12 Aug 2010) New Revision: 18601 Modified: branches/RF-9040_build_updated_m2/bom/pom.xml branches/RF-9040_build_updated_m2/ui/common/api/pom.xml branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml branches/RF-9040_build_updated_m2/ui/dist/pom.xml branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml branches/RF-9040_build_updated_m2/ui/output/api/pom.xml branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml branches/RF-9040_build_updated_m2/ui/parent/pom.xml branches/RF-9040_build_updated_m2/ui/pom.xml Log: RF-9040 ui build refactoring Modified: branches/RF-9040_build_updated_m2/bom/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -63,6 +63,61 @@ <artifactId>richfaces-core-impl</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.output</groupId> + <artifactId>richfaces-ui-output-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${project.version}</version> + </dependency>  <dependency> <groupId>javax.faces</groupId> Modified: branches/RF-9040_build_updated_m2/ui/common/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/common/api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -35,13 +35,7 @@ <packaging>jar</packaging> <dependencies> -  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -64,11 +58,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -36,14 +36,12 @@ <packaging>jar</packaging> <properties> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencies> <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-api</artifactId> - <version>${project.version}</version> </dependency>  @@ -54,11 +52,6 @@  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -81,11 +74,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -62,11 +62,6 @@  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -89,11 +84,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/dist/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/dist/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -20,9 +20,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> @@ -32,10 +33,7 @@ <name>Richfaces UI Assembler</name> <modules> -  -  <module>richfaces-components-api</module> -  <module>richfaces-components-ui</module> </modules> @@ -77,7 +75,8 @@ <profiles> <profile> <id>build-force</id> - + +  <modules> <module>../../core</module> <module>../../misc/dist</module> Modified: branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,6 +25,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> @@ -66,14 +67,6 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,6 +25,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui</groupId> @@ -75,16 +76,6 @@ <artifactId>richfaces-commons-api</artifactId> </dependency> <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,6 +25,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -36,11 +37,6 @@ <dependencies>  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -71,11 +67,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -27,6 +27,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -35,7 +36,6 @@ <packaging>jar</packaging> <properties> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <build> @@ -72,23 +72,16 @@ <artifactId>richfaces-core-impl</artifactId> </dependency> <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> - <version>${project.version}</version> </dependency> - -  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> <scope>provided</scope> </dependency> + +  <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -112,11 +105,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -142,11 +130,6 @@ <artifactId>jsf-mock</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${org.richfaces.cdk.version}</version> - </dependency> </dependencies> <scm> Modified: branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -26,6 +26,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.misc</groupId> @@ -55,16 +56,11 @@ <properties> <assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group> <faces-shade-transformers.version>2</faces-shade-transformers.version> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencies>  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> </dependency> @@ -79,11 +75,6 @@  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -106,11 +97,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/output/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -26,6 +26,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -47,11 +48,6 @@  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -74,11 +70,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -27,6 +27,7 @@ <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.output</groupId> @@ -71,16 +72,10 @@ <dependency> <groupId>org.richfaces.ui.output</groupId> <artifactId>richfaces-ui-output-api</artifactId> - <version>${project.version}</version> </dependency>  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -103,11 +98,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -25,110 +25,20 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <artifactId>richfaces-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <name>Richfaces UI Components: Miscellanous Parent</name> + <name>Richfaces UI Components Parent</name> <packaging>pom</packaging> <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> - <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> - <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> - <org.richfaces.ui.common.version>4.0.0-SNAPSHOT</org.richfaces.ui.common.version> - <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> - <org.richfaces.ui.misc.version>4.0.0-SNAPSHOT</org.richfaces.ui.misc.version> - <org.richfaces.ui.iteration.version>4.0.0-SNAPSHOT</org.richfaces.ui.iteration.version> - <org.richfaces.ui.output.version>4.0.0-SNAPSHOT</org.richfaces.ui.output.version> </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-bom</artifactId> - <version>${org.richfaces.core.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-bom</artifactId> - <version>${org.richfaces.commons.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.common</groupId> - <artifactId>richfaces-ui-common-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.common</groupId> - <artifactId>richfaces-ui-common-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.core</groupId> - <artifactId>richfaces-ui-core-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-ui</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.iteration</groupId> - <artifactId>richfaces-ui-iteration-api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui.output</groupId> - <artifactId>richfaces-ui-output-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui.misc</groupId> - <artifactId>richfaces-ui-misc-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${org.richfaces.cdk.version}</version> - </dependency> - </dependencies> - - </dependencyManagement> - + <build> <pluginManagement> <plugins> @@ -151,7 +61,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>${org.richfaces.cdk.version}</version> + <version>${project.version}</version> <configuration> <library> <prefix>org.richfaces</prefix> @@ -220,11 +130,6 @@  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -247,11 +152,6 @@  <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> - <dependency>  <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -325,8 +225,8 @@ <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/misc/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/misc/parent</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/parent</developerConnection> <url>http://fisheye.jboss.org/browse/richfaces/</url> </scm> </project> Modified: branches/RF-9040_build_updated_m2/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) +++ branches/RF-9040_build_updated_m2/ui/pom.xml 2010-08-12 20:16:31 UTC (rev 18601) @@ -28,7 +28,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.ui</groupId>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18600 - in branches/RF-9040_build_updated_m2/core: commons and 1 other directory.

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

Author: jbalunas(a)redhat.com Date: 2010-08-12 15:33:11 -0400 (Thu, 12 Aug 2010) New Revision: 18600 Modified: branches/RF-9040_build_updated_m2/core/commons/pom.xml branches/RF-9040_build_updated_m2/core/pom.xml Log: RF-9040 core/commons updated Modified: branches/RF-9040_build_updated_m2/core/commons/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/pom.xml 2010-08-12 19:28:21 UTC (rev 18599) +++ branches/RF-9040_build_updated_m2/core/commons/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) @@ -22,10 +22,10 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> <version>4.0.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <relativePath>../parent/pom.xml</relativePath> </parent> - <groupId>org.richfaces.commons</groupId> + <groupId>org.richfaces.core</groupId> <artifactId>richfaces-commons-api</artifactId> <version>4.0.0-SNAPSHOT</version> <name>RichFaces Commons API</name> Modified: branches/RF-9040_build_updated_m2/core/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/pom.xml 2010-08-12 19:28:21 UTC (rev 18599) +++ branches/RF-9040_build_updated_m2/core/pom.xml 2010-08-12 19:33:11 UTC (rev 18600) @@ -37,7 +37,7 @@ <modules> <module>parent</module> - <module>commons/api</module> + <module>commons</module> <module>api</module> <module>impl</module> </modules>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18599 - branches/RF-9040_build_updated_m2/core/commons.

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

Author: jbalunas(a)redhat.com Date: 2010-08-12 15:28:21 -0400 (Thu, 12 Aug 2010) New Revision: 18599 Removed: branches/RF-9040_build_updated_m2/core/commons/api/ Log: RF-9040 build refactor

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18598 - in branches/RF-9040_build_updated_m2: core and 6 other directories.

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

Author: jbalunas(a)redhat.com Date: 2010-08-12 15:20:29 -0400 (Thu, 12 Aug 2010) New Revision: 18598 Added: branches/RF-9040_build_updated_m2/core/commons/checkstyle-suppressions.xml branches/RF-9040_build_updated_m2/core/commons/pom.xml branches/RF-9040_build_updated_m2/core/commons/src/ Removed: branches/RF-9040_build_updated_m2/core/bom/ branches/RF-9040_build_updated_m2/core/commons/api/checkstyle-suppressions.xml branches/RF-9040_build_updated_m2/core/commons/api/pom.xml branches/RF-9040_build_updated_m2/core/commons/api/src/ branches/RF-9040_build_updated_m2/core/commons/bom/pom.xml branches/RF-9040_build_updated_m2/core/commons/lgpl.txt branches/RF-9040_build_updated_m2/core/commons/parent/ branches/RF-9040_build_updated_m2/core/commons/pom.xml Modified: branches/RF-9040_build_updated_m2/bom/pom.xml branches/RF-9040_build_updated_m2/core/api/pom.xml branches/RF-9040_build_updated_m2/core/impl/pom.xml branches/RF-9040_build_updated_m2/core/parent/pom.xml branches/RF-9040_build_updated_m2/core/pom.xml Log: CODING IN PROGRESS - inital updates for RF-9040 Modified: branches/RF-9040_build_updated_m2/bom/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/bom/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -1,102 +1,145 @@ -  -<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> +  +<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/maven-v4_0_0.xsd" +> + <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <packaging>pom</packaging> - <version>4.0.0-SNAPSHOT</version> - <name>RichFaces BOM</name> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <packaging>pom</packaging> + <version>4.0.0-SNAPSHOT</version> + <name>RichFaces BOM</name> - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> - </parent> + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10-SNAPSHOT</version> + </parent> - <description> + <description> The RichFaces "Bill of Materials". This defines all runtime dependency versions for RichFaces. </description> - <url>http://www.jboss.org/richfaces</url> + <url>http://www.jboss.org/richfaces</url> - <properties> - </properties> + <properties> + </properties> -  - <dependencyManagement> - <dependencies> -  -  - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <version>${jsf2.api.version}</version> - </dependency> +  + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>${project.version}</version> + </dependency> +  + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.0.2</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>2.0.1</version> + </dependency> -  - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>r05</version> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.8</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - +  + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r05</version> + </dependency> +  + <dependency> + <groupId>net.sourceforge.cssparser</groupId> + <artifactId>cssparser</artifactId> + <version>0.9.5</version> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> +  <dependency> <groupId>opensymphony</groupId> @@ -114,24 +157,96 @@ <version>1.6.0</version> </dependency> </dependencies> - </dependencyManagement> + </dependencyManagement> - <build> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - </plugin> - </plugins> - </build> + <profiles> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/build/bom - </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/build/bom - </developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/trunk/build/bom</url> - </scm> +  + <profile> + <id>jsf_ri</id> + <activation> + <property> + <name>!jsf_profile</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>test</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>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf_ri_2_1_snapshot</id> + <activation> + <property> + <name>jsf_profile</name> + <value>jsf_ri_2_1_snapshot</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>2.1.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + </plugin> + </plugins> + </build> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/build/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/build/bom</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/build/bom</url> + </scm> + </project> Modified: branches/RF-9040_build_updated_m2/core/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/api/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/api/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -47,13 +47,7 @@ </dependency>  -  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> Deleted: branches/RF-9040_build_updated_m2/core/commons/api/checkstyle-suppressions.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/api/checkstyle-suppressions.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/commons/api/checkstyle-suppressions.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -1,32 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE suppressions PUBLIC - "-//Puppy Crawl//DTD Suppressions 1.0//EN" - "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> - -<suppressions> - <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" /> - <suppress checks="FallThrough" files="JSMin.java" /> - <suppress checks="IllegalCatch" files="UISwitchablePanel.java" /> - <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" /> - <suppress checks="IllegalCatch" files="StagingServer.java" /> - <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" /> - <suppress checks="FallThrough" files="StagingServer.java" /> - <suppress checks="ModifiedControlVariable" files="Cookie.java" /> - <suppress checks="IllegalCatch" files="CacheManager.java" /> - <suppress checks="MissingSwitchDefault" files="JSONTokener.java" /> - <suppress checks="IllegalCatch" files="AjaxViewRoot.java" /> - <suppress checks="FallThrough" files="XMLTokener.java" /> - <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" /> - <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" /> - <suppress checks="ModifiedControlVariable" files="URLCodec.java" /> - -  - <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" /> - <suppress checks="IllegalCatch" files="StagingServer.java" /> - -  - <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> -</suppressions> Deleted: branches/RF-9040_build_updated_m2/core/commons/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/api/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/commons/api/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - <version>4.0.0-SNAPSHOT</version> - <name>RichFaces Commons API</name> - - <dependencies> -  -  - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.test-jsf</groupId> - <artifactId>jsf-mock</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> -  - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - </plugins> - </build> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons/api</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons/api</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons/api</url> - </scm> -</project> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/core/commons/bom/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/bom/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/commons/bom/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -1,70 +0,0 @@ - -  -<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-bom</artifactId> - <packaging>pom</packaging> - <version>4.0.0-SNAPSHOT</version> - <name>RichFaces Commons BOM</name> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> - </parent> - - <description> - The RichFaces Commons "Bill of Materials". This defines any commons specific runtime dependency versions. - </description> - - <url>http://www.jboss.org/richfaces</url> - - <properties> - <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> - </properties> - -  - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <version>${org.richfaces.bom.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons/bom</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons/bom</url> - </scm> - -</project> Copied: branches/RF-9040_build_updated_m2/core/commons/checkstyle-suppressions.xml (from rev 18565, branches/RF-9040_build_updated_m2/core/commons/api/checkstyle-suppressions.xml) =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/checkstyle-suppressions.xml (rev 0) +++ branches/RF-9040_build_updated_m2/core/commons/checkstyle-suppressions.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -0,0 +1,32 @@ +<?xml version="1.0"?> + +<!DOCTYPE suppressions PUBLIC + "-//Puppy Crawl//DTD Suppressions 1.0//EN" + "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> + +<suppressions> + <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" /> + <suppress checks="FallThrough" files="JSMin.java" /> + <suppress checks="IllegalCatch" files="UISwitchablePanel.java" /> + <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" /> + <suppress checks="IllegalCatch" files="StagingServer.java" /> + <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" /> + <suppress checks="FallThrough" files="StagingServer.java" /> + <suppress checks="ModifiedControlVariable" files="Cookie.java" /> + <suppress checks="IllegalCatch" files="CacheManager.java" /> + <suppress checks="MissingSwitchDefault" files="JSONTokener.java" /> + <suppress checks="IllegalCatch" files="AjaxViewRoot.java" /> + <suppress checks="FallThrough" files="XMLTokener.java" /> + <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" /> + <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" /> + <suppress checks="ModifiedControlVariable" files="URLCodec.java" /> + +  + <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" /> + <suppress checks="IllegalCatch" files="StagingServer.java" /> + +  + <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> +</suppressions> Deleted: branches/RF-9040_build_updated_m2/core/commons/lgpl.txt =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/lgpl.txt 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/commons/lgpl.txt 2010-08-12 19:20:29 UTC (rev 18598) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library 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 library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Deleted: branches/RF-9040_build_updated_m2/core/commons/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/commons/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> - </parent> - - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-aggregator</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>Richfaces Commons Aggregator</name> - - <description>The root aggregator for the commons module. This manages intermodule relationships, and destribution assembly where needed.</description> - - <modules> - <module>bom</module> - <module>parent</module> - <module>api</module> - </modules> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons</developerConnection> - <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons</url> - </scm> -</project> - Copied: branches/RF-9040_build_updated_m2/core/commons/pom.xml (from rev 18565, branches/RF-9040_build_updated_m2/core/commons/api/pom.xml) =================================================================== --- branches/RF-9040_build_updated_m2/core/commons/pom.xml (rev 0) +++ branches/RF-9040_build_updated_m2/core/commons/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + + <groupId>org.richfaces.commons</groupId> + <artifactId>richfaces-commons-api</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>RichFaces Commons API</name> + + <dependencies> +  + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> +  + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + </plugins> + </build> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/commons/api</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/commons/api</developerConnection> + <url>http://fisheye.jboss.org/browse/richfaces/trunk/commons/api</url> + </scm> +</project> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/core/commons/src (from rev 18565, branches/RF-9040_build_updated_m2/core/commons/api/src) Modified: branches/RF-9040_build_updated_m2/core/impl/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/impl/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/impl/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -58,11 +58,6 @@  <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> @@ -126,11 +121,6 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> Modified: branches/RF-9040_build_updated_m2/core/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/parent/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/parent/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -28,8 +28,8 @@ <parent> <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>9</version> + <artifactId>richfaces-bom</artifactId> + <version>4.0.0-SNAPSHOT</version> </parent> <description> @@ -42,14 +42,6 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-bom</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> -  <!-- These dependencies are usually provided by Modified: branches/RF-9040_build_updated_m2/core/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/core/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) +++ branches/RF-9040_build_updated_m2/core/pom.xml 2010-08-12 19:20:29 UTC (rev 18598) @@ -23,7 +23,7 @@ <parent> <groupId>org.richfaces</groupId> <artifactId>richfaces-parent</artifactId> - <version>9</version> + <version>10-SNAPSHOT</version> </parent> <groupId>org.richfaces.core</groupId> @@ -36,9 +36,8 @@ <description>The root aggregator for the richfaces core module. This manages intermodule relationships, and destribution assembly where needed.</description> <modules> - <module>commons</module> - <module>bom</module> <module>parent</module> + <module>commons/api</module> <module>api</module> <module>impl</module> </modules>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18597 - modules/build/parent/branches/RF-9040.

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

Author: jbalunas(a)redhat.com Date: 2010-08-12 15:19:17 -0400 (Thu, 12 Aug 2010) New Revision: 18597 Modified: modules/build/parent/branches/RF-9040/pom.xml Log: Removed jsf profiles from richfaces-parent Modified: modules/build/parent/branches/RF-9040/pom.xml =================================================================== --- modules/build/parent/branches/RF-9040/pom.xml 2010-08-12 17:43:25 UTC (rev 18596) +++ modules/build/parent/branches/RF-9040/pom.xml 2010-08-12 19:19:17 UTC (rev 18597) @@ -130,13 +130,6 @@ <artifactId>junit</artifactId> <version>4.7</version> </dependency> -  -  - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <version>${jsf2.impl.version}</version> - </dependency> </dependencies> </dependencyManagement> @@ -344,105 +337,6 @@ </properties> </profile> -  - <profile> - <id>jsf_ri</id> - <activation> - <property> - <name>!jsf_profile</name> - </property> - </activation> - <properties> -  - <jsf2.api.groupid>com.sun.faces</jsf2.api.groupid> - <jsf2.api.artifactid>jsf-api</jsf2.api.artifactid> - <jsf2.api.version>2.0.2</jsf2.api.version> -  - <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid> - <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid> - <jsf2.impl.version>2.0.2</jsf2.impl.version> - </properties> - </profile> - <profile> - <id>jsf_ri_2.0.3</id> - <activation> - <property> - <name>jsf_profile</name> - <value>jsf_ri_2.0.3</value> - </property> - </activation> - <properties> -  - <jsf2.api.groupid>com.sun.faces</jsf2.api.groupid> - <jsf2.api.artifactid>jsf-api</jsf2.api.artifactid> - <jsf2.api.version>2.0.3-B03</jsf2.api.version> -  - <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid> - <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid> - <jsf2.impl.version>2.0.3-B03</jsf2.impl.version> - </properties> - </profile> - <profile> - <id>jsf_ri_snapshot</id> - <activation> - <property> - <name>jsf_profile</name> - <value>jsf_ri_snapshot</value> - </property> - </activation> - <properties> -  - <jsf2.api.groupid>com.sun.faces</jsf2.api.groupid> - <jsf2.api.artifactid>jsf-api</jsf2.api.artifactid> - <jsf2.api.version>2.0.3-SNAPSHOT</jsf2.api.version> -  - <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid> - <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid> - <jsf2.impl.version>2.0.3-SNAPSHOT</jsf2.impl.version> - </properties> - </profile> - <profile> - <id>myfaces</id> - <activation> - <property> - <name>jsf_profile</name> - <value>myfaces</value> - </property> - </activation> - <properties> -  - <jsf2.api.groupid>org.apache.myfaces.core</jsf2.api.groupid> - <jsf2.api.artifactid>myfaces-api</jsf2.api.artifactid> - <jsf2.api.version>2.0.0</jsf2.api.version> -  - <jsf2.impl.groupid>org.apache.myfaces.core</jsf2.impl.groupid> - <jsf2.impl.artifactid>myfaces-impl</jsf2.impl.artifactid> - <jsf2.impl.version>2.0.0</jsf2.impl.version> - </properties> - </profile> - <profile> - <id>myfaces_snapshot</id> - <activation> - <property> - <name>jsf_profile</name> - <value>myfaces_snapshot</value> - </property> - </activation> - <properties> -  - <jsf2.api.groupid>org.apache.myfaces.core</jsf2.api.groupid> - <jsf2.api.artifactid>myfaces-api</jsf2.api.artifactid> - <jsf2.api.version>2.0.1-SNAPSHOT</jsf2.api.version> -  - <jsf2.impl.groupid>org.apache.myfaces.core</jsf2.impl.groupid> - <jsf2.impl.artifactid>myfaces-impl</jsf2.impl.artifactid> - <jsf2.impl.version>2.0.1-SNAPSHOT</jsf2.impl.version> - </properties> - </profile> <!-- This profile can be used while testing staged releases. This works around two issues with how maven inherits from settings.xml @@ -487,7 +381,6 @@ </pluginRepository> </pluginRepositories> </profile> - </profiles> <distributionManagement>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18596 - in trunk/ui/input/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directories.

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

Author: abelevich Date: 2010-08-12 13:43:25 -0400 (Thu, 12 Aug 2010) New Revision: 18596 Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/bg_shadow.png trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/ico_cancel.gif trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/ico_ok.gif trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/mark_changed.gif trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/mark_list.gif trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/spacer.gif Removed: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/css/ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/images/ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/script/ Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml Log: move resources to the org.richfaces, add ok/cancel button support Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-08-12 15:15:56 UTC (rev 18595) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-08-12 17:43:25 UTC (rev 18596) @@ -46,8 +46,8 @@ @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-event.js"), - @ResourceDependency(library="org.richfaces.script", name = "inplaceInput.js"), - @ResourceDependency(library="org.richfaces.css", name = "inplaceInput.ecss") }) + @ResourceDependency(library="org.richfaces", name = "inplaceInput.js"), + @ResourceDependency(library="org.richfaces", name = "inplaceInput.ecss") }) public class InplaceInputBaseRenderer extends RendererBase { public static final String OPTIONS_STATE = "state"; Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/bg_shadow.png =================================================================== (Binary files differ) Property changes on: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/bg_shadow.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/ico_cancel.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/ico_cancel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/ico_ok.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/ico_ok.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss (rev 0) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2010-08-12 17:43:25 UTC (rev 18596) @@ -0,0 +1,155 @@ +input.rf-ii-f { + background-image: none; + background-color : '#{richSkin.editBackgroundColor}'; + border-bottom-width : 10px; + border-bottom-style: solid; + border-bottom-color: '#{richSkin.editBackgroundColor}'; + padding : 0px 0px 0px 0px; + border : 0px; + margin : 0px; + width : 100%; + height : 100%; + font-family:inherit; + font-size : inherit; +} + +.rf-ii-d-s { + display : inline-block; + white-space : nowrap; + background-color : '#{richSkin.editorBackgroundColor}'; + border-bottom-width : 1px; + border-bottom-style : dashed; + border-bottom-color : '#{richSkin.generalTextColor}'; + padding-left : 3px; + padding-right : 3px; + display : inline-block; + position : relative; +} + +.rf-ii-c-s { + display : inline-block; + background-image : url("#{resource['org.richfaces:mark_changed.gif']}"); + background-position : top left; + background-repeat : no-repeat; +} + +.rf-ii-e-s { + position : absolute; + top : 0px; + left : 0px; + display : inline-block; +} + +.rf-ii-f { + background-color : '#{richSkin.editBackgroundColor}'; + border-bottom-width : 10px; + border-bottom-style: solid; + border-bottom-color: '#{richSkin.editBackgroundColor}'; + padding : 0px 0px 0px 0px; + border : 0px; + margin : 0px; + width : 100%; + height : 100% +} + +.rf-ii-strut { + width : 100px; + height : 1px +} + +.rf-ii-btn { + background-image : "url(#{resource['org.richfaces.renderkit.html.images.InplaceComponentButtonGradientImage']})"; + background-position: top; + background-repeat: repeat-x; + background-color: '#{richSkin.tabBackgroundColor}'; + border-width : 1px; + border-style: outset; + border-color: '#{richSkin.panelBorderColor}'; + padding : 0px; + margin : 0px; +} + +.rf-ii-btn-p { + background-image : "url(#{resource['org.richfaces.renderkit.html.images.InplaceComponentPressButtonGradientImage']})"; + background-position: top; + background-repeat: repeat-x; + background-color: '#{richSkin.tabBackgroundColor}'; + border-width : 1px; + border-style : inset; + border-color : '#{richSkin.panelBorderColor}'; + padding : 0px; + margin : 0px; +} + +.rf-ii-btn-set { + position : absolute; + top:0px; + left : 100px; + white-space : nowrap; +} + +.rf-ii-btn-prepos { + position : absolute; + bottom : 0px; + right : 0px; + wigth : 1px; + height : 1px; +} + +.rf-ii-btn-pos { + position : absolute; + top : 1px; + right : 0px; + white-space : nowrap; +} + +.rf-ii-btn-shadow { + position: relative; + padding : 6px 6px 6px 6px; + top : -6px; + right : -6px; +} + +.rf-ii-btn-shadow-t { + background-position : top left; + background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); + position : absolute; + width : 6px; + top : 0px; + bottom : 6px; + left : 0px +} + +.rf-ii-btn-shadow-l { + background-position : bottom left; + background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); + position : absolute; + height : 6px; + bottom : 0px; + left : 0px; + right : 6px; +} + +.rf-ii-btn-shadow-r { + background-position : bottom right; + background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); + position: absolute; + width: 6px; + top: 6px; + bottom: 0px; + right: 0px; +} + +.rf-ii-btn-shadow-b { + background-position : right top; + background-image : url("#{resource['org.richfaces:bg_shadow.png']}"); + position: absolute; + height: 6px; + top: 0px; + left: 6px; + right: 0px; +} + +.rf-ii-none { + display: none; +} \ No newline at end of file Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js (rev 0) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2010-08-12 17:43:25 UTC (rev 18596) @@ -0,0 +1,106 @@ +(function ($, richfaces) { + + richfaces.ui = richfaces.ui || {}; + + richfaces.ui.InplaceInput = function(id, options) { + this.currentState = options.state; + this.editEvent = options.editEvent; + this.noneCss = options.noneCss; + this.changedCss = options.changedCss; + this.showControls = options.showControls; + + + this.element = $(document.getElementById(id)); + this.editContainer = $(document.getElementById(options.editContainer)); + this.input = $(document.getElementById(options.input)); + this.label = $(document.getElementById(options.label)); + this.initialValue = this.label.text(); + + richfaces.Event.bind(this.element, this.editEvent, this.editState, this); + richfaces.Event.bind(this.input, "change", this.changedState, this); + richfaces.Event.bind(this.input, "blur", this.readyState, this); + + if(this.showControls) { + this.okbtn = $(document.getElementById(options.okbtn)); + this.cancelbtn = $(document.getElementById(options.cancelbtn)); + richfaces.Event.bind(this.okbtn, "mousedown", this.clickOk, this); + richfaces.Event.bind(this.cancelbtn, "mousedown", this.clickCancel, this); + } + }; + + $.extend(richfaces.ui.InplaceInput, { + READY : "ready", + EDIT : "edit", + CHANGED : "changed" + }); + + $.extend(richfaces.ui.InplaceInput.prototype, ( function () { + return { + name : "RichFaces.ui.InplaceInput", + + switchToState: function(state) { + if(this.currentState != state) { + var states = RichFaces.ui.InplaceInput; + switch(state) { + case states.READY: this.doReady(); break; + case states.EDIT: this.doEdit(); break; + case states.CHANGED: this.doChanged(); break; + default: + } + this.currentState = state; + } + }, + + editState: function(){ + this.switchToState(RichFaces.ui.InplaceInput.EDIT); + }, + + changedState: function(){ + this.switchToState(RichFaces.ui.InplaceInput.CHANGED); + }, + + readyState: function() { + if(!this.showControls) { + this.switchToState(RichFaces.ui.InplaceInput.READY); + } + }, + + doEdit: function() { + this.editContainer.removeClass(this.noneCss); + this.input.focus(); + }, + + doChanged: function() { + var inputValue = this.input.val(); + if(inputValue.length > 0) { + this.label.text(inputValue); + } + + if(inputValue != this.initialValue) { + this.element.addClass(this.changedCss); + } else { + this.element.removeClass(this.changedCss); + } + }, + + doReady: function() { + this.editContainer.addClass(this.noneCss); + }, + + clickOk: function() { + this.changedState(); + this.switchToState(RichFaces.ui.InplaceInput.READY); + return false; + }, + + clickCancel: function() { + var text = this.label.text(); + this.input.val(text); + this.switchToState(RichFaces.ui.InplaceInput.READY); + return false; + } + } + })()); + +})(jQuery, window.RichFaces); + Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/mark_changed.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/mark_changed.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/mark_list.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/mark_list.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/spacer.gif =================================================================== (Binary files differ) Property changes on: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/spacer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml =================================================================== --- trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-08-12 15:15:56 UTC (rev 18595) +++ trunk/ui/input/ui/src/main/templates/inplaceInput.template.xml 2010-08-12 17:43:25 UTC (rev 18596) @@ -24,7 +24,7 @@ #{inplaceValue} </span> <div id="#{clientId}:edit" class="#{getEditStyleClass(component, inplaceState)}"> - <input id="#{clientId}:input" name="#{clientId}:input" type="text" value="#{inplaceValue}" class="rf-ii-f" /> + <input id="#{clientId}:input" autocomplete="off" name="#{clientId}:input" type="text" value="#{inplaceValue}" class="rf-ii-f" /> <c:if test="#{component.attributes['showControls']}"> <div class="rf-ii-btn-prepos"> @@ -38,12 +38,12 @@ <div id="#{clientId}:btn" style="position : relative"> <input type="image" id="#{clientId}:okbtn" - src="#{getResourcePath(facesContext, 'images/ico_ok.gif')}" + src="#{getResourcePath(facesContext, 'org.richfaces/ico_ok.gif')}" class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" /> <input type="image" id="#{clientId}:cancelbtn" - src="#{getResourcePath(facesContext,'images/ico_cancel.gif')}" + src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}" class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" /> <br />

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18595 - trunk/ui/input/ui/src/main/java/org/richfaces/renderkit.

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

Author: abelevich Date: 2010-08-12 11:15:56 -0400 (Thu, 12 Aug 2010) New Revision: 18595 Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java Log: Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-08-12 14:57:44 UTC (rev 18594) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2010-08-12 15:15:56 UTC (rev 18595) @@ -47,7 +47,7 @@ @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(library="org.richfaces.script", name = "inplaceInput.js"), - @ResourceDependency(library="org.richfaces.css", name = "css/inplaceInput.ecss") }) + @ResourceDependency(library="org.richfaces.css", name = "inplaceInput.ecss") }) public class InplaceInputBaseRenderer extends RendererBase { public static final String OPTIONS_STATE = "state";

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18594 - in branches/RF-9040_build_updated_m2: core/impl/src/main/java/org/richfaces/renderkit/html/images and 80 other directories.

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

Author: jbalunas(a)redhat.com Date: 2010-08-12 10:57:44 -0400 (Thu, 12 Aug 2010) New Revision: 18594 Added: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/app-tags.taglib.xml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml Removed: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml Modified: branches/RF-9040_build_updated_m2/ branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java branches/RF-9040_build_updated_m2/core/impl/src/main/resources/META-INF/resources/richfaces.js branches/RF-9040_build_updated_m2/core/impl/src/test/java/org/richfaces/renderkit/html/images/GradientEnumsTest.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/ajax.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/commandButton.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/commandLink.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/functions.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/log.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/imgUsage.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/simple.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/lookCustomization.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/simple.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/clientParam.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/param.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/skinChange.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/modalPopup.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/simplePopup.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/referencedusage.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/simple.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/viewusage.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml branches/RF-9040_build_updated_m2/ui/output/api/pom.xml branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml branches/RF-9040_build_updated_m2/ui/parent/pom.xml Log: Merged revisions 18579,18581,18584,18586-18588 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk ....... r18579 | nbelaevski | 2010-08-11 18:59:48 -0400 (Wed, 11 Aug 2010) | 1 line ui/common module build integration ....... r18581 | nbelaevski | 2010-08-11 20:10:10 -0400 (Wed, 11 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-9027 ....... r18584 | ilya_shaikovsky | 2010-08-12 06:11:17 -0400 (Thu, 12 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-9022 initial functionality done. ....... r18586 | nbelaevski | 2010-08-12 08:18:20 -0400 (Thu, 12 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-8879 ....... r18587 | ilya_shaikovsky | 2010-08-12 08:44:43 -0400 (Thu, 12 Aug 2010) | 1 line https://jira.jboss.org/browse/RF-9022 ....... r18588 | ilya_shaikovsky | 2010-08-12 09:06:32 -0400 (Thu, 12 Aug 2010) | 1 line checkstyle and compiler warnings corrections ....... Property changes on: branches/RF-9040_build_updated_m2 ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-18564 + /trunk:1-18589 Modified: branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java =================================================================== --- branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -68,7 +68,7 @@ this.height = stream.readInt(); //TODO - create a special method? - this.gradientType = GradientType.PLAIN; + this.gradientType = GradientType.plain; } public Integer getHeight(FacesContext context, String parameterName) { Modified: branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java =================================================================== --- branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientAlignment.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -22,6 +22,7 @@ package org.richfaces.renderkit.html.images; import static java.lang.Math.max; + import java.util.Locale; /** @@ -31,7 +32,7 @@ * @since 3.2 */ public enum GradientAlignment { - TOP { + top { @Override public int getBottomRectangleHeight(int imageHeight, int gradientHeight) { return max(imageHeight - gradientHeight, 0); @@ -41,7 +42,7 @@ return 0; } }, - MIDDLE { + middle { @Override public int getBottomRectangleHeight(int imageHeight, int gradientHeight) { return max((imageHeight - gradientHeight) / 2, 0); @@ -51,7 +52,7 @@ return getBottomRectangleHeight(imageHeight, gradientHeight); } }, - BOTTOM { + bottom { @Override public int getBottomRectangleHeight(int imageHeight, int gradientHeight) { return 0; @@ -64,10 +65,10 @@ public static final GradientAlignment getByParameter(String string) { if ((string == null) || (string.length() == 0)) { - return MIDDLE; + return middle; } - return GradientAlignment.valueOf(string.toUpperCase(Locale.US)); + return GradientAlignment.valueOf(string.toLowerCase(Locale.US)); } public abstract int getTopRectangleHeight(int imageHeight, int gradientHeight); Modified: branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java =================================================================== --- branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/core/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -21,7 +21,7 @@ package org.richfaces.renderkit.html.images; -import java.awt.*; +import java.awt.Color; import java.util.Locale; /** @@ -30,7 +30,7 @@ * created 16.04.2008 */ public enum GradientType { - GLASS { + glass { @Override public BiColor getFirstLayerColors(BiColor biColor) { Color bottomColor = biColor.getBottomColor(); @@ -57,7 +57,7 @@ } } }, - PLASTIC { + plastic { @Override public BiColor getFirstLayerColors(BiColor biColor) { Color bottomColor = biColor.getBottomColor(); @@ -84,7 +84,7 @@ } } }, - PLAIN { + plain { @Override public BiColor getFirstLayerColors(BiColor biColor) { if ((biColor.getBottomColor() != null) && (biColor.getTopColor() != null)) { @@ -104,10 +104,10 @@ public static final GradientType getByParameter(String string) { if ((string == null) || (string.length() == 0)) { - return PLAIN; + return plain; } - return GradientType.valueOf(string.toUpperCase(Locale.US)); + return GradientType.valueOf(string.toLowerCase(Locale.US)); } public abstract BiColor getFirstLayerColors(BiColor biColor); Modified: branches/RF-9040_build_updated_m2/core/impl/src/main/resources/META-INF/resources/richfaces.js =================================================================== --- branches/RF-9040_build_updated_m2/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/core/impl/src/main/resources/META-INF/resources/richfaces.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -186,7 +186,7 @@ var levelSelect = console.children("select.rich-log-element"); if (levelSelect.length == 0) { - levelSelect = jQuery("<select class='rich-log-element' />").appendTo(console); + levelSelect = jQuery("<select class='rich-log-element' name='richfaces.log' />").appendTo(console); } if (levelSelect.children().length == 0) { Modified: branches/RF-9040_build_updated_m2/core/impl/src/test/java/org/richfaces/renderkit/html/images/GradientEnumsTest.java =================================================================== --- branches/RF-9040_build_updated_m2/core/impl/src/test/java/org/richfaces/renderkit/html/images/GradientEnumsTest.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/core/impl/src/test/java/org/richfaces/renderkit/html/images/GradientEnumsTest.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -38,10 +38,10 @@ } public void testAlignment() throws Exception { - GradientAlignment.MIDDLE.equals(GradientAlignment.getByParameter("middle")); + GradientAlignment.middle.equals(GradientAlignment.getByParameter("middle")); } public void testType() throws Exception { - GradientType.PLAIN.equals(GradientType.getByParameter("plain")); + GradientType.plain.equals(GradientType.getByParameter("plain")); } } Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -53,7 +53,7 @@ public String getSkin() { String currentSkin = getViewParameter(SKIN_VIEW_PARAMETER); - if (currentSkin != null){ + if (currentSkin != null) { skin = currentSkin; } return skin; Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -23,6 +23,8 @@ private static final String DEMO_VIEW_PARAMETER = "demo"; private static final String SAMPLE_VIEW_PARAMETER = "sample"; private static final String SEPARATOR = "/"; + private static final String SAMPLE_PREFIX = "-sample"; + private static final String SAMPLES_FOLDER = "samples/"; @ManagedProperty(value = "#{navigationParser.groupsList}") private List<GroupDescriptor> groups; @@ -30,13 +32,13 @@ private SampleDescriptor currentSample; private String sample; private String demo; - + @PostConstruct public void init() { - currentDemo =null; + currentDemo = null; currentSample = null; } - + public DemoDescriptor getCurrentDemo() { String id = getViewParameter(DEMO_VIEW_PARAMETER); if (currentDemo == null || !currentDemo.getId().equals(id)) { @@ -81,9 +83,9 @@ GroupDescriptor group = it.next(); Iterator<DemoDescriptor> dit = group.getDemos().iterator(); while (dit.hasNext()) { - DemoDescriptor demo = (DemoDescriptor) dit.next(); - if (demo.getId().equals(id)) { - return demo; + DemoDescriptor locDemo = (DemoDescriptor) dit.next(); + if (locDemo.getId().equals(id)) { + return locDemo; } } } @@ -91,7 +93,6 @@ } public String getSampleURI() { - DemoDescriptor currentDemo = getCurrentDemo(); FacesContext context = FacesContext.getCurrentInstance(); NavigationHandler handler = context.getApplication().getNavigationHandler(); @@ -108,6 +109,22 @@ return null; } + /** + * @return actual sample inclusion src Consider that: 1) all the samples should be placed in "samples" subfolder of + * the actual sample 2) all the samples pages should use the same name as main sample page with "-sample" + * prefix + */ + public String getSampleIncludeURI() { + String sampleURI = getSampleURI(); + StringBuffer sampleURIBuffer = new StringBuffer(sampleURI); + int folderOffset = sampleURIBuffer.lastIndexOf(currentSample.getId()); + int fileNameOffset = sampleURIBuffer.lastIndexOf(currentSample.getId()) + currentSample.getId().length() + + SAMPLE_PREFIX.length() + 1; + String result = new StringBuffer(sampleURI).insert(folderOffset, SAMPLES_FOLDER).insert(fileNameOffset, + SAMPLE_PREFIX).toString(); + return result; + } + public List<GroupDescriptor> getGroups() { return groups; } Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -11,8 +11,8 @@ private List<DemoDescriptor> demos; - @XmlElementWrapper(name="demos") - @XmlElement(name="demo") + @XmlElementWrapper(name = "demos") + @XmlElement(name = "demo") public List<DemoDescriptor> getDemos() { return demos; } Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components (from rev 18588, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components) Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh (from rev 18588, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,121 +0,0 @@ -package org.richfaces.demo.components.sh; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -import javax.faces.FacesException; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIComponentBase; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.ajax4jsf.javascript.JSFunction; -import org.ajax4jsf.resource.ResourceNotFoundException; - -@FacesComponent(value = "syntaxHighlighter") -@ResourceDependencies({ @ResourceDependency(library = "js", name = "shCore.js"), - @ResourceDependency(library = "css", name = "shCore.css"), - @ResourceDependency(library = "css", name = "shThemeDefault.css"), - @ResourceDependency(library = "js", name = "shBrushJScript.js"), - @ResourceDependency(library = "js", name = "shBrushJava.js"), - @ResourceDependency(library = "js", name = "shBrushXml.js"), - @ResourceDependency(library = "js", name = "shBrushCss.js"), - @ResourceDependency(library = "js", name = "shBrushPlain.js") }) -public class SyntaxHighlighter extends UIComponentBase { - private static final String COMPONENT_FAMILY = "org.richfaces.SyntaxHighlighter"; - private static final String DEFAULT_SOURCE_TYPE = "xhtml"; - - enum propertyKeys { - sourceType, src, style, styleClass - }; - - @Override - public String getFamily() { - return COMPONENT_FAMILY; - } - - private void renderStream(FacesContext context, InputStream stream) throws IOException { - ResponseWriter writer = context.getResponseWriter(); - InputStreamReader in = new InputStreamReader(stream); - char[] temp = new char[1024]; - try { - int bytes; - while ((bytes = in.read(temp)) > 0) { - writer.writeText(temp, 0, bytes); - } - } catch (IOException e) { - throw new FacesException(e); - } finally { - in.close(); - } - } - - private void renderContent(FacesContext context) throws IOException { - ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext(); - String src = getSrc(); - if (src != null) { - InputStream stream = ec.getResourceAsStream(src); - if (stream != null) { - renderStream(context, stream); - } else { - throw new ResourceNotFoundException("resource for highlight not found"); - } - } else { - throw new NullPointerException("src may not be null"); - } - } - - @Override - public void encodeEnd(FacesContext context) throws IOException { - ResponseWriter writer = context.getResponseWriter(); - writer.startElement("div", null); - writer.writeAttribute("id", this.getClientId(), null); - writer.writeAttribute("class", this.getStyleClass(), null); - writer.writeAttribute("style", this.getStyle(), null); - writer.startElement("pre", null); - writer.writeAttribute("class", new StringBuffer().append("brush: ").append(this.getSourceType()), null); - renderContent(context); - writer.endElement("pre"); - JSFunction function = new JSFunction("SyntaxHighlighter.all"); - writer.startElement("script", null); - writer.write(function.toScript()); - writer.endElement("script"); - writer.endElement("div"); - } - - public String getSourceType() { - return (String) getStateHelper().eval(propertyKeys.sourceType, DEFAULT_SOURCE_TYPE); - } - - public void setSourceType(String sourceType) { - getStateHelper().put(propertyKeys.sourceType, sourceType); - } - - public String getSrc() { - return (String) getStateHelper().eval(propertyKeys.src); - } - - public void setSrc(String src) { - getStateHelper().put(propertyKeys.src, src); - } - - public String getStyle() { - return (String) getStateHelper().eval(propertyKeys.style); - } - - public void setStyle(String style) { - getStateHelper().put(propertyKeys.style, style); - } - - public String getStyleClass() { - return (String) getStateHelper().eval(propertyKeys.styleClass); - } - - public void setStyleClass(String styleClass) { - getStateHelper().put(propertyKeys.styleClass, styleClass); - } -} Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java (from rev 18588, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,121 @@ +package org.richfaces.demo.components.sh; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +import javax.faces.FacesException; +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.FacesComponent; +import javax.faces.component.UIComponentBase; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.javascript.JSFunction; +import org.ajax4jsf.resource.ResourceNotFoundException; + +@FacesComponent(value = "syntaxHighlighter") +@ResourceDependencies({ @ResourceDependency(library = "js", name = "shCore.js"), + @ResourceDependency(library = "css", name = "shCore.css"), + @ResourceDependency(library = "css", name = "shThemeDefault.css"), + @ResourceDependency(library = "js", name = "shBrushJScript.js"), + @ResourceDependency(library = "js", name = "shBrushJava.js"), + @ResourceDependency(library = "js", name = "shBrushXml.js"), + @ResourceDependency(library = "js", name = "shBrushCss.js"), + @ResourceDependency(library = "js", name = "shBrushPlain.js") }) +public class SyntaxHighlighter extends UIComponentBase { + private static final String COMPONENT_FAMILY = "org.richfaces.SyntaxHighlighter"; + private static final String DEFAULT_SOURCE_TYPE = "xhtml"; + + enum propertyKeys { + sourceType, src, style, styleClass + }; + + @Override + public String getFamily() { + return COMPONENT_FAMILY; + } + + private void renderStream(FacesContext context, InputStream stream) throws IOException { + ResponseWriter writer = context.getResponseWriter(); + InputStreamReader in = new InputStreamReader(stream); + char[] temp = new char[1024]; + try { + int bytes; + while ((bytes = in.read(temp)) > 0) { + writer.writeText(temp, 0, bytes); + } + } catch (IOException e) { + throw new FacesException(e); + } finally { + in.close(); + } + } + + private void renderContent(FacesContext context) throws IOException { + ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext(); + String src = getSrc(); + if (src != null) { + InputStream stream = ec.getResourceAsStream(src); + if (stream != null) { + renderStream(context, stream); + } else { + throw new ResourceNotFoundException("resource for highlight not found"); + } + } else { + throw new NullPointerException("src may not be null"); + } + } + + @Override + public void encodeEnd(FacesContext context) throws IOException { + ResponseWriter writer = context.getResponseWriter(); + writer.startElement("div", null); + writer.writeAttribute("id", this.getClientId(), null); + writer.writeAttribute("class", this.getStyleClass(), null); + writer.writeAttribute("style", this.getStyle(), null); + writer.startElement("pre", null); + writer.writeAttribute("class", new StringBuffer().append("brush: ").append(this.getSourceType()), null); + renderContent(context); + writer.endElement("pre"); + JSFunction function = new JSFunction("SyntaxHighlighter.all"); + writer.startElement("script", null); + writer.write(function.toScript()); + writer.endElement("script"); + writer.endElement("div"); + } + + public String getSourceType() { + return (String) getStateHelper().eval(propertyKeys.sourceType, DEFAULT_SOURCE_TYPE); + } + + public void setSourceType(String sourceType) { + getStateHelper().put(propertyKeys.sourceType, sourceType); + } + + public String getSrc() { + return (String) getStateHelper().eval(propertyKeys.src); + } + + public void setSrc(String src) { + getStateHelper().put(propertyKeys.src, src); + } + + public String getStyle() { + return (String) getStateHelper().eval(propertyKeys.style); + } + + public void setStyle(String style) { + getStateHelper().put(propertyKeys.style, style); + } + + public String getStyleClass() { + return (String) getStateHelper().eval(propertyKeys.styleClass); + } + + public void setStyleClass(String styleClass) { + getStateHelper().put(propertyKeys.styleClass, styleClass); + } +} Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -5,18 +5,16 @@ import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; - +import javax.faces.bean.RequestScoped; import javax.imageio.ImageIO; @ManagedBean(name = "mediaBean") -@SessionScoped +@RequestScoped public class MediaBean { public void paint(OutputStream out, Object data) throws IOException { if (data instanceof MediaData) { Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,12 +1,12 @@ package org.richfaces.demo.mediaOutput; +import java.io.Serializable; + import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; +import javax.faces.bean.RequestScoped; -import java.io.Serializable; - @ManagedBean(name = "mediaData") -@SessionScoped +@RequestScoped public class MediaData implements Serializable { /** Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,5 +1,9 @@ package org.richfaces.demo.outputPanel; +/** + * @author Ilya Shaikovsky This bean used for outputPanel demo. It's not annotation defined because we need two + * instances under different names. So used faces-config. + */ public class OutputPanelBean { private String text; Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -23,7 +23,7 @@ @ManagedBean(name = "carsBean") @SessionScoped -public class CarsBean implements Serializable{ +public class CarsBean implements Serializable { /** * */ @@ -35,13 +35,13 @@ public List<SelectItem> getVendorOptions() { List<SelectItem> result = new ArrayList<SelectItem>(); - result.add(new SelectItem("","")); + result.add(new SelectItem("", "")); for (InventoryVendorList vendorList : getInventoryVendorLists()) { result.add(new SelectItem(vendorList.getVendor())); } return result; } - + public List<String> getAllVendors() { List<String> result = new ArrayList<String>(); for (InventoryVendorList vendorList : getInventoryVendorLists()) { @@ -58,7 +58,7 @@ Collections.sort(inventoryItems, new Comparator<InventoryItem>() { public int compare(InventoryItem o1, InventoryItem o2) { - return o1.getVendor().compareTo(o2.getVendor()); + return o1.getVendor().compareTo(o2.getVendor()); } }); Iterator<InventoryItem> iterator = inventoryItems.iterator(); Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java 2010-08-12 14:57:44 UTC (rev 18594) @@ -23,14 +23,15 @@ return new Filter<InventoryItem>() { public boolean accept(InventoryItem item) { Long mileage = getMileageFilter(); - if (mileage == null || mileage==0 || mileage.compareTo(item.getMileage().longValue()) >= 0) { + if (mileage == null || mileage == 0 || mileage.compareTo(item.getMileage().longValue()) >= 0) { return true; } return false; } }; } - public Filter<?> getFilterVendor(){ + + public Filter<?> getFilterVendor() { return new Filter<InventoryItem>() { public boolean accept(InventoryItem t) { String vendor = getVendorFilter(); Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/app-tags.taglib.xml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/WEB-INF/app-tags.taglib.xml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/app-tags.taglib.xml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/app-tags.taglib.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,49 @@ + +<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd" + version="2.0"> + <namespace>http://richfaces.org/demo/app-taglib</namespace> + <tag> + <tag-name>syntaxHighlighter</tag-name> + <component> + <component-type>syntaxHighlighter</component-type> + </component> + </tag> +</facelet-taglib> Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/WEB-INF/web.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -9,6 +9,10 @@ <welcome-file>default.htm</welcome-file> <welcome-file>default.jsp</welcome-file> </welcome-file-list> + <context-param> + <param-name>javax.faces.FACELETS_LIBRARIES</param-name> + <param-value>/WEB-INF/app-tags.taglib.xml</param-value> + </context-param> <context-param> <param-name>org.richfaces.enableControlSkinning</param-name> <param-value>true</param-value> Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/css) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,226 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter a, -.syntaxhighlighter div, -.syntaxhighlighter code, -.syntaxhighlighter table, -.syntaxhighlighter table td, -.syntaxhighlighter table tr, -.syntaxhighlighter table tbody, -.syntaxhighlighter table thead, -.syntaxhighlighter table caption, -.syntaxhighlighter textarea { - -moz-border-radius: 0 0 0 0 !important; - -webkit-border-radius: 0 0 0 0 !important; - background: none !important; - border: 0 !important; - bottom: auto !important; - float: none !important; - height: auto !important; - left: auto !important; - line-height: 1.1em !important; - margin: 0 !important; - outline: 0 !important; - overflow: visible !important; - padding: 0 !important; - position: static !important; - right: auto !important; - text-align: left !important; - top: auto !important; - vertical-align: baseline !important; - width: auto !important; - box-sizing: content-box !important; - font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important; - font-weight: normal !important; - font-style: normal !important; - font-size: 1em !important; - min-height: inherit !important; - min-height: auto !important; -} - -.syntaxhighlighter { - width: 100% !important; - margin: 1em 0 1em 0 !important; - position: relative !important; - overflow: auto !important; - font-size: 1em !important; -} -.syntaxhighlighter.source { - overflow: hidden !important; -} -.syntaxhighlighter .bold { - font-weight: bold !important; -} -.syntaxhighlighter .italic { - font-style: italic !important; -} -.syntaxhighlighter .line { - white-space: pre !important; -} -.syntaxhighlighter table { - width: 100% !important; -} -.syntaxhighlighter table caption { - text-align: left !important; - padding: .5em 0 0.5em 1em !important; -} -.syntaxhighlighter table td.code { - width: 100% !important; -} -.syntaxhighlighter table td.code .container { - position: relative !important; -} -.syntaxhighlighter table td.code .container textarea { - box-sizing: border-box !important; - position: absolute !important; - left: 0 !important; - top: 0 !important; - width: 100% !important; - height: 100% !important; - border: none !important; - background: white !important; - padding-left: 1em !important; - overflow: hidden !important; - white-space: pre !important; -} -.syntaxhighlighter table td.gutter .line { - text-align: right !important; - padding: 0 0.5em 0 1em !important; -} -.syntaxhighlighter table td.code .line { - padding: 0 1em !important; -} -.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line { - padding-left: 0em !important; -} -.syntaxhighlighter.show { - display: block !important; -} -.syntaxhighlighter.collapsed table { - display: none !important; -} -.syntaxhighlighter.collapsed .toolbar { - padding: 0.1em 0.8em 0em 0.8em !important; - font-size: 1em !important; - position: static !important; - width: auto !important; - height: auto !important; -} -.syntaxhighlighter.collapsed .toolbar span { - display: inline !important; - margin-right: 1em !important; -} -.syntaxhighlighter.collapsed .toolbar span a { - padding: 0 !important; - display: none !important; -} -.syntaxhighlighter.collapsed .toolbar span a.expandSource { - display: inline !important; -} -.syntaxhighlighter .toolbar { - position: absolute !important; - right: 1px !important; - top: 1px !important; - width: 11px !important; - height: 11px !important; - font-size: 10px !important; - z-index: 10 !important; -} -.syntaxhighlighter .toolbar span.title { - display: inline !important; -} -.syntaxhighlighter .toolbar a { - display: block !important; - text-align: center !important; - text-decoration: none !important; - padding-top: 1px !important; -} -.syntaxhighlighter .toolbar a.expandSource { - display: none !important; -} -.syntaxhighlighter.ie { - font-size: .9em !important; - padding: 1px 0 1px 0 !important; -} -.syntaxhighlighter.ie .toolbar { - line-height: 8px !important; -} -.syntaxhighlighter.ie .toolbar a { - padding-top: 0px !important; -} -.syntaxhighlighter.printing .line.alt1 .content, -.syntaxhighlighter.printing .line.alt2 .content, -.syntaxhighlighter.printing .line.highlighted .number, -.syntaxhighlighter.printing .line.highlighted.alt1 .content, -.syntaxhighlighter.printing .line.highlighted.alt2 .content { - background: none !important; -} -.syntaxhighlighter.printing .line .number { - color: #bbbbbb !important; -} -.syntaxhighlighter.printing .line .content { - color: black !important; -} -.syntaxhighlighter.printing .toolbar { - display: none !important; -} -.syntaxhighlighter.printing a { - text-decoration: none !important; -} -.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a { - color: black !important; -} -.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a { - color: #008200 !important; -} -.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a { - color: blue !important; -} -.syntaxhighlighter.printing .keyword { - color: #006699 !important; - font-weight: bold !important; -} -.syntaxhighlighter.printing .preprocessor { - color: gray !important; -} -.syntaxhighlighter.printing .variable { - color: #aa7700 !important; -} -.syntaxhighlighter.printing .value { - color: #009900 !important; -} -.syntaxhighlighter.printing .functions { - color: #ff1493 !important; -} -.syntaxhighlighter.printing .constants { - color: #0066cc !important; -} -.syntaxhighlighter.printing .script { - font-weight: bold !important; -} -.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a { - color: gray !important; -} -.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a { - color: #ff1493 !important; -} -.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a { - color: red !important; -} -.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a { - color: black !important; -} Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shCore.css 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,226 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +.syntaxhighlighter a, +.syntaxhighlighter div, +.syntaxhighlighter code, +.syntaxhighlighter table, +.syntaxhighlighter table td, +.syntaxhighlighter table tr, +.syntaxhighlighter table tbody, +.syntaxhighlighter table thead, +.syntaxhighlighter table caption, +.syntaxhighlighter textarea { + -moz-border-radius: 0 0 0 0 !important; + -webkit-border-radius: 0 0 0 0 !important; + background: none !important; + border: 0 !important; + bottom: auto !important; + float: none !important; + height: auto !important; + left: auto !important; + line-height: 1.1em !important; + margin: 0 !important; + outline: 0 !important; + overflow: visible !important; + padding: 0 !important; + position: static !important; + right: auto !important; + text-align: left !important; + top: auto !important; + vertical-align: baseline !important; + width: auto !important; + box-sizing: content-box !important; + font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important; + font-weight: normal !important; + font-style: normal !important; + font-size: 1em !important; + min-height: inherit !important; + min-height: auto !important; +} + +.syntaxhighlighter { + width: 100% !important; + margin: 1em 0 1em 0 !important; + position: relative !important; + overflow: auto !important; + font-size: 1em !important; +} +.syntaxhighlighter.source { + overflow: hidden !important; +} +.syntaxhighlighter .bold { + font-weight: bold !important; +} +.syntaxhighlighter .italic { + font-style: italic !important; +} +.syntaxhighlighter .line { + white-space: pre !important; +} +.syntaxhighlighter table { + width: 100% !important; +} +.syntaxhighlighter table caption { + text-align: left !important; + padding: .5em 0 0.5em 1em !important; +} +.syntaxhighlighter table td.code { + width: 100% !important; +} +.syntaxhighlighter table td.code .container { + position: relative !important; +} +.syntaxhighlighter table td.code .container textarea { + box-sizing: border-box !important; + position: absolute !important; + left: 0 !important; + top: 0 !important; + width: 100% !important; + height: 100% !important; + border: none !important; + background: white !important; + padding-left: 1em !important; + overflow: hidden !important; + white-space: pre !important; +} +.syntaxhighlighter table td.gutter .line { + text-align: right !important; + padding: 0 0.5em 0 1em !important; +} +.syntaxhighlighter table td.code .line { + padding: 0 1em !important; +} +.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line { + padding-left: 0em !important; +} +.syntaxhighlighter.show { + display: block !important; +} +.syntaxhighlighter.collapsed table { + display: none !important; +} +.syntaxhighlighter.collapsed .toolbar { + padding: 0.1em 0.8em 0em 0.8em !important; + font-size: 1em !important; + position: static !important; + width: auto !important; + height: auto !important; +} +.syntaxhighlighter.collapsed .toolbar span { + display: inline !important; + margin-right: 1em !important; +} +.syntaxhighlighter.collapsed .toolbar span a { + padding: 0 !important; + display: none !important; +} +.syntaxhighlighter.collapsed .toolbar span a.expandSource { + display: inline !important; +} +.syntaxhighlighter .toolbar { + position: absolute !important; + right: 1px !important; + top: 1px !important; + width: 11px !important; + height: 11px !important; + font-size: 10px !important; + z-index: 10 !important; +} +.syntaxhighlighter .toolbar span.title { + display: inline !important; +} +.syntaxhighlighter .toolbar a { + display: block !important; + text-align: center !important; + text-decoration: none !important; + padding-top: 1px !important; +} +.syntaxhighlighter .toolbar a.expandSource { + display: none !important; +} +.syntaxhighlighter.ie { + font-size: .9em !important; + padding: 1px 0 1px 0 !important; +} +.syntaxhighlighter.ie .toolbar { + line-height: 8px !important; +} +.syntaxhighlighter.ie .toolbar a { + padding-top: 0px !important; +} +.syntaxhighlighter.printing .line.alt1 .content, +.syntaxhighlighter.printing .line.alt2 .content, +.syntaxhighlighter.printing .line.highlighted .number, +.syntaxhighlighter.printing .line.highlighted.alt1 .content, +.syntaxhighlighter.printing .line.highlighted.alt2 .content { + background: none !important; +} +.syntaxhighlighter.printing .line .number { + color: #bbbbbb !important; +} +.syntaxhighlighter.printing .line .content { + color: black !important; +} +.syntaxhighlighter.printing .toolbar { + display: none !important; +} +.syntaxhighlighter.printing a { + text-decoration: none !important; +} +.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a { + color: black !important; +} +.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a { + color: #008200 !important; +} +.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a { + color: blue !important; +} +.syntaxhighlighter.printing .keyword { + color: #006699 !important; + font-weight: bold !important; +} +.syntaxhighlighter.printing .preprocessor { + color: gray !important; +} +.syntaxhighlighter.printing .variable { + color: #aa7700 !important; +} +.syntaxhighlighter.printing .value { + color: #009900 !important; +} +.syntaxhighlighter.printing .functions { + color: #ff1493 !important; +} +.syntaxhighlighter.printing .constants { + color: #0066cc !important; +} +.syntaxhighlighter.printing .script { + font-weight: bold !important; +} +.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a { + color: gray !important; +} +.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a { + color: #ff1493 !important; +} +.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a { + color: red !important; +} +.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a { + color: black !important; +} Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,117 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -.syntaxhighlighter { - background-color: white !important; -} -.syntaxhighlighter .line.alt1 { - background-color: white !important; -} -.syntaxhighlighter .line.alt2 { - background-color: white !important; -} -.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { - background-color: #e0e0e0 !important; -} -.syntaxhighlighter .line.highlighted.number { - color: black !important; -} -.syntaxhighlighter table caption { - color: black !important; -} -.syntaxhighlighter .gutter { - color: #afafaf !important; -} -.syntaxhighlighter .gutter .line { - border-right: 3px solid #6ce26c !important; -} -.syntaxhighlighter .gutter .line.highlighted { - background-color: #6ce26c !important; - color: white !important; -} -.syntaxhighlighter.printing .line .content { - border: none !important; -} -.syntaxhighlighter.collapsed { - overflow: visible !important; -} -.syntaxhighlighter.collapsed .toolbar { - color: blue !important; - background: white !important; - border: 1px solid #6ce26c !important; -} -.syntaxhighlighter.collapsed .toolbar a { - color: blue !important; -} -.syntaxhighlighter.collapsed .toolbar a:hover { - color: red !important; -} -.syntaxhighlighter .toolbar { - color: white !important; - background: #6ce26c !important; - border: none !important; -} -.syntaxhighlighter .toolbar a { - color: white !important; -} -.syntaxhighlighter .toolbar a:hover { - color: black !important; -} -.syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: black !important; -} -.syntaxhighlighter .comments, .syntaxhighlighter .comments a { - color: #008200 !important; -} -.syntaxhighlighter .string, .syntaxhighlighter .string a { - color: blue !important; -} -.syntaxhighlighter .keyword { - color: #006699 !important; -} -.syntaxhighlighter .preprocessor { - color: gray !important; -} -.syntaxhighlighter .variable { - color: #aa7700 !important; -} -.syntaxhighlighter .value { - color: #009900 !important; -} -.syntaxhighlighter .functions { - color: #ff1493 !important; -} -.syntaxhighlighter .constants { - color: #0066cc !important; -} -.syntaxhighlighter .script { - font-weight: bold !important; - color: #006699 !important; - background-color: none !important; -} -.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { - color: gray !important; -} -.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #ff1493 !important; -} -.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { - color: red !important; -} - -.syntaxhighlighter .keyword { - font-weight: bold !important; -} Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/css/shThemeDefault.css 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,117 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +.syntaxhighlighter { + background-color: white !important; +} +.syntaxhighlighter .line.alt1 { + background-color: white !important; +} +.syntaxhighlighter .line.alt2 { + background-color: white !important; +} +.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 { + background-color: #e0e0e0 !important; +} +.syntaxhighlighter .line.highlighted.number { + color: black !important; +} +.syntaxhighlighter table caption { + color: black !important; +} +.syntaxhighlighter .gutter { + color: #afafaf !important; +} +.syntaxhighlighter .gutter .line { + border-right: 3px solid #6ce26c !important; +} +.syntaxhighlighter .gutter .line.highlighted { + background-color: #6ce26c !important; + color: white !important; +} +.syntaxhighlighter.printing .line .content { + border: none !important; +} +.syntaxhighlighter.collapsed { + overflow: visible !important; +} +.syntaxhighlighter.collapsed .toolbar { + color: blue !important; + background: white !important; + border: 1px solid #6ce26c !important; +} +.syntaxhighlighter.collapsed .toolbar a { + color: blue !important; +} +.syntaxhighlighter.collapsed .toolbar a:hover { + color: red !important; +} +.syntaxhighlighter .toolbar { + color: white !important; + background: #6ce26c !important; + border: none !important; +} +.syntaxhighlighter .toolbar a { + color: white !important; +} +.syntaxhighlighter .toolbar a:hover { + color: black !important; +} +.syntaxhighlighter .plain, .syntaxhighlighter .plain a { + color: black !important; +} +.syntaxhighlighter .comments, .syntaxhighlighter .comments a { + color: #008200 !important; +} +.syntaxhighlighter .string, .syntaxhighlighter .string a { + color: blue !important; +} +.syntaxhighlighter .keyword { + color: #006699 !important; +} +.syntaxhighlighter .preprocessor { + color: gray !important; +} +.syntaxhighlighter .variable { + color: #aa7700 !important; +} +.syntaxhighlighter .value { + color: #009900 !important; +} +.syntaxhighlighter .functions { + color: #ff1493 !important; +} +.syntaxhighlighter .constants { + color: #0066cc !important; +} +.syntaxhighlighter .script { + font-weight: bold !important; + color: #006699 !important; + background-color: none !important; +} +.syntaxhighlighter .color1, .syntaxhighlighter .color1 a { + color: gray !important; +} +.syntaxhighlighter .color2, .syntaxhighlighter .color2 a { + color: #ff1493 !important; +} +.syntaxhighlighter .color3, .syntaxhighlighter .color3 a { + color: red !important; +} + +.syntaxhighlighter .keyword { + font-weight: bold !important; +} Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,14 +0,0 @@ -function expandHighlighter() { - jQuery('.show').each(function() { - this.style.display = 'none' - }); - jQuery('.source').slideDown(); - jQuery('.hide').fadeIn(); -} -function collapseHighlighter() { - jQuery('.hide').each(function() { - this.style.display = 'none' - }); - jQuery('.show').fadeIn(); - jQuery('.source').slideUp(); -} \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/sh.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,14 @@ +function expandHighlighter() { + jQuery('.show').each(function() { + this.style.display = 'none' + }); + jQuery('.source').slideDown(); + jQuery('.hide').fadeIn(); +} +function collapseHighlighter() { + jQuery('.hide').each(function() { + this.style.display = 'none' + }); + jQuery('.show').fadeIn(); + jQuery('.source').slideUp(); +} \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,91 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -;(function() -{ - // CommonJS - typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; - - function Brush() - { - function getKeywordsCSS(str) - { - return '\\b([a-z_]|)' + str.replace(/ /g, '(?=:)\\b|\\b([a-z_\\*]|\\*|)') + '(?=:)\\b'; - }; - - function getValuesCSS(str) - { - return '\\b' + str.replace(/ /g, '(?!-)(?!:)\\b|\\b()') + '\:\\b'; - }; - - var keywords = 'ascent azimuth background-attachment background-color background-image background-position ' + - 'background-repeat background baseline bbox border-collapse border-color border-spacing border-style border-top ' + - 'border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color ' + - 'border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width ' + - 'border-bottom-width border-left-width border-width border bottom cap-height caption-side centerline clear clip color ' + - 'content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent direction display ' + - 'elevation empty-cells float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font ' + - 'height left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top ' + - 'margin-right margin-bottom margin-left margin marker-offset marks mathline max-height max-width min-height min-width orphans ' + - 'outline-color outline-style outline-width outline overflow padding-top padding-right padding-bottom padding-left padding page ' + - 'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' + - 'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' + - 'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' + - 'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index'; - - var values = 'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+ - 'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+ - 'continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double '+ - 'embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia '+ - 'gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside invert italic '+ - 'justify landscape large larger left-side left leftwards level lighter lime line-through list-item local loud lower-alpha '+ - 'lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower '+ - 'navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once open-quote outset '+ - 'outside overline pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side '+ - 'rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow '+ - 'small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize '+ - 'table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal '+ - 'text-bottom text-top thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin '+ - 'upper-roman url visible wait white wider w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow'; - - var fonts = '[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif'; - - this.regexList = [ - { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments - { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings - { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings - { regex: /\#[a-fA-F0-9]{3,6}/g, css: 'value' }, // html colors - { regex: /(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)/g, css: 'value' }, // sizes - { regex: /!important/g, css: 'color3' }, // !important - { regex: new RegExp(getKeywordsCSS(keywords), 'gm'), css: 'keyword' }, // keywords - { regex: new RegExp(getValuesCSS(values), 'g'), css: 'value' }, // values - { regex: new RegExp(this.getKeywords(fonts), 'g'), css: 'color1' } // fonts - ]; - - this.forHtmlScript({ - left: /(<|<)\s*style.*?(>|>)/gi, - right: /(<|<)\/\s*style\s*(>|>)/gi - }); - }; - - Brush.prototype = new SyntaxHighlighter.Highlighter(); - Brush.aliases = ['css']; - - SyntaxHighlighter.brushes.CSS = Brush; - - // CommonJS - typeof(exports) != 'undefined' ? exports.Brush = Brush : null; -})(); Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushCss.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,91 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +;(function() +{ + // CommonJS + typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; + + function Brush() + { + function getKeywordsCSS(str) + { + return '\\b([a-z_]|)' + str.replace(/ /g, '(?=:)\\b|\\b([a-z_\\*]|\\*|)') + '(?=:)\\b'; + }; + + function getValuesCSS(str) + { + return '\\b' + str.replace(/ /g, '(?!-)(?!:)\\b|\\b()') + '\:\\b'; + }; + + var keywords = 'ascent azimuth background-attachment background-color background-image background-position ' + + 'background-repeat background baseline bbox border-collapse border-color border-spacing border-style border-top ' + + 'border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color ' + + 'border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width ' + + 'border-bottom-width border-left-width border-width border bottom cap-height caption-side centerline clear clip color ' + + 'content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent direction display ' + + 'elevation empty-cells float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font ' + + 'height left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top ' + + 'margin-right margin-bottom margin-left margin marker-offset marks mathline max-height max-width min-height min-width orphans ' + + 'outline-color outline-style outline-width outline overflow padding-top padding-right padding-bottom padding-left padding page ' + + 'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' + + 'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' + + 'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' + + 'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index'; + + var values = 'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+ + 'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+ + 'continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double '+ + 'embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia '+ + 'gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside invert italic '+ + 'justify landscape large larger left-side left leftwards level lighter lime line-through list-item local loud lower-alpha '+ + 'lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower '+ + 'navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once open-quote outset '+ + 'outside overline pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side '+ + 'rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow '+ + 'small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize '+ + 'table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal '+ + 'text-bottom text-top thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin '+ + 'upper-roman url visible wait white wider w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow'; + + var fonts = '[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif'; + + this.regexList = [ + { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments + { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings + { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings + { regex: /\#[a-fA-F0-9]{3,6}/g, css: 'value' }, // html colors + { regex: /(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)/g, css: 'value' }, // sizes + { regex: /!important/g, css: 'color3' }, // !important + { regex: new RegExp(getKeywordsCSS(keywords), 'gm'), css: 'keyword' }, // keywords + { regex: new RegExp(getValuesCSS(values), 'g'), css: 'value' }, // values + { regex: new RegExp(this.getKeywords(fonts), 'g'), css: 'color1' } // fonts + ]; + + this.forHtmlScript({ + left: /(<|<)\s*style.*?(>|>)/gi, + right: /(<|<)\/\s*style\s*(>|>)/gi + }); + }; + + Brush.prototype = new SyntaxHighlighter.Highlighter(); + Brush.aliases = ['css']; + + SyntaxHighlighter.brushes.CSS = Brush; + + // CommonJS + typeof(exports) != 'undefined' ? exports.Brush = Brush : null; +})(); Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,52 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -;(function() -{ - // CommonJS - typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; - - function Brush() - { - var keywords = 'break case catch continue ' + - 'default delete do else false ' + - 'for function if in instanceof ' + - 'new null return super switch ' + - 'this throw true try typeof var while with' - ; - - var r = SyntaxHighlighter.regexLib; - - this.regexList = [ - { regex: r.multiLineDoubleQuotedString, css: 'string' }, // double quoted strings - { regex: r.multiLineSingleQuotedString, css: 'string' }, // single quoted strings - { regex: r.singleLineCComments, css: 'comments' }, // one line comments - { regex: r.multiLineCComments, css: 'comments' }, // multiline comments - { regex: /\s*#.*/gm, css: 'preprocessor' }, // preprocessor tags like #region and #endregion - { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // keywords - ]; - - this.forHtmlScript(r.scriptScriptTags); - }; - - Brush.prototype = new SyntaxHighlighter.Highlighter(); - Brush.aliases = ['js', 'jscript', 'javascript']; - - SyntaxHighlighter.brushes.JScript = Brush; - - // CommonJS - typeof(exports) != 'undefined' ? exports.Brush = Brush : null; -})(); Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJScript.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,52 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +;(function() +{ + // CommonJS + typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; + + function Brush() + { + var keywords = 'break case catch continue ' + + 'default delete do else false ' + + 'for function if in instanceof ' + + 'new null return super switch ' + + 'this throw true try typeof var while with' + ; + + var r = SyntaxHighlighter.regexLib; + + this.regexList = [ + { regex: r.multiLineDoubleQuotedString, css: 'string' }, // double quoted strings + { regex: r.multiLineSingleQuotedString, css: 'string' }, // single quoted strings + { regex: r.singleLineCComments, css: 'comments' }, // one line comments + { regex: r.multiLineCComments, css: 'comments' }, // multiline comments + { regex: /\s*#.*/gm, css: 'preprocessor' }, // preprocessor tags like #region and #endregion + { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // keywords + ]; + + this.forHtmlScript(r.scriptScriptTags); + }; + + Brush.prototype = new SyntaxHighlighter.Highlighter(); + Brush.aliases = ['js', 'jscript', 'javascript']; + + SyntaxHighlighter.brushes.JScript = Brush; + + // CommonJS + typeof(exports) != 'undefined' ? exports.Brush = Brush : null; +})(); Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,57 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -;(function() -{ - // CommonJS - typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; - - function Brush() - { - var keywords = 'abstract assert boolean break byte case catch char class const ' + - 'continue default do double else enum extends ' + - 'false final finally float for goto if implements import ' + - 'instanceof int interface long native new null ' + - 'package private protected public return ' + - 'short static strictfp super switch synchronized this throw throws true ' + - 'transient try void volatile while'; - - this.regexList = [ - { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments - { regex: /\/\*([^\*][\s\S]*)?\*\//gm, css: 'comments' }, // multiline comments - { regex: /\/\*(?!\*\/)\*[\s\S]*?\*\//gm, css: 'preprocessor' }, // documentation comments - { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings - { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings - { regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi, css: 'value' }, // numbers - { regex: /(?!\@interface\b)\@[\$\w]+\b/g, css: 'color1' }, // annotation @anno - { regex: /\@interface\b/g, css: 'color2' }, // @interface keyword - { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // java keyword - ]; - - this.forHtmlScript({ - left : /(<|<)%[@!=]?/g, - right : /%(>|>)/g - }); - }; - - Brush.prototype = new SyntaxHighlighter.Highlighter(); - Brush.aliases = ['java']; - - SyntaxHighlighter.brushes.Java = Brush; - - // CommonJS - typeof(exports) != 'undefined' ? exports.Brush = Brush : null; -})(); Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushJava.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,57 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +;(function() +{ + // CommonJS + typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; + + function Brush() + { + var keywords = 'abstract assert boolean break byte case catch char class const ' + + 'continue default do double else enum extends ' + + 'false final finally float for goto if implements import ' + + 'instanceof int interface long native new null ' + + 'package private protected public return ' + + 'short static strictfp super switch synchronized this throw throws true ' + + 'transient try void volatile while'; + + this.regexList = [ + { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments + { regex: /\/\*([^\*][\s\S]*)?\*\//gm, css: 'comments' }, // multiline comments + { regex: /\/\*(?!\*\/)\*[\s\S]*?\*\//gm, css: 'preprocessor' }, // documentation comments + { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings + { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings + { regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi, css: 'value' }, // numbers + { regex: /(?!\@interface\b)\@[\$\w]+\b/g, css: 'color1' }, // annotation @anno + { regex: /\@interface\b/g, css: 'color2' }, // @interface keyword + { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // java keyword + ]; + + this.forHtmlScript({ + left : /(<|<)%[@!=]?/g, + right : /%(>|>)/g + }); + }; + + Brush.prototype = new SyntaxHighlighter.Highlighter(); + Brush.aliases = ['java']; + + SyntaxHighlighter.brushes.Java = Brush; + + // CommonJS + typeof(exports) != 'undefined' ? exports.Brush = Brush : null; +})(); Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,33 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -;(function() -{ - // CommonJS - typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; - - function Brush() - { - }; - - Brush.prototype = new SyntaxHighlighter.Highlighter(); - Brush.aliases = ['text', 'plain']; - - SyntaxHighlighter.brushes.Plain = Brush; - - // CommonJS - typeof(exports) != 'undefined' ? exports.Brush = Brush : null; -})(); Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushPlain.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,33 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +;(function() +{ + // CommonJS + typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; + + function Brush() + { + }; + + Brush.prototype = new SyntaxHighlighter.Highlighter(); + Brush.aliases = ['text', 'plain']; + + SyntaxHighlighter.brushes.Plain = Brush; + + // CommonJS + typeof(exports) != 'undefined' ? exports.Brush = Brush : null; +})(); Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,69 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -;(function() -{ - // CommonJS - typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; - - function Brush() - { - function process(match, regexInfo) - { - var constructor = SyntaxHighlighter.Match, - code = match[0], - tag = new XRegExp('(<|<)[\\s\\/\\?]*(?<name>[:\\w-\\.]+)', 'xg').exec(code), - result = [] - ; - - if (match.attributes != null) - { - var attributes, - regex = new XRegExp('(?<name> [\\w:\\-\\.]+)' + - '\\s*=\\s*' + - '(?<value> ".*?"|\'.*?\'|\\w+)', - 'xg'); - - while ((attributes = regex.exec(code)) != null) - { - result.push(new constructor(attributes.name, match.index + attributes.index, 'color1')); - result.push(new constructor(attributes.value, match.index + attributes.index + attributes[0].indexOf(attributes.value), 'string')); - } - } - - if (tag != null) - result.push( - new constructor(tag.name, match.index + tag[0].indexOf(tag.name), 'keyword') - ); - - return result; - } - - this.regexList = [ - { regex: new XRegExp('(\\<|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\>|>)', 'gm'), css: 'color2' }, // <![ ... [ ... ]]> - { regex: SyntaxHighlighter.regexLib.xmlComments, css: 'comments' }, //  - { regex: new XRegExp('(<|<)[\\s\\/\\?]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(>|>)', 'sg'), func: process } - ]; - }; - - Brush.prototype = new SyntaxHighlighter.Highlighter(); - Brush.aliases = ['xml', 'xhtml', 'xslt', 'html']; - - SyntaxHighlighter.brushes.Xml = Brush; - - // CommonJS - typeof(exports) != 'undefined' ? exports.Brush = Brush : null; -})(); Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shBrushXml.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,69 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +;(function() +{ + // CommonJS + typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null; + + function Brush() + { + function process(match, regexInfo) + { + var constructor = SyntaxHighlighter.Match, + code = match[0], + tag = new XRegExp('(<|<)[\\s\\/\\?]*(?<name>[:\\w-\\.]+)', 'xg').exec(code), + result = [] + ; + + if (match.attributes != null) + { + var attributes, + regex = new XRegExp('(?<name> [\\w:\\-\\.]+)' + + '\\s*=\\s*' + + '(?<value> ".*?"|\'.*?\'|\\w+)', + 'xg'); + + while ((attributes = regex.exec(code)) != null) + { + result.push(new constructor(attributes.name, match.index + attributes.index, 'color1')); + result.push(new constructor(attributes.value, match.index + attributes.index + attributes[0].indexOf(attributes.value), 'string')); + } + } + + if (tag != null) + result.push( + new constructor(tag.name, match.index + tag[0].indexOf(tag.name), 'keyword') + ); + + return result; + } + + this.regexList = [ + { regex: new XRegExp('(\\<|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\>|>)', 'gm'), css: 'color2' }, // <![ ... [ ... ]]> + { regex: SyntaxHighlighter.regexLib.xmlComments, css: 'comments' }, //  + { regex: new XRegExp('(<|<)[\\s\\/\\?]*(\\w+)(?<attributes>.*?)[\\s\\/\\?]*(>|>)', 'sg'), func: process } + ]; + }; + + Brush.prototype = new SyntaxHighlighter.Highlighter(); + Brush.aliases = ['xml', 'xhtml', 'xslt', 'html']; + + SyntaxHighlighter.brushes.Xml = Brush; + + // CommonJS + typeof(exports) != 'undefined' ? exports.Brush = Brush : null; +})(); Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,17 +0,0 @@ -/** - * SyntaxHighlighter - * http://alexgorbatchev.com/SyntaxHighlighter - * - * SyntaxHighlighter is donationware. If you are using it, please donate. - * http://alexgorbatchev.com/SyntaxHighlighter/donate.html - * - * @version - * 3.0.83 (July 02 2010) - * - * @copyright - * Copyright (C) 2004-2010 Alex Gorbatchev. - * - * @license - * Dual licensed under the MIT and GPL licenses. - */ -eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('K M;I(M)1S 2U("2a\'t 4k M 4K 2g 3l 4G 4H");(6(){6 r(f,e){I(!M.1R(f))1S 3m("3s 15 4R");K a=f.1w;f=M(f.1m,t(f)+(e||""));I(a)f.1w={1m:a.1m,19:a.19?a.19.1a(0):N};H f}6 t(f){H(f.1J?"g":"")+(f.4s?"i":"")+(f.4p?"m":"")+(f.4v?"x":"")+(f.3n?"y":"")}6 B(f,e,a,b){K c=u.L,d,h,g;v=R;5K{O(;c--;){g=u[c];I(a&g.3r&&(!g.2p||g.2p.W(b))){g.2q.12=e;I((h=g.2q.X(f))&&h.P===e){d={3k:g.2b.W(b,h,a),1C:h};1N}}}}5v(i){1S i}5q{v=11}H d}6 p(f,e,a){I(3b.Z.1i)H f.1i(e,a);O(a=a||0;a<f.L;a++)I(f[a]===e)H a;H-1}M=6(f,e){K a=[],b=M.1B,c=0,d,h;I(M.1R(f)){I(e!==1d)1S 3m("2a\'t 5r 5I 5F 5B 5C 15 5E 5p");H r(f)}I(v)1S 2U("2a\'t W 3l M 59 5m 5g 5x 5i");e=e||"";O(d={2N:11,19:[],2K:6(g){H e.1! i(g)>-1},3d:6(g){e+=g}};c<f.L;)I(h=B(f,c,b,d)){a.U(h.3k);c+=h.1C[0].L||1}Y I(h=n.X.W(z[b],f.1a(c))){a.U(h[0]);c+=h[0].L}Y{h=f.3a(c);I(h==="[")b=M.2I;Y I(h==="]")b=M.1B;a.U(h);c++}a=15(a.1K(""),n.Q.W(e,w,""));a.1w={1m:f,19:d.2N?d.19:N};H a};M.3v="1.5.0";M.2I=1;M.1B=2;K C=/\\$(?:(\\d\\d?|[$&`\'])|{([$\\w]+)})/g,w=/[^5h]+|([\\s\\S])(?=[\\s\\S]*\\1)/g,A=/^(?:[?*+]|{\\d+(?:,\\d*)?})\\??/,v=11,u=[],n={X:15.Z.X,1A:15.Z.1A,1C:1r.Z.1C,Q:1r.Z.Q,1e:1r.Z.1e},x=n.X.W(/()??/,"")[1]===1d,D=6(){K f=/^/g;n.1A.W(f,"");H!f.12}(),y=6(){K f=/x/g;n.Q.W("x",f,"");H!f.12}(),E=15.Z.3n!==1d,z={};z[M.2I]=/^(?:\\\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\\29-26-f]{2}|u[\\29-26-f]{4}|c[A-3o-z]|[\\s\\S]))/;z[M.1B]=/^(?:\\\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\\d*|x[\\29-26-f]{2}|u[\\29-26-f]{4}|c[A-3o-z]|[\\s\\S])|\\(\\?[:=!]|[?*+]\\?|{\\d+(?:,\\d*)?}\\??)/;M.1h=6(f,e,a,b){u.U({2q:r(f,"g"+(E?"y":"")),2b:e,3r:a||M.1B,2p:b||N})};M.2n=6(f,e){K a=f+"/"+(e||"");H M.2n[a]||(M.2n[a]=M(f,e))};M.3c=6(f){H r(f,"g"! )};M.5l=6(f){H f.Q(/[-[\\]{}()*+?.,\\\\^$|#\\s]/g,"\\\\$&")};M! .5e=6(f, e,a,b){e=r(e,"g"+(b&&E?"y":""));e.12=a=a||0;f=e.X(f);H b?f&&f.P===a?f:N:f};M.3q=6(){M.1h=6(){1S 2U("2a\'t 55 1h 54 3q")}};M.1R=6(f){H 53.Z.1q.W(f)==="[2m 15]"};M.3p=6(f,e,a,b){O(K c=r(e,"g"),d=-1,h;h=c.X(f);){a.W(b,h,++d,f,c);c.12===h.P&&c.12++}I(e.1J)e.12=0};M.57=6(f,e){H 6 a(b,c){K d=e[c].1I?e[c]:{1I:e[c]},h=r(d.1I,"g"),g=[],i;O(i=0;i<b.L;i++)M.3p(b[i],h,6(k){g.U(d.3j?k[d.3j]||"":k[0])});H c===e.L-1||!g.L?g:a(g,c+1)}([f],0)};15.Z.1p=6(f,e){H J.X(e[0])};15.Z.W=6(f,e){H J.X(e)};15.Z.X=6(f){K e=n.X.1p(J,14),a;I(e){I(!x&&e.L>1&&p(e,"")>-1){a=15(J.1m,n.Q.W(t(J),"g",""));n.Q.W(f.1a(e.P),a,6(){O(K c=1;c<14.L-2;c++)I(14[c]===1d)e[c]=1d})}I(J.1w&&J.1w.19)O(K b=1;b<e.L;b++)I(a=J.1w.19[b-1])e[a]=e[b];!D&&J.1J&&!e[0].L&&J.12>e.P&&J.12--}H e};I(!D)15.Z.1A=6(f){(f=n.X.W(J,f))&&J.1J&&!f[0].L&&J.12>f.P&&J.12--;H!!f};1r.Z.1C=6(f){M.1R(f)||(f=15(f));I(f.1J){K e=n.1C.1p(J,14);f.12=0;H e}H f.X(J)};1r.Z.Q=6(f,e){K a=M.1R(f),b,c;I(a&&1j e.58()==="3f"&&e.1i("${")===-1&&y)H n.Q.1p(J,14);I(a){I(f.! 1w)b=f.1w.19}Y f+="";I(1j e==="6")c=n.Q.W(J,f,6(){I(b){14[0]=1f 1r(14[0]);O(K d=0;d<b.L;d++)I(b[d])14[0][b[d]]=14[d+1]}I(a&&f.1J)f.12=14[14.L-2]+14[0].L;H e.1p(N,14)});Y{c=J+"";c=n.Q.W(c,f,6(){K d=14;H n.Q.W(e,C,6(h,g,i){I(g)5b(g){24"$":H"$";24"&":H d[0];24"`":H d[d.L-1].1a(0,d[d.L-2]);24"\'":H d[d.L-1].1a(d[d.L-2]+d[0].L);5a:i="";g=+g;I(!g)H h;O(;g>d.L-3;){i=1r.Z.1a.W(g,-1)+i;g=1Q.3i(g/10)}H(g?d[g]||"":"$")+i}Y{g=+i;I(g<=d.L-3)H d[g];g=b?p(b,i):-1;H g>-1?d[g+1]:h}})})}I(a&&f.1J)f.12=0;H c};1r.Z.1e=6(f,e){I(!M.1R(f))H n.1e.1p(J,14);K a=J+"",b=[],c=0,d,h;I(e===1d||+e<0)e=5D;Y{e=1Q.3i(+e);I(!e)H[]}O(f=M.3c(f);d=f.X(a);){I(f.12>c){b.U(a.1a(c,d.P));d.L>1&&d.P<a.L&&3b.Z.U.1p(b,d.1a(1));h=d[0].L;c=f.12;I(b.L>=e)1N}f.12===d.P&&f.12++}I(c===a.L){I(!n.1A.W(f,"")||h)b.U("")}Y b.U(a.1a(c));H b.L>e?b.1a(0,e):b};M.1h(/\$\\?#[^)]*\$/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"});M.1h(/\$(?!\\?)/,6(){J.19.U(N);H"("});M.1h(/\\(\\?<([$\\w]+)>/,6(f){J.19.U(f[1]);J.2N=R;H"("});M.1h(/\\\! \k<([\\w$]+)>/,6(f){K e=p(J.19,f[1]);H e>-1?"\\\\"+(e+1)+(3R(f! .2S.3a(f .P+f[0].L))?"":"(?:)"):f[0]});M.1h(/\\[\\^?]/,6(f){H f[0]==="[]"?"\\\\b\\\\B":"[\\\\s\\\\S]"});M.1h(/^\\(\\?([5A]+)\$/,6(f){J.3d(f[1]);H""});M.1h(/(?:\\s+|#.*)+/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"},M.1B,6(){H J.2K("x")});M.1h(/\\./,6(){H"[\\\\s\\\\S]"},M.1B,6(){H J.2K("s")})})();1j 2e!="1d"&&(2e.M=M);K 1v=6(){6 r(a,b){a.1l.1i(b)!=-1||(a.1l+=" "+b)}6 t(a){H a.1i("3e")==0?a:"3e"+a}6 B(a){H e.1Y.2A[t(a)]}6 p(a,b,c){I(a==N)H N;K d=c!=R?a.3G:[a.2G],h={"#":"1c",".":"1l"}[b.1o(0,1)]||"3h",g,i;g=h!="3h"?b.1o(1):b.5u();I((a[h]||"").1i(g)!=-1)H a;O(a=0;d&&a<d.L&&i==N;a++)i=p(d[a],b,c);H i}6 C(a,b){K c={},d;O(d 2g a)c[d]=a[d];O(d 2g b)c[d]=b[d];H c}6 w(a,b,c,d){6 h(g){g=g||1P.5y;I(!g.1F){g.1F=g.52;g.3N=6(){J.5w=11}}c.W(d||1P,g)}a.3g?a.3g("4U"+b,h):a.4y(b,h,11)}6 A(a,b){K c=e.1Y.2j,d=N;I(c==N){c={};O(K h 2g e.1U){K g=e.1U[h];d=g.4x;I(d!=N){g.1V=h.4w();O(g=0;g<d.L;g++)c[d[g]]=h}}e.1Y.2j=c}d=e.1U[c[a]];d==N&&b!=11&&1P.1X(e.13.1x.1X+(e.13.1x.3E+a));H d}6 v(a,b){O(K c=a.1e("\\n! "),d=0;d<c.L;d++)c[d]=b(c[d],d);H c.1K("\\n")}6 u(a,b){I(a==N||a.L==0||a=="\\n")H a;a=a.Q(/</g,"&1y;");a=a.Q(/ {2,}/g,6(c){O(K d="",h=0;h<c.L-1;h++)d+=e.13.1W;H d+" "});I(b!=N)a=v(a,6(c){I(c.L==0)H"";K d="";c=c.Q(/^(&2s;| )+/,6(h){d=h;H""});I(c.L==0)H d;H d+\'<17 1g="\'+b+\'">\'+c+"</17>"});H a}6 n(a,b){a.1e("\\n");O(K c="",d=0;d<50;d++)c+=" ";H a=v(a,6(h){I(h.1i("\\t")==-1)H h;O(K g=0;(g=h.1i("\\t"))!=-1;)h=h.1o(0,g)+c.1o(0,b-g%b)+h.1o(g+1,h.L);H h})}6 x(a){H a.Q(/^\\s+|\\s+$/g,"")}6 D(a,b){I(a.P<b.P)H-1;Y I(a.P>b.P)H 1;Y I(a.L<b.L)H-1;Y I(a.L>b.L)H 1;H 0}6 y(a,b){6 c(k){H k[0]}O(K d=N,h=[],g=b.2D?b.2D:c;(d=b.1I.X(a))!=N;){K i=g(d,b);I(1j i=="3f")i=[1f e.2L(i,d.P,b.23)];h=h.1O(i)}H h}6 E(a){K b=/(.*)((&1G;|&1y;).*)/;H a.Q(e.3A.3M,6(c){K d="",h=N;I(h=b.X(c)){c=h[1];d=h[2]}H\'<a 2h="\'+c+\'">\'+c+"</a>"+d})}6 z(){O(K a=1E.36("1k"),b=[],c=0;c<a.L;c++)a[c].3s=="20"&&b.U(a[c]);H b}6 f(a){a=a.1F;K b=p(a,".20",R);a=p(a,".3O",R);K c=1E.4i("3t");I(!(!a||!b||p(a,"! 3t"))){B(b.1c);r(b,"1m");O(K d=a.3G,h=[],g=0;g<d.L;g++)h.U(d[g! ].4z||d[ g].4A);h=h.1K("\\r");c.39(1E.4D(h));a.39(c);c.2C();c.4C();w(c,"4u",6(){c.2G.4E(c);b.1l=b.1l.Q("1m","")})}}I(1j 3F!="1d"&&1j M=="1d")M=3F("M").M;K e={2v:{"1g-27":"","2i-1s":1,"2z-1s-2t":11,1M:N,1t:N,"42-45":R,"43-22":4,1u:R,16:R,"3V-17":R,2l:11,"41-40":R,2k:11,"1z-1k":11},13:{1W:"&2s;",2M:R,46:11,44:11,34:"4n",1x:{21:"4o 1m",2P:"?",1X:"1v\\n\\n",3E:"4r\'t 4t 1D O: ",4g:"4m 4B\'t 51 O 1z-1k 4F: ",37:\'<!4T 1z 4S "-//4V//3H 4W 1.0 4Z//4Y" "1Z://2y.3L.3K/4X/3I/3H/3I-4P.4J"><1z 4I="1Z://2y.3L.3K/4L/5L"><3J><4N 1Z-4M="5G-5M" 6K="2O/1z; 6J=6I-8" /><1t>6L 1v</1t></3J><3B 1L="25-6M:6Q,6P,6O,6N-6F;6y-2f:#6x;2f:#6w;25-22:6v;2O-3D:3C;"><T 1L="2O-3D:3C;3w-32:1.6z;"><T 1L="25-22:6A-6E;">1v</T><T 1L="25-22:.6C;3w-6B:6R;"><T>3v 3.0.76 (72 73 3x)</T><T><a 2h="1Z://3u.2w/1v" 1F="38" 1L="2f:#3y">1Z://3u.2w/1v</a></T><T>70 17 6U 71.</T><T>6T 6X-3x 6Y 6D.</T></T><T>6t 61 60 J 1k, 5Z <a 2h="6u://2y.62.2w/63-66/65?64=5X-5W&5P=5O" 1L="2f:#3y">5R</a> 5V <2R/>5U 5T 5S!</T></T></3B></1z>\'}},1Y:{2j:N,! 2A:{}},1U:{},3A:{6n:/\\/\\*[\\s\\S]*?\\*\\//2c,6m:/\\/\\/.*$/2c,6l:/#.*$/2c,6k:/"([^\\\\"\\n]|\\\\.)*"/g,6o:/\'([^\\\\\'\\n]|\\\\.)*\'/g,6p:1f M(\'"([^\\\\\\\\"]|\\\\\\\\.)*"\',"3z"),6s:1f M("\'([^\\\\\\\\\']|\\\\\\\\.)*\'","3z"),6q:/(&1y;|<)!--[\\s\\S]*?--(&1G;|>)/2c,3M:/\\w+:\\/\\/[\\w-.\\/?%&=:@;]*/g,6a:{18:/(&1y;|<)\\?=?/g,1b:/\\?(&1G;|>)/g},69:{18:/(&1y;|<)%=?/g,1b:/%(&1G;|>)/g},6d:{18:/(&1y;|<)\\s*1k.*?(&1G;|>)/2T,1b:/(&1y;|<)\\/\\s*1k\\s*(&1G;|>)/2T}},16:{1H:6(a){6 b(i,k){H e.16.2o(i,k,e.13.1x[k])}O(K c=\'<T 1g="16">\',d=e.16.2x,h=d.2X,g=0;g<h.L;g++)c+=(d[h[g]].1H||b)(a,h[g]);c+="</T>";H c},2o:6(a,b,c){H\'<2W><a 2h="#" 1g="6e 6h\'+b+" "+b+\'">\'+c+"</a></2W>"},2b:6(a){K b=a.1F,c=b.1l||"";b=B(p(b,".20",R).1c);K d=6(h){H(h=15(h+"6f(\\\\w+)").X(c))?h[1]:N}("6g");b&&d&&e.16.2x[d].2B(b);a.3N()},2x:{2X:["21","2P"],21:{1H:6(a){I(a.V("2l")!=R)H"";K b=a.V("1t");H e.16.2o(a,"21",b?b:e.13.1x.21)},2B:6(a){a=1E.6j(t(a.1c));a.1l=a.1l.Q("47","")}},2P:{2B:6(){K a="68=0";a+=", 18="+(! 31.30-33)/2+", 32="+(31.2Z-2Y)/2+", 30=33, 2Z=2Y";a=a.Q(/^,/,"! ");a=1P. 6Z("","38",a);a.2C();K b=a.1E;b.6W(e.13.1x.37);b.6V();a.2C()}}}},35:6(a,b){K c;I(b)c=[b];Y{c=1E.36(e.13.34);O(K d=[],h=0;h<c.L;h++)d.U(c[h]);c=d}c=c;d=[];I(e.13.2M)c=c.1O(z());I(c.L===0)H d;O(h=0;h<c.L;h++){O(K g=c[h],i=a,k=c[h].1l,j=3W 0,l={},m=1f M("^\\\\[(?<2V>(.*?))\\\\]$"),s=1f M("(?<27>[\\\\w-]+)\\\\s*:\\\\s*(?<1T>[\\\\w-%#]+|\\\\[.*?\\\\]|\\".*?\\"|\'.*?\')\\\\s*;?","g");(j=s.X(k))!=N;){K o=j.1T.Q(/^[\'"]|[\'"]$/g,"");I(o!=N&&m.1A(o)){o=m.X(o);o=o.2V.L>0?o.2V.1e(/\\s*,\\s*/):[]}l[j.27]=o}g={1F:g,1n:C(i,l)};g.1n.1D!=N&&d.U(g)}H d},1M:6(a,b){K c=J.35(a,b),d=N,h=e.13;I(c.L!==0)O(K g=0;g<c.L;g++){b=c[g];K i=b.1F,k=b.1n,j=k.1D,l;I(j!=N){I(k["1z-1k"]=="R"||e.2v["1z-1k"]==R){d=1f e.4l(j);j="4O"}Y I(d=A(j))d=1f d;Y 6H;l=i.3X;I(h.2M){l=l;K m=x(l),s=11;I(m.1i("<![6G[")==0){m=m.4h(9);s=R}K o=m.L;I(m.1i("]]\\>")==o-3){m=m.4h(0,o-3);s=R}l=s?m:l}I((i.1t||"")!="")k.1t=i.1t;k.1D=j;d.2Q(k);b=d.2F(l);I((i.1c||"")!="")b.1c=i.1c;i.2G.74(b,i)}}},2E:6(a){w(1P,"4k",6(){e.1M(a)})}};e.2E=e.2E! ;e.1M=e.1M;e.2L=6(a,b,c){J.1T=a;J.P=b;J.L=a.L;J.23=c;J.1V=N};e.2L.Z.1q=6(){H J.1T};e.4l=6(a){6 b(j,l){O(K m=0;m<j.L;m++)j[m].P+=l}K c=A(a),d,h=1f e.1U.5Y,g=J,i="2F 1H 2Q".1e(" ");I(c!=N){d=1f c;O(K k=0;k<i.L;k++)(6(){K j=i[k];g[j]=6(){H h[j].1p(h,14)}})();d.28==N?1P.1X(e.13.1x.1X+(e.13.1x.4g+a)):h.2J.U({1I:d.28.17,2D:6(j){O(K l=j.17,m=[],s=d.2J,o=j.P+j.18.L,F=d.28,q,G=0;G<s.L;G++){q=y(l,s[G]);b(q,o);m=m.1O(q)}I(F.18!=N&&j.18!=N){q=y(j.18,F.18);b(q,j.P);m=m.1O(q)}I(F.1b!=N&&j.1b!=N){q=y(j.1b,F.1b);b(q,j.P+j[0].5Q(j.1b));m=m.1O(q)}O(j=0;j<m.L;j++)m[j].1V=c.1V;H m}})}};e.4j=6(){};e.4j.Z={V:6(a,b){K c=J.1n[a];c=c==N?b:c;K d={"R":R,"11":11}[c];H d==N?c:d},3Y:6(a){H 1E.4i(a)},4c:6(a,b){K c=[];I(a!=N)O(K d=0;d<a.L;d++)I(1j a[d]=="2m")c=c.1O(y(b,a[d]));H J.4e(c.6b(D))},4e:6(a){O(K b=0;b<a.L;b++)I(a[b]!==N)O(K c=a[b],d=c.P+c.L,h=b+1;h<a.L&&a[b]!==N;h++){K g=a[h];I(g!==N)I(g.P>d)1N;Y I(g.P==c.P&&g.L>c.L)a[b]=N;Y I(g.P>=c.P&&g.P<d)a[h]=N}H a},4d:6(a){K b=[],c=2u(J.V("2i-1s"));v(a,6(d,! h){b.U(h+c)});H b},3U:6(a){K b=J.V("1M",[]);I(1j b!="2m"&&b.U=! =N)b=[b] ;a:{a=a.1q();K c=3W 0;O(c=c=1Q.6c(c||0,0);c<b.L;c++)I(b[c]==a){b=c;1N a}b=-1}H b!=-1},2r:6(a,b,c){a=["1s","6i"+b,"P"+a,"6r"+(b%2==0?1:2).1q()];J.3U(b)&&a.U("67");b==0&&a.U("1N");H\'<T 1g="\'+a.1K(" ")+\'">\'+c+"</T>"},3Q:6(a,b){K c="",d=a.1e("\\n").L,h=2u(J.V("2i-1s")),g=J.V("2z-1s-2t");I(g==R)g=(h+d-1).1q().L;Y I(3R(g)==R)g=0;O(K i=0;i<d;i++){K k=b?b[i]:h+i,j;I(k==0)j=e.13.1W;Y{j=g;O(K l=k.1q();l.L<j;)l="0"+l;j=l}a=j;c+=J.2r(i,k,a)}H c},49:6(a,b){a=x(a);K c=a.1e("\\n");J.V("2z-1s-2t");K d=2u(J.V("2i-1s"));a="";O(K h=J.V("1D"),g=0;g<c.L;g++){K i=c[g],k=/^(&2s;|\\s)+/.X(i),j=N,l=b?b[g]:d+g;I(k!=N){j=k[0].1q();i=i.1o(j.L);j=j.Q(" ",e.13.1W)}i=x(i);I(i.L==0)i=e.13.1W;a+=J.2r(g,l,(j!=N?\'<17 1g="\'+h+\' 5N">\'+j+"</17>":"")+i)}H a},4f:6(a){H a?"<4a>"+a+"</4a>":""},4b:6(a,b){6 c(l){H(l=l?l.1V||g:g)?l+" ":""}O(K d=0,h="",g=J.V("1D",""),i=0;i<b.L;i++){K k=b[i],j;I(!(k===N||k.L===0)){j=c(k);h+=u(a.1o(d,k.P-d),j+"48")+u(k.1T,j+k.23);d=k.P+k.L+(k.75||0)}}h+=u(a.1o(d),c()+"48");H h},1H! :6(a){K b="",c=["20"],d;I(J.V("2k")==R)J.1n.16=J.1n.1u=11;1l="20";J.V("2l")==R&&c.U("47");I((1u=J.V("1u"))==11)c.U("6S");c.U(J.V("1g-27"));c.U(J.V("1D"));a=a.Q(/^[ ]*[\\n]+|[\\n]*[ ]*$/g,"").Q(/\\r/g," ");b=J.V("43-22");I(J.V("42-45")==R)a=n(a,b);Y{O(K h="",g=0;g<b;g++)h+=" ";a=a.Q(/\\t/g,h)}a=a;a:{b=a=a;h=/<2R\\s*\\/?>|&1y;2R\\s*\\/?&1G;/2T;I(e.13.46==R)b=b.Q(h,"\\n");I(e.13.44==R)b=b.Q(h,"");b=b.1e("\\n");h=/^\\s*/;g=4Q;O(K i=0;i<b.L&&g>0;i++){K k=b[i];I(x(k).L!=0){k=h.X(k);I(k==N){a=a;1N a}g=1Q.4q(k[0].L,g)}}I(g>0)O(i=0;i<b.L;i++)b[i]=b[i].1o(g);a=b.1K("\\n")}I(1u)d=J.4d(a);b=J.4c(J.2J,a);b=J.4b(a,b);b=J.49(b,d);I(J.V("41-40"))b=E(b);1j 2H!="1d"&&2H.3S&&2H.3S.1C(/5s/)&&c.U("5t");H b=\'<T 1c="\'+t(J.1c)+\'" 1g="\'+c.1K(" ")+\'">\'+(J.V("16")?e.16.1H(J):"")+\'<3Z 5z="0" 5H="0" 5J="0">\'+J.4f(J.V("1t"))+"<3T><3P>"+(1u?\'<2d 1g="1u">\'+J.3Q(a)+"</2d>":"")+\'<2d 1g="17"><T 1g="3O">\'+b+"</T></2d></3P></3T></3Z></T>"},2F:6(a){I(a===N)a="";J.17=a;K b=J.3Y("T");b.3X=J.1H(a);J.V(! "16")&&w(p(b,".16"),"5c",e.16.2b);J.V("3V-17")&&w(p(b,".17"),"! 56",f);H b},2Q:6(a){J.1c=""+1Q.5d(1Q.5n()*5k).1q();e.1Y.2A[t(J.1c)]=J;J.1n=C(e.2v,a||{});I(J.V("2k")==R)J.1n.16=J.1n.1u=11},5j:6(a){a=a.Q(/^\\s+|\\s+$/g,"").Q(/\\s+/g,"|");H"\\\\b(?:"+a+")\\\\b"},5f:6(a){J.28={18:{1I:a.18,23:"1k"},1b:{1I:a.1b,23:"1k"},17:1f M("(?<18>"+a.18.1m+")(?<17>.*?)(?<1b>"+a.1b.1m+")","5o")}}};H e}();1j 2e!="1d"&&(2e.1v=1v);',62,441,'||||||function|||||||||||||||||||||||||||||||||||||return|if|this|var|length|XRegExp|null|for|index|replace|true||div|push|getParam|call|exec|else|prototype||false|lastIndex|config|arguments|RegExp|toolbar|code|left|captureNames|slice|right|id|undefined|split|new|class|addToken|indexOf|typeof|script|className|source|params|substr|apply|toString|String|line|title|gutter|SyntaxHighlighter|_xregexp|strings|lt|html|test|OUTSIDE_CLASS|match|brush|document|target|gt|getHtml|regex|global|join|style|highlight|break|concat|window|Math|isRegExp|throw|value|brushes|brushName|space|alert|vars|http|syntaxhighlighter|expandSource|size|css|case|! font|Fa|name|htmlScript|dA|can|handler|gm|td|exports|color|in|href|first|discoveredBrushes|light|collapse|object|cache|getButtonHtml|trigger|pattern|getLineHtml|nbsp|numbers|parseInt|defaults|com|items|www|pad|highlighters|execute|focus|func|all|getDiv|parentNode|navigator|INSIDE_CLASS|regexList|hasFlag|Match|useScriptTags|hasNamedCapture|text|help|init|br|input|gi|Error|values|span|list|250|height|width|screen|top|500|tagName|findElements|getElementsByTagName|aboutDialog|_blank|appendChild|charAt|Array|copyAsGlobal|setFlag|highlighter_|string|attachEvent|nodeName|floor|backref|output|the|TypeError|sticky|Za|iterate|freezeTokens|scope|type|textarea|alexgorbatchev|version|margin|2010|005896|gs|regexLib|body|center|align|noBrush|require|childNodes|DTD|xhtml1|head|org|w3|url|preventDefault|container|tr|getLineNumbersHtml|isNaN|userAgent|tbody|isLineHighlighted|quick|void|innerHTML|create|table|links|auto|smart|tab|stripBrs|tabs|bloggerMode|collapsed|plain|getCodeLinesHtml|capt! ion|getMatchesHtml|findMatches|figureOutLineNumbers|removeNest! edMatche s|getTitleHtml|brushNotHtmlScript|substring|createElement|Highlighter|load|HtmlScript|Brush|pre|expand|multiline|min|Can|ignoreCase|find|blur|extended|toLowerCase|aliases|addEventListener|innerText|textContent|wasn|select|createTextNode|removeChild|option|same|frame|xmlns|dtd|twice|1999|equiv|meta|htmlscript|transitional|1E3|expected|PUBLIC|DOCTYPE|on|W3C|XHTML|TR|EN|Transitional||configured|srcElement|Object|after|run|dblclick|matchChain|valueOf|constructor|default|switch|click|round|execAt|forHtmlScript|token|gimy|functions|getKeywords|1E6|escape|within|random|sgi|another|finally|supply|MSIE|ie|toUpperCase|catch|returnValue|definition|event|border|imsx|constructing|one|Infinity|from|when|Content|cellpadding|flags|cellspacing|try|xhtml|Type|spaces|2930402|hosted_button_id|lastIndexOf|donate|active|development|keep|to|xclick|_s|Xml|please|like|you|paypal|cgi|cmd|webscr|bin|highlighted|scrollbars|aspScriptTags|phpScriptTags|sort|max|scriptScriptTags|toolbar_item|_|command|com! mand_|number|getElementById|doubleQuotedString|singleLinePerlComments|singleLineCComments|multiLineCComments|singleQuotedString|multiLineDoubleQuotedString|xmlComments|alt|multiLineSingleQuotedString|If|https|1em|000|fff|background|5em|xx|bottom|75em|Gorbatchev|large|serif|CDATA|continue|utf|charset|content|About|family|sans|Helvetica|Arial|Geneva|3em|nogutter|Copyright|syntax|close|write|2004|Alex|open|JavaScript|highlighter|July|02|replaceChild|offset|83'.split('|'),0,{})) Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/resources/js/shCore.js 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,17 @@ +/** + * SyntaxHighlighter + * http://alexgorbatchev.com/SyntaxHighlighter + * + * SyntaxHighlighter is donationware. If you are using it, please donate. + * http://alexgorbatchev.com/SyntaxHighlighter/donate.html + * + * @version + * 3.0.83 (July 02 2010) + * + * @copyright + * Copyright (C) 2004-2010 Alex Gorbatchev. + * + * @license + * Dual licensed under the MIT and GPL licenses. + */ +eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('K M;I(M)1S 2U("2a\'t 4k M 4K 2g 3l 4G 4H");(6(){6 r(f,e){I(!M.1R(f))1S 3m("3s 15 4R");K a=f.1w;f=M(f.1m,t(f)+(e||""));I(a)f.1w={1m:a.1m,19:a.19?a.19.1a(0):N};H f}6 t(f){H(f.1J?"g":"")+(f.4s?"i":"")+(f.4p?"m":"")+(f.4v?"x":"")+(f.3n?"y":"")}6 B(f,e,a,b){K c=u.L,d,h,g;v=R;5K{O(;c--;){g=u[c];I(a&g.3r&&(!g.2p||g.2p.W(b))){g.2q.12=e;I((h=g.2q.X(f))&&h.P===e){d={3k:g.2b.W(b,h,a),1C:h};1N}}}}5v(i){1S i}5q{v=11}H d}6 p(f,e,a){I(3b.Z.1i)H f.1i(e,a);O(a=a||0;a<f.L;a++)I(f[a]===e)H a;H-1}M=6(f,e){K a=[],b=M.1B,c=0,d,h;I(M.1R(f)){I(e!==1d)1S 3m("2a\'t 5r 5I 5F 5B 5C 15 5E 5p");H r(f)}I(v)1S 2U("2a\'t W 3l M 59 5m 5g 5x 5i");e=e||"";O(d={2N:11,19:[],2K:6(g){H e.1! i(g)>-1},3d:6(g){e+=g}};c<f.L;)I(h=B(f,c,b,d)){a.U(h.3k);c+=h.1C[0].L||1}Y I(h=n.X.W(z[b],f.1a(c))){a.U(h[0]);c+=h[0].L}Y{h=f.3a(c);I(h==="[")b=M.2I;Y I(h==="]")b=M.1B;a.U(h);c++}a=15(a.1K(""),n.Q.W(e,w,""));a.1w={1m:f,19:d.2N?d.19:N};H a};M.3v="1.5.0";M.2I=1;M.1B=2;K C=/\\$(?:(\\d\\d?|[$&`\'])|{([$\\w]+)})/g,w=/[^5h]+|([\\s\\S])(?=[\\s\\S]*\\1)/g,A=/^(?:[?*+]|{\\d+(?:,\\d*)?})\\??/,v=11,u=[],n={X:15.Z.X,1A:15.Z.1A,1C:1r.Z.1C,Q:1r.Z.Q,1e:1r.Z.1e},x=n.X.W(/()??/,"")[1]===1d,D=6(){K f=/^/g;n.1A.W(f,"");H!f.12}(),y=6(){K f=/x/g;n.Q.W("x",f,"");H!f.12}(),E=15.Z.3n!==1d,z={};z[M.2I]=/^(?:\\\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\\29-26-f]{2}|u[\\29-26-f]{4}|c[A-3o-z]|[\\s\\S]))/;z[M.1B]=/^(?:\\\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\\d*|x[\\29-26-f]{2}|u[\\29-26-f]{4}|c[A-3o-z]|[\\s\\S])|\\(\\?[:=!]|[?*+]\\?|{\\d+(?:,\\d*)?}\\??)/;M.1h=6(f,e,a,b){u.U({2q:r(f,"g"+(E?"y":"")),2b:e,3r:a||M.1B,2p:b||N})};M.2n=6(f,e){K a=f+"/"+(e||"");H M.2n[a]||(M.2n[a]=M(f,e))};M.3c=6(f){H r(f,"g"! )};M.5l=6(f){H f.Q(/[-[\\]{}()*+?.,\\\\^$|#\\s]/g,"\\\\$&")};M! .5e=6(f, e,a,b){e=r(e,"g"+(b&&E?"y":""));e.12=a=a||0;f=e.X(f);H b?f&&f.P===a?f:N:f};M.3q=6(){M.1h=6(){1S 2U("2a\'t 55 1h 54 3q")}};M.1R=6(f){H 53.Z.1q.W(f)==="[2m 15]"};M.3p=6(f,e,a,b){O(K c=r(e,"g"),d=-1,h;h=c.X(f);){a.W(b,h,++d,f,c);c.12===h.P&&c.12++}I(e.1J)e.12=0};M.57=6(f,e){H 6 a(b,c){K d=e[c].1I?e[c]:{1I:e[c]},h=r(d.1I,"g"),g=[],i;O(i=0;i<b.L;i++)M.3p(b[i],h,6(k){g.U(d.3j?k[d.3j]||"":k[0])});H c===e.L-1||!g.L?g:a(g,c+1)}([f],0)};15.Z.1p=6(f,e){H J.X(e[0])};15.Z.W=6(f,e){H J.X(e)};15.Z.X=6(f){K e=n.X.1p(J,14),a;I(e){I(!x&&e.L>1&&p(e,"")>-1){a=15(J.1m,n.Q.W(t(J),"g",""));n.Q.W(f.1a(e.P),a,6(){O(K c=1;c<14.L-2;c++)I(14[c]===1d)e[c]=1d})}I(J.1w&&J.1w.19)O(K b=1;b<e.L;b++)I(a=J.1w.19[b-1])e[a]=e[b];!D&&J.1J&&!e[0].L&&J.12>e.P&&J.12--}H e};I(!D)15.Z.1A=6(f){(f=n.X.W(J,f))&&J.1J&&!f[0].L&&J.12>f.P&&J.12--;H!!f};1r.Z.1C=6(f){M.1R(f)||(f=15(f));I(f.1J){K e=n.1C.1p(J,14);f.12=0;H e}H f.X(J)};1r.Z.Q=6(f,e){K a=M.1R(f),b,c;I(a&&1j e.58()==="3f"&&e.1i("${")===-1&&y)H n.Q.1p(J,14);I(a){I(f.! 1w)b=f.1w.19}Y f+="";I(1j e==="6")c=n.Q.W(J,f,6(){I(b){14[0]=1f 1r(14[0]);O(K d=0;d<b.L;d++)I(b[d])14[0][b[d]]=14[d+1]}I(a&&f.1J)f.12=14[14.L-2]+14[0].L;H e.1p(N,14)});Y{c=J+"";c=n.Q.W(c,f,6(){K d=14;H n.Q.W(e,C,6(h,g,i){I(g)5b(g){24"$":H"$";24"&":H d[0];24"`":H d[d.L-1].1a(0,d[d.L-2]);24"\'":H d[d.L-1].1a(d[d.L-2]+d[0].L);5a:i="";g=+g;I(!g)H h;O(;g>d.L-3;){i=1r.Z.1a.W(g,-1)+i;g=1Q.3i(g/10)}H(g?d[g]||"":"$")+i}Y{g=+i;I(g<=d.L-3)H d[g];g=b?p(b,i):-1;H g>-1?d[g+1]:h}})})}I(a&&f.1J)f.12=0;H c};1r.Z.1e=6(f,e){I(!M.1R(f))H n.1e.1p(J,14);K a=J+"",b=[],c=0,d,h;I(e===1d||+e<0)e=5D;Y{e=1Q.3i(+e);I(!e)H[]}O(f=M.3c(f);d=f.X(a);){I(f.12>c){b.U(a.1a(c,d.P));d.L>1&&d.P<a.L&&3b.Z.U.1p(b,d.1a(1));h=d[0].L;c=f.12;I(b.L>=e)1N}f.12===d.P&&f.12++}I(c===a.L){I(!n.1A.W(f,"")||h)b.U("")}Y b.U(a.1a(c));H b.L>e?b.1a(0,e):b};M.1h(/\$\\?#[^)]*\$/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"});M.1h(/\$(?!\\?)/,6(){J.19.U(N);H"("});M.1h(/\\(\\?<([$\\w]+)>/,6(f){J.19.U(f[1]);J.2N=R;H"("});M.1h(/\\\! \k<([\\w$]+)>/,6(f){K e=p(J.19,f[1]);H e>-1?"\\\\"+(e+1)+(3R(f! .2S.3a(f .P+f[0].L))?"":"(?:)"):f[0]});M.1h(/\\[\\^?]/,6(f){H f[0]==="[]"?"\\\\b\\\\B":"[\\\\s\\\\S]"});M.1h(/^\\(\\?([5A]+)\$/,6(f){J.3d(f[1]);H""});M.1h(/(?:\\s+|#.*)+/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"},M.1B,6(){H J.2K("x")});M.1h(/\\./,6(){H"[\\\\s\\\\S]"},M.1B,6(){H J.2K("s")})})();1j 2e!="1d"&&(2e.M=M);K 1v=6(){6 r(a,b){a.1l.1i(b)!=-1||(a.1l+=" "+b)}6 t(a){H a.1i("3e")==0?a:"3e"+a}6 B(a){H e.1Y.2A[t(a)]}6 p(a,b,c){I(a==N)H N;K d=c!=R?a.3G:[a.2G],h={"#":"1c",".":"1l"}[b.1o(0,1)]||"3h",g,i;g=h!="3h"?b.1o(1):b.5u();I((a[h]||"").1i(g)!=-1)H a;O(a=0;d&&a<d.L&&i==N;a++)i=p(d[a],b,c);H i}6 C(a,b){K c={},d;O(d 2g a)c[d]=a[d];O(d 2g b)c[d]=b[d];H c}6 w(a,b,c,d){6 h(g){g=g||1P.5y;I(!g.1F){g.1F=g.52;g.3N=6(){J.5w=11}}c.W(d||1P,g)}a.3g?a.3g("4U"+b,h):a.4y(b,h,11)}6 A(a,b){K c=e.1Y.2j,d=N;I(c==N){c={};O(K h 2g e.1U){K g=e.1U[h];d=g.4x;I(d!=N){g.1V=h.4w();O(g=0;g<d.L;g++)c[d[g]]=h}}e.1Y.2j=c}d=e.1U[c[a]];d==N&&b!=11&&1P.1X(e.13.1x.1X+(e.13.1x.3E+a));H d}6 v(a,b){O(K c=a.1e("\\n! "),d=0;d<c.L;d++)c[d]=b(c[d],d);H c.1K("\\n")}6 u(a,b){I(a==N||a.L==0||a=="\\n")H a;a=a.Q(/</g,"&1y;");a=a.Q(/ {2,}/g,6(c){O(K d="",h=0;h<c.L-1;h++)d+=e.13.1W;H d+" "});I(b!=N)a=v(a,6(c){I(c.L==0)H"";K d="";c=c.Q(/^(&2s;| )+/,6(h){d=h;H""});I(c.L==0)H d;H d+\'<17 1g="\'+b+\'">\'+c+"</17>"});H a}6 n(a,b){a.1e("\\n");O(K c="",d=0;d<50;d++)c+=" ";H a=v(a,6(h){I(h.1i("\\t")==-1)H h;O(K g=0;(g=h.1i("\\t"))!=-1;)h=h.1o(0,g)+c.1o(0,b-g%b)+h.1o(g+1,h.L);H h})}6 x(a){H a.Q(/^\\s+|\\s+$/g,"")}6 D(a,b){I(a.P<b.P)H-1;Y I(a.P>b.P)H 1;Y I(a.L<b.L)H-1;Y I(a.L>b.L)H 1;H 0}6 y(a,b){6 c(k){H k[0]}O(K d=N,h=[],g=b.2D?b.2D:c;(d=b.1I.X(a))!=N;){K i=g(d,b);I(1j i=="3f")i=[1f e.2L(i,d.P,b.23)];h=h.1O(i)}H h}6 E(a){K b=/(.*)((&1G;|&1y;).*)/;H a.Q(e.3A.3M,6(c){K d="",h=N;I(h=b.X(c)){c=h[1];d=h[2]}H\'<a 2h="\'+c+\'">\'+c+"</a>"+d})}6 z(){O(K a=1E.36("1k"),b=[],c=0;c<a.L;c++)a[c].3s=="20"&&b.U(a[c]);H b}6 f(a){a=a.1F;K b=p(a,".20",R);a=p(a,".3O",R);K c=1E.4i("3t");I(!(!a||!b||p(a,"! 3t"))){B(b.1c);r(b,"1m");O(K d=a.3G,h=[],g=0;g<d.L;g++)h.U(d[g! ].4z||d[ g].4A);h=h.1K("\\r");c.39(1E.4D(h));a.39(c);c.2C();c.4C();w(c,"4u",6(){c.2G.4E(c);b.1l=b.1l.Q("1m","")})}}I(1j 3F!="1d"&&1j M=="1d")M=3F("M").M;K e={2v:{"1g-27":"","2i-1s":1,"2z-1s-2t":11,1M:N,1t:N,"42-45":R,"43-22":4,1u:R,16:R,"3V-17":R,2l:11,"41-40":R,2k:11,"1z-1k":11},13:{1W:"&2s;",2M:R,46:11,44:11,34:"4n",1x:{21:"4o 1m",2P:"?",1X:"1v\\n\\n",3E:"4r\'t 4t 1D O: ",4g:"4m 4B\'t 51 O 1z-1k 4F: ",37:\'<!4T 1z 4S "-//4V//3H 4W 1.0 4Z//4Y" "1Z://2y.3L.3K/4X/3I/3H/3I-4P.4J"><1z 4I="1Z://2y.3L.3K/4L/5L"><3J><4N 1Z-4M="5G-5M" 6K="2O/1z; 6J=6I-8" /><1t>6L 1v</1t></3J><3B 1L="25-6M:6Q,6P,6O,6N-6F;6y-2f:#6x;2f:#6w;25-22:6v;2O-3D:3C;"><T 1L="2O-3D:3C;3w-32:1.6z;"><T 1L="25-22:6A-6E;">1v</T><T 1L="25-22:.6C;3w-6B:6R;"><T>3v 3.0.76 (72 73 3x)</T><T><a 2h="1Z://3u.2w/1v" 1F="38" 1L="2f:#3y">1Z://3u.2w/1v</a></T><T>70 17 6U 71.</T><T>6T 6X-3x 6Y 6D.</T></T><T>6t 61 60 J 1k, 5Z <a 2h="6u://2y.62.2w/63-66/65?64=5X-5W&5P=5O" 1L="2f:#3y">5R</a> 5V <2R/>5U 5T 5S!</T></T></3B></1z>\'}},1Y:{2j:N,! 2A:{}},1U:{},3A:{6n:/\\/\\*[\\s\\S]*?\\*\\//2c,6m:/\\/\\/.*$/2c,6l:/#.*$/2c,6k:/"([^\\\\"\\n]|\\\\.)*"/g,6o:/\'([^\\\\\'\\n]|\\\\.)*\'/g,6p:1f M(\'"([^\\\\\\\\"]|\\\\\\\\.)*"\',"3z"),6s:1f M("\'([^\\\\\\\\\']|\\\\\\\\.)*\'","3z"),6q:/(&1y;|<)!--[\\s\\S]*?--(&1G;|>)/2c,3M:/\\w+:\\/\\/[\\w-.\\/?%&=:@;]*/g,6a:{18:/(&1y;|<)\\?=?/g,1b:/\\?(&1G;|>)/g},69:{18:/(&1y;|<)%=?/g,1b:/%(&1G;|>)/g},6d:{18:/(&1y;|<)\\s*1k.*?(&1G;|>)/2T,1b:/(&1y;|<)\\/\\s*1k\\s*(&1G;|>)/2T}},16:{1H:6(a){6 b(i,k){H e.16.2o(i,k,e.13.1x[k])}O(K c=\'<T 1g="16">\',d=e.16.2x,h=d.2X,g=0;g<h.L;g++)c+=(d[h[g]].1H||b)(a,h[g]);c+="</T>";H c},2o:6(a,b,c){H\'<2W><a 2h="#" 1g="6e 6h\'+b+" "+b+\'">\'+c+"</a></2W>"},2b:6(a){K b=a.1F,c=b.1l||"";b=B(p(b,".20",R).1c);K d=6(h){H(h=15(h+"6f(\\\\w+)").X(c))?h[1]:N}("6g");b&&d&&e.16.2x[d].2B(b);a.3N()},2x:{2X:["21","2P"],21:{1H:6(a){I(a.V("2l")!=R)H"";K b=a.V("1t");H e.16.2o(a,"21",b?b:e.13.1x.21)},2B:6(a){a=1E.6j(t(a.1c));a.1l=a.1l.Q("47","")}},2P:{2B:6(){K a="68=0";a+=", 18="+(! 31.30-33)/2+", 32="+(31.2Z-2Y)/2+", 30=33, 2Z=2Y";a=a.Q(/^,/,"! ");a=1P. 6Z("","38",a);a.2C();K b=a.1E;b.6W(e.13.1x.37);b.6V();a.2C()}}}},35:6(a,b){K c;I(b)c=[b];Y{c=1E.36(e.13.34);O(K d=[],h=0;h<c.L;h++)d.U(c[h]);c=d}c=c;d=[];I(e.13.2M)c=c.1O(z());I(c.L===0)H d;O(h=0;h<c.L;h++){O(K g=c[h],i=a,k=c[h].1l,j=3W 0,l={},m=1f M("^\\\\[(?<2V>(.*?))\\\\]$"),s=1f M("(?<27>[\\\\w-]+)\\\\s*:\\\\s*(?<1T>[\\\\w-%#]+|\\\\[.*?\\\\]|\\".*?\\"|\'.*?\')\\\\s*;?","g");(j=s.X(k))!=N;){K o=j.1T.Q(/^[\'"]|[\'"]$/g,"");I(o!=N&&m.1A(o)){o=m.X(o);o=o.2V.L>0?o.2V.1e(/\\s*,\\s*/):[]}l[j.27]=o}g={1F:g,1n:C(i,l)};g.1n.1D!=N&&d.U(g)}H d},1M:6(a,b){K c=J.35(a,b),d=N,h=e.13;I(c.L!==0)O(K g=0;g<c.L;g++){b=c[g];K i=b.1F,k=b.1n,j=k.1D,l;I(j!=N){I(k["1z-1k"]=="R"||e.2v["1z-1k"]==R){d=1f e.4l(j);j="4O"}Y I(d=A(j))d=1f d;Y 6H;l=i.3X;I(h.2M){l=l;K m=x(l),s=11;I(m.1i("<![6G[")==0){m=m.4h(9);s=R}K o=m.L;I(m.1i("]]\\>")==o-3){m=m.4h(0,o-3);s=R}l=s?m:l}I((i.1t||"")!="")k.1t=i.1t;k.1D=j;d.2Q(k);b=d.2F(l);I((i.1c||"")!="")b.1c=i.1c;i.2G.74(b,i)}}},2E:6(a){w(1P,"4k",6(){e.1M(a)})}};e.2E=e.2E! ;e.1M=e.1M;e.2L=6(a,b,c){J.1T=a;J.P=b;J.L=a.L;J.23=c;J.1V=N};e.2L.Z.1q=6(){H J.1T};e.4l=6(a){6 b(j,l){O(K m=0;m<j.L;m++)j[m].P+=l}K c=A(a),d,h=1f e.1U.5Y,g=J,i="2F 1H 2Q".1e(" ");I(c!=N){d=1f c;O(K k=0;k<i.L;k++)(6(){K j=i[k];g[j]=6(){H h[j].1p(h,14)}})();d.28==N?1P.1X(e.13.1x.1X+(e.13.1x.4g+a)):h.2J.U({1I:d.28.17,2D:6(j){O(K l=j.17,m=[],s=d.2J,o=j.P+j.18.L,F=d.28,q,G=0;G<s.L;G++){q=y(l,s[G]);b(q,o);m=m.1O(q)}I(F.18!=N&&j.18!=N){q=y(j.18,F.18);b(q,j.P);m=m.1O(q)}I(F.1b!=N&&j.1b!=N){q=y(j.1b,F.1b);b(q,j.P+j[0].5Q(j.1b));m=m.1O(q)}O(j=0;j<m.L;j++)m[j].1V=c.1V;H m}})}};e.4j=6(){};e.4j.Z={V:6(a,b){K c=J.1n[a];c=c==N?b:c;K d={"R":R,"11":11}[c];H d==N?c:d},3Y:6(a){H 1E.4i(a)},4c:6(a,b){K c=[];I(a!=N)O(K d=0;d<a.L;d++)I(1j a[d]=="2m")c=c.1O(y(b,a[d]));H J.4e(c.6b(D))},4e:6(a){O(K b=0;b<a.L;b++)I(a[b]!==N)O(K c=a[b],d=c.P+c.L,h=b+1;h<a.L&&a[b]!==N;h++){K g=a[h];I(g!==N)I(g.P>d)1N;Y I(g.P==c.P&&g.L>c.L)a[b]=N;Y I(g.P>=c.P&&g.P<d)a[h]=N}H a},4d:6(a){K b=[],c=2u(J.V("2i-1s"));v(a,6(d,! h){b.U(h+c)});H b},3U:6(a){K b=J.V("1M",[]);I(1j b!="2m"&&b.U=! =N)b=[b] ;a:{a=a.1q();K c=3W 0;O(c=c=1Q.6c(c||0,0);c<b.L;c++)I(b[c]==a){b=c;1N a}b=-1}H b!=-1},2r:6(a,b,c){a=["1s","6i"+b,"P"+a,"6r"+(b%2==0?1:2).1q()];J.3U(b)&&a.U("67");b==0&&a.U("1N");H\'<T 1g="\'+a.1K(" ")+\'">\'+c+"</T>"},3Q:6(a,b){K c="",d=a.1e("\\n").L,h=2u(J.V("2i-1s")),g=J.V("2z-1s-2t");I(g==R)g=(h+d-1).1q().L;Y I(3R(g)==R)g=0;O(K i=0;i<d;i++){K k=b?b[i]:h+i,j;I(k==0)j=e.13.1W;Y{j=g;O(K l=k.1q();l.L<j;)l="0"+l;j=l}a=j;c+=J.2r(i,k,a)}H c},49:6(a,b){a=x(a);K c=a.1e("\\n");J.V("2z-1s-2t");K d=2u(J.V("2i-1s"));a="";O(K h=J.V("1D"),g=0;g<c.L;g++){K i=c[g],k=/^(&2s;|\\s)+/.X(i),j=N,l=b?b[g]:d+g;I(k!=N){j=k[0].1q();i=i.1o(j.L);j=j.Q(" ",e.13.1W)}i=x(i);I(i.L==0)i=e.13.1W;a+=J.2r(g,l,(j!=N?\'<17 1g="\'+h+\' 5N">\'+j+"</17>":"")+i)}H a},4f:6(a){H a?"<4a>"+a+"</4a>":""},4b:6(a,b){6 c(l){H(l=l?l.1V||g:g)?l+" ":""}O(K d=0,h="",g=J.V("1D",""),i=0;i<b.L;i++){K k=b[i],j;I(!(k===N||k.L===0)){j=c(k);h+=u(a.1o(d,k.P-d),j+"48")+u(k.1T,j+k.23);d=k.P+k.L+(k.75||0)}}h+=u(a.1o(d),c()+"48");H h},1H! :6(a){K b="",c=["20"],d;I(J.V("2k")==R)J.1n.16=J.1n.1u=11;1l="20";J.V("2l")==R&&c.U("47");I((1u=J.V("1u"))==11)c.U("6S");c.U(J.V("1g-27"));c.U(J.V("1D"));a=a.Q(/^[ ]*[\\n]+|[\\n]*[ ]*$/g,"").Q(/\\r/g," ");b=J.V("43-22");I(J.V("42-45")==R)a=n(a,b);Y{O(K h="",g=0;g<b;g++)h+=" ";a=a.Q(/\\t/g,h)}a=a;a:{b=a=a;h=/<2R\\s*\\/?>|&1y;2R\\s*\\/?&1G;/2T;I(e.13.46==R)b=b.Q(h,"\\n");I(e.13.44==R)b=b.Q(h,"");b=b.1e("\\n");h=/^\\s*/;g=4Q;O(K i=0;i<b.L&&g>0;i++){K k=b[i];I(x(k).L!=0){k=h.X(k);I(k==N){a=a;1N a}g=1Q.4q(k[0].L,g)}}I(g>0)O(i=0;i<b.L;i++)b[i]=b[i].1o(g);a=b.1K("\\n")}I(1u)d=J.4d(a);b=J.4c(J.2J,a);b=J.4b(a,b);b=J.49(b,d);I(J.V("41-40"))b=E(b);1j 2H!="1d"&&2H.3S&&2H.3S.1C(/5s/)&&c.U("5t");H b=\'<T 1c="\'+t(J.1c)+\'" 1g="\'+c.1K(" ")+\'">\'+(J.V("16")?e.16.1H(J):"")+\'<3Z 5z="0" 5H="0" 5J="0">\'+J.4f(J.V("1t"))+"<3T><3P>"+(1u?\'<2d 1g="1u">\'+J.3Q(a)+"</2d>":"")+\'<2d 1g="17"><T 1g="3O">\'+b+"</T></2d></3P></3T></3Z></T>"},2F:6(a){I(a===N)a="";J.17=a;K b=J.3Y("T");b.3X=J.1H(a);J.V(! "16")&&w(p(b,".16"),"5c",e.16.2b);J.V("3V-17")&&w(p(b,".17"),"! 56",f);H b},2Q:6(a){J.1c=""+1Q.5d(1Q.5n()*5k).1q();e.1Y.2A[t(J.1c)]=J;J.1n=C(e.2v,a||{});I(J.V("2k")==R)J.1n.16=J.1n.1u=11},5j:6(a){a=a.Q(/^\\s+|\\s+$/g,"").Q(/\\s+/g,"|");H"\\\\b(?:"+a+")\\\\b"},5f:6(a){J.28={18:{1I:a.18,23:"1k"},1b:{1I:a.1b,23:"1k"},17:1f M("(?<18>"+a.18.1m+")(?<17>.*?)(?<1b>"+a.1b.1m+")","5o")}}};H e}();1j 2e!="1d"&&(2e.1v=1v);',62,441,'||||||function|||||||||||||||||||||||||||||||||||||return|if|this|var|length|XRegExp|null|for|index|replace|true||div|push|getParam|call|exec|else|prototype||false|lastIndex|config|arguments|RegExp|toolbar|code|left|captureNames|slice|right|id|undefined|split|new|class|addToken|indexOf|typeof|script|className|source|params|substr|apply|toString|String|line|title|gutter|SyntaxHighlighter|_xregexp|strings|lt|html|test|OUTSIDE_CLASS|match|brush|document|target|gt|getHtml|regex|global|join|style|highlight|break|concat|window|Math|isRegExp|throw|value|brushes|brushName|space|alert|vars|http|syntaxhighlighter|expandSource|size|css|case|! font|Fa|name|htmlScript|dA|can|handler|gm|td|exports|color|in|href|first|discoveredBrushes|light|collapse|object|cache|getButtonHtml|trigger|pattern|getLineHtml|nbsp|numbers|parseInt|defaults|com|items|www|pad|highlighters|execute|focus|func|all|getDiv|parentNode|navigator|INSIDE_CLASS|regexList|hasFlag|Match|useScriptTags|hasNamedCapture|text|help|init|br|input|gi|Error|values|span|list|250|height|width|screen|top|500|tagName|findElements|getElementsByTagName|aboutDialog|_blank|appendChild|charAt|Array|copyAsGlobal|setFlag|highlighter_|string|attachEvent|nodeName|floor|backref|output|the|TypeError|sticky|Za|iterate|freezeTokens|scope|type|textarea|alexgorbatchev|version|margin|2010|005896|gs|regexLib|body|center|align|noBrush|require|childNodes|DTD|xhtml1|head|org|w3|url|preventDefault|container|tr|getLineNumbersHtml|isNaN|userAgent|tbody|isLineHighlighted|quick|void|innerHTML|create|table|links|auto|smart|tab|stripBrs|tabs|bloggerMode|collapsed|plain|getCodeLinesHtml|capt! ion|getMatchesHtml|findMatches|figureOutLineNumbers|removeNest! edMatche s|getTitleHtml|brushNotHtmlScript|substring|createElement|Highlighter|load|HtmlScript|Brush|pre|expand|multiline|min|Can|ignoreCase|find|blur|extended|toLowerCase|aliases|addEventListener|innerText|textContent|wasn|select|createTextNode|removeChild|option|same|frame|xmlns|dtd|twice|1999|equiv|meta|htmlscript|transitional|1E3|expected|PUBLIC|DOCTYPE|on|W3C|XHTML|TR|EN|Transitional||configured|srcElement|Object|after|run|dblclick|matchChain|valueOf|constructor|default|switch|click|round|execAt|forHtmlScript|token|gimy|functions|getKeywords|1E6|escape|within|random|sgi|another|finally|supply|MSIE|ie|toUpperCase|catch|returnValue|definition|event|border|imsx|constructing|one|Infinity|from|when|Content|cellpadding|flags|cellspacing|try|xhtml|Type|spaces|2930402|hosted_button_id|lastIndexOf|donate|active|development|keep|to|xclick|_s|Xml|please|like|you|paypal|cgi|cmd|webscr|bin|highlighted|scrollbars|aspScriptTags|phpScriptTags|sort|max|scriptScriptTags|toolbar_item|_|command|com! mand_|number|getElementById|doubleQuotedString|singleLinePerlComments|singleLineCComments|multiLineCComments|singleQuotedString|multiLineDoubleQuotedString|xmlComments|alt|multiLineSingleQuotedString|If|https|1em|000|fff|background|5em|xx|bottom|75em|Gorbatchev|large|serif|CDATA|continue|utf|charset|content|About|family|sans|Helvetica|Arial|Geneva|3em|nogutter|Copyright|syntax|close|write|2004|Alex|open|JavaScript|highlighter|July|02|replaceChild|offset|83'.split('|'),0,{})) Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/ajax.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/ajax.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/ajax.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -8,15 +8,13 @@ <ui:composition> <p>The behavior that adds javascript call for sending Ajax request to specified event on parent component</p> - <h:form> - <h:inputText value="#{userBean.name}"> - <a4j:ajax event="keyup" render="out"/> - </h:inputText> - <h:outputText value="#{userBean.name}" id="out"/> - </h:form> - <p>Typical use-case of dependent select components. When you - choosing the type in the first select - corresponding items appears in - second one.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}"/> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}"/> + <ui:param name="sourceType" value="xhtml"/> + <ui:param name="openLabel" value="View Source"/> + <ui:param name="hideLabel" value="Hide Source"/> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,14 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <h:inputText value="#{userBean.name}"> - <a4j:ajax event="keyup" render="out" /> - </h:inputText> - <h:outputText value="#{userBean.name}" id="out" /> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/ajax-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:inputText value="#{userBean.name}"> + <a4j:ajax event="keyup" render="out" /> + </h:inputText> + <h:outputText value="#{userBean.name}" id="out" /> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,21 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <h:selectOneMenu value="#{selectsBean.currentType}" - valueChangeListener="#{selectsBean.valueChanged}"> - <f:selectItems value="#{selectsBean.firstList}" /> - <a4j:ajax event="valueChange" render="second" execute="@this" /> - </h:selectOneMenu> - <a4j:outputPanel id="second" layout="block"> - <h:selectOneMenu value="#{selectsBean.currentType}" - rendered="#{not empty selectsBean.currentType}"> - <f:selectItems value="#{selectsBean.secondList}" /> - </h:selectOneMenu> - </a4j:outputPanel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/samples/selectsUpdates-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,21 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:selectOneMenu value="#{selectsBean.currentType}" + valueChangeListener="#{selectsBean.valueChanged}"> + <f:selectItems value="#{selectsBean.firstList}" /> + <a4j:ajax event="valueChange" render="second" execute="@this" /> + </h:selectOneMenu> + <a4j:outputPanel id="second" layout="block"> + <h:selectOneMenu value="#{selectsBean.currentType}" + rendered="#{not empty selectsBean.currentType}"> + <f:selectItems value="#{selectsBean.secondList}" /> + </h:selectOneMenu> + </a4j:outputPanel> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -6,21 +6,16 @@ xmlns:a4j="http://richfaces.org/a4j"> <ui:composition> - <p>Typical use-case of dependent select components. When you choosing - the type in the first select - corresponding items appears in second one. - </p> - <h:form> - <h:selectOneMenu value="#{selectsBean.currentType}" - valueChangeListener="#{selectsBean.valueChanged}"> - <f:selectItems value="#{selectsBean.firstList}" /> - <a4j:ajax event="valueChange" render="second" execute="@this" /> - </h:selectOneMenu> - <a4j:outputPanel id="second" layout="block"> - <h:selectOneMenu value="#{selectsBean.currentType}" rendered="#{not empty selectsBean.currentType}"> - <f:selectItems value="#{selectsBean.secondList}" /> - </h:selectOneMenu> - </a4j:outputPanel> - </h:form> + <p>Typical use-case of dependent select components. When you + choosing the type in the first select - corresponding items appears in + second one.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/attachQueue.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,39 +2,23 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> -<p>In RichFaces 4 all request settings related to queue was moved out of components attributes and -now customization available using new a4j:attachQueue tag. Next sample shows how requestGroupingId -(former similarityGroupingId) could be set for different components making the requests from them similar. -Besides setting requestGroupingId - attach queue tag at second button redefines default queue -request delay from 500ms to 1500ms. -</p> + xmlns:a4j="http://richfaces.org/a4j"> + <p>In RichFaces 4 all request settings related to queue was moved + out of components attributes and now customization available using new + a4j:attachQueue tag. Next sample shows how requestGroupingId (former + similarityGroupingId) could be set for different components making the + requests from them similar. Besides setting requestGroupingId - attach + queue tag at second button redefines default queue request delay from + 500ms to 1500ms.</p> -<p>If you will click the buttons fast - requests will be combined and only last click will -be processed</p> - -<a4j:queue requestDelay="500"></a4j:queue> - <h:form> - <rich:panel> - <h:panelGrid columns="2"> - <a4j:commandButton value="Set Name to Alex" render="rep"> - <a4j:attachQueue requestGroupingId="group1"/> - <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" /> - </a4j:commandButton> - - <a4j:commandButton value="Set Name to John" render="rep"> - <a4j:attachQueue requestGroupingId="group1" requestDelay="1500"/> - <a4j:param name="username" value="John" - assignTo="#{userBean.name}" /> - </a4j:commandButton> - </h:panelGrid> - </rich:panel> - - <rich:panel> - <h:outputText id="rep" value="Selected Name:#{userBean.name}" /> - </rich:panel> - </h:form> + <p>If you will click the buttons fast - requests will be combined + and only last click will be processed</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <a4j:queue requestDelay="500"></a4j:queue> - <h:form> - <rich:panel> - <h:panelGrid columns="2"> - <a4j:commandButton value="Set Name to Alex" render="rep"> - <a4j:attachQueue requestGroupingId="group1" /> - <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" /> - </a4j:commandButton> - - <a4j:commandButton value="Set Name to John" render="rep"> - <a4j:attachQueue requestGroupingId="group1" requestDelay="1500" /> - <a4j:param name="username" value="John" assignTo="#{userBean.name}" /> - </a4j:commandButton> - </h:panelGrid> - </rich:panel> - - <rich:panel> - <h:outputText id="rep" value="Selected Name:#{userBean.name}" /> - </rich:panel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/attachQueue/samples/attachQueue-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <a4j:queue requestDelay="500"></a4j:queue> + <h:form> + <rich:panel> + <h:panelGrid columns="2"> + <a4j:commandButton value="Set Name to Alex" render="rep"> + <a4j:attachQueue requestGroupingId="group1" /> + <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" /> + </a4j:commandButton> + + <a4j:commandButton value="Set Name to John" render="rep"> + <a4j:attachQueue requestGroupingId="group1" requestDelay="1500" /> + <a4j:param name="username" value="John" assignTo="#{userBean.name}" /> + </a4j:commandButton> + </h:panelGrid> + </rich:panel> + + <rich:panel> + <h:outputText id="rep" value="Selected Name:#{userBean.name}" /> + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/commandButton.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/commandButton.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/commandButton.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,32 +2,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <style> -  - </style> - <p> - The combination similar to h:commandButton with f:ajax. Inherits all - a4j:ajax special options. - </p> - <h:form> - <h:panelGrid columns="3"> - <h:outputText value="Name:" /> - <h:inputText value="#{userBean.name}" /> - <a4j:commandButton value="Say Hello" render="out" execute="@form" /> - </h:panelGrid> - </h:form> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" /> - </a4j:outputPanel> + <p>The combination similar to h:commandButton with f:ajax. Inherits + all a4j:ajax special options.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,25 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.outhello { - font-weight: bold; -} -</style> - <h:form> - <h:panelGrid columns="3"> - <h:outputText value="Name:" /> - <h:inputText value="#{userBean.name}" /> - <a4j:commandButton value="Say Hello" render="out" execute="@form" /> - </h:panelGrid> - </h:form> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name} !" - rendered="#{not empty userBean.name}" styleClass="outhello" /> - </a4j:outputPanel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandButton/samples/commandButton-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.outhello { + font-weight: bold; +} +</style> + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Name:" /> + <h:inputText value="#{userBean.name}" /> + <a4j:commandButton value="Say Hello" render="out" execute="@form" /> + </h:panelGrid> + </h:form> + <br /> + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name} !" + rendered="#{not empty userBean.name}" styleClass="outhello" /> + </a4j:outputPanel> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/commandLink.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/commandLink.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/commandLink.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,32 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - <style> -  - </style> - <p> - The combination similar to h:commandLink with f:ajax. Inherits all - a4j:ajax special options. - </p> - <h:form> - <h:panelGrid columns="3"> - <h:outputText value="Name:" /> - <h:inputText value="#{userBean.name}" /> - <a4j:commandLink value="Say Hello" render="out" execute="@form" /> - </h:panelGrid> - </h:form> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name} !" styleClass="outhello" /> - </a4j:outputPanel> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + + <p>The combination similar to h:commandLink with f:ajax. Inherits + all a4j:ajax special options.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,24 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.outhello { - font-weight: bold; -} -</style> - <h:form> - <h:panelGrid columns="3"> - <h:outputText value="Name:" /> - <h:inputText value="#{userBean.name}" /> - <a4j:commandLink value="Say Hello" render="out" execute="@form" /> - </h:panelGrid> - </h:form> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name} !" styleClass="outhello" /> - </a4j:outputPanel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/commandLink/samples/commandLink-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,24 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.outhello { + font-weight: bold; +} +</style> + <h:form> + <h:panelGrid columns="3"> + <h:outputText value="Name:" /> + <h:inputText value="#{userBean.name}" /> + <a4j:commandLink value="Say Hello" render="out" execute="@form" /> + </h:panelGrid> + </h:form> + <br /> + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name} !" styleClass="outhello" /> + </a4j:outputPanel> +</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,88 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:fn="http://java.sun.com/jsp/jstl/functions"> - <style> -.atop { - vertical-align: top; -} -</style> - <h:form id="form"> - <h:panelGrid columns="2" columnClasses="atop"> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Quick Filter Panel" /> - </f:facet> - <fieldset><legend>Filter By Vendor</legend> - <ul> - <a4j:repeat value="#{carsBean.allVendors}" var="vendor"> - <li><h:outputLink value="#">#{vendor} - <rich:componentControl target="table" operation="filter" - event="click"> - <f:param value="vendor" /> - <f:param value="#{vendor}" /> - </rich:componentControl> - </h:outputLink></li> - </a4j:repeat> - </ul> - </fieldset> - </rich:panel> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="20"> - <rich:column id="vendor" - filterValue="#{carsFilteringBean.vendorFilter}" - filterExpression="#{carsFilteringBean.vendorFilter == '' or carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter == car.vendor}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Vendor" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Mileage" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Days Live" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.daysLive}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="VIN " /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - <f:facet name="footer"> - <rich:dataScroller /> - </f:facet> - </rich:dataTable> - </h:panelGrid> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/samples/tableFilteringAPI-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,88 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + <style> +.atop { + vertical-align: top; +} +</style> + <h:form id="form"> + <h:panelGrid columns="2" columnClasses="atop"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Quick Filter Panel" /> + </f:facet> + <fieldset><legend>Filter By Vendor</legend> + <ul> + <a4j:repeat value="#{carsBean.allVendors}" var="vendor"> + <li><h:outputLink value="#">#{vendor} + <rich:componentControl target="table" operation="filter" + event="click"> + <f:param value="vendor" /> + <f:param value="#{vendor}" /> + </rich:componentControl> + </h:outputLink></li> + </a4j:repeat> + </ul> + </fieldset> + </rich:panel> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="20"> + <rich:column id="vendor" + filterValue="#{carsFilteringBean.vendorFilter}" + filterExpression="#{carsFilteringBean.vendorFilter == '' or carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter == car.vendor}"> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Vendor" /> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Mileage" /> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Days Live" /> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.daysLive}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="VIN " /> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + <f:facet name="footer"> + <rich:dataScroller /> + </f:facet> + </rich:dataTable> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/componentControl/tableFilteringAPI.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,93 +2,20 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:r="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <style> - .atop{ - vertical-align:top; - } - </style> - <p>ComponentControl allows to call JS api on any component. It supports parameters passing using f:param, a4j:param and a4j:hasParam tags. </p> - <p>Currently target component should be defined by using clientId, but we planning to add lookup by short id in nearest versions.</p> - <h:form id="form"> - <h:panelGrid columns="2" columnClasses="atop"> - <r:panel> - <f:facet name="header"> - <h:outputText value="Quick Filter Panel" /> - </f:facet> - <fieldset><legend>Filter By Vendor</legend> - <ul> - <a4j:repeat value="#{carsBean.allVendors}" var="vendor"> - <li><h:outputLink value="#">#{vendor} - <rich:componentControl target="table" operation="filter" event="click"> - <f:param value="vendor"/> - <f:param value="#{vendor}"/> - </rich:componentControl> - </h:outputLink> - </li> - </a4j:repeat> - </ul> - </fieldset> - </r:panel> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="20"> - <rich:column id="vendor" filterValue="#{carsFilteringBean.vendorFilter}" - filterExpression="#{carsFilteringBean.vendorFilter == '' or carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter == car.vendor}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Vendor" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Mileage" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Days Live" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.daysLive}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="VIN " /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - <f:facet name="footer"> - <rich:dataScroller/> - </f:facet> - </rich:dataTable> - </h:panelGrid> - - </h:form> + <p>ComponentControl allows to call JS api on any component. It + supports parameters passing using f:param, a4j:param and a4j:hasParam + tags.</p> + <p>Currently target component should be defined by using clientId, + but we planning to add lookup by short id in nearest versions.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/grid.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,9 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>The component takes iterates a model as any other iteration @@ -12,42 +10,12 @@ inline data. To define grid properties and styles, use the same definitions as for <h:panelGrid>.</p> <p>The following example shows the dataGrid component in use:</p> - <style> -.label { - font-weight: bold; -} - -.pbody { - width: 200px; -} -</style> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Car Store"></h:outputText> - </f:facet> - <h:form> - <rich:dataGrid value="#{carsBean.allInventoryItems}" var="car" - columns="3" elements="9" width="600px"> - <rich:panel bodyClass="pbody"> - <f:facet name="header"> - <h:outputText value="#{car.vendor} #{car.model}"></h:outputText> - </f:facet> - <h:panelGrid columns="2"> - <h:outputText value="Price:" styleClass="label"></h:outputText> - <h:outputText value="#{car.price}" /> - <h:outputText value="Mileage:" styleClass="label"></h:outputText> - <h:outputText value="#{car.mileage}" /> - <h:outputText value="VIN:" styleClass="label"></h:outputText> - <h:outputText value="#{car.vin}" /> - <h:outputText value="Stock:" styleClass="label"></h:outputText> - <h:outputText value="#{car.stock}" /> - </h:panelGrid> - </rich:panel> - <f:facet name="footer"> - <rich:dataScroller/> - </f:facet> - </rich:dataGrid> - </h:form> - </rich:panel> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,45 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.label { - font-weight: bold; -} - -.pbody { - width: 200px; -} -</style> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Car Store"></h:outputText> - </f:facet> - <h:form> - <rich:dataGrid value="#{carsBean.allInventoryItems}" var="car" - columns="3" elements="9" width="600px"> - <rich:panel bodyClass="pbody"> - <f:facet name="header"> - <h:outputText value="#{car.vendor} #{car.model}"></h:outputText> - </f:facet> - <h:panelGrid columns="2"> - <h:outputText value="Price:" styleClass="label"></h:outputText> - <h:outputText value="#{car.price}" /> - <h:outputText value="Mileage:" styleClass="label"></h:outputText> - <h:outputText value="#{car.mileage}" /> - <h:outputText value="VIN:" styleClass="label"></h:outputText> - <h:outputText value="#{car.vin}" /> - <h:outputText value="Stock:" styleClass="label"></h:outputText> - <h:outputText value="#{car.stock}" /> - </h:panelGrid> - </rich:panel> - <f:facet name="footer"> - <rich:dataScroller /> - </f:facet> - </rich:dataGrid> - </h:form> - </rich:panel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataGrid/samples/grid-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,45 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.label { + font-weight: bold; +} + +.pbody { + width: 200px; +} +</style> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Car Store"></h:outputText> + </f:facet> + <h:form> + <rich:dataGrid value="#{carsBean.allInventoryItems}" var="car" + columns="3" elements="9" width="600px"> + <rich:panel bodyClass="pbody"> + <f:facet name="header"> + <h:outputText value="#{car.vendor} #{car.model}"></h:outputText> + </f:facet> + <h:panelGrid columns="2"> + <h:outputText value="Price:" styleClass="label"></h:outputText> + <h:outputText value="#{car.price}" /> + <h:outputText value="Mileage:" styleClass="label"></h:outputText> + <h:outputText value="#{car.mileage}" /> + <h:outputText value="VIN:" styleClass="label"></h:outputText> + <h:outputText value="#{car.vin}" /> + <h:outputText value="Stock:" styleClass="label"></h:outputText> + <h:outputText value="#{car.stock}" /> + </h:panelGrid> + </rich:panel> + <f:facet name="footer"> + <rich:dataScroller /> + </f:facet> + </rich:dataGrid> + </h:form> + </rich:panel> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,40 +2,27 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <style> -.calign { - text-align: center; -} -</style> -<p>dataScroller provides cliens side API functions in order to provide control from -your JavaScript custom handlers. List of api methods:</p> -<ul style="font-style: italic"> - <li>next</li> - <li>previous</li> - <li>first</li> - <li>last</li> -</ul> -<p>This simple sample shows how the scroller could be controlled via API from external controls(arrows images)</p> - <h:form id="form"> - <h:panelGrid columns="1" rowClasses="calign"> - <h:panelGrid columns="3" id="repeat"> - <h:graphicImage value="/images/icons/scroller/arr_left.png" - onclick="#{rich:component('ds')}.previous()" /> - <a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic" - id="pics"> - <h:graphicImage value="#{pic.uri}" style="padding:5px;"/> - </a4j:repeat> - <h:graphicImage value="/images/icons/scroller/arr_right.png" - onclick="#{rich:component('ds')}.next()" /> - </h:panelGrid> - <rich:dataScroller for="pics" id="ds" render="repeat" stepControls="none" boundaryControls="none" fastControls="none" maxPages="10"/> - </h:panelGrid> - </h:form> + <p>dataScroller provides cliens side API functions in order to + provide control from your JavaScript custom handlers. List of api + methods:</p> + <ul style="font-style: italic"> + <li>next</li> + <li>previous</li> + <li>first</li> + <li>last</li> + </ul> + <p>This simple sample shows how the scroller could be controlled + via API from external controls(arrows images)</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,30 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.calign { - text-align: center; -} -</style> - <h:form id="form"> - <h:panelGrid columns="1" rowClasses="calign"> - <h:panelGrid columns="3" id="repeat"> - <h:graphicImage value="/images/icons/scroller/arr_left.png" - onclick="#{rich:component('ds')}.previous()" /> - <a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic" - id="pics"> - <h:graphicImage value="#{pic.uri}" style="padding:5px;" /> - </a4j:repeat> - <h:graphicImage value="/images/icons/scroller/arr_right.png" - onclick="#{rich:component('ds')}.next()" /> - </h:panelGrid> - <rich:dataScroller for="pics" id="ds" render="repeat" - stepControls="none" boundaryControls="none" fastControls="none" - maxPages="10" /> - </h:panelGrid> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/dataScrollerAPI-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.calign { + text-align: center; +} +</style> + <h:form id="form"> + <h:panelGrid columns="1" rowClasses="calign"> + <h:panelGrid columns="3" id="repeat"> + <h:graphicImage value="/images/icons/scroller/arr_left.png" + onclick="#{rich:component('ds')}.previous()" /> + <a4j:repeat rows="3" value="#{slidesBean.pictures}" var="pic" + id="pics"> + <h:graphicImage value="#{pic.uri}" style="padding:5px;" /> + </a4j:repeat> + <h:graphicImage value="/images/icons/scroller/arr_right.png" + onclick="#{rich:component('ds')}.next()" /> + </h:panelGrid> + <rich:dataScroller for="pics" id="ds" render="repeat" + stepControls="none" boundaryControls="none" fastControls="none" + maxPages="10" /> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,45 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form id="form"> - <rich:dataScroller for="table" maxPages="6" /> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="10"> - <rich:column accept="#{carsFiteringBean.acceptVendor}"> - <f:facet name="header"> - <h:outputText value="Vendor " /> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Mileage" /> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="VIN " /> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - </rich:dataTable> - <rich:dataScroller for="table" maxPages="6" /> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/samples/simpleScrolling-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,45 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <rich:dataScroller for="table" maxPages="6" /> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="10"> + <rich:column accept="#{carsFiteringBean.acceptVendor}"> + <f:facet name="header"> + <h:outputText value="Vendor " /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="VIN " /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + </rich:dataTable> + <rich:dataScroller for="table" maxPages="6" /> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,52 +2,21 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - > + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<p>dataScroller component provided in order to implement Ajax pagination for data iteration components.</p> -<p>Starting from 4.x version - no more additional updated should be defined by end-developer in order to -synchronize different dataScrollers attached to the same table as in example below.</p> - <h:form id="form"> - <rich:dataScroller for="table" maxPages="6"/> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="10"> - <rich:column accept="#{carsFiteringBean.acceptVendor}"> - <f:facet name="header"> - <h:outputText value="Vendor " /> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Mileage" /> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="VIN " /> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - </rich:dataTable> - <rich:dataScroller for="table" maxPages="6"/> - </h:form> + <p>dataScroller component provided in order to implement Ajax + pagination for data iteration components.</p> + <p>Starting from 4.x version - no more additional updated should be + defined by end-developer in order to synchronize different + dataScrollers attached to the same table as in example below.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,113 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <rich:dataTable width="700" var="record" - value="#{reportBean.expReport.records}"> - <f:facet name="header"> - <rich:columnGroup> - <rich:column rowspan="2"> - </rich:column> - <rich:column colspan="3"> - <h:outputText value="Expenses" /> - </rich:column> - <rich:column rowspan="2"> - <h:outputText value="subtotals" /> - </rich:column> - <rich:column breakRowBefore="true"> - <h:outputText value="Meals" /> - </rich:column> - <rich:column> - <h:outputText value="Hotels" /> - </rich:column> - <rich:column> - <h:outputText value="Transport" /> - </rich:column> - </rich:columnGroup> - </f:facet> - - <rich:column colspan="5"> - <h:outputText value="#{record.city}" /> - </rich:column> - - <rich:subTable var="expense" value="#{record.items}"> - <rich:column> - <h:outputText value="#{expense.day}"></h:outputText> - <f:facet name="footer"> - <div></div> - </f:facet> - </rich:column> - <rich:column> - <h:outputText value="#{expense.meals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - <f:facet name="footer"> - <h:outputText value="#{record.totalMeals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - <rich:column> - <h:outputText value="#{expense.hotels}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - <f:facet name="footer"> - <h:outputText value="#{record.totalHotels}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - - <rich:column> - <h:outputText value="#{expense.transport}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - <f:facet name="footer"> - <h:outputText value="#{record.totalTransport}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - <rich:column> - - <f:facet name="footer"> - <h:outputText value="#{record.total}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - - </rich:subTable> - - <f:facet name="footer"> - - <rich:columnGroup> - <rich:column>Totals</rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.totalMeals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.totalHotels}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.totalTransport}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.grandTotal}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - </rich:columnGroup> - </f:facet> - - </rich:dataTable> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/simpleTable-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,113 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <rich:dataTable width="700" var="record" + value="#{reportBean.expReport.records}"> + <f:facet name="header"> + <rich:columnGroup> + <rich:column rowspan="2"> + </rich:column> + <rich:column colspan="3"> + <h:outputText value="Expenses" /> + </rich:column> + <rich:column rowspan="2"> + <h:outputText value="subtotals" /> + </rich:column> + <rich:column breakRowBefore="true"> + <h:outputText value="Meals" /> + </rich:column> + <rich:column> + <h:outputText value="Hotels" /> + </rich:column> + <rich:column> + <h:outputText value="Transport" /> + </rich:column> + </rich:columnGroup> + </f:facet> + + <rich:column colspan="5"> + <h:outputText value="#{record.city}" /> + </rich:column> + + <rich:subTable var="expense" value="#{record.items}"> + <rich:column> + <h:outputText value="#{expense.day}"></h:outputText> + <f:facet name="footer"> + <div></div> + </f:facet> + </rich:column> + <rich:column> + <h:outputText value="#{expense.meals}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + <f:facet name="footer"> + <h:outputText value="#{record.totalMeals}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </f:facet> + </rich:column> + <rich:column> + <h:outputText value="#{expense.hotels}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + <f:facet name="footer"> + <h:outputText value="#{record.totalHotels}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </f:facet> + </rich:column> + + <rich:column> + <h:outputText value="#{expense.transport}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + <f:facet name="footer"> + <h:outputText value="#{record.totalTransport}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </f:facet> + </rich:column> + <rich:column> + + <f:facet name="footer"> + <h:outputText value="#{record.total}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </f:facet> + </rich:column> + + </rich:subTable> + + <f:facet name="footer"> + + <rich:columnGroup> + <rich:column>Totals</rich:column> + <rich:column> + <h:outputText value="#{reportBean.expReport.totalMeals}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </rich:column> + <rich:column> + <h:outputText value="#{reportBean.expReport.totalHotels}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </rich:column> + <rich:column> + <h:outputText value="#{reportBean.expReport.totalTransport}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </rich:column> + <rich:column> + <h:outputText value="#{reportBean.expReport.grandTotal}"> + <f:convertNumber pattern="$####.00" /> + </h:outputText> + </rich:column> + </rich:columnGroup> + </f:facet> + + </rich:dataTable> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,69 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:r="http://java.sun.com/jsf/composite/rich"> - <h:form id="form"> - <r:messages /> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="30"> - <f:facet name="noData"> - Nothing found - </f:facet> - <rich:column filterValue="#{carsFilteringBean.vendorFilter}" - filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Vendor " /> - <h:selectOneMenu value="#{carsFilteringBean.vendorFilter}"> - <f:selectItems value="#{carsBean.vendorOptions}" /> - <a4j:ajax render="table" execute="@this" event="change" /> - </h:selectOneMenu> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Mileage < " /> - <h:inputText value="#{carsFilteringBean.mileageFilter}"> - <f:convertNumber groupingUsed="true" /> - <f:validateLongRange maximum="500000" /> - <a4j:ajax event="blur" render="form:table" execute="@this" /> - </h:inputText> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column filterValue="#{carsFilteringBean.vinFilter}" - filterExpression="#{fn:containsIgnoreCase(car.vin,carsFilteringBean.vinFilter)}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="VIN " /> - <h:inputText value="#{carsFilteringBean.vinFilter}"> - <a4j:ajax event="blur" render="table" execute="@this" /> - </h:inputText> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - </rich:dataTable> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableFiltering-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,69 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:fn="http://java.sun.com/jsp/jstl/functions" + xmlns:r="http://java.sun.com/jsf/composite/rich"> + <h:form id="form"> + <r:messages /> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="30"> + <f:facet name="noData"> + Nothing found + </f:facet> + <rich:column filterValue="#{carsFilteringBean.vendorFilter}" + filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}"> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Vendor " /> + <h:selectOneMenu value="#{carsFilteringBean.vendorFilter}"> + <f:selectItems value="#{carsBean.vendorOptions}" /> + <a4j:ajax render="table" execute="@this" event="change" /> + </h:selectOneMenu> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="Mileage < " /> + <h:inputText value="#{carsFilteringBean.mileageFilter}"> + <f:convertNumber groupingUsed="true" /> + <f:validateLongRange maximum="500000" /> + <a4j:ajax event="blur" render="form:table" execute="@this" /> + </h:inputText> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column filterValue="#{carsFilteringBean.vinFilter}" + filterExpression="#{fn:containsIgnoreCase(car.vin,carsFilteringBean.vinFilter)}"> + <f:facet name="header"> + <h:panelGroup> + <h:outputText value="VIN " /> + <h:inputText value="#{carsFilteringBean.vinFilter}"> + <a4j:ajax event="blur" render="table" execute="@this" /> + </h:inputText> + </h:panelGroup> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + </rich:dataTable> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,43 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table"> - <rich:column> - <f:facet name="header"> - State Flag - </f:facet> - <h:graphicImage value="#{cap.stateFlag}" /> - </rich:column> - <rich:column sortBy="#{cap.name}" id="name" - sortOrder="#{capitalsSortingBean.capitalsOrder}"> - <f:facet name="header"> - <a4j:commandLink value="Sort by Capital Name" render="table" - action="#{capitalsSortingBean.sortByCapitals}" /> - </f:facet> - <h:outputText value="#{cap.name}" /> - </rich:column> - <rich:column sortBy="#{cap.state}" id="state" - sortOrder="#{capitalsSortingBean.statesOrder}"> - <f:facet name="header"> - <a4j:commandLink value="Sort by State Name" render="table" - action="#{capitalsSortingBean.sortByStates}" /> - </f:facet> - <h:outputText value="#{cap.state}" /> - </rich:column> - <rich:column sortBy="#{cap.timeZone}" id="timeZone" - comparator="#{capitalsSortingBean.timeZoneComparator}" - sortOrder="#{capitalsSortingBean.timeZonesOrder}"> - <f:facet name="header"> - <a4j:commandLink value="Sort by Time Zone" render="table" - action="#{capitalsSortingBean.sortByTimeZones}" /> - </f:facet> - <h:outputText value="#{cap.timeZone}" /> - </rich:column> - </rich:dataTable> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableSorting-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,43 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table"> + <rich:column> + <f:facet name="header"> + State Flag + </f:facet> + <h:graphicImage value="#{cap.stateFlag}" /> + </rich:column> + <rich:column sortBy="#{cap.name}" id="name" + sortOrder="#{capitalsSortingBean.capitalsOrder}"> + <f:facet name="header"> + <a4j:commandLink value="Sort by Capital Name" render="table" + action="#{capitalsSortingBean.sortByCapitals}" /> + </f:facet> + <h:outputText value="#{cap.name}" /> + </rich:column> + <rich:column sortBy="#{cap.state}" id="state" + sortOrder="#{capitalsSortingBean.statesOrder}"> + <f:facet name="header"> + <a4j:commandLink value="Sort by State Name" render="table" + action="#{capitalsSortingBean.sortByStates}" /> + </f:facet> + <h:outputText value="#{cap.state}" /> + </rich:column> + <rich:column sortBy="#{cap.timeZone}" id="timeZone" + comparator="#{capitalsSortingBean.timeZoneComparator}" + sortOrder="#{capitalsSortingBean.timeZonesOrder}"> + <f:facet name="header"> + <a4j:commandLink value="Sort by Time Zone" render="table" + action="#{capitalsSortingBean.sortByTimeZones}" /> + </f:facet> + <h:outputText value="#{cap.timeZone}" /> + </rich:column> + </rich:dataTable> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,66 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.even-row { - background-color: #FCFFFE; -} - -.odd-row { - background-color: #ECF3FE; -} - -.active-row { - background-color: #FFEBDA !important; - cursor: pointer; -} -</style> - <h:form id="form"> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="20" rowClasses="odd-row, even-row" - styleClass="stable"> - <rich:column accept="#{carsFiteringBean.acceptVendor}"> - <f:facet name="header"> - <h:outputText value="Vendor " /> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> - <f:facet name="header"> - <h:outputText value="Mileage" /> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="VIN " /> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - </rich:dataTable> - </h:form> - <script> - $('.stable tr').mouseover(function(){$(this).addClass('active-row')}); - $('.stable tr').mouseout(function(){$(this).removeClass('active-row')}); - - $('.stable tr:odd').addClass('odd-row'); - $('.stable tr:even').addClass('even-row'); - -</script> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/samples/tableStyling-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,66 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.even-row { + background-color: #FCFFFE; +} + +.odd-row { + background-color: #ECF3FE; +} + +.active-row { + background-color: #FFEBDA !important; + cursor: pointer; +} +</style> + <h:form id="form"> + <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" + id="table" rows="20" rowClasses="odd-row, even-row" + styleClass="stable"> + <rich:column accept="#{carsFiteringBean.acceptVendor}"> + <f:facet name="header"> + <h:outputText value="Vendor " /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="VIN " /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + </rich:dataTable> + </h:form> + <script> + $('.stable tr').mouseover(function(){$(this).addClass('active-row')}); + $('.stable tr').mouseout(function(){$(this).removeClass('active-row')}); + + $('.stable tr:odd').addClass('odd-row'); + $('.stable tr:even').addClass('even-row'); + +</script> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,118 +2,17 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>This sample shows simple master-detail table implemented using<b> tbl:dataTable</b> and<b> tbl:subtable</b> components</p> - <rich:dataTable width="700" var="record" - value="#{reportBean.expReport.records}"> - <f:facet name="header"> - <rich:columnGroup> - <rich:column rowspan="2"> - </rich:column> - <rich:column colspan="3"> - <h:outputText value="Expenses" /> - </rich:column> - <rich:column rowspan="2"> - <h:outputText value="subtotals" /> - </rich:column> - <rich:column breakRowBefore="true"> - <h:outputText value="Meals" /> - </rich:column> - <rich:column> - <h:outputText value="Hotels" /> - </rich:column> - <rich:column> - <h:outputText value="Transport" /> - </rich:column> - </rich:columnGroup> - </f:facet> - - <rich:column colspan="5"> - <h:outputText value="#{record.city}" /> - </rich:column> - - <rich:subTable var="expense" value="#{record.items}"> - <rich:column> - <h:outputText value="#{expense.day}"></h:outputText> - <f:facet name="footer"> - <div></div> - </f:facet> - </rich:column> - <rich:column> - <h:outputText value="#{expense.meals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - <f:facet name="footer"> - <h:outputText value="#{record.totalMeals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - <rich:column> - <h:outputText value="#{expense.hotels}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - <f:facet name="footer"> - <h:outputText value="#{record.totalHotels}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - - <rich:column> - <h:outputText value="#{expense.transport}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - <f:facet name="footer"> - <h:outputText value="#{record.totalTransport}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - <rich:column> - - <f:facet name="footer"> - <h:outputText value="#{record.total}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </f:facet> - </rich:column> - - </rich:subTable> - - <f:facet name="footer"> - - <rich:columnGroup> - <rich:column>Totals</rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.totalMeals}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.totalHotels}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.totalTransport}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - <rich:column> - <h:outputText value="#{reportBean.expReport.grandTotal}"> - <f:convertNumber pattern="$####.00" /> - </h:outputText> - </rich:column> - </rich:columnGroup> - </f:facet> - - </rich:dataTable> - + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,70 +2,15 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:fn="http://java.sun.com/jsp/jstl/functions" - xmlns:r="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <h:form id="form"> - <r:messages/> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="30"> - <f:facet name="noData"> - Nothing found - </f:facet> - <rich:column filterValue="#{carsFilteringBean.vendorFilter}" filterExpression="#{fn:containsIgnoreCase(car.vendor, carsFilteringBean.vendorFilter)}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Vendor " /> - <h:selectOneMenu value="#{carsFilteringBean.vendorFilter}"> - <f:selectItems value="#{carsBean.vendorOptions}" /> - <a4j:ajax render="table" execute="@this" event="change"/> - </h:selectOneMenu> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="Mileage < " /> - <h:inputText value="#{carsFilteringBean.mileageFilter}"> - <f:convertNumber groupingUsed="true"/> - <f:validateLongRange maximum="500000"/> - <a4j:ajax event="blur" render="form:table" execute="@this" /> - </h:inputText> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column filterValue="#{carsFilteringBean.vinFilter}" - filterExpression="#{fn:containsIgnoreCase(car.vin,carsFilteringBean.vinFilter)}"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText value="VIN " /> - <h:inputText value="#{carsFilteringBean.vinFilter}"> - <a4j:ajax event="blur" render="table" execute="@this" /> - </h:inputText> - </h:panelGroup> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - </rich:dataTable> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,48 +2,23 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<p> -Here is simple example of sorting feature of RichFaces Table component. -</p> -<p>Object property which should be used for sorting should be defined in sortBy attribute.</p> -<p>Currently you could only control sortOrder in your actions, and in near versions we're planning to add special sort controls</p> -<p>Also you could use # {rich:component('tableId')}.sort('columnId', ['sortOrder']) JS api</p> - <h:form> - <rich:dataTable value="#{capitalsBean.capitals}" var="cap" id="table"> - <rich:column> - <f:facet name="header"> - State Flag - </f:facet> - <h:graphicImage value="#{cap.stateFlag}" /> - </rich:column> - <rich:column sortBy="#{cap.name}" id="name" - sortOrder="#{capitalsSortingBean.capitalsOrder}"> - <f:facet name="header"> - <a4j:commandLink value="Sort by Capital Name" render="table" action="#{capitalsSortingBean.sortByCapitals}"/> - </f:facet> - <h:outputText value="#{cap.name}" /> - </rich:column> - <rich:column sortBy="#{cap.state}" id="state" - sortOrder="#{capitalsSortingBean.statesOrder}"> - <f:facet name="header"> - <a4j:commandLink value="Sort by State Name" render="table" action="#{capitalsSortingBean.sortByStates}"/> - </f:facet> - <h:outputText value="#{cap.state}" /> - </rich:column> - <rich:column sortBy="#{cap.timeZone}" id="timeZone" - comparator="#{capitalsSortingBean.timeZoneComparator}" - sortOrder="#{capitalsSortingBean.timeZonesOrder}"> - <f:facet name="header"> - <a4j:commandLink value="Sort by Time Zone" render="table" action="#{capitalsSortingBean.sortByTimeZones}"/> - </f:facet> - <h:outputText value="#{cap.timeZone}" /> - </rich:column> - </rich:dataTable> - </h:form> + <p>Here is simple example of sorting feature of RichFaces Table + component.</p> + <p>Object property which should be used for sorting should be + defined in sortBy attribute.</p> + <p>Currently you could only control sortOrder in your actions, and + in near versions we're planning to add special sort controls</p> + <p>Also you could use # + {rich:component('tableId')}.sort('columnId', ['sortOrder']) JS api</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,71 +2,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:fn="http://java.sun.com/jsp/jstl/functions"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <style> -.even-row { - background-color: #FCFFFE; -} -.odd-row { - background-color: #ECF3FE; -} - -.active-row { - background-color: #FFEBDA !important; - cursor: pointer; -} -</style> <p>This sample shows simple table styling. The table appears in zebra-style and has highlighting of hovered row.</p> - <h:form id="form"> - <rich:dataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" rows="20" rowClasses="odd-row, even-row" - styleClass="stable"> - <rich:column accept="#{carsFiteringBean.acceptVendor}"> - <f:facet name="header"> - <h:outputText value="Vendor " /> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column filter="#{carsFilteringBean.mileageFilterImpl}"> - <f:facet name="header"> - <h:outputText value="Mileage" /> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="VIN " /> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - </rich:dataTable> - </h:form> - <script> - $('.stable tr').mouseover(function(){$(this).addClass('active-row')}); - $('.stable tr').mouseout(function(){$(this).removeClass('active-row')}); - - $('.stable tr:odd').addClass('odd-row'); - $('.stable tr:even').addClass('even-row'); - -</script> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,59 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:extendedDataTable value="#{carsBean.allInventoryItems}" - var="car" id="table" frozenColumns="2" - style="height:300px; width:500px;"> - <f:facet name="header"> - <h:outputText value="Cars marketplace" /> - </f:facet> - <rich:column> - <f:facet name="header"> - <h:outputText value="vendor" /> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Mileage" /> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="VIN Code" /> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Items stock" /> - </f:facet> - <h:outputText value="#{car.stock}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Days Live" /> - </f:facet> - <h:outputText value="#{car.daysLive}" /> - </rich:column> - </rich:extendedDataTable> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/samples/simpleTable-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,59 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:extendedDataTable value="#{carsBean.allInventoryItems}" + var="car" id="table" frozenColumns="2" + style="height:300px; width:500px;"> + <f:facet name="header"> + <h:outputText value="Cars marketplace" /> + </f:facet> + <rich:column> + <f:facet name="header"> + <h:outputText value="vendor" /> + </f:facet> + <h:outputText value="#{car.vendor}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Model" /> + </f:facet> + <h:outputText value="#{car.model}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Price" /> + </f:facet> + <h:outputText value="#{car.price}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Mileage" /> + </f:facet> + <h:outputText value="#{car.mileage}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="VIN Code" /> + </f:facet> + <h:outputText value="#{car.vin}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Items stock" /> + </f:facet> + <h:outputText value="#{car.stock}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Days Live" /> + </f:facet> + <h:outputText value="#{car.daysLive}" /> + </rich:column> + </rich:extendedDataTable> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/extendedDataTable/simpleTable.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,70 +2,26 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<p>ExtendedDataTable component provides next set of features:</p> -<ul> - <li> Horizontal/Vertical scrolling </li> - <li> Ajax lazy loading on vertical scroll </li> - <li> Support "frozen" columns which are not scrolled on using horizontal scroll</li> -</ul> + <p>ExtendedDataTable component provides next set of features:</p> + <ul> + <li>Horizontal/Vertical scrolling</li> + <li>Ajax lazy loading on vertical scroll</li> + <li>Support "frozen" columns which are not scrolled on using + horizontal scroll</li> + </ul> - <h:form> - <rich:extendedDataTable value="#{carsBean.allInventoryItems}" var="car" - id="table" frozenColumns="2" style="height:300px; width:500px;"> - <f:facet name="header"> - <h:outputText value="Cars marketplace" /> - </f:facet> - <rich:column> - <f:facet name="header"> - <h:outputText value="vendor" /> - </f:facet> - <h:outputText value="#{car.vendor}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Model" /> - </f:facet> - <h:outputText value="#{car.model}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Price" /> - </f:facet> - <h:outputText value="#{car.price}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Mileage" /> - </f:facet> - <h:outputText value="#{car.mileage}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="VIN Code" /> - </f:facet> - <h:outputText value="#{car.vin}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Items stock" /> - </f:facet> - <h:outputText value="#{car.stock}" /> - </rich:column> - <rich:column> - <f:facet name="header"> - <h:outputText value="Days Live" /> - </f:facet> - <h:outputText value="#{car.daysLive}" /> - </rich:column> - </rich:extendedDataTable> - </h:form> - <p>In order to turn on Ajax loading - just specify clientRows attribute with number of rows - to be loaded on the client</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + <p>In order to turn on Ajax loading - just specify clientRows + attribute with number of rows to be loaded on the client</p> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/functions.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/functions.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/functions.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,32 +2,39 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <p> - RichFaces provides set of functions for more convinient work with DOM tree and - to use some server side expressions. - </p> - <p> - Here is the current list: - </p> + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <p>RichFaces provides set of functions for more convinient work + with DOM tree and to use some server side expressions.</p> + <p>Here is the current list:</p> <ul> - <li><b>rich:clientId(id)</b> - returns client Id for component by it's short id.</li> - <li><b>rich:element(id)</b> - returns DOM element for the passed short id</li> - <li><b>rich:component(id)</b> - returns richfaces client component instance to call some API method.</li> - <li><b>rich:isUserInRole(role)</b> - returns is the user has specified role.</li> - <li><b>rich:findComponent(id)</b> - returns component instance for given short id</li> + <li><b>rich:clientId(id)</b> - returns client Id for component by + it's short id.</li> + <li><b>rich:element(id)</b> - returns DOM element for the passed + short id</li> + <li><b>rich:component(id)</b> - returns richfaces client + component instance to call some API method.</li> + <li><b>rich:isUserInRole(role)</b> - returns is the user has + specified role.</li> + <li><b>rich:findComponent(id)</b> - returns component instance + for given short id</li> </ul> -<p>For example the result of #{rich:element('input')} expression will be - document.getElementById('formId:input').</p> -<p>And here is one more simple example. There is no need in Bean creation in order to store the value. It's picked from component instance by using rich:findComponent call.</p> - <h:form> - <h:inputText id="input"> - <a4j:ajax render="out"/> - </h:inputText> - <h:outputText value="#{rich:findComponent('input').value}" id="out"/> - </h:form> - <p>One more sample could be found at dataScroller API page. There are rich:component used for calling JS API of dataScroller.</p> - <p>This set goes to be extended continously. Rise jira or forum requests if you have - proposals on new useful functions.</p> + <p>For example the result of # {rich:element('input')} expression + will be - document.getElementById('formId:input').</p> + <p>And here is one more simple example. There is no need in Bean + creation in order to store the value. It's picked from component + instance by using rich:findComponent call.</p> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + + <p>One more sample could be found at dataScroller API page. There + are rich:component used for calling JS API of dataScroller.</p> + <p>This set goes to be extended continously. Rise jira or forum + requests if you have proposals on new useful functions.</p> </ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,14 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <h:inputText id="input"> - <a4j:ajax render="out" /> - </h:inputText> - <h:outputText value="#{rich:findComponent('input').value}" id="out" /> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/functions/samples/functions-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:inputText id="input"> + <a4j:ajax render="out" /> + </h:inputText> + <h:outputText value="#{rich:findComponent('input').value}" id="out" /> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/jquery.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,52 +2,14 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:rich="http://richfaces.org/rich" - xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> - <style type="text/css"> -.pic-normal { - width: 120px; - border: 2px solid #ACBECE; -} + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> -.wrap1 { - width: 190px; - height: 130px; - float: left; -} -</style> - - - <br /> - - <a4j:outputPanel id="gallery"> - <h:graphicImage value="/images/nature/pic1.jpg" /> - <h:graphicImage value="/images/nature/pic2.jpg" /> - <h:graphicImage value="/images/nature/pic3.jpg" /> - <h:graphicImage value="/images/nature/pic4.jpg" /> - <h:graphicImage value="/images/nature/pic5.jpg" /> - <h:graphicImage value="/images/nature/pic6.jpg" /> - <h:graphicImage value="/images/nature/pic7.jpg" /> - <h:graphicImage value="/images/nature/pic8.jpg" /> - <h:graphicImage value="/images/nature/pic9.jpg" /> - </a4j:outputPanel> - - <br style="clear: both" /> - - - <rich:jQuery selector="#gallery img" query="addClass('pic-normal')" /> - <rich:jQuery selector="#gallery img" - query="wrap('<div class=\'wrap1\'></div>')" /> - <rich:jQuery selector="#gallery img" - query="mouseover(function(){enlargePic(this)})" /> - <rich:jQuery selector="#gallery img" - query="mouseout(function(){normalPic(this)})" /> - - <rich:jQuery name="enlargePic" query="stop().animate({width:'180px'})" /> - <rich:jQuery name="normalPic" query="stop().animate({width:'120px'})" /> - - - </ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,49 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style type="text/css"> -.pic-normal { - width: 120px; - border: 2px solid #ACBECE; -} - -.wrap1 { - width: 190px; - height: 130px; - float: left; -} -</style> - - - <br /> - - <a4j:outputPanel id="gallery"> - <h:graphicImage value="/images/nature/pic1.jpg" /> - <h:graphicImage value="/images/nature/pic2.jpg" /> - <h:graphicImage value="/images/nature/pic3.jpg" /> - <h:graphicImage value="/images/nature/pic4.jpg" /> - <h:graphicImage value="/images/nature/pic5.jpg" /> - <h:graphicImage value="/images/nature/pic6.jpg" /> - <h:graphicImage value="/images/nature/pic7.jpg" /> - <h:graphicImage value="/images/nature/pic8.jpg" /> - <h:graphicImage value="/images/nature/pic9.jpg" /> - </a4j:outputPanel> - - <br style="clear: both" /> - - - <rich:jQuery selector="#gallery img" query="addClass('pic-normal')" /> - <rich:jQuery selector="#gallery img" - query="wrap('<div class=\'wrap1\'></div>')" /> - <rich:jQuery selector="#gallery img" - query="mouseover(function(){enlargePic(this)})" /> - <rich:jQuery selector="#gallery img" - query="mouseout(function(){normalPic(this)})" /> - - <rich:jQuery name="enlargePic" query="stop().animate({width:'180px'})" /> - <rich:jQuery name="normalPic" query="stop().animate({width:'120px'})" /> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jquery/samples/jquery-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style type="text/css"> +.pic-normal { + width: 120px; + border: 2px solid #ACBECE; +} + +.wrap1 { + width: 190px; + height: 130px; + float: left; +} +</style> + + + <br /> + + <a4j:outputPanel id="gallery"> + <h:graphicImage value="/images/nature/pic1.jpg" /> + <h:graphicImage value="/images/nature/pic2.jpg" /> + <h:graphicImage value="/images/nature/pic3.jpg" /> + <h:graphicImage value="/images/nature/pic4.jpg" /> + <h:graphicImage value="/images/nature/pic5.jpg" /> + <h:graphicImage value="/images/nature/pic6.jpg" /> + <h:graphicImage value="/images/nature/pic7.jpg" /> + <h:graphicImage value="/images/nature/pic8.jpg" /> + <h:graphicImage value="/images/nature/pic9.jpg" /> + </a4j:outputPanel> + + <br style="clear: both" /> + + + <rich:jQuery selector="#gallery img" query="addClass('pic-normal')" /> + <rich:jQuery selector="#gallery img" + query="wrap('<div class=\'wrap1\'></div>')" /> + <rich:jQuery selector="#gallery img" + query="mouseover(function(){enlargePic(this)})" /> + <rich:jQuery selector="#gallery img" + query="mouseout(function(){normalPic(this)})" /> + + <rich:jQuery name="enlargePic" query="stop().animate({width:'180px'})" /> + <rich:jQuery name="normalPic" query="stop().animate({width:'120px'})" /> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,41 +1,25 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - - <p><b>a4j:jsFunction</b> component also designed to send Ajax requests, but allows to perform - an the requests from a Javascript code directly. The component sends a request using - a standard JSF approach, so the JSF form is required. The following example - shows how the part of a page is re-rendered when a user hovers over the names. - </p> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> - - <table width="400"> - <tbody> - <tr> - <td><span onmouseover="updateName('Kate')" - onmouseout="updateName('')">Kate</span></td> - <td><span onmouseover="updateName('John')" - onmouseout="updateName('')">John</span></td> - <td><span onmouseover="updateName('Alex')" - onmouseout="updateName('')">Alex</span></td> - </tr> - <tr> - <td colspan="3">Name: <b><h:outputText id="showname" - value="#{functionBean.text}" /></b></td> - </tr> - </tbody> - </table> - <h:form> - <a4j:jsFunction name="updateName" render="showname" - action="#{functionBean.processHover}"> - <f:param name="name" /> - </a4j:jsFunction> - </h:form> - </ui:composition> - +<ui:composition> + + <p><b>a4j:jsFunction</b> component also designed to send Ajax + requests, but allows to perform an the requests from a Javascript code + directly. The component sends a request using a standard JSF approach, + so the JSF form is required. The following example shows how the part + of a page is re-rendered when a user hovers over the names.</p> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + +</ui:composition> + </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,30 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <table width="400"> - <tbody> - <tr> - <td><span onmouseover="updateName('Kate')" - onmouseout="updateName('')">Kate</span></td> - <td><span onmouseover="updateName('John')" - onmouseout="updateName('')">John</span></td> - <td><span onmouseover="updateName('Alex')" - onmouseout="updateName('')">Alex</span></td> - </tr> - <tr> - <td colspan="3">Name: <b><h:outputText id="showname" - value="#{functionBean.text}" /></b></td> - </tr> - </tbody> - </table> - <h:form> - <a4j:jsFunction name="updateName" render="showname" - action="#{functionBean.processHover}"> - <f:param name="name" /> - </a4j:jsFunction> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/jsFunction/samples/jsFunction-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <table width="400"> + <tbody> + <tr> + <td><span onmouseover="updateName('Kate')" + onmouseout="updateName('')">Kate</span></td> + <td><span onmouseover="updateName('John')" + onmouseout="updateName('')">John</span></td> + <td><span onmouseover="updateName('Alex')" + onmouseout="updateName('')">Alex</span></td> + </tr> + <tr> + <td colspan="3">Name: <b><h:outputText id="showname" + value="#{functionBean.text}" /></b></td> + </tr> + </tbody> + </table> + <h:form> + <a4j:jsFunction name="updateName" render="showname" + action="#{functionBean.processHover}"> + <f:param name="name" /> + </a4j:jsFunction> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/lists.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,46 +2,21 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p><b>rich:list</b> component allows to build one of the HTML lists (UL, OL, DL) dynamically from backend data</p> <p>It accepts the same data types as the other iteration components and renders them according to <b>type</b> attribute.</p> - <h:form id="form"> - <h:outputText value="List Type: " style="font-weight:bold" /> - <a4j:commandLink value="ordered" render="list,form"> - <a4j:param name="t" value="ordered" assignTo="#{listBean.listType}" /> - <f:attribute name="style" - value="#{(listBean.listType=='ordered') ? 'color:orange' : ''}" /> - </a4j:commandLink> - <h:outputText value=" | " /> - <a4j:commandLink value="unordered" render="list,form"> - <a4j:param name="t" value="unordered" assignTo="#{listBean.listType}" /> - <f:attribute name="style" - value="#{(listBean.listType=='unordered') ? 'color:orange' : ''}" /> - </a4j:commandLink> - <h:outputText value=" | " /> - <a4j:commandLink value="definitions" render="list,form"> - <a4j:param name="t" value="definitions" - assignTo="#{listBean.listType}" /> - <f:attribute name="style" - value="#{(listBean.listType=='definitions') ? 'color:orange' : ''}" /> - </a4j:commandLink> - </h:form> - - <rich:list value="#{carsBean.inventoryVendorLists}" id="list" - var="vendorList" type="#{listBean.listType}"> - <f:facet name="term"> - <h:panelGroup layout="block"> - <h:outputText value="In stock: #{vendorList.count}" - style="font-weight:bold" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{vendorList.vendor}" /> - </rich:list> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,40 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form id="form"> - <h:outputText value="List Type: " style="font-weight:bold" /> - <a4j:commandLink value="ordered" render="list,form"> - <a4j:param name="t" value="ordered" assignTo="#{listBean.listType}" /> - <f:attribute name="style" - value="#{(listBean.listType=='ordered') ? 'color:orange' : ''}" /> - </a4j:commandLink> - <h:outputText value=" | " /> - <a4j:commandLink value="unordered" render="list,form"> - <a4j:param name="t" value="unordered" assignTo="#{listBean.listType}" /> - <f:attribute name="style" - value="#{(listBean.listType=='unordered') ? 'color:orange' : ''}" /> - </a4j:commandLink> - <h:outputText value=" | " /> - <a4j:commandLink value="definitions" render="list,form"> - <a4j:param name="t" value="definitions" - assignTo="#{listBean.listType}" /> - <f:attribute name="style" - value="#{(listBean.listType=='definitions') ? 'color:orange' : ''}" /> - </a4j:commandLink> - </h:form> - - <rich:list value="#{carsBean.inventoryVendorLists}" id="list" - var="vendorList" type="#{listBean.listType}"> - <f:facet name="term"> - <h:panelGroup layout="block"> - <h:outputText value="In stock: #{vendorList.count}" - style="font-weight:bold" /> - </h:panelGroup> - </f:facet> - <h:outputText value="#{vendorList.vendor}" /> - </rich:list> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/list/samples/lists-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,40 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <h:outputText value="List Type: " style="font-weight:bold" /> + <a4j:commandLink value="ordered" render="list,form"> + <a4j:param name="t" value="ordered" assignTo="#{listBean.listType}" /> + <f:attribute name="style" + value="#{(listBean.listType=='ordered') ? 'color:orange' : ''}" /> + </a4j:commandLink> + <h:outputText value=" | " /> + <a4j:commandLink value="unordered" render="list,form"> + <a4j:param name="t" value="unordered" assignTo="#{listBean.listType}" /> + <f:attribute name="style" + value="#{(listBean.listType=='unordered') ? 'color:orange' : ''}" /> + </a4j:commandLink> + <h:outputText value=" | " /> + <a4j:commandLink value="definitions" render="list,form"> + <a4j:param name="t" value="definitions" + assignTo="#{listBean.listType}" /> + <f:attribute name="style" + value="#{(listBean.listType=='definitions') ? 'color:orange' : ''}" /> + </a4j:commandLink> + </h:form> + + <rich:list value="#{carsBean.inventoryVendorLists}" id="list" + var="vendorList" type="#{listBean.listType}"> + <f:facet name="term"> + <h:panelGroup layout="block"> + <h:outputText value="In stock: #{vendorList.count}" + style="font-weight:bold" /> + </h:panelGroup> + </f:facet> + <h:outputText value="#{vendorList.vendor}" /> + </rich:list> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/log.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/log.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/log.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,24 +1,20 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - <p> - Log component allows you to inspect client side activities - during an Ajax request. It shows reuqest data, response data, DOM - tree changes on update and other useful debug information. - </p> - <h:form> - <h:inputText value="#{userBean.name}" /> - <a4j:commandButton value="Submit" render="out"/> - <br/> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name}!" rendered="#{not empty userBean.name}"/> - </a4j:outputPanel> - </h:form> - <a4j:log/> - </ui:composition> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p>Log component allows you to inspect client side activities + during an Ajax request. It shows reuqest data, response data, DOM tree + changes on update and other useful debug information.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + +</ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,18 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <h:inputText value="#{userBean.name}" /> - <a4j:commandButton value="Submit" render="out" /> - <br /> - <a4j:outputPanel id="out"> - <h:outputText value="Hello #{userBean.name}!" - rendered="#{not empty userBean.name}" /> - </a4j:outputPanel> - </h:form> - <a4j:log /> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/log/samples/log-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,18 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:inputText value="#{userBean.name}" /> + <a4j:commandButton value="Submit" render="out" /> + <br /> + <a4j:outputPanel id="out"> + <h:outputText value="Hello #{userBean.name}!" + rendered="#{not empty userBean.name}" /> + </a4j:outputPanel> + </h:form> + <a4j:log /> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/flashUsage.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,36 +1,19 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - <script src="#{facesContext.externalContext.requestContextPath}/script/swfobject.js" type="text/javascript"/> - <p>SWF Movie:</p> - <a4j:outputPanel id="flashPanelDynamic"> - - <a4j:mediaOutput element="a" id="swfLink" style="display: none;" cacheable="false" session="true" - createContent="#{mediaBean.paintFlash}" value="#{mediaData}" /> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> - <a4j:outputPanel layout="block" id="myFlashContent" style="width: 200px; height: 200px"> - <a href="http://www.adobe.com/go/getflashplayer"> - <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" /> - </a> - </a4j:outputPanel> +<ui:composition> + <p>SWF Movie:</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> - <script type="text/javascript"> - var flashvars = {}; - var params = {}; - var attributes = {}; - swfobject.embedSWF(document.getElementById('page:swfLink').href, document.getElementById('myFlashContent'), "200", "200", "9.0.0", false, flashvars, params, attributes); - </script> +</ui:composition> - </a4j:outputPanel> - - <br /> - <br /> - - </ui:composition> - </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/imgUsage.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/imgUsage.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/imgUsage.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,39 +1,36 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - <p>a4j:mediaOutput allows to generate images, video, sounds and other binary - resources defined by a user on-the-fly. - </p> - <p><b>createContent</b> attribute references to the method that will be used - for content creating. The method accepts two parameters. The first parameter - has an OutputStream type. It is a reference to the steam that should be used for output. - The second parameter is a reference to a 'value' attribute of the component. - </p> - <p> - <b>value</b> attribute references to data that can be used as input data for a content - creator method. The data should be serializable because it is encoded to the URL - of the resource. - </p> - <p> - <b>mimeType</b> attribute defines the type of output content. It is used to define - the corresponded type in the header of an HTTP response. - </p> - <p> - <b>cacheable</b> attribute is a flag that defines the caching strategy. If 'cacheable' - is set to false, the response will not be cached. If it is set to true, it will be cached - and the serialized value of 'value' attribute plays the role of a cache key. - </p> - - <p>Dynamically generated JPEG file:</p> - - <a4j:mediaOutput element="img" cacheable="false" session="true" - createContent="#{mediaBean.paint}" value="#{mediaData}" mimeType="image/jpeg" /> - <br/><br/> - </ui:composition> - + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p>a4j:mediaOutput allows to generate images, video, sounds and + other binary resources defined by a user on-the-fly.</p> + <p><b>createContent</b> attribute references to the method that + will be used for content creating. The method accepts two parameters. + The first parameter has an OutputStream type. It is a reference to the + steam that should be used for output. The second parameter is a + reference to a 'value' attribute of the component.</p> + <p><b>value</b> attribute references to data that can be used as + input data for a content creator method. The data should be + serializable because it is encoded to the URL of the resource.</p> + <p><b>mimeType</b> attribute defines the type of output content. It + is used to define the corresponded type in the header of an HTTP + response.</p> + <p><b>cacheable</b> attribute is a flag that defines the caching + strategy. If 'cacheable' is set to false, the response will not be + cached. If it is set to true, it will be cached and the serialized + value of 'value' attribute plays the role of a cache key.</p> + + <p>Dynamically generated JPEG file:</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,32 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <script - src="#{facesContext.externalContext.requestContextPath}/script/swfobject.js" - type="text/javascript" /> - <a4j:outputPanel id="flashPanelDynamic"> - - <a4j:mediaOutput element="a" id="swfLink" style="display: none;" - cacheable="false" session="true" - createContent="#{mediaBean.paintFlash}" value="#{mediaData}" /> - - <a4j:outputPanel layout="block" id="myFlashContent" - style="width: 200px; height: 200px"> - <a href="http://www.adobe.com/go/getflashplayer"> <img - src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" - alt="Get Adobe Flash player" /> </a> - </a4j:outputPanel> - - <script type="text/javascript"> - var flashvars = {}; - var params = {}; - var attributes = {}; - swfobject.embedSWF(document.getElementById('page:swfLink').href, document.getElementById('myFlashContent'), "200", "200", "9.0.0", false, flashvars, params, attributes); - </script> - - </a4j:outputPanel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/flashUsage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,32 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <script + src="#{facesContext.externalContext.requestContextPath}/script/swfobject.js" + type="text/javascript" /> + <a4j:outputPanel id="flashPanelDynamic"> + + <a4j:mediaOutput element="a" id="swfLink" style="display: none;" + cacheable="false" session="true" + createContent="#{mediaBean.paintFlash}" value="#{mediaData}" /> + + <a4j:outputPanel layout="block" id="myFlashContent" + style="width: 200px; height: 200px"> + <a href="http://www.adobe.com/go/getflashplayer"> <img + src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" + alt="Get Adobe Flash player" /> </a> + </a4j:outputPanel> + + <script type="text/javascript"> + var flashvars = {}; + var params = {}; + var attributes = {}; + swfobject.embedSWF(document.getElementById('page:swfLink').href, document.getElementById('myFlashContent'), "200", "200", "9.0.0", false, flashvars, params, attributes); + </script> + + </a4j:outputPanel> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,12 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <a4j:mediaOutput element="img" cacheable="false" session="true" - createContent="#{mediaBean.paint}" value="#{mediaData}" - mimeType="image/jpeg" /> - -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/mediaOutput/samples/imgUsage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,12 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <a4j:mediaOutput element="img" cacheable="false" session="true" + createContent="#{mediaBean.paint}" value="#{mediaData}" + mimeType="image/jpeg" /> + +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/compositemessages.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,41 +1,20 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> - - <ui:composition> - <p> - Next sample shows how you could simply create composite component from - standard h:messages and a4j:outputPanel in order to get them updated - for any ajax request without render definition. - </p> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="User Details Panel" /> - </f:facet> - <h:panelGrid columns="2"> - <h:panelGrid columns="2"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}" required="true" label="Name"> - <f:validateLength minimum="3" maximum="12"/> - </h:inputText> - <h:outputText value="Adress:" /> - <h:inputTextarea value="#{userBean.address}" label="Adress" required="true"> - <f:validateLength maximum="100"/> - </h:inputTextarea> - </h:panelGrid> - <rich:messages/> - </h:panelGrid> - <a4j:commandButton value="Submit" type="button" action="#{userBean.store}" execute="@form"/> - <a4j:outputPanel ajaxRendered="true"> - <h:outputText value="#{userBean.recordStatus}" id="out" rendered="#{facesContext.maximumSeverity == null}"/> - </a4j:outputPanel> - </rich:panel> - </h:form> - </ui:composition> - + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p>Next sample shows how you could simply create composite + component from standard h:messages and a4j:outputPanel in order to get + them updated for any ajax request without render definition.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,36 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:r="http://java.sun.com/jsf/composite/rich"> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="User Details Panel" /> - </f:facet> - <h:panelGrid columns="2"> - <h:panelGrid columns="2"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}" required="true" label="Name"> - <f:validateLength minimum="3" maximum="12" /> - </h:inputText> - <h:outputText value="Adress:" /> - <h:inputTextarea value="#{userBean.address}" label="Adress" - required="true"> - <f:validateLength maximum="100" /> - </h:inputTextarea> - </h:panelGrid> - <r:messages /> - </h:panelGrid> - <a4j:commandButton value="Submit" type="button" - action="#{userBean.store}" execute="@form" /> - <a4j:outputPanel ajaxRendered="true"> - <h:outputText value="#{userBean.recordStatus}" id="out" - rendered="#{facesContext.maximumSeverity == null}" /> - </a4j:outputPanel> - </rich:panel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/compositemessages-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,36 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:r="http://java.sun.com/jsf/composite/rich"> + <h:form> + <rich:panel id="psnel"> + <f:facet name="header"> + <h:outputText value="User Details Panel" /> + </f:facet> + <h:panelGrid columns="2"> + <h:panelGrid columns="2"> + <h:outputText value="User name:" /> + <h:inputText value="#{userBean.name}" required="true" label="Name"> + <f:validateLength minimum="3" maximum="12" /> + </h:inputText> + <h:outputText value="Adress:" /> + <h:inputTextarea value="#{userBean.address}" label="Adress" + required="true"> + <f:validateLength maximum="100" /> + </h:inputTextarea> + </h:panelGrid> + <r:messages /> + </h:panelGrid> + <a4j:commandButton value="Submit" type="button" + action="#{userBean.store}" execute="@form" /> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText value="#{userBean.recordStatus}" id="out" + rendered="#{facesContext.maximumSeverity == null}" /> + </a4j:outputPanel> + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,69 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style type="text/css"> -.col { - width: 50%; - padding: 10px; - padding: 0px 30px 0px 0px; - vertical-align: top; -} -</style> - <h:panelGrid columns="2" width="100%" columnClasses="col"> - - <f:verbatim> - This code does not work as expected. The expected echo text does not appear - below even the condition for <code>'rendered'</code> returns <code>true</code>. - Also, the error message does not appear when the length of the text reaches the limit. - </f:verbatim> - <f:verbatim> - This code works properly. The <code>h:message</code> is marked for update during - each Ajaxrequest/response. The place for bottom label is reserved with - <code>outputPanel</code> while the component is not rendered. - </f:verbatim> - - <a4j:outputPanel layout="block"> - - - <a4j:outputPanel layout="block"> - <h:form> - <h:message for="text1" style="color:red" /> - - <h:outputText style="font-weight: bold;" value="Enter Text: " /> - <h:inputText id="text1" label="text1" value="#{opBean1.text}"> - <f:validateLength maximum="10" /> - <a4j:ajax event="keyup" execute="@this" render="out1" - onerror="function(){return false}" /> - </h:inputText> - - <h:outputText id="out1" rendered="#{not empty opBean1.text}" - value="Approved Text: #{opBean1.text}" /> - </h:form> - </a4j:outputPanel> - - </a4j:outputPanel> - - <a4j:outputPanel layout="block"> - <h:form> - <a4j:outputPanel layout="block" ajaxRendered="true"> - <h:message for="text2" style="color:red" /> - </a4j:outputPanel> - - <h:outputText style="font-weight: bold;" value="Enter Text: " /> - <h:inputText id="text2" label="text2" value="#{opBean2.text}"> - <f:validateLength maximum="10" /> - <a4j:ajax event="keyup" execute="@this" render="out2" /> - </h:inputText> - - <a4j:outputPanel id="out2" layout="block"> - <h:outputText rendered="#{not empty opBean2.text}" - value="Approved Text: #{opBean2.text}" /> - </a4j:outputPanel> - </h:form> - </a4j:outputPanel> - </h:panelGrid> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,69 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style type="text/css"> +.col { + width: 50%; + padding: 10px; + padding: 0px 30px 0px 0px; + vertical-align: top; +} +</style> + <h:panelGrid columns="2" width="100%" columnClasses="col"> + + <f:verbatim> + This code does not work as expected. The expected echo text does not appear + below even the condition for <code>'rendered'</code> returns <code>true</code>. + Also, the error message does not appear when the length of the text reaches the limit. + </f:verbatim> + <f:verbatim> + This code works properly. The <code>h:message</code> is marked for update during + each Ajaxrequest/response. The place for bottom label is reserved with + <code>outputPanel</code> while the component is not rendered. + </f:verbatim> + + <a4j:outputPanel layout="block"> + + + <a4j:outputPanel layout="block"> + <h:form> + <h:message for="text1" style="color:red" /> + + <h:outputText style="font-weight: bold;" value="Enter Text: " /> + <h:inputText id="text1" label="text1" value="#{opBean1.text}"> + <f:validateLength maximum="10" /> + <a4j:ajax event="keyup" execute="@this" render="out1" + onerror="function(){return false}" /> + </h:inputText> + + <h:outputText id="out1" rendered="#{not empty opBean1.text}" + value="Approved Text: #{opBean1.text}" /> + </h:form> + </a4j:outputPanel> + + </a4j:outputPanel> + + <a4j:outputPanel layout="block"> + <h:form> + <a4j:outputPanel layout="block" ajaxRendered="true"> + <h:message for="text2" style="color:red" /> + </a4j:outputPanel> + + <h:outputText style="font-weight: bold;" value="Enter Text: " /> + <h:inputText id="text2" label="text2" value="#{opBean2.text}"> + <f:validateLength maximum="10" /> + <a4j:ajax event="keyup" execute="@this" render="out2" /> + </h:inputText> + + <a4j:outputPanel id="out2" layout="block"> + <h:outputText rendered="#{not empty opBean2.text}" + value="Approved Text: #{opBean2.text}" /> + </a4j:outputPanel> + </h:form> + </a4j:outputPanel> + </h:panelGrid> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/simple.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/simple.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/outputPanel/simple.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,84 +2,35 @@ <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://java.sun.com/jsf/composite/rich" - xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <style type="text/css"> - .col { - width:50%; - padding:10px; - padding: 0px 30px 0px 0px; - vertical-align: top; - } - </style> - <p> - <b>a4j:outputPanel</b> component designed to provide next features: - <ul> - <li><b>Automaticall updates</b> of the child content on Ajax requests</li> - <li>Wrapper component for <b>conditional rendering of nested elements</b> via Ajax</li> - <li><b>Configurable layouts</b>: - <ul> - <li>inline - rendered as span element</li> - <li>block - rendered as div element</li> - <li>none - special layout for nested components confitional rendering cases</li> - </ul> - </li> - <li></li> - </ul> - </p> - <h:panelGrid columns="2" width="100%" columnClasses="col"> - <f:verbatim> - This code does not work as expected. The expected echo text does not appear - below even the condition for <code>'rendered'</code> returns <code>true</code>. - Also, the error message does not appear when the length of the text reaches the limit. - </f:verbatim> - <f:verbatim> - This code works properly. The <code>h:message</code> is marked for update during - each Ajaxrequest/response. The place for bottom label is reserved with - <code>outputPanel</code> while the component is not rendered. - </f:verbatim> - - <a4j:outputPanel layout="block"> - - - <a4j:outputPanel layout="block"> - <h:form> - <h:message for="text1" style="color:red" /> - - <h:outputText style="font-weight: bold;" value="Enter Text: "/> - <h:inputText id="text1" label="text1" value="#{opBean1.text}"> - <f:validateLength maximum="10"/> - <a4j:ajax event="keyup" execute="@this" render="out1" onerror="function(){return false}"/> - </h:inputText> - - <h:outputText id="out1" rendered="#{not empty opBean1.text}" value="Approved Text: #{opBean1.text}" /> - </h:form> - </a4j:outputPanel> - - </a4j:outputPanel> - - <a4j:outputPanel layout="block"> - <h:form> - <a4j:outputPanel layout="block" ajaxRendered="true"> - <h:message for="text2" style="color:red" /> - </a4j:outputPanel> - - <h:outputText style="font-weight: bold;" value="Enter Text: "/> - <h:inputText id="text2" label="text2" value="#{opBean2.text}"> - <f:validateLength maximum="10"/> - <a4j:ajax event="keyup" execute="@this" render="out2" /> - </h:inputText> - - <a4j:outputPanel id="out2" layout="block"> - <h:outputText rendered="#{not empty opBean2.text}" value="Approved Text: #{opBean2.text}" /> - </a4j:outputPanel> - </h:form> - </a4j:outputPanel> - </h:panelGrid> + <p><b>a4j:outputPanel</b> component designed to provide next + features: + <ul> + <li><b>Automaticall updates</b> of the child content on Ajax + requests</li> + <li>Wrapper component for <b>conditional rendering of nested + elements</b> via Ajax</li> + <li><b>Configurable layouts</b>: + <ul> + <li>inline - rendered as span element</li> + <li>block - rendered as div element</li> + <li>none - special layout for nested components confitional + rendering cases</li> + </ul> + </li> + <li></li> + </ul> + </p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/lookCustomization.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/lookCustomization.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/lookCustomization.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,94 +2,16 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <style> -.rf-panel-header { - color: #0054BD; -} -.panel { - vertical-align: top; -} - -.top { - width: 200px; - height: 100px; -} - -.head2 { - background-image: url(); - background-color: #4C9600; - height: 18px; - text-align: center; - vertical-align: middle; - color: #CFF; - padding: 4px 0; -} - -.body3 { - height: 100px; - overflow: auto; -} -</style> - <h:panelGrid columnClasses="panel" border="0" columns="2"> - <rich:panel> - <f:facet name="header"> - Panel #1. Changing Style Synchronously - </f:facet> - Each component in the RichFaces has a pre-defined set of classes you can manipulate with. If defined, those - classes overwrite the ones come from the skin. - </rich:panel> - - <rich:panel> - <f:facet name="header"> - Panel #2. Changing Style Synchronously - </f:facet> - In this example, we define header color using the .rf-panel-header class and all panels located on the same page - inherit this color - </rich:panel> - - </h:panelGrid> - - <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel - onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" - onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" - style="width:200px;" headerClass="head2" bodyClass="body3"> - <f:facet name="header"> - Panel header - </f:facet> - Base on the previous layout, but some javascript behaviour added. - </rich:panel> - - <rich:panel style="width:200px;" bodyClass="body3"> - <f:facet name="header"> - Scrolling Text Panel - </f:facet> - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - </rich:panel> - - <rich:panel styleClass="top"> - This is a panel without the header - </rich:panel> - - </h:panelGrid> - + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,91 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.rf-panel-header { - color: #0054BD; -} - -.panel { - vertical-align: top; -} - -.top { - width: 200px; - height: 100px; -} - -.head2 { - background-image: url(); - background-color: #4C9600; - height: 18px; - text-align: center; - vertical-align: middle; - color: #CFF; - padding: 4px 0; -} - -.body3 { - height: 100px; - overflow: auto; -} -</style> - <h:panelGrid columnClasses="panel" border="0" columns="2"> - <rich:panel> - <f:facet name="header"> - Panel #1. Changing Style Synchronously - </f:facet> - Each component in the RichFaces has a pre-defined set of classes you can manipulate with. If defined, those - classes overwrite the ones come from the skin. - </rich:panel> - - <rich:panel> - <f:facet name="header"> - Panel #2. Changing Style Synchronously - </f:facet> - In this example, we define header color using the .rf-panel-header class and all panels located on the same page - inherit this color - </rich:panel> - - </h:panelGrid> - - <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel - onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" - onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" - style="width:200px;" headerClass="head2" bodyClass="body3"> - <f:facet name="header"> - Panel header - </f:facet> - Base on the previous layout, but some javascript behaviour added. - </rich:panel> - - <rich:panel style="width:200px;" bodyClass="body3"> - <f:facet name="header"> - Scrolling Text Panel - </f:facet> - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - </rich:panel> - - <rich:panel styleClass="top"> - This is a panel without the header - </rich:panel> - - </h:panelGrid> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/lookCustomization-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,91 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.rf-panel-header { + color: #0054BD; +} + +.panel { + vertical-align: top; +} + +.top { + width: 200px; + height: 100px; +} + +.head2 { + background-image: url(); + background-color: #4C9600; + height: 18px; + text-align: center; + vertical-align: middle; + color: #CFF; + padding: 4px 0; +} + +.body3 { + height: 100px; + overflow: auto; +} +</style> + <h:panelGrid columnClasses="panel" border="0" columns="2"> + <rich:panel> + <f:facet name="header"> + Panel #1. Changing Style Synchronously + </f:facet> + Each component in the RichFaces has a pre-defined set of classes you can manipulate with. If defined, those + classes overwrite the ones come from the skin. + </rich:panel> + + <rich:panel> + <f:facet name="header"> + Panel #2. Changing Style Synchronously + </f:facet> + In this example, we define header color using the .rf-panel-header class and all panels located on the same page + inherit this color + </rich:panel> + + </h:panelGrid> + + <h:panelGrid columnClasses="panel" border="0" columns="3"> + <rich:panel + onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" + onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" + style="width:200px;" headerClass="head2" bodyClass="body3"> + <f:facet name="header"> + Panel header + </f:facet> + Base on the previous layout, but some javascript behaviour added. + </rich:panel> + + <rich:panel style="width:200px;" bodyClass="body3"> + <f:facet name="header"> + Scrolling Text Panel + </f:facet> + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + </rich:panel> + + <rich:panel styleClass="top"> + This is a panel without the header + </rich:panel> + + </h:panelGrid> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,45 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <rich:panel header="Panel with default Look-n-feel"> - <h:graphicImage value="/images/icons/common/rf.png" - style="float:right" /> - RichFaces is a component library for JSF and an advanced framework for - easily integrating AJAX capabilities into business applications. - <ul> - <li>100+ AJAX enabled components in two libraries</li> - <li>a4j: page centric AJAX controls</li> - <li>rich: self contained, ready to use components</li> - <li>Whole set of JSF benefits while working with AJAX</li> - <li>Skinnability mechanism</li> - <li>Component Development Kit (CDK)</li> - <li>Dynamic resources handling</li> - <li>Testing facilities for components, actions, listeners, and - pages</li> - <li>Broad cross-browser support</li> - <li>Large and active community</li> - </ul> - </rich:panel> - <p><b>Panel without header:</b></p> - <rich:panel> - <p><b>JSF 2 and RichFaces 4:</b></p> - <p>We are working hard on RichFaces 4.0 which will have full JSF 2 - integration. That is not all though, here is a summary of updates and - features:</p> - <ul> - <li>Redesigned modular repository and build system.</li> - <li>Simplified Component Development Kit with annotations, - faces-config extensions, advanced templates support and more..</li> - <li>Ajax framework improvements extending the JSF 2 - specification.</li> - <li>Component review for consistency, usability, and redesign - following semantic HTML principles where possible.</li> - <li>Both server-side and client-side performance optimization.</li> - <li>Strict code clean-up and review.</li> - </ul> - </rich:panel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,45 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <rich:panel header="Panel with default Look-n-feel"> + <h:graphicImage value="/images/icons/common/rf.png" + style="float:right" /> + RichFaces is a component library for JSF and an advanced framework for + easily integrating AJAX capabilities into business applications. + <ul> + <li>100+ AJAX enabled components in two libraries</li> + <li>a4j: page centric AJAX controls</li> + <li>rich: self contained, ready to use components</li> + <li>Whole set of JSF benefits while working with AJAX</li> + <li>Skinnability mechanism</li> + <li>Component Development Kit (CDK)</li> + <li>Dynamic resources handling</li> + <li>Testing facilities for components, actions, listeners, and + pages</li> + <li>Broad cross-browser support</li> + <li>Large and active community</li> + </ul> + </rich:panel> + <p><b>Panel without header:</b></p> + <rich:panel> + <p><b>JSF 2 and RichFaces 4:</b></p> + <p>We are working hard on RichFaces 4.0 which will have full JSF 2 + integration. That is not all though, here is a summary of updates and + features:</p> + <ul> + <li>Redesigned modular repository and build system.</li> + <li>Simplified Component Development Kit with annotations, + faces-config extensions, advanced templates support and more..</li> + <li>Ajax framework improvements extending the JSF 2 + specification.</li> + <li>Component review for consistency, usability, and redesign + following semantic HTML principles where possible.</li> + <li>Both server-side and client-side performance optimization.</li> + <li>Strict code clean-up and review.</li> + </ul> + </rich:panel> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/simple.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/simple.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/panel/simple.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,9 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>The panel is a rectangle area on a page that may contain any @@ -13,42 +11,12 @@ of any parts of the panel, including color scheme, borders and paddings can be customizable using with pre-defined number of CSS classes.</p> - <rich:panel header="Panel with default Look-n-feel"> - <h:graphicImage value="/images/icons/common/rf.png" - style="float:right" /> - RichFaces is a component library for JSF and an advanced framework for - easily integrating AJAX capabilities into business applications. - <ul> - <li>100+ AJAX enabled components in two libraries</li> - <li>a4j: page centric AJAX controls</li> - <li>rich: self contained, ready to use components</li> - <li>Whole set of JSF benefits while working with AJAX</li> - <li>Skinnability mechanism</li> - <li>Component Development Kit (CDK)</li> - <li>Dynamic resources handling</li> - <li>Testing facilities for components, actions, listeners, and - pages</li> - <li>Broad cross-browser support</li> - <li>Large and active community</li> - </ul> - </rich:panel> - <p><b>Panel without header:</b></p> - <rich:panel> - <p><b>JSF 2 and RichFaces 4:</b></p> - <p>We are working hard on RichFaces 4.0 which will have full JSF 2 - integration. That is not all though, here is a summary of updates and - features:</p> - <ul> - <li>Redesigned modular repository and build system.</li> - <li>Simplified Component Development Kit with annotations, - faces-config extensions, advanced templates support and more..</li> - <li>Ajax framework improvements extending the JSF 2 - specification.</li> - <li>Component review for consistency, usability, and redesign - following semantic HTML principles where possible.</li> - <li>Both server-side and client-side performance optimization.</li> - <li>Strict code clean-up and review.</li> - </ul> - </rich:panel> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/clientParam.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/clientParam.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/clientParam.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,33 +2,24 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>It is possible to use javascript variable of custom function for the 'value' attribute. - In this case the 'noEscape' attribute should be set to true. When noEscape="true", the - 'value' can contain any javascript expression or javascript function invocation and the - result of them will be send to the server as a value of a4j:actionparam. The following - example demonstrates how to assign the backing bean with browser screen size values.</p> - <h:form> - <a4j:commandButton value="Show Screen Size" render="infoPanel"> - <a4j:param name="w" value="screen.width" - assignTo="#{paramBean.screenWidth}" noEscape="true" /> - <a4j:param name="h" value="screen.height" - assignTo="#{paramBean.screenHeight}" noEscape="true" /> - </a4j:commandButton> - <br /> + <p>It is possible to use javascript variable of custom function for + the 'value' attribute. In this case the 'noEscape' attribute should be + set to true. When noEscape="true", the 'value' can contain any + javascript expression or javascript function invocation and the result + of them will be send to the server as a value of a4j:actionparam. The + following example demonstrates how to assign the backing bean with + browser screen size values.</p> - <h:panelGrid columns="2" id="infoPanel"> - <h:outputText value="Width:" /> - <h:outputText value="#{paramBean.screenWidth}" /> - <h:outputText value="Height:" /> - <h:outputText value="#{paramBean.screenHeight}" /> - </h:panelGrid> - - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/param.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/param.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/param.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,34 +2,21 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<p> -a4j:actionparam is a component which extends regular f:param with the possibility to -assign the value to the property of the manager bean directly using the assignTo attribute. -Using this feature you can update model values without invoking even a single line of java code on the - server side.</p> - <h:form> - <rich:panel> - <h:panelGrid columns="2"> - <a4j:commandButton value="Set Name to Alex" render="rep"> - <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" /> - </a4j:commandButton> - - <a4j:commandButton value="Set Name to John" render="rep"> - <a4j:param name="username" value="John" - assignTo="#{userBean.name}" /> - </a4j:commandButton> - </h:panelGrid> - </rich:panel> -<br/> - <rich:panel> - <h:outputText id="rep" value="Selected Name:#{userBean.name}" /> - </rich:panel> - </h:form> + <p>a4j:actionparam is a component which extends regular f:param + with the possibility to assign the value to the property of the manager + bean directly using the assignTo attribute. Using this feature you can + update model values without invoking even a single line of java code on + the server side.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,25 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <a4j:commandButton value="Show Screen Size" render="infoPanel"> - <a4j:param name="w" value="screen.width" - assignTo="#{paramBean.screenWidth}" noEscape="true" /> - <a4j:param name="h" value="screen.height" - assignTo="#{paramBean.screenHeight}" noEscape="true" /> - </a4j:commandButton> - <br /> - - <h:panelGrid columns="2" id="infoPanel"> - <h:outputText value="Width:" /> - <h:outputText value="#{paramBean.screenWidth}" /> - <h:outputText value="Height:" /> - <h:outputText value="#{paramBean.screenHeight}" /> - </h:panelGrid> - - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/clientParam-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <a4j:commandButton value="Show Screen Size" render="infoPanel"> + <a4j:param name="w" value="screen.width" + assignTo="#{paramBean.screenWidth}" noEscape="true" /> + <a4j:param name="h" value="screen.height" + assignTo="#{paramBean.screenHeight}" noEscape="true" /> + </a4j:commandButton> + <br /> + + <h:panelGrid columns="2" id="infoPanel"> + <h:outputText value="Width:" /> + <h:outputText value="#{paramBean.screenWidth}" /> + <h:outputText value="Height:" /> + <h:outputText value="#{paramBean.screenHeight}" /> + </h:panelGrid> + + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,25 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:panel> - <h:panelGrid columns="2"> - <a4j:commandButton value="Set Name to Alex" render="rep"> - <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" /> - </a4j:commandButton> - - <a4j:commandButton value="Set Name to John" render="rep"> - <a4j:param name="username" value="John" assignTo="#{userBean.name}" /> - </a4j:commandButton> - </h:panelGrid> - </rich:panel> - <br /> - <rich:panel> - <h:outputText id="rep" value="Selected Name:#{userBean.name}" /> - </rich:panel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/param-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:panel> + <h:panelGrid columns="2"> + <a4j:commandButton value="Set Name to Alex" render="rep"> + <a4j:param name="username" value="Alex" assignTo="#{userBean.name}" /> + </a4j:commandButton> + + <a4j:commandButton value="Set Name to John" render="rep"> + <a4j:param name="username" value="John" assignTo="#{userBean.name}" /> + </a4j:commandButton> + </h:panelGrid> + </rich:panel> + <br /> + <rich:panel> + <h:outputText id="rep" value="Selected Name:#{userBean.name}" /> + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,26 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Change Demo Appplication Skin To: " /> - </f:facet> - <h:panelGrid columns="2"> - <h:link value="DeepMarine" includeViewParams="true"> - <a4j:param name="skin" value="deepMarine" - assignTo="#{skinBean.skin}" /> - </h:link> - - <h:link value="BlueSky" includeViewParams="true"> - <a4j:param name="skin" value="blueSky" assignTo="#{skinBean.skin}" /> - </h:link> - </h:panelGrid> - - </rich:panel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/samples/skinChange-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,26 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Change Demo Appplication Skin To: " /> + </f:facet> + <h:panelGrid columns="2"> + <h:link value="DeepMarine" includeViewParams="true"> + <a4j:param name="skin" value="deepMarine" + assignTo="#{skinBean.skin}" /> + </h:link> + + <h:link value="BlueSky" includeViewParams="true"> + <a4j:param name="skin" value="blueSky" assignTo="#{skinBean.skin}" /> + </h:link> + </h:panelGrid> + + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/skinChange.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/skinChange.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/param/skinChange.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,32 +2,21 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>You can use a4j:param not only with ajax components, but with non-ajax command - components and for GET navigation components also. In the following example, the used skin of the demo is changed when - the whole page is refreshed with the regular h:link. </p> - <h:form> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Change Demo Appplication Skin To: " /> - </f:facet> - <h:panelGrid columns="2"> - <h:link value="DeepMarine" includeViewParams="true"> - <a4j:param name="skin" value="deepMarine" - assignTo="#{skinBean.skin}" /> - </h:link> + <p>You can use a4j:param not only with ajax components, but with + non-ajax command components and for GET navigation components also. In + the following example, the used skin of the demo is changed when the + whole page is refreshed with the regular h:link.</p> - <h:link value="BlueSky" includeViewParams="true"> - <a4j:param name="skin" value="blueSky" assignTo="#{skinBean.skin}" /> - </h:link> - </h:panelGrid> - - </rich:panel> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/poll.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -3,8 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:rich="http://richfaces.org/rich"> <ui:composition> <p>a4j:poll is one of the way how you can organize the periodical @@ -19,34 +18,14 @@ the page based on the data taken from the server. To turn off polling, press "Stop Polling" button.</p> - <h:form> - <a4j:poll id="poll" interval="1500" enabled="#{pollBean.pollEnabled}" - render="poll,grid" /> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> - <h:form> - <h:panelGrid columns="2" width="80%" id="grid"> - <h:panelGrid columns="1"> - - <h:outputText value="Polling Inactive" - rendered="#{not pollBean.pollEnabled}"></h:outputText> - - <h:outputText value="Polling Active" - rendered="#{pollBean.pollEnabled}"></h:outputText> - - <a4j:commandButton style="width:120px" id="control" - value="#{pollBean.pollEnabled?'Stop':'Start'} Polling" - render="poll, grid"> - <a4j:param name="polling" value="#{!pollBean.pollEnabled}" - assignTo="#{pollBean.pollEnabled}" /> - </a4j:commandButton> - - </h:panelGrid> - - <h:outputText id="serverDate" style="font-size:16px" - value="Server Date: #{pollBean.date}" /> - </h:panelGrid> - </h:form> <rich:panel> <b>NOTE:</b>polling is automatically disabled in this demo after one minute of working. </rich:panel> Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,36 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <a4j:poll id="poll" interval="1500" enabled="#{pollBean.pollEnabled}" - render="poll,grid" /> - </h:form> - - <h:form> - <h:panelGrid columns="2" width="80%" id="grid"> - <h:panelGrid columns="1"> - - <h:outputText value="Polling Inactive" - rendered="#{not pollBean.pollEnabled}"></h:outputText> - - <h:outputText value="Polling Active" - rendered="#{pollBean.pollEnabled}"></h:outputText> - - <a4j:commandButton style="width:120px" id="control" - value="#{pollBean.pollEnabled?'Stop':'Start'} Polling" - render="poll, grid"> - <a4j:param name="polling" value="#{!pollBean.pollEnabled}" - assignTo="#{pollBean.pollEnabled}" /> - </a4j:commandButton> - - </h:panelGrid> - - <h:outputText id="serverDate" style="font-size:16px" - value="Server Date: #{pollBean.date}" /> - </h:panelGrid> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/poll/samples/poll-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,36 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <a4j:poll id="poll" interval="1500" enabled="#{pollBean.pollEnabled}" + render="poll,grid" /> + </h:form> + + <h:form> + <h:panelGrid columns="2" width="80%" id="grid"> + <h:panelGrid columns="1"> + + <h:outputText value="Polling Inactive" + rendered="#{not pollBean.pollEnabled}"></h:outputText> + + <h:outputText value="Polling Active" + rendered="#{pollBean.pollEnabled}"></h:outputText> + + <a4j:commandButton style="width:120px" id="control" + value="#{pollBean.pollEnabled?'Stop':'Start'} Polling" + render="poll, grid"> + <a4j:param name="polling" value="#{!pollBean.pollEnabled}" + assignTo="#{pollBean.pollEnabled}" /> + </a4j:commandButton> + + </h:panelGrid> + + <h:outputText id="serverDate" style="font-size:16px" + value="Server Date: #{pollBean.date}" /> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/modalPopup.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/modalPopup.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/modalPopup.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,9 +2,7 @@ <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:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>There you could check the modal panel which blocks the main @@ -12,25 +10,13 @@ with <b>modal="true"</b></p> <p>In that sample the panel also defined as resizable so you could change its sizes using mouse</p> - <h:commandButton value="Call the popup"> - <rich:componentControl target="popup" operation="show" /> - </h:commandButton> - <rich:popupPanel id="popup" modal="true" - resizeable="true" onmaskclick="#{rich:component('popup')}.hide()"> - <f:facet name="header"> - <h:outputText value="Simple popup panel" /> - </f:facet> - <f:facet name="controls"> - <h:outputLink value="#" - onclick="#{rich:component('popup')}.hide(); return false;"> - X - </h:outputLink> - </f:facet> - <p>Additionally there you could check how to handle the clicks - outside the panel.</p> - <p>In this sample the click outside - closes the panel as well as - clicking hide control in the header</p> - </rich:popupPanel> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,27 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:commandButton value="Call the popup"> - <rich:componentControl target="popup" operation="show" /> - </h:commandButton> - <rich:popupPanel id="popup" modal="true" resizeable="true" - onmaskclick="#{rich:component('popup')}.hide()"> - <f:facet name="header"> - <h:outputText value="Simple popup panel" /> - </f:facet> - <f:facet name="controls"> - <h:outputLink value="#" - onclick="#{rich:component('popup')}.hide(); return false;"> - X - </h:outputLink> - </f:facet> - <p>Additionally there you could check how to handle the clicks - outside the panel.</p> - <p>In this sample the click outside - closes the panel as well as - clicking hide control in the header</p> - </rich:popupPanel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/modalPopup-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,27 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:commandButton value="Call the popup"> + <rich:componentControl target="popup" operation="show" /> + </h:commandButton> + <rich:popupPanel id="popup" modal="true" resizeable="true" + onmaskclick="#{rich:component('popup')}.hide()"> + <f:facet name="header"> + <h:outputText value="Simple popup panel" /> + </f:facet> + <f:facet name="controls"> + <h:outputLink value="#" + onclick="#{rich:component('popup')}.hide(); return false;"> + X + </h:outputLink> + </f:facet> + <p>Additionally there you could check how to handle the clicks + outside the panel.</p> + <p>In this sample the click outside - closes the panel as well as + clicking hide control in the header</p> + </rich:popupPanel> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,29 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:commandButton value="Call the popup"> - <rich:componentControl target="popup" operation="show" /> - </h:commandButton> - <rich:popupPanel id="popup" modal="false" autosized="true" - resizeable="false"> - <f:facet name="header"> - <h:outputText value="Simple popup panel" /> - </f:facet> - <f:facet name="controls"> - <h:outputLink value="#" - onclick="#{rich:component('popup')}.hide(); return false;"> - X - </h:outputLink> - </f:facet> - <p>Any content might be inside the panel.</p> - <p>Consider inclusion of the form elements into the popup or - redefinition of <b>domElementAttachment</b> attribute.</p> - <p>The popup panel is open and closed from the javascript function - of component client side object. The following code <a href="#" - onclick="#{rich:component('popup')}.hide()">hide this panel</a>: <f:verbatim>#</f:verbatim>{rich:component('popup')}.hide()</p> - </rich:popupPanel> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/samples/simplePopup-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:commandButton value="Call the popup"> + <rich:componentControl target="popup" operation="show" /> + </h:commandButton> + <rich:popupPanel id="popup" modal="false" autosized="true" + resizeable="false"> + <f:facet name="header"> + <h:outputText value="Simple popup panel" /> + </f:facet> + <f:facet name="controls"> + <h:outputLink value="#" + onclick="#{rich:component('popup')}.hide(); return false;"> + X + </h:outputLink> + </f:facet> + <p>Any content might be inside the panel.</p> + <p>Consider inclusion of the form elements into the popup or + redefinition of <b>domElementAttachment</b> attribute.</p> + <p>The popup panel is open and closed from the javascript function + of component client side object. The following code <a href="#" + onclick="#{rich:component('popup')}.hide()">hide this panel</a>: <f:verbatim>#</f:verbatim>{rich:component('popup')}.hide()</p> + </rich:popupPanel> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/simplePopup.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/simplePopup.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/popup/simplePopup.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,9 +2,7 @@ <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:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>Popup panel component used to create any kind of popups on the page.</p> @@ -18,27 +16,15 @@ </ul> <p>This sample shows simple <b>non-modal popup</b> which are <b>movable</b> but not resizable as defined to use <b>autosizing</b> according to it's content</p> - <h:commandButton value="Call the popup"> - <rich:componentControl target="popup" operation="show" /> - </h:commandButton> - <rich:popupPanel id="popup" modal="false" autosized="true" - resizeable="false"> - <f:facet name="header"> - <h:outputText value="Simple popup panel" /> - </f:facet> - <f:facet name="controls"> - <h:outputLink value="#" - onclick="#{rich:component('popup')}.hide(); return false;"> - X - </h:outputLink> - </f:facet> - <p>Any content might be inside the panel.</p> - <p>Consider inclusion of the form elements into the popup or - redefinition of <b>domElementAttachment</b> attribute.</p> - <p>The popup panel is open and closed from the javascript function - of component client side object. The following code <a href="#" - onclick="#{rich:component('popup')}.hide()">hide this panel</a>: <f:verbatim>#</f:verbatim>{rich:component('popup')}.hide()</p> - </rich:popupPanel> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> + <p>Besides this sample shows two variants of working with the component JS API:</p> <ul> <li>The popup is called by the <b>rich:componentControl</b> attached to button</li> Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/push.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,57 +2,26 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> - <p>The <b><a4j:push></b> periodically perform AJAX request to - server, to simulate 'push' data.</p> - <p><b><a4j:push></b> makes request to - minimal code only (not to JSF tree) in order to check the presence of - messages in the queue. If the message exists the complete request will - be performed. The component doesn't poll registered beans but - registers EventListener which receives messages about events.</p> - <p>Attribute '<b>interval</b>' is used as for poll component. It - specifies the interval in ms. for call push request. Simple example of - usage:</p> - <h:form> - <h:dataTable value="#{choicesBean.choices}" var="choice" id="choiceVotes"> - <f:facet name="header"> - <h:outputText value="Voting for favorite fruit" /> - </f:facet> - <h:column> - <f:facet name="header"> - <h:outputText value="Choice name" /> - </f:facet> - <h:outputText value="#{choice.label}" id="choiceLabel" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Current Votes" /> - </f:facet> - <h:outputText value="#{choice.votesCount}" id="choiceVotes" /> - </h:column> - </h:dataTable> - - <a4j:jsFunction name="startPush" action="#{choicesBean.start}" execute="@this" render="push, stop, start"/> - <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" execute="@this" render="push, stop, start"/> - - <h:commandButton onclick="startPush()" value="Start" id="start" disabled="#{choicesBean.enabled}" type="button"/> - - <h:commandButton onclick="stopPush()" type="button" value="Stop" id="stop" disabled="#{!choicesBean.enabled}"/> - - <a4j:outputPanel layout="block" id="tempResults"> - <h:outputText - value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}" - rendered="#{choicesBean.enabled}" /> - </a4j:outputPanel> - - <a4j:push enabled="#{choicesBean.enabled}" interval="1000" - eventProducer="#{choicesBean.addListener}" id="push" action="#{choicesBean.processUpdates}"> - <a4j:ajax render="choiceVotes push tempResults" /> - </a4j:push> - </h:form> + <p>The <b><a4j:push></b> periodically perform AJAX request to + server, to simulate 'push' data.</p> + <p><b><a4j:push></b> makes request to minimal code only (not + to JSF tree) in order to check the presence of messages in the queue. + If the message exists the complete request will be performed. The + component doesn't poll registered beans but registers EventListener + which receives messages about events.</p> + <p>Attribute '<b>interval</b>' is used as for poll component. It + specifies the interval in ms. for call push request. Simple example of + usage:</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,51 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <h:dataTable value="#{choicesBean.choices}" var="choice" - id="choiceVotes"> - <f:facet name="header"> - <h:outputText value="Voting for favorite fruit" /> - </f:facet> - <h:column> - <f:facet name="header"> - <h:outputText value="Choice name" /> - </f:facet> - <h:outputText value="#{choice.label}" id="choiceLabel" /> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Current Votes" /> - </f:facet> - <h:outputText value="#{choice.votesCount}" id="choiceVotes" /> - </h:column> - </h:dataTable> - - <a4j:jsFunction name="startPush" action="#{choicesBean.start}" - execute="@this" render="push, stop, start" /> - <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" - execute="@this" render="push, stop, start" /> - - <h:commandButton onclick="startPush()" value="Start" id="start" - disabled="#{choicesBean.enabled}" type="button" /> - - <h:commandButton onclick="stopPush()" type="button" value="Stop" - id="stop" disabled="#{!choicesBean.enabled}" /> - - <a4j:outputPanel layout="block" id="tempResults"> - <h:outputText - value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}" - rendered="#{choicesBean.enabled}" /> - </a4j:outputPanel> - - <a4j:push enabled="#{choicesBean.enabled}" interval="1000" - eventProducer="#{choicesBean.addListener}" id="push" - action="#{choicesBean.processUpdates}"> - <a4j:ajax render="choiceVotes push tempResults" /> - </a4j:push> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/push/samples/push-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,51 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:dataTable value="#{choicesBean.choices}" var="choice" + id="choiceVotes"> + <f:facet name="header"> + <h:outputText value="Voting for favorite fruit" /> + </f:facet> + <h:column> + <f:facet name="header"> + <h:outputText value="Choice name" /> + </f:facet> + <h:outputText value="#{choice.label}" id="choiceLabel" /> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Current Votes" /> + </f:facet> + <h:outputText value="#{choice.votesCount}" id="choiceVotes" /> + </h:column> + </h:dataTable> + + <a4j:jsFunction name="startPush" action="#{choicesBean.start}" + execute="@this" render="push, stop, start" /> + <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" + execute="@this" render="push, stop, start" /> + + <h:commandButton onclick="startPush()" value="Start" id="start" + disabled="#{choicesBean.enabled}" type="button" /> + + <h:commandButton onclick="stopPush()" type="button" value="Stop" + id="stop" disabled="#{!choicesBean.enabled}" /> + + <a4j:outputPanel layout="block" id="tempResults"> + <h:outputText + value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}" + rendered="#{choicesBean.enabled}" /> + </a4j:outputPanel> + + <a4j:push enabled="#{choicesBean.enabled}" interval="1000" + eventProducer="#{choicesBean.addListener}" id="push" + action="#{choicesBean.processUpdates}"> + <a4j:ajax render="choiceVotes push tempResults" /> + </a4j:push> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/queue.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,92 +1,50 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:r="http://java.sun.com/jsf/composite/rich"> -<p>JSF 2 provides queue mechanism out-of the box already. And RichFaces queue just provides -some additional customizations to improve the queue usability and allow to tune your -performance while using Ajax as much as possible.</p> -<p>The only big difference which the developers who used queue in 3.3.x should remember: -as JSF 2 already provides single queue and not allows to have more than one queue instance(currently) -you can't really fire concurrent requests anymore. So the queue in RF now not actually defines -logical queue but just a component for defining queueing options. -</p> -<p>Here you could explore additional optimization parameters of the queue and learn how they -influence Ajax requests. This example is a good start to learn about Ajax requests -flood protection.</p> + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <p>JSF 2 provides queue mechanism out-of the box already. And + RichFaces queue just provides some additional customizations to improve + the queue usability and allow to tune your performance while using Ajax + as much as possible.</p> + <p>The only big difference which the developers who used queue in + 3.3.x should remember: as JSF 2 already provides single queue and not + allows to have more than one queue instance(currently) you can't really + fire concurrent requests anymore. So the queue in RF now not actually + defines logical queue but just a component for defining queueing + options.</p> + <p>Here you could explore additional optimization parameters of the + queue and learn how they influence Ajax requests. This example is a + good start to learn about Ajax requests flood protection.</p> -<p>Pay attention to next point in the example:</p> -<ul> -<li>Setting request delay to greater value reduces the greatly requests count on fast typing. (More similar requests are combined in the result)</li> -</ul> -Also pay your attention to the queue definition. Such definition (inside some form without a name) means that the queue options becomes global for the form. - <r:panel> - <h:form id="form"> - <a4j:queue requestDelay="#{queueBean.requestDelay}"/> - <h:panelGrid columns="1" width="100%"> - <h:panelGrid columns="2"> - <h:outputText value="Type here:" /> - <h:inputText id="myinput" value="#{queueBean.text}" - onkeyup="addEvent();" disabled="#{not (facesContext.maximumSeverity==null)}"> - <a4j:ajax onbegin="addRequest();" event="keyup" render="outtext" - oncomplete="printCounts()" onbeforedomupdate="addUpdate()" /> - </h:inputText> - <h:outputText value="Repeated text:" /> - <h:outputText value="#{queueBean.text}" id="outtext" - style="font-weight:bold;" /> - <h:outputText value="Events count:" /> - <h:outputText value="0" id="events" /> - <h:outputText value="Requests count:" /> - <h:outputText value="0" id="requests" /> - <h:outputText value="DOM updates count:" /> - <h:outputText value="0" id="updates" /> - </h:panelGrid> - <r:message for="form:delay" style="color:red;" /> - <h:panelGrid columns="2"> - <h:outputText value="Request delay:" /> - <h:inputText value="#{queueBean.requestDelay}" id="delay" - converterMessage="Delay field should be a number (Demo input disabled till this resolved)"> - <f:convertNumber integerOnly="true"/> - </h:inputText> - <f:facet name="footer"> - <h:commandButton value="Apply" action="#{queueBean.resetText}" /> - </f:facet> - </h:panelGrid> - </h:panelGrid> - </h:form> - </r:panel> - <script type="text/javascript"> - var events = 0; - var updates = 0; - var outEvents = #{rich:element('events')}; - var outUpdates = #{rich:element('updates')}; - var outRequests = #{rich:element('requests')}; - - var requests=0; - function addEvent(){ - events++; - } - function addUpdate(){ - updates++; - } - function addRequest(){ - requests++; - } + <p>Pay attention to next point in the example:</p> + <ul> + <li>Setting request delay to greater value reduces the greatly + requests count on fast typing. (More similar requests are combined in + the result)</li> + </ul> + <p>Also pay your attention to the queue definition. Such definition + (inside some form without a name) means that the queue options becomes + global for the form.</p> - function printCounts(){ - outEvents.innerHTML=events; - outUpdates.innerHTML=updates; - outRequests.innerHTML=requests; - } - </script> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> <p>Queue could be defined as</p> - <ul><li><b>Default for view.</b> In this case - the parameters will be used for all - the Ajax requests in view(if not redefined). In order to define such queue - just place - <b>a4j:queu</b> outside of any forms without defining <b>name</b></li> - <li><b>Default for form.</b> Similar to view-scoped but should be defiend in some form without defining <b>name</b></li> - <li><b>Referenced from ajax behaviors/components.</b> Queue should be defined with name and referenced using attachQueue tag(see corresponding sample).</li></ul> + <ul> + <li><b>Default for view.</b> In this case - the parameters will + be used for all the Ajax requests in view(if not redefined). In order + to define such queue - just place <b>a4j:queu</b> outside of any forms + without defining <b>name</b></li> + <li><b>Default for form.</b> Similar to view-scoped but should be + defiend in some form without defining <b>name</b></li> + <li><b>Referenced from ajax behaviors/components.</b> Queue + should be defined with name and referenced using attachQueue tag(see + corresponding sample).</li> + </ul> </ui:composition> Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,69 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - xmlns:r="http://java.sun.com/jsf/composite/rich"> - <rich:panel> - <h:form id="form"> - <a4j:queue requestDelay="#{queueBean.requestDelay}" /> - <h:panelGrid columns="1" width="100%"> - <h:panelGrid columns="2"> - <h:outputText value="Type here:" /> - <h:inputText id="myinput" value="#{queueBean.text}" - onkeyup="addEvent();" - disabled="#{not (facesContext.maximumSeverity==null)}"> - <a4j:ajax onbegin="addRequest();" event="keyup" render="outtext" - oncomplete="printCounts()" onbeforedomupdate="addUpdate()" /> - </h:inputText> - <h:outputText value="Repeated text:" /> - <h:outputText value="#{queueBean.text}" id="outtext" - style="font-weight:bold;" /> - <h:outputText value="Events count:" /> - <h:outputText value="0" id="events" /> - <h:outputText value="Requests count:" /> - <h:outputText value="0" id="requests" /> - <h:outputText value="DOM updates count:" /> - <h:outputText value="0" id="updates" /> - </h:panelGrid> - <r:message for="form:delay" style="color:red;" /> - <h:panelGrid columns="2"> - <h:outputText value="Request delay:" /> - <h:inputText value="#{queueBean.requestDelay}" id="delay" - converterMessage="Delay field should be a number (Demo input disabled till this resolved)"> - <f:convertNumber integerOnly="true" /> - </h:inputText> - <f:facet name="footer"> - <h:commandButton value="Apply" action="#{queueBean.resetText}" /> - </f:facet> - </h:panelGrid> - </h:panelGrid> - </h:form> - </rich:panel> - <script type="text/javascript"> - var events = 0; - var updates = 0; - var outEvents = #{rich:element('events')}; - var outUpdates = #{rich:element('updates')}; - var outRequests = #{rich:element('requests')}; - - var requests=0; - function addEvent(){ - events++; - } - function addUpdate(){ - updates++; - } - function addRequest(){ - requests++; - } - - function printCounts(){ - outEvents.innerHTML=events; - outUpdates.innerHTML=updates; - outRequests.innerHTML=requests; - } - </script> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/queue/samples/queue-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,69 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + xmlns:r="http://java.sun.com/jsf/composite/rich"> + <rich:panel> + <h:form id="form"> + <a4j:queue requestDelay="#{queueBean.requestDelay}" /> + <h:panelGrid columns="1" width="100%"> + <h:panelGrid columns="2"> + <h:outputText value="Type here:" /> + <h:inputText id="myinput" value="#{queueBean.text}" + onkeyup="addEvent();" + disabled="#{not (facesContext.maximumSeverity==null)}"> + <a4j:ajax onbegin="addRequest();" event="keyup" render="outtext" + oncomplete="printCounts()" onbeforedomupdate="addUpdate()" /> + </h:inputText> + <h:outputText value="Repeated text:" /> + <h:outputText value="#{queueBean.text}" id="outtext" + style="font-weight:bold;" /> + <h:outputText value="Events count:" /> + <h:outputText value="0" id="events" /> + <h:outputText value="Requests count:" /> + <h:outputText value="0" id="requests" /> + <h:outputText value="DOM updates count:" /> + <h:outputText value="0" id="updates" /> + </h:panelGrid> + <r:message for="form:delay" style="color:red;" /> + <h:panelGrid columns="2"> + <h:outputText value="Request delay:" /> + <h:inputText value="#{queueBean.requestDelay}" id="delay" + converterMessage="Delay field should be a number (Demo input disabled till this resolved)"> + <f:convertNumber integerOnly="true" /> + </h:inputText> + <f:facet name="footer"> + <h:commandButton value="Apply" action="#{queueBean.resetText}" /> + </f:facet> + </h:panelGrid> + </h:panelGrid> + </h:form> + </rich:panel> + <script type="text/javascript"> + var events = 0; + var updates = 0; + var outEvents = #{rich:element('events')}; + var outUpdates = #{rich:element('updates')}; + var outRequests = #{rich:element('requests')}; + + var requests=0; + function addEvent(){ + events++; + } + function addUpdate(){ + updates++; + } + function addRequest(){ + requests++; + } + + function printCounts(){ + outEvents.innerHTML=events; + outUpdates.innerHTML=updates; + outRequests.innerHTML=requests; + } + </script> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/region.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,11 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:composition> +<ui:composition> <p><b>a4j:region</b> component designed for marking zones which should be processed during Ajax requests without using execute definitions at Ajax behaviors/components. This allow to decouple the @@ -22,66 +20,12 @@ info panels. But the ajax behaviors inside the first panel uses execute declarations and pointed to panelGrid id. And the second panel inputs just wrapped to region without any additional execute definitions.</p> - <h:form> - <h:panelGrid columns="2"> - <h:panelGrid> - <f:facet name="header"> - User Info Panel explicitly execute'd by Id - </f:facet> - <h:panelGrid columns="2" id="userInfoPanel1"> - <h:outputText value="User Name: " /> - <h:inputText value="#{regionBean.user1.name}"> - <a4j:ajax render="echopanel1" event="keyup" - execute="userInfoPanel1" /> - </h:inputText> - <h:outputText value="User email: " /> - <h:inputText value="#{regionBean.user1.email}"> - <a4j:ajax render="echopanel1" event="keyup" - execute="userInfoPanel1" /> - </h:inputText> - </h:panelGrid> - </h:panelGrid> - <h:panelGrid columns="2" id="echopanel1"> - <f:facet name="header"> - Echo Panel - </f:facet> - <h:outputText value="Entered name:" /> - <h:outputText value="#{regionBean.user1.name}" /> - <h:outputText value="Entered email:" /> - <h:outputText value="#{regionBean.user1.email}" /> - </h:panelGrid> - </h:panelGrid> - </h:form> - <h:form> - <h:panelGrid columns="2"> - <h:panelGrid> - <f:facet name="header"> - User Info Panel with Region - </f:facet> - <a4j:region> - <h:panelGrid columns="2"> - <h:outputText value="User Name: " /> - <h:inputText value="#{regionBean.user2.name}"> - <a4j:ajax render="echopanel2" event="keyup" /> - </h:inputText> - <h:outputText value="User email: " /> - <h:inputText value="#{regionBean.user2.email}"> - <a4j:ajax render="echopanel2" event="keyup" /> - </h:inputText> - </h:panelGrid> - </a4j:region> - </h:panelGrid> - <h:panelGrid columns="2" id="echopanel2"> - <f:facet name="header"> - Echo Panel - </f:facet> - <h:outputText value="Entered name:" /> - <h:outputText value="#{regionBean.user2.name}" /> - <h:outputText value="Entered email:" /> - <h:outputText value="#{regionBean.user2.email}" /> - </h:panelGrid> - </h:panelGrid> - </h:form> - + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,72 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> - -<ui:composition> - <h:form> - <h:panelGrid columns="2"> - <h:panelGrid> - <f:facet name="header"> - User Info Panel explicitly execute'd by Id - </f:facet> - <h:panelGrid columns="2" id="userInfoPanel1"> - <h:outputText value="User Name: " /> - <h:inputText value="#{regionBean.user1.name}"> - <a4j:ajax render="echopanel1" event="keyup" - execute="userInfoPanel1" /> - </h:inputText> - <h:outputText value="User email: " /> - <h:inputText value="#{regionBean.user1.email}"> - <a4j:ajax render="echopanel1" event="keyup" - execute="userInfoPanel1" /> - </h:inputText> - </h:panelGrid> - </h:panelGrid> - <h:panelGrid columns="2" id="echopanel1"> - <f:facet name="header"> - Echo Panel - </f:facet> - <h:outputText value="Entered name:" /> - <h:outputText value="#{regionBean.user1.name}" /> - <h:outputText value="Entered email:" /> - <h:outputText value="#{regionBean.user1.email}" /> - </h:panelGrid> - </h:panelGrid> - </h:form> - <h:form> - <h:panelGrid columns="2"> - <h:panelGrid> - <f:facet name="header"> - User Info Panel with Region - </f:facet> - <a4j:region> - <h:panelGrid columns="2"> - <h:outputText value="User Name: " /> - <h:inputText value="#{regionBean.user2.name}"> - <a4j:ajax render="echopanel2" event="keyup" /> - </h:inputText> - <h:outputText value="User email: " /> - <h:inputText value="#{regionBean.user2.email}"> - <a4j:ajax render="echopanel2" event="keyup" /> - </h:inputText> - </h:panelGrid> - </a4j:region> - </h:panelGrid> - <h:panelGrid columns="2" id="echopanel2"> - <f:facet name="header"> - Echo Panel - </f:facet> - <h:outputText value="Entered name:" /> - <h:outputText value="#{regionBean.user2.name}" /> - <h:outputText value="Entered email:" /> - <h:outputText value="#{regionBean.user2.email}" /> - </h:panelGrid> - </h:panelGrid> - </h:form> - -</ui:composition> -</html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/region/samples/region-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,72 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://java.sun.com/jsf/composite/rich"> + +<ui:composition> + <h:form> + <h:panelGrid columns="2"> + <h:panelGrid> + <f:facet name="header"> + User Info Panel explicitly execute'd by Id + </f:facet> + <h:panelGrid columns="2" id="userInfoPanel1"> + <h:outputText value="User Name: " /> + <h:inputText value="#{regionBean.user1.name}"> + <a4j:ajax render="echopanel1" event="keyup" + execute="userInfoPanel1" /> + </h:inputText> + <h:outputText value="User email: " /> + <h:inputText value="#{regionBean.user1.email}"> + <a4j:ajax render="echopanel1" event="keyup" + execute="userInfoPanel1" /> + </h:inputText> + </h:panelGrid> + </h:panelGrid> + <h:panelGrid columns="2" id="echopanel1"> + <f:facet name="header"> + Echo Panel + </f:facet> + <h:outputText value="Entered name:" /> + <h:outputText value="#{regionBean.user1.name}" /> + <h:outputText value="Entered email:" /> + <h:outputText value="#{regionBean.user1.email}" /> + </h:panelGrid> + </h:panelGrid> + </h:form> + <h:form> + <h:panelGrid columns="2"> + <h:panelGrid> + <f:facet name="header"> + User Info Panel with Region + </f:facet> + <a4j:region> + <h:panelGrid columns="2"> + <h:outputText value="User Name: " /> + <h:inputText value="#{regionBean.user2.name}"> + <a4j:ajax render="echopanel2" event="keyup" /> + </h:inputText> + <h:outputText value="User email: " /> + <h:inputText value="#{regionBean.user2.email}"> + <a4j:ajax render="echopanel2" event="keyup" /> + </h:inputText> + </h:panelGrid> + </a4j:region> + </h:panelGrid> + <h:panelGrid columns="2" id="echopanel2"> + <f:facet name="header"> + Echo Panel + </f:facet> + <h:outputText value="Entered name:" /> + <h:outputText value="#{regionBean.user2.name}" /> + <h:outputText value="Entered email:" /> + <h:outputText value="#{regionBean.user2.email}" /> + </h:panelGrid> + </h:panelGrid> + </h:form> + +</ui:composition> +</html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,32 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <a4j:outputPanel id="panel" layout="block"> - <a4j:repeat value="#{capitalsBean.capitals}" var="cap" rows="20" - id="repeat"> - <rich:panel style="float:left; width:200px; padding:5px;"> - <f:facet name="header"> - <h:panelGroup> - <h:graphicImage value="#{cap.stateFlag}" /> - <h:outputText value="#{cap.state}" style="font-weight:bold" /> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2"> - <h:outputText value="State Capital" style="font-weight:bold" /> - <h:outputText value="#{cap.name}" /> - <h:outputText value="State TimeZone" style="font-weight:bold" /> - <h:outputText value="#{cap.timeZone}" /> - </h:panelGrid> - </rich:panel> - </a4j:repeat> - </a4j:outputPanel> - <a4j:outputPanel layout="block"> - <rich:dataScroller for="repeat" render="panel" /> - </a4j:outputPanel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/samples/simpleGrid-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,32 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <a4j:outputPanel id="panel" layout="block"> + <a4j:repeat value="#{capitalsBean.capitals}" var="cap" rows="20" + id="repeat"> + <rich:panel style="float:left; width:200px; padding:5px;"> + <f:facet name="header"> + <h:panelGroup> + <h:graphicImage value="#{cap.stateFlag}" /> + <h:outputText value="#{cap.state}" style="font-weight:bold" /> + </h:panelGroup> + </f:facet> + <h:panelGrid columns="2"> + <h:outputText value="State Capital" style="font-weight:bold" /> + <h:outputText value="#{cap.name}" /> + <h:outputText value="State TimeZone" style="font-weight:bold" /> + <h:outputText value="#{cap.timeZone}" /> + </h:panelGrid> + </rich:panel> + </a4j:repeat> + </a4j:outputPanel> + <a4j:outputPanel layout="block"> + <rich:dataScroller for="repeat" render="panel" /> + </a4j:outputPanel> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/repeat/simpleGrid.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,38 +2,18 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:r="http://java.sun.com/jsf/composite/rich" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>a4j:repeat is a base iteration component of RichFaces. It allows to create any markups based on iterative data. This sample shows simple grid from capitals list.</p> - <h:form> - <a4j:outputPanel id="panel" layout="block"> - <a4j:repeat value="#{capitalsBean.capitals}" var="cap" rows="20" - id="repeat"> - <r:panel style="float:left; width:200px; padding:5px;"> - <f:facet name="header"> - <h:panelGroup> - <h:graphicImage value="#{cap.stateFlag}" /> - <h:outputText value="#{cap.state}" style="font-weight:bold" /> - </h:panelGroup> - </f:facet> - <h:panelGrid columns="2"> - <h:outputText value="State Capital" style="font-weight:bold" /> - <h:outputText value="#{cap.name}" /> - <h:outputText value="State TimeZone" style="font-weight:bold" /> - <h:outputText value="#{cap.timeZone}" /> - </h:panelGrid> - </r:panel> - </a4j:repeat> - </a4j:outputPanel> - <a4j:outputPanel layout="block"> - <rich:dataScroller for="repeat" render="panel" /> - </a4j:outputPanel> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/standardSkinning/standardSkinning.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -88,7 +88,7 @@ <p>To get a better idea of standard component skinning we recommend to explore CSS files located in - ui/core/src/main/resources/org/richfaces/ folder of RichFaces svn.</p> + ui/core/ui/src/main/resources/org/richfaces/ folder of RichFaces svn.</p> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/referencedusage.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/referencedusage.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/referencedusage.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,42 +2,20 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://java.sun.com/jsf/composite/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>Example of status which referenced from the components</p> - <p>There are two inputs with Ajax behaviors attached. And there are two statuses which - are referenced from that behaviors. <b>status</b> attribute at Ajax tags defined with - corresponding statuses <b>name</b> attributes values.</p> - <h:form> - <h:panelGrid columns="3" width="300px;"> - <rich:panel> - <f:facet name="header"> - <h:outputText value="User Details Panel" /> - </f:facet> - <h:panelGrid columns="3"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}"> - <a4j:ajax status="nameStatus" event="keyup" /> - </h:inputText> - <a4j:status name="nameStatus"> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" style="width:16px; height:16px;"/> - </f:facet> - </a4j:status> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}"> - <a4j:ajax status="adressStatus" event="keyup" /> - </h:inputText> - <a4j:status name="adressStatus"> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" style="width:16px; height:16px;"/> - </f:facet> - </a4j:status> - </h:panelGrid> - </rich:panel> - </h:panelGrid> - </h:form> + <p>There are two inputs with Ajax behaviors attached. And there are + two statuses which are referenced from that behaviors. <b>status</b> + attribute at Ajax tags defined with corresponding statuses <b>name</b> + attributes values.</p> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,39 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <h:panelGrid columns="3" width="300px;"> - <rich:panel> - <f:facet name="header"> - <h:outputText value="User Details Panel" /> - </f:facet> - <h:panelGrid columns="3"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}"> - <a4j:ajax status="nameStatus" event="keyup" /> - </h:inputText> - <a4j:status name="nameStatus"> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" - style="width:16px; height:16px;" /> - </f:facet> - </a4j:status> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}"> - <a4j:ajax status="adressStatus" event="keyup" /> - </h:inputText> - <a4j:status name="adressStatus"> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" - style="width:16px; height:16px;" /> - </f:facet> - </a4j:status> - </h:panelGrid> - </rich:panel> - </h:panelGrid> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/referencedusage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,39 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <h:panelGrid columns="3" width="300px;"> + <rich:panel> + <f:facet name="header"> + <h:outputText value="User Details Panel" /> + </f:facet> + <h:panelGrid columns="3"> + <h:outputText value="User name:" /> + <h:inputText value="#{userBean.name}"> + <a4j:ajax status="nameStatus" event="keyup" /> + </h:inputText> + <a4j:status name="nameStatus"> + <f:facet name="start"> + <h:graphicImage value="/images/ai.gif" + style="width:16px; height:16px;" /> + </f:facet> + </a4j:status> + <h:outputText value="Adress:" /> + <h:inputText value="#{userBean.address}"> + <a4j:ajax status="adressStatus" event="keyup" /> + </h:inputText> + <a4j:status name="adressStatus"> + <f:facet name="start"> + <h:graphicImage value="/images/ai.gif" + style="width:16px; height:16px;" /> + </f:facet> + </a4j:status> + </h:panelGrid> + </rich:panel> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,33 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="Panel with status" /> - </f:facet> - <h:panelGrid columns="2"> - <h:panelGrid columns="2"> - <a4j:ajax event="keyup"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}" /> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}" /> - </a4j:ajax> - </h:panelGrid> - <a4j:status> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" /> - </f:facet> - </a4j:status> - </h:panelGrid> - <a4j:commandButton value="Submit" type="button" - action="#{userBean.store}" render="out" execute="@form" /> - <h:outputText value="#{userBean.recordStatus}" id="out" /> - </rich:panel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,33 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:panel id="psnel"> + <f:facet name="header"> + <h:outputText value="Panel with status" /> + </f:facet> + <h:panelGrid columns="2"> + <h:panelGrid columns="2"> + <a4j:ajax event="keyup"> + <h:outputText value="User name:" /> + <h:inputText value="#{userBean.name}" /> + <h:outputText value="Adress:" /> + <h:inputText value="#{userBean.address}" /> + </a4j:ajax> + </h:panelGrid> + <a4j:status> + <f:facet name="start"> + <h:graphicImage value="/images/ai.gif" /> + </f:facet> + </a4j:status> + </h:panelGrid> + <a4j:commandButton value="Submit" type="button" + action="#{userBean.store}" render="out" execute="@form" /> + <h:outputText value="#{userBean.recordStatus}" id="out" /> + </rich:panel> + </h:form> +</ui:composition> \ No newline at end of file Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,44 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:panelGrid columns="3"> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="User Details Panel" /> - </f:facet> - <h:panelGrid columns="2"> - <a4j:ajax event="keyup"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}" /> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}" /> - </a4j:ajax> - </h:panelGrid> - <h:commandButton value="Submit" type="button" - action="#{userBean.store}"> - <a4j:ajax render="out" /> - </h:commandButton> - <h:outputText value="#{userBean.recordStatus}" id="out" /> - </rich:panel> - </h:form> - <h:form> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Simple search panel" /> - </f:facet> - <h:inputText value="Search..." /> - <a4j:commandButton value="Submit" type="button" /> - </rich:panel> - </h:form> - <a4j:status> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" /> - </f:facet> - </a4j:status> - </h:panelGrid> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/samples/viewusage-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,44 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:panelGrid columns="3"> + <h:form> + <rich:panel id="psnel"> + <f:facet name="header"> + <h:outputText value="User Details Panel" /> + </f:facet> + <h:panelGrid columns="2"> + <a4j:ajax event="keyup"> + <h:outputText value="User name:" /> + <h:inputText value="#{userBean.name}" /> + <h:outputText value="Adress:" /> + <h:inputText value="#{userBean.address}" /> + </a4j:ajax> + </h:panelGrid> + <h:commandButton value="Submit" type="button" + action="#{userBean.store}"> + <a4j:ajax render="out" /> + </h:commandButton> + <h:outputText value="#{userBean.recordStatus}" id="out" /> + </rich:panel> + </h:form> + <h:form> + <rich:panel> + <f:facet name="header"> + <h:outputText value="Simple search panel" /> + </f:facet> + <h:inputText value="Search..." /> + <a4j:commandButton value="Submit" type="button" /> + </rich:panel> + </h:form> + <a4j:status> + <f:facet name="start"> + <h:graphicImage value="/images/ai.gif" /> + </f:facet> + </a4j:status> + </h:panelGrid> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/simple.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/simple.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/simple.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,38 +2,18 @@ <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://java.sun.com/jsf/composite/rich" - xmlns:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> <p>Example of form scoped status. It's defined within a form and handles all Ajax requests within this form</p> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="Panel with status" /> - </f:facet> - <h:panelGrid columns="2"> - <h:panelGrid columns="2"> - <a4j:ajax event="keyup"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}" /> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}" /> - </a4j:ajax> - </h:panelGrid> - <a4j:status> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif" /> - </f:facet> - </a4j:status> - </h:panelGrid> - <a4j:commandButton value="Submit" type="button" - action="#{userBean.store}" render="out" execute="@form" /> - <h:outputText value="#{userBean.recordStatus}" id="out" /> - </rich:panel> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/viewusage.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/viewusage.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/status/viewusage.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,61 +1,29 @@ <!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://java.sun.com/jsf/composite/rich" - xmlns:a4j="http://richfaces.org/a4j"> - - <ui:composition> - <p>a4j:status is an indicator of an Ajax request. It has two states - start and stop. The start - state indicates that an Ajax request is in progress. When Ajax Response comes back, - the component switches to the stop stage. - </p> - <p> Status could be defined: - <ul> + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + +<ui:composition> + <p>a4j:status is an indicator of an Ajax request. It has two states + - start and stop. The start state indicates that an Ajax request is in + progress. When Ajax Response comes back, the component switches to the + stop stage.</p> + <p>Status could be defined: + <ul> <li>Default for View</li> <li>Default for form</li> <li>Referenced explicity from the component which sends request</li> - </ul> - </p> - <p> - Example of View scoped status. It should be defined outside of any form and will - handle all the Ajax requests within the view. - </p> - <h:panelGrid columns="3"> - <h:form> - <rich:panel id="psnel"> - <f:facet name="header"> - <h:outputText value="User Details Panel" /> - </f:facet> - <h:panelGrid columns="2"> - <a4j:ajax event="keyup"> - <h:outputText value="User name:" /> - <h:inputText value="#{userBean.name}"/> - <h:outputText value="Adress:" /> - <h:inputText value="#{userBean.address}"/> - </a4j:ajax> - </h:panelGrid> - <h:commandButton value="Submit" type="button" action="#{userBean.store}"> - <a4j:ajax render="out"/> - </h:commandButton> - <h:outputText value="#{userBean.recordStatus}" id="out"/> - </rich:panel> - </h:form> - <h:form> - <rich:panel> - <f:facet name="header"> - <h:outputText value="Simple search panel" /> - </f:facet> - <h:inputText value="Search..."/> - <a4j:commandButton value="Submit" type="button"/> - </rich:panel> - </h:form> - <a4j:status> - <f:facet name="start"> - <h:graphicImage value="/images/ai.gif"/> - </f:facet> - </a4j:status> - </h:panelGrid> - </ui:composition> + </ul> + </p> + <p>Example of View scoped status. It should be defined outside of + any form and will handle all the Ajax requests within the view.</p> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,65 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <h:form> - <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list"> - <f:facet name="header"> - <rich:columnGroup> - <rich:column colspan="6"> - <h:outputText value="Cars marketplace" /> - </rich:column> - <rich:column breakRowBefore="true"> - <h:outputText value="Model" /> - </rich:column> - <rich:column> - <h:outputText value="Price" /> - </rich:column> - <rich:column> - <h:outputText value="Mileage" /> - </rich:column> - <rich:column> - <h:outputText value="VIN Code" /> - </rich:column> - <rich:column> - <h:outputText value="Items stock" /> - </rich:column> - <rich:column> - <h:outputText value="Days Live" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <rich:column colspan="6"> - <rich:subTableToggleControl for="sbtbl" /> - <h:outputText value="#{list.vendor}" /> - </rich:column> - <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl" - expandMode="client"> - <rich:column> - <h:outputText value="#{item.model}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.price}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.mileage}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.vin}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.stock}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.daysLive}" /> - </rich:column> - <f:facet name="footer"> - <h:outputText value="Total of #{list.vendor} Cars: #{list.count}" /> - </f:facet> - </rich:subTable> - </rich:dataTable> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/samples/subTableToggleControl-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,65 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form> + <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list"> + <f:facet name="header"> + <rich:columnGroup> + <rich:column colspan="6"> + <h:outputText value="Cars marketplace" /> + </rich:column> + <rich:column breakRowBefore="true"> + <h:outputText value="Model" /> + </rich:column> + <rich:column> + <h:outputText value="Price" /> + </rich:column> + <rich:column> + <h:outputText value="Mileage" /> + </rich:column> + <rich:column> + <h:outputText value="VIN Code" /> + </rich:column> + <rich:column> + <h:outputText value="Items stock" /> + </rich:column> + <rich:column> + <h:outputText value="Days Live" /> + </rich:column> + </rich:columnGroup> + </f:facet> + <rich:column colspan="6"> + <rich:subTableToggleControl for="sbtbl" /> + <h:outputText value="#{list.vendor}" /> + </rich:column> + <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl" + expandMode="client"> + <rich:column> + <h:outputText value="#{item.model}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.price}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.mileage}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.vin}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.stock}" /> + </rich:column> + <rich:column> + <h:outputText value="#{item.daysLive}" /> + </rich:column> + <f:facet name="footer"> + <h:outputText value="Total of #{list.vendor} Cars: #{list.count}" /> + </f:facet> + </rich:subTable> + </rich:dataTable> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/subTableToggleControl/subTableToggleControl.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,75 +2,27 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<p>This sample shows simple master-detail table implemented using<b> rich:dataTable</b> and<b> rich:subtable</b> components</p> -<p>There is one feature which is completely new for 4.x - subtables now could be collapsed/expanded by using -new component <b>rich:tableToggleControl</b></p> -<p>Switching customization:</p> -<ul> -<li>subTable's could be collapsed/expanded in different modes defined via subTable expandMode attribute -- "<i>client</i>", "<i>ajax</i>" and "<i>server</i>"</li> -<li>The developer could get control on current states of subTables using its <b>expanded</b> attribute.</li> -</ul> - <h:form> - <rich:dataTable value="#{carsBean.inventoryVendorLists}" var="list"> - <f:facet name="header"> - <rich:columnGroup> - <rich:column colspan="6"> - <h:outputText value="Cars marketplace" /> - </rich:column> - <rich:column breakRowBefore="true"> - <h:outputText value="Model" /> - </rich:column> - <rich:column> - <h:outputText value="Price" /> - </rich:column> - <rich:column> - <h:outputText value="Mileage" /> - </rich:column> - <rich:column> - <h:outputText value="VIN Code" /> - </rich:column> - <rich:column> - <h:outputText value="Items stock" /> - </rich:column> - <rich:column> - <h:outputText value="Days Live" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <rich:column colspan="6"> - <rich:subTableToggleControl for="sbtbl"/> - <h:outputText value="#{list.vendor}" /> - </rich:column> - <rich:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client"> - <rich:column> - <h:outputText value="#{item.model}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.price}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.mileage}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.vin}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.stock}" /> - </rich:column> - <rich:column> - <h:outputText value="#{item.daysLive}" /> - </rich:column> - <f:facet name="footer"> - <h:outputText value="Total of #{list.vendor} Cars: #{list.count}" /> - </f:facet> - </rich:subTable> - </rich:dataTable> - </h:form> + <p>This sample shows simple master-detail table implemented using<b> + rich:dataTable</b> and<b> rich:subtable</b> components</p> + <p>There is one feature which is completely new for 4.x - subtables + now could be collapsed/expanded by using new component <b>rich:tableToggleControl</b></p> + <p>Switching customization:</p> + <ul> + <li>subTable's could be collapsed/expanded in different modes + defined via subTable expandMode attribute - "<i>client</i>", "<i>ajax</i>" + and "<i>server</i>"</li> + <li>The developer could get control on current states of + subTables using its <b>expanded</b> attribute.</li> + </ul> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples) Deleted: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-12 13:06:32 UTC (rev 18588) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -1,36 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - <style> -.rf-tp-i { - border: 1px solid #{ richSkin.panelBorderColor -} -} -</style> - <h:form> - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl forPanel="panel1" targetItem="item1" /> - </h:commandLink> - <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl forPanel="panel1" targetItem="item2" /> - </h:commandLink> - <rich:togglePanel id="panel1" activeItem="item1"> - <rich:togglePanelItem name="item1" styleClass="rf-tp-i"> - <p>This toggle panel switches in Ajax mode. So only one active - item loaded to the client.</p> - <p>For now you are at Panel 1</p> - </rich:togglePanelItem> - <rich:togglePanelItem name="item2" styleClass="rf-tp-i"> - <p>After the second link click - panel changed active item to - the second one according to name specified in the - togglePanelBehavior</p> - <p>For now you are at Panel 2</p> - </rich:togglePanelItem> - </rich:togglePanel> - </h:form> -</ui:composition> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/simple-sample.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,36 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <style> +.rf-tp-i { + border: 1px solid #{ richSkin.panelBorderColor +} +} +</style> + <h:form> + <h:commandLink value="Toggle Panel Item 1"> + <rich:toggleControl forPanel="panel1" targetItem="item1" /> + </h:commandLink> + <h:outputText value=" | " /> + <h:commandLink value="Toggle Panel Item 2"> + <rich:toggleControl forPanel="panel1" targetItem="item2" /> + </h:commandLink> + <rich:togglePanel id="panel1" activeItem="item1"> + <rich:togglePanelItem name="item1" styleClass="rf-tp-i"> + <p>This toggle panel switches in Ajax mode. So only one active + item loaded to the client.</p> + <p>For now you are at Panel 1</p> + </rich:togglePanelItem> + <rich:togglePanelItem name="item2" styleClass="rf-tp-i"> + <p>After the second link click - panel changed active item to + the second one according to name specified in the + togglePanelBehavior</p> + <p>For now you are at Panel 2</p> + </rich:togglePanelItem> + </rich:togglePanel> + </h:form> +</ui:composition> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/simple.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -2,39 +2,16 @@ <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:a4j="http://richfaces.org/a4j"> + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:composition> -<style> - .rf-tp-i { - border: 1px solid #{ richSkin.panelBorderColor - } -</style> - <p>DESC</p> - <h:form> - <h:commandLink value="Toggle Panel Item 1"> - <rich:toggleControl forPanel="panel1" targetItem="item1" /> - </h:commandLink> - <h:outputText value=" | " /> - <h:commandLink value="Toggle Panel Item 2"> - <rich:toggleControl forPanel="panel1" targetItem="item2" /> - </h:commandLink> - <rich:togglePanel id="panel1" activeItem="item1"> - <rich:togglePanelItem name="item1" styleClass="rf-tp-i"> - <p>This toggle panel switches in Ajax mode. So only one active - item loaded to the client.</p> - <p>For now you are at Panel 1</p> - </rich:togglePanelItem> - <rich:togglePanelItem name="item2" styleClass="rf-tp-i"> - <p>After the second link click - panel changed active item to - the second one according to name specified in the - togglePanelBehavior</p> - <p>For now you are at Panel 2</p> - </rich:togglePanelItem> - </rich:togglePanel> - </h:form> + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> </ui:composition> </html> \ No newline at end of file Copied: branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml (from rev 18588, trunk/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml) =================================================================== --- branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml (rev 0) +++ branches/RF-9040_build_updated_m2/examples/richfaces-showcase/src/main/webapp/templates/includes/source-view.xhtml 2010-08-12 14:57:44 UTC (rev 18594) @@ -0,0 +1,41 @@ +<!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:at="http://richfaces.org/demo/app-taglib" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<ui:composition> + <f:subview> + <style> + .sourceView{ + padding-top: 10px; + } + </style> + <a4j:outputPanel styleClass="sourceView" layout="block"> + <a4j:outputPanel layout="block" id="show"> + <h:outputLink value="#" + onclick="jQuery(#{rich:element('hide')}).slideDown(); jQuery(#{rich:element('show')}).hide(); return false;" + id="sh1" styleClass="show"> + <h:outputText value="#{empty openlabel?'View Source' : openlabel }" /> + </h:outputLink> + </a4j:outputPanel> + + <a4j:outputPanel id="hide" layout="block" style="display:none"> + <h:outputLink styleClass="hide" value="#" + onclick="jQuery(#{rich:element('hide')}).slideUp(); jQuery(#{rich:element('show')}).show(500); return false;"> + <h:outputText value="#{empty hidelabel?'Hide Source' : openlabel }" /> + </h:outputLink> + <at:syntaxHighlighter styleClass="source" src="#{src}" + sourceType="#{sourceType}" /> + <h:outputLink styleClass="hide" value="#" + onclick="jQuery(#{rich:element('hide')}).slideUp(); jQuery(#{rich:element('show')}).show(500); return false;"> + <h:outputText value="#{empty hidelabel?'Hide Source' : openlabel }" /> + </h:outputLink> + </a4j:outputPanel> + </a4j:outputPanel> + </f:subview> +</ui:composition> +</html> \ No newline at end of file Modified: branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/common/ui/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -30,7 +30,7 @@ <relativePath>../../parent/pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui.commmon</groupId> + <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> <name>Richfaces UI Components: Common UI</name> <packaging>jar</packaging> @@ -40,6 +40,12 @@ </properties> <dependencies> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + <version>${project.version}</version> + </dependency> +  <dependency> <groupId>org.richfaces.core</groupId> Modified: branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/core/ui/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -49,6 +49,10 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + </dependency> <dependency> <groupId>org.richfaces.cdk</groupId> Modified: branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-api/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -40,6 +40,10 @@ <dependencies> <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> @@ -147,7 +151,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>org.richfaces.ui.iteration, org.richfaces.ui.output</includeGroupIds> + <includeGroupIds>org.richfaces.ui.common, org.richfaces.ui.iteration, org.richfaces.ui.output</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> Modified: branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/dist/richfaces-components-ui/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -41,6 +41,10 @@ <dependencies>  <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + </dependency> + <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> @@ -173,7 +177,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, ${assembly.projects.group}.output</includeGroupIds> + <includeGroupIds>${assembly.projects.group}.common, ${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration, ${assembly.projects.group}.output</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> Modified: branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/iteration/api/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -64,6 +64,10 @@ <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + </dependency>  <dependency> Modified: branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/iteration/ui/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -63,6 +63,10 @@ <artifactId>richfaces-core-api</artifactId> </dependency> <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + </dependency> + <dependency>  <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-impl</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/misc/ui/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -69,9 +69,13 @@ <artifactId>annotations</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui.core</groupId> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> - </dependency> + </dependency>  <dependency> Modified: branches/RF-9040_build_updated_m2/ui/output/api/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/output/api/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -40,6 +40,10 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + </dependency>  <dependency> Modified: branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/output/ui/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -54,6 +54,10 @@ <artifactId>richfaces-core-impl</artifactId> </dependency> <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + </dependency> + <dependency>  <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> Modified: branches/RF-9040_build_updated_m2/ui/parent/pom.xml =================================================================== --- branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) +++ branches/RF-9040_build_updated_m2/ui/parent/pom.xml 2010-08-12 14:57:44 UTC (rev 18594) @@ -40,6 +40,7 @@ <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> + <org.richfaces.ui.common.version>4.0.0-SNAPSHOT</org.richfaces.ui.common.version> <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> <org.richfaces.ui.misc.version>4.0.0-SNAPSHOT</org.richfaces.ui.misc.version> <org.richfaces.ui.iteration.version>4.0.0-SNAPSHOT</org.richfaces.ui.iteration.version> @@ -64,6 +65,17 @@ </dependency> <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.common</groupId> + <artifactId>richfaces-ui-common-ui</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> <version>${project.version}</version>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18593 - trunk/examples.

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

Author: abelevich Date: 2010-08-12 10:53:49 -0400 (Thu, 12 Aug 2010) New Revision: 18593 Modified: trunk/examples/pom.xml Log: add input-demo Modified: trunk/examples/pom.xml =================================================================== --- trunk/examples/pom.xml 2010-08-12 14:52:39 UTC (rev 18592) +++ trunk/examples/pom.xml 2010-08-12 14:53:49 UTC (rev 18593) @@ -41,6 +41,7 @@ <module>core-demo</module> <module>misc-demo</module> <module>output-demo</module> + <module>input-demo</module> <module>repeater-demo</module> <module>iteration-demo</module> <module>richfaces-showcase</module>

15 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r18592 - in trunk/examples: input-demo and 9 other directories.

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

Author: abelevich Date: 2010-08-12 10:52:39 -0400 (Thu, 12 Aug 2010) New Revision: 18592 Added: trunk/examples/input-demo/ trunk/examples/input-demo/pom.xml trunk/examples/input-demo/src/ trunk/examples/input-demo/src/main/ trunk/examples/input-demo/src/main/java/ trunk/examples/input-demo/src/main/java/org/ trunk/examples/input-demo/src/main/java/org/richfaces/ trunk/examples/input-demo/src/main/java/org/richfaces/demo/ trunk/examples/input-demo/src/main/java/org/richfaces/demo/SkinBean.java trunk/examples/input-demo/src/main/webapp/ trunk/examples/input-demo/src/main/webapp/META-INF/ trunk/examples/input-demo/src/main/webapp/META-INF/MANIFEST.MF trunk/examples/input-demo/src/main/webapp/WEB-INF/ trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/examples/input-demo/src/main/webapp/WEB-INF/web.xml trunk/examples/input-demo/src/main/webapp/index.jsp trunk/examples/input-demo/src/main/webapp/index.xhtml trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml Log: input demo initial commit Added: trunk/examples/input-demo/pom.xml =================================================================== --- trunk/examples/input-demo/pom.xml (rev 0) +++ trunk/examples/input-demo/pom.xml 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>9</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.richfaces.examples</groupId> + <artifactId>input-demo</artifactId> + <version>4.0.0-SNAPSHOT</version> + <name>Richfaces Examples: Inputs</name> + <packaging>war</packaging> + + <url>http://jboss.org/richfaces</url> + + <repositories> + <repository> + <id>jboss-public-repository-group</id> + <name>Jboss Repository for Maven</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + <repository> + <id>java-net</id> + <name>Java.net Maven Repository</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <org.richfaces.ui.version>4.0.0-SNAPSHOT</org.richfaces.ui.version> + </properties> + + <build> + <finalName>${artifactId}-${project.version}</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <webResources> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-alpha-1</version> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> + </configuration> + </execution> + </executions> + <configuration> + <webResources> + <resource> + <directory>${symbol_dollar}{basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui-parent</artifactId> + <version>${version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui.input</groupId> + <artifactId>richfaces-ui-input-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui.core</groupId> + <artifactId>richfaces-ui-core-ui</artifactId> + </dependency> + + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.8</version> + </dependency> + +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + +  + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> +</project> Added: trunk/examples/input-demo/src/main/java/org/richfaces/demo/SkinBean.java =================================================================== --- trunk/examples/input-demo/src/main/java/org/richfaces/demo/SkinBean.java (rev 0) +++ trunk/examples/input-demo/src/main/java/org/richfaces/demo/SkinBean.java 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,21 @@ +package org.richfaces.demo; + +import javax.faces.bean.ManagedBean; +import javax.faces.bean.SessionScoped; + +@ManagedBean(name = "skinBean") +@SessionScoped +public class SkinBean { + private String skin = "blueSky"; + + public SkinBean() { + skin = "blueSky"; + } + public String getSkin() { + return skin; + } + + public void setSkin(String skin) { + this.skin = skin; + } +} Added: trunk/examples/input-demo/src/main/webapp/META-INF/MANIFEST.MF =================================================================== --- trunk/examples/input-demo/src/main/webapp/META-INF/MANIFEST.MF (rev 0) +++ trunk/examples/input-demo/src/main/webapp/META-INF/MANIFEST.MF 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> +</faces-config> Added: trunk/examples/input-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/examples/input-demo/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/WEB-INF/web.xml 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,108 @@ +<?xml version='1.0' encoding='UTF-8'?> + +  + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name></display-name> + <description></description> + <context-param> + <param-name>org.richfaces.skin</param-name> + <param-value>blueSky</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + + <context-param> + <param-name>org.richfaces.enableControlSkinning</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinningClasses</param-name> + <param-value>true</param-value> + </context-param> + + + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <context-param> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to validate the XML in your + faces-config.xml resources against the DTD. Default + value is false. + </description> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + +  +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + +</web-app> Added: trunk/examples/input-demo/src/main/webapp/index.jsp =================================================================== --- trunk/examples/input-demo/src/main/webapp/index.jsp (rev 0) +++ trunk/examples/input-demo/src/main/webapp/index.jsp 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,4 @@ +<html> +<body> + <jsp:forward page="index.jsf" /></body> +</html> Added: trunk/examples/input-demo/src/main/webapp/index.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/index.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/index.xhtml 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,28 @@ +<!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"> +<h:head> +</h:head> +<h:body> + <h4>Input Components Sample</h4> + <ul> + <li><h:link outcome="inplaceInput">rich:inplaceInput</h:link></li> + </ul> + + <h:form> + <h:panelGrid columns="3"> + <h:commandButton value="Classic"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="classic" /> + </h:commandButton> + <h:commandButton value="BlueSky"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="blueSky" /> + </h:commandButton> + <h:commandButton value="DeepMarine"> + <f:setPropertyActionListener target="#{skinBean.skin}" value="deepMarine" /> + </h:commandButton> + </h:panelGrid> + </h:form> +</h:body> +</html> \ No newline at end of file Added: trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml (rev 0) +++ trunk/examples/input-demo/src/main/webapp/inplaceInput.xhtml 2010-08-12 14:52:39 UTC (rev 18592) @@ -0,0 +1,18 @@ +<!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:in="http://richfaces.org/input"> +<f:view contentType="text/html" /> + +<h:head> + <title>InplaceInput</title> +</h:head> + +<h:body> + <h:form id="form"> + <in:inplaceInput showControls="true" value="New York"/> + </h:form> +</h:body> +</html>

15 years, 9 months

1
0
0 / 0

← Newer
1
...
43
44
45
46
47
48
49
...
74
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits August 2010