JBoss Rich Faces SVN: r14406 - in branches/rf4_build: runtime and 54 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-05-29 09:08:01 -0400 (Fri, 29 May 2009)
New Revision: 14406
Added:
branches/rf4_build/runtime/
branches/rf4_build/runtime/trunk/
branches/rf4_build/runtime/trunk/api/
branches/rf4_build/runtime/trunk/api/pom.xml
branches/rf4_build/runtime/trunk/impl/
branches/rf4_build/runtime/trunk/impl/pom.xml
branches/rf4_build/runtime/trunk/pom.xml
branches/rf4_build/runtime/trunk/test/
branches/rf4_build/runtime/trunk/test/pom.xml
branches/rf4_build/runtime/trunk/version-matrix/
branches/rf4_build/runtime/trunk/version-matrix/pom.xml
branches/rf4_build/ui/
branches/rf4_build/ui/trunk/
branches/rf4_build/ui/trunk/components/
branches/rf4_build/ui/trunk/components/calendar/
branches/rf4_build/ui/trunk/components/calendar/api/
branches/rf4_build/ui/trunk/components/calendar/api/pom.xml
branches/rf4_build/ui/trunk/components/calendar/api/src/
branches/rf4_build/ui/trunk/components/calendar/api/src/main/
branches/rf4_build/ui/trunk/components/calendar/api/src/main/java/
branches/rf4_build/ui/trunk/components/calendar/api/src/main/resources/
branches/rf4_build/ui/trunk/components/calendar/api/src/main/resources/META-INF/
branches/rf4_build/ui/trunk/components/calendar/api/src/main/resources/META-INF/faces-config.xml
branches/rf4_build/ui/trunk/components/calendar/api/src/test/
branches/rf4_build/ui/trunk/components/calendar/api/src/test/java/
branches/rf4_build/ui/trunk/components/calendar/api/src/test/resources/
branches/rf4_build/ui/trunk/components/calendar/examples/
branches/rf4_build/ui/trunk/components/calendar/examples/pom.xml
branches/rf4_build/ui/trunk/components/calendar/examples/src/
branches/rf4_build/ui/trunk/components/calendar/examples/src/main/
branches/rf4_build/ui/trunk/components/calendar/examples/src/main/webapp/
branches/rf4_build/ui/trunk/components/calendar/examples/src/main/webapp/WEB-INF/
branches/rf4_build/ui/trunk/components/calendar/examples/src/main/webapp/WEB-INF/web.xml
branches/rf4_build/ui/trunk/components/calendar/impl/
branches/rf4_build/ui/trunk/components/calendar/impl/pom.xml
branches/rf4_build/ui/trunk/components/calendar/impl/src/
branches/rf4_build/ui/trunk/components/calendar/impl/src/main/
branches/rf4_build/ui/trunk/components/calendar/impl/src/main/java/
branches/rf4_build/ui/trunk/components/calendar/impl/src/main/resources/
branches/rf4_build/ui/trunk/components/calendar/impl/src/test/
branches/rf4_build/ui/trunk/components/calendar/impl/src/test/java/
branches/rf4_build/ui/trunk/components/calendar/impl/src/test/resources/
branches/rf4_build/ui/trunk/components/calendar/pom.xml
branches/rf4_build/ui/trunk/components/calendar/ui/
branches/rf4_build/ui/trunk/components/calendar/ui/pom.xml
branches/rf4_build/ui/trunk/components/calendar/ui/src/
branches/rf4_build/ui/trunk/components/calendar/ui/src/main/
branches/rf4_build/ui/trunk/components/calendar/ui/src/main/java/
branches/rf4_build/ui/trunk/components/calendar/ui/src/main/resources/
branches/rf4_build/ui/trunk/components/calendar/ui/src/test/
branches/rf4_build/ui/trunk/components/calendar/ui/src/test/java/
branches/rf4_build/ui/trunk/components/calendar/ui/src/test/resources/
branches/rf4_build/ui/trunk/components/pom.xml
branches/rf4_build/ui/trunk/components/tree/
branches/rf4_build/ui/trunk/components/tree/api/
branches/rf4_build/ui/trunk/components/tree/api/pom.xml
branches/rf4_build/ui/trunk/components/tree/api/src/
branches/rf4_build/ui/trunk/components/tree/api/src/main/
branches/rf4_build/ui/trunk/components/tree/api/src/main/java/
branches/rf4_build/ui/trunk/components/tree/api/src/main/java/ITest.java
branches/rf4_build/ui/trunk/components/tree/api/src/main/resources/
branches/rf4_build/ui/trunk/components/tree/api/src/main/resources/META-INF/
branches/rf4_build/ui/trunk/components/tree/api/src/main/resources/META-INF/faces-config.xml
branches/rf4_build/ui/trunk/components/tree/api/src/test/
branches/rf4_build/ui/trunk/components/tree/api/src/test/java/
branches/rf4_build/ui/trunk/components/tree/api/src/test/resources/
branches/rf4_build/ui/trunk/components/tree/examples/
branches/rf4_build/ui/trunk/components/tree/examples/pom.xml
branches/rf4_build/ui/trunk/components/tree/examples/src/
branches/rf4_build/ui/trunk/components/tree/examples/src/main/
branches/rf4_build/ui/trunk/components/tree/examples/src/main/webapp/
branches/rf4_build/ui/trunk/components/tree/examples/src/main/webapp/WEB-INF/
branches/rf4_build/ui/trunk/components/tree/examples/src/main/webapp/WEB-INF/web.xml
branches/rf4_build/ui/trunk/components/tree/impl/
branches/rf4_build/ui/trunk/components/tree/impl/pom.xml
branches/rf4_build/ui/trunk/components/tree/impl/src/
branches/rf4_build/ui/trunk/components/tree/impl/src/main/
branches/rf4_build/ui/trunk/components/tree/impl/src/main/java/
branches/rf4_build/ui/trunk/components/tree/impl/src/main/java/TestImpl.java
branches/rf4_build/ui/trunk/components/tree/impl/src/main/resources/
branches/rf4_build/ui/trunk/components/tree/impl/src/test/
branches/rf4_build/ui/trunk/components/tree/impl/src/test/java/
branches/rf4_build/ui/trunk/components/tree/impl/src/test/resources/
branches/rf4_build/ui/trunk/components/tree/pom.xml
branches/rf4_build/ui/trunk/components/tree/ui/
branches/rf4_build/ui/trunk/components/tree/ui/pom.xml
branches/rf4_build/ui/trunk/components/tree/ui/src/
branches/rf4_build/ui/trunk/components/tree/ui/src/main/
branches/rf4_build/ui/trunk/components/tree/ui/src/main/java/
branches/rf4_build/ui/trunk/components/tree/ui/src/main/java/UITest.java
branches/rf4_build/ui/trunk/components/tree/ui/src/main/resources/
branches/rf4_build/ui/trunk/components/tree/ui/src/test/
branches/rf4_build/ui/trunk/components/tree/ui/src/test/java/
branches/rf4_build/ui/trunk/components/tree/ui/src/test/resources/
branches/rf4_build/ui/trunk/pom.xml
branches/rf4_build/ui/trunk/skins/
branches/rf4_build/ui/trunk/skins/pom.xml
branches/rf4_build/ui/trunk/themes/
branches/rf4_build/ui/trunk/themes/pom.xml
branches/rf4_build/ui/trunk/version-matrix/
branches/rf4_build/ui/trunk/version-matrix/pom.xml
Log:
Initial draft committed for review
Added: branches/rf4_build/runtime/trunk/api/pom.xml
===================================================================
--- branches/rf4_build/runtime/trunk/api/pom.xml (rev 0)
+++ branches/rf4_build/runtime/trunk/api/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,25 @@
+<?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.runtime</groupId>
+ <artifactId>version-matrix</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>api</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/runtime/trunk/impl/pom.xml
===================================================================
--- branches/rf4_build/runtime/trunk/impl/pom.xml (rev 0)
+++ branches/rf4_build/runtime/trunk/impl/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,30 @@
+<?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.runtime</groupId>
+ <artifactId>version-matrix</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>impl</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/runtime/trunk/pom.xml
===================================================================
--- branches/rf4_build/runtime/trunk/pom.xml (rev 0)
+++ branches/rf4_build/runtime/trunk/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,31 @@
+<?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>
+ <groupId>org.richfaces</groupId>
+ <artifactId>runtime</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>version-matrix</module>
+ <module>api</module>
+ <module>test</module>
+ <module>impl</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: branches/rf4_build/runtime/trunk/test/pom.xml
===================================================================
--- branches/rf4_build/runtime/trunk/test/pom.xml (rev 0)
+++ branches/rf4_build/runtime/trunk/test/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,29 @@
+<?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.runtime</groupId>
+ <artifactId>version-matrix</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>test</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/runtime/trunk/version-matrix/pom.xml
===================================================================
--- branches/rf4_build/runtime/trunk/version-matrix/pom.xml (rev 0)
+++ branches/rf4_build/runtime/trunk/version-matrix/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,48 @@
+<?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>runtime</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>version-matrix</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <jsf.version>2.0.0-PR2_3</jsf.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${jsf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/calendar/api/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/api/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/api/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,16 @@
+<?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.ui.components</groupId>
+ <artifactId>calendar</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-api</artifactId>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/calendar/api/src/main/resources/META-INF/faces-config.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/api/src/main/resources/META-INF/faces-config.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/api/src/main/resources/META-INF/faces-config.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,12 @@
+<?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_1_2.xsd"
+ version="1.2">
+
+ <component>
+ <component-type>org.richfaces.Calendar</component-type>
+ <component-class>org.richfaces.Calendar</component-class>
+ </component>
+
+</faces-config>
Added: branches/rf4_build/ui/trunk/components/calendar/examples/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/examples/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/examples/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,25 @@
+<?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.ui.components</groupId>
+ <artifactId>calendar</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-examples</artifactId>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-ui</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/calendar/examples/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/examples/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/examples/src/main/webapp/WEB-INF/web.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <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>
+ </servlet-mapping>
+
+</web-app>
Added: branches/rf4_build/ui/trunk/components/calendar/impl/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/impl/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/impl/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,29 @@
+<?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.ui.components</groupId>
+ <artifactId>calendar</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-impl</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/calendar/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,25 @@
+<?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.ui</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.components</groupId>
+ <artifactId>calendar</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ <module>ui</module>
+ <module>examples</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/calendar/ui/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/calendar/ui/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/calendar/ui/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,29 @@
+<?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.ui.components</groupId>
+ <artifactId>calendar</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-ui</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-impl</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,23 @@
+<?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.ui</groupId>
+ <artifactId>version-matrix</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>components</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>tree</module>
+ <module>calendar</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/tree/api/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/api/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/api/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,16 @@
+<?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.ui.components</groupId>
+ <artifactId>tree</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-api</artifactId>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/tree/api/src/main/java/ITest.java
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/api/src/main/java/ITest.java (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/api/src/main/java/ITest.java 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,4 @@
+
+public interface ITest {
+
+}
Added: branches/rf4_build/ui/trunk/components/tree/api/src/main/resources/META-INF/faces-config.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/api/src/main/resources/META-INF/faces-config.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/api/src/main/resources/META-INF/faces-config.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,12 @@
+<?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_1_2.xsd"
+ version="1.2">
+
+ <component>
+ <component-type>org.richfaces.Tree</component-type>
+ <component-class>org.richfaces.Tree</component-class>
+ </component>
+
+</faces-config>
Added: branches/rf4_build/ui/trunk/components/tree/examples/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/examples/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/examples/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,25 @@
+<?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.ui.components</groupId>
+ <artifactId>tree</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-examples</artifactId>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-ui</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/tree/examples/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/examples/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/examples/src/main/webapp/WEB-INF/web.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <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>
+ </servlet-mapping>
+
+</web-app>
Added: branches/rf4_build/ui/trunk/components/tree/impl/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/impl/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/impl/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,30 @@
+<?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.ui.components</groupId>
+ <artifactId>tree</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-impl</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/tree/impl/src/main/java/TestImpl.java
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/impl/src/main/java/TestImpl.java (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/impl/src/main/java/TestImpl.java 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,4 @@
+
+public class TestImpl implements ITest {
+
+}
Added: branches/rf4_build/ui/trunk/components/tree/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,25 @@
+<?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.ui</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui.components</groupId>
+ <artifactId>tree</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ <module>ui</module>
+ <module>examples</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/tree/ui/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/ui/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/ui/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,30 @@
+<?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.ui.components</groupId>
+ <artifactId>tree</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}-ui</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>test</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-impl</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/components/tree/ui/src/main/java/UITest.java
===================================================================
--- branches/rf4_build/ui/trunk/components/tree/ui/src/main/java/UITest.java (rev 0)
+++ branches/rf4_build/ui/trunk/components/tree/ui/src/main/java/UITest.java 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,4 @@
+
+public class UITest {
+
+}
Added: branches/rf4_build/ui/trunk/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,20 @@
+<?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>
+ <groupId>org.richfaces</groupId>
+ <artifactId>ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>version-matrix</module>
+ <module>components</module>
+ <module>skins</module>
+ <module>themes</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/skins/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/skins/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/skins/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,18 @@
+<?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.ui</groupId>
+ <artifactId>version-matrix</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>skins</artifactId>
+ <packaging>pom</packaging>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/themes/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/themes/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/themes/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,18 @@
+<?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.ui</groupId>
+ <artifactId>version-matrix</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>themes</artifactId>
+ <packaging>pom</packaging>
+
+</project>
\ No newline at end of file
Added: branches/rf4_build/ui/trunk/version-matrix/pom.xml
===================================================================
--- branches/rf4_build/ui/trunk/version-matrix/pom.xml (rev 0)
+++ branches/rf4_build/ui/trunk/version-matrix/pom.xml 2009-05-29 13:08:01 UTC (rev 14406)
@@ -0,0 +1,101 @@
+<?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>ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>version-matrix</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <jsf.version>2.0.0-PR2_3</jsf.version>
+ <runtime.version>${project.version}</runtime.version>
+ <!-- cdk.version>${project.version}</cdk.version -->
+ <cdk.version>3.3.2-SNAPSHOT</cdk.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>${cdk.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>generate-tests</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>test</artifactId>
+ <version>${runtime.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.runtime</groupId>
+ <artifactId>api</artifactId>
+ <version>${runtime.version}</version>
+ </dependency>
+
+ </dependencies>
+</project>
\ No newline at end of file
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14405 - branches.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-05-29 09:05:46 -0400 (Fri, 29 May 2009)
New Revision: 14405
Added:
branches/rf4_build/
Log:
rf4_build branch created
Copied: branches/rf4_build (from rev 14404, trunk)
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14404 - in branches/community/3.3.X/samples/suggestionbox-sample/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-05-29 07:22:48 -0400 (Fri, 29 May 2009)
New Revision: 14404
Added:
branches/community/3.3.X/samples/suggestionbox-sample/src/main/java/org/richfaces/CustomComponent.java
branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/pages/RF-5599.jsp
Modified:
branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/WEB-INF/faces-config.xml
Log:
Content between angle brackets is being stripped out from selected item of a suggestion box
https://jira.jboss.org/jira/browse/RF-5599
Added: branches/community/3.3.X/samples/suggestionbox-sample/src/main/java/org/richfaces/CustomComponent.java
===================================================================
--- branches/community/3.3.X/samples/suggestionbox-sample/src/main/java/org/richfaces/CustomComponent.java (rev 0)
+++ branches/community/3.3.X/samples/suggestionbox-sample/src/main/java/org/richfaces/CustomComponent.java 2009-05-29 11:22:48 UTC (rev 14404)
@@ -0,0 +1,51 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces;
+
+import java.util.ArrayList;
+
+public class CustomComponent {
+
+ private ArrayList<String> value;
+
+ private String input;
+
+ public ArrayList<String> suggestionAction(Object obj) {
+
+ if (null == value) {
+ value = new ArrayList<String>();
+ value.add("String <string> 1");
+ value.add("String <string> 2");
+ value.add("String <string> 3");
+ }
+
+ return value;
+ }
+
+ public String getInput() {
+ return input;
+ }
+
+ public void setInput(String input) {
+ this.input = input;
+ }
+}
+
Modified: branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-05-29 11:22:12 UTC (rev 14403)
+++ branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-05-29 11:22:48 UTC (rev 14404)
@@ -8,6 +8,11 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>customComponent</managed-bean-name>
+ <managed-bean-class>org.richfaces.CustomComponent</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>skinBean</managed-bean-name>
<managed-bean-class>org.richfaces.SkinBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
Added: branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/pages/RF-5599.jsp
===================================================================
--- branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/pages/RF-5599.jsp (rev 0)
+++ branches/community/3.3.X/samples/suggestionbox-sample/src/main/webapp/pages/RF-5599.jsp 2009-05-29 11:22:48 UTC (rev 14404)
@@ -0,0 +1,24 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/suggestionbox"
+ prefix="rich"%>
+<html>
+<head>
+<title>Custom Component</title>
+</head>
+<body>
+<f:view>
+ <h:form id="f">
+ <h:inputText id="text" value="#{customComponent.input}" />
+ <rich:suggestionbox for="text" height="100" width="200"
+ suggestionAction="#{customComponent.suggestionAction}"
+ var="row" fetchValue="#{row}">
+ <h:column>
+ <h:outputText value="#{row}" />
+ </h:column>
+ </rich:suggestionbox>
+ </h:form>
+</f:view>
+</body>
+</html>
\ No newline at end of file
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14403 - in branches/community/3.3.X/ui/suggestionbox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-05-29 07:22:12 -0400 (Fri, 29 May 2009)
New Revision: 14403
Modified:
branches/community/3.3.X/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx
Log:
Content between angle brackets is being stripped out from selected item of a suggestion box
https://jira.jboss.org/jira/browse/RF-5599
Modified: branches/community/3.3.X/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java
===================================================================
--- branches/community/3.3.X/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2009-05-28 17:46:49 UTC (rev 14402)
+++ branches/community/3.3.X/ui/suggestionbox/src/main/java/org/richfaces/renderkit/html/SuggestionBoxRenderer.java 2009-05-29 11:22:12 UTC (rev 14403)
@@ -127,26 +127,27 @@
private Pattern getTokensPattern(UIComponent component) {
//TODO nick - cache ?
- String tokens = (String) component.getAttributes().get("tokens");
+ String tokens = (String) component.getAttributes().get("tokens");
if (tokens != null && tokens.length() != 0) {
Pattern pattern;
+
synchronized (tokensCache) {
- pattern = tokensCache.get(tokens);
- if (pattern == null) {
- StringBuilder patternSource = new StringBuilder();
- char[] array = tokens.toCharArray();
- int l = array.length;
- for (int i = 0; i < l; i++) {
- if (i != 0) {
- patternSource.append('|');
- }
- patternSource.append(Pattern.quote(String.valueOf(array[i])));
- }
-
- pattern = Pattern.compile(patternSource.toString());
- tokensCache.put(tokens, pattern);
- }
- }
+ pattern = tokensCache.get(tokens);
+ if (pattern == null) {
+ StringBuilder patternSource = new StringBuilder();
+ char[] array = tokens.toCharArray();
+ int l = array.length;
+ for (int i = 0; i < l; i++) {
+ if (i != 0) {
+ patternSource.append('|');
+ }
+ patternSource.append(Pattern.quote(String.valueOf(array[i])));
+ }
+
+ pattern = Pattern.compile(patternSource.toString());
+ tokensCache.put(tokens, pattern);
+ }
+ }
return pattern;
} else {
@@ -241,13 +242,13 @@
UISuggestionBox suggestionBox = (UISuggestionBox) component;
if (!suggestionBox.isSubmitted()) {
suggestionBox.setRowIndex(-1);
+
writer.startElement(HTML.DIV_ELEM, component);
getUtils().encodeId(context, component);
- StringBuffer clazz = new StringBuffer(
- "rich-sb-common-container ");
- clazz.append(suggestionBox.getPopupClass() + " ").
- append(suggestionBox.getStyleClass());
+ StringBuffer clazz = new StringBuffer("rich-sb-common-container ");
+ clazz.append(suggestionBox.getPopupClass() + " ")
+ .append(suggestionBox.getStyleClass());
writer.writeAttribute("class", clazz, "popupClass");
int zIndex = suggestionBox.getZindex();
@@ -256,9 +257,9 @@
style.append(getSizeForStyle(component, "width", null, false));
style.append(getSizeForStyle(component, "height", null, false));
-
- style.append(suggestionBox.getPopupStyle() + ";").
- append(suggestionBox.getStyle() + ";");
+ style.append(suggestionBox.getPopupStyle() + ";")
+ .append(suggestionBox.getStyle() + ";");
+
writer.writeAttribute("style", style, "popupStyle");
UIComponent popupFacet = component.getFacet("popup");
@@ -281,21 +282,15 @@
writer.endElement(HTML.DIV_ELEM);
writer.startElement("iframe", component);
- writer.writeAttribute("src",
- getResource("/org/richfaces/renderkit/html/images/spacer.gif")
- .getUri(context, null), null);
- writer.writeAttribute("id", component.getClientId(context)
- + "_iframe", null);
- writer.writeAttribute(
- "style", "position:absolute;display:none;z-index:" + zIndex + ";", null);
+ writer.writeAttribute("src", getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null);
+ writer.writeAttribute("id", component.getClientId(context) + "_iframe", null);
+ writer.writeAttribute("style", "position:absolute;display:none;z-index:" + zIndex + ";", null);
writer.endElement("iframe");
writer.startElement("input", component);
writer.writeAttribute("type", "hidden", null);
- writer.writeAttribute("id", component.getClientId(context)
- + "_selection", null);
- writer.writeAttribute("name", component.getClientId(context)
- + "_selection", null);
+ writer.writeAttribute("id", component.getClientId(context) + "_selection", null);
+ writer.writeAttribute("name", component.getClientId(context) + "_selection", null);
writer.endElement("input");
} else {
@@ -387,7 +382,7 @@
UIComponent targetComponent = getTarget(component);
String targetId = targetComponent.getClientId(context);
- Map attributes = component.getAttributes();
+ Map<String, Object> attributes = component.getAttributes();
StringBuffer script = new StringBuffer(" new ");
// Build ajax function call
JSFunction submitSuggest = AjaxRendererUtils.buildAjaxFunction(
@@ -395,7 +390,7 @@
submitSuggest.addParameter(targetId);
submitSuggest.addParameter(component.getClientId(context));
submitSuggest.addParameter(component.getAttributes().get("onsubmit"));
- Map options = AjaxRendererUtils.buildEventOptions(context, component);
+ Map<String, Object> options = AjaxRendererUtils.buildEventOptions(context, component);
options.put("popup", component.getClientId(context));
for (int i = 0; i < OPTIONS.length; i++) {
String option = OPTIONS[i];
@@ -423,8 +418,7 @@
}
String onselect = (String) attributes.get("onselect");
if (null != onselect) {
- JSFunctionDefinition function = new JSFunctionDefinition(
- "suggestion");
+ JSFunctionDefinition function = new JSFunctionDefinition("suggestion");
function.addParameter("event");
function.addToBody(onselect);
@@ -433,8 +427,7 @@
}
String onobjectchange = (String) attributes.get("onobjectchange");
if (null != onobjectchange) {
- JSFunctionDefinition function = new JSFunctionDefinition(
- "suggestion","event");
+ JSFunctionDefinition function = new JSFunctionDefinition("suggestion","event");
function.addToBody(onobjectchange);
options.put("onobjectchange", function);
@@ -482,7 +475,7 @@
*/
private static class DataTemplateContext extends TemplateContext {
- private List columns;
+ private List<UIComponent> columns;
private int first;
@@ -516,8 +509,8 @@
this.putParameter("hasHead", Boolean.TRUE);
}
// Fill child columns components
- columns = new ArrayList(component.getChildCount());
- for (Iterator iter = component.getChildren().iterator(); iter
+ columns = new ArrayList<UIComponent>(component.getChildCount());
+ for (Iterator<UIComponent> iter = component.getChildren().iterator(); iter
.hasNext();) {
UIComponent column = (UIComponent) iter.next();
if (column instanceof UIColumn) {
@@ -881,15 +874,13 @@
final String endHtml = "</td></tr>";
UIComponent nothingLabelFacet = component.getFacet("nothingLabel");
- if(null != nothingLabelFacet && nothingLabelFacet.isRendered()) {
+ if (nothingLabelFacet != null && nothingLabelFacet.isRendered()) {
writer.write(startHtml);
renderChild(context, nothingLabelFacet);
writer.write(endHtml);
- }
- else {
+ } else {
String nothingLabel = suggestionBox.getNothingLabel();
- if (null != nothingLabel &&
- !"".equals(nothingLabel)) {
+ if (nothingLabel != null && !"".equals(nothingLabel)) {
writer.write(startHtml);
writer.write(nothingLabel);
writer.write(endHtml);
Modified: branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
===================================================================
--- branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2009-05-28 17:46:49 UTC (rev 14402)
+++ branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2009-05-29 11:22:12 UTC (rev 14403)
@@ -621,18 +621,30 @@
markPreviousPage: function() {
var pos = this.countVisibleEntries();
if (this.index > 0) {
- if (pos.current>0) this.index = this.index - Math.min(pos.current,pos.all);
- else this.index = this.index - pos.all;
- if (this.index < 0) this.index = 0;
+ if (pos.current>0) {
+ this.index = this.index - Math.min(pos.current,pos.all);
+ } else {
+ this.index = this.index - pos.all;
+ }
+
+ if (this.index < 0) {
+ this.index = 0;
+ }
}
},
markNextPage: function() {
var pos = this.countVisibleEntries();
if (this.index < this.entryCount - 1) {
- if ((pos.current < pos.all - 1) && pos.current>=0) this.index = this.index + (pos.all - pos.current - 1);
- else this.index = this.index + pos.all;
- if (this.index > this.entryCount - 1) this.index = this.entryCount - 1;
+ if ((pos.current < pos.all - 1) && pos.current>=0) {
+ this.index = this.index + (pos.all - pos.current - 1);
+ } else {
+ this.index = this.index + pos.all;
+ }
+
+ if (this.index > this.entryCount - 1) {
+ this.index = this.entryCount - 1;
+ }
}
},
@@ -644,7 +656,9 @@
}*/
// optimization
var element = $(this.contentTable).firstChild;
- while (!element.tagName || element.tagName.toLowerCase()!="tbody") element = element.nextSibling;
+ while (!element.tagName || element.tagName.toLowerCase()!="tbody") {
+ element = element.nextSibling;
+ }
return $(element.childNodes[index]);
},
Modified: branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx
===================================================================
--- branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx 2009-05-28 17:46:49 UTC (rev 14402)
+++ branches/community/3.3.X/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx 2009-05-29 11:22:12 UTC (rev 14403)
@@ -27,7 +27,9 @@
</u:insertFacet>
<f:if context="hasColumnHead">
<u:insertChildren context="columns">
- <th nowrap="nowrap"><u:insertFacet name="header"/></th>
+ <th nowrap="nowrap">
+ <u:insertFacet name="header"/>
+ </th>
</u:insertChildren>
</f:if>
</thead>
@@ -54,15 +56,19 @@
<f:call name="getEntryClass"/>
</f:attribute>
<f:if property="fetchValue">
- <td style="display: none;"><f:attribute name="class"
- property="selectValueClass"
- mantadory="false"/> <f:verbatim
- property="fetchValue"/></td>
+ <td style="display: none;">
+ <f:attribute name="class" property="selectValueClass" mantadory="false"/>
+ <f:verbatim property="fetchValue" escape="true"/>
+ </td>
</f:if>
+
<u:insertChildren context="columns">
<td nowrap="nowrap" class="rich-sb-cell-padding">
- <f:attribute name="style"><f:call name="cellPadding"/></f:attribute>
- <u:insertChild/></td>
+ <f:attribute name="style">
+ <f:call name="cellPadding"/>
+ </f:attribute>
+ <u:insertChild/>
+ </td>
</u:insertChildren>
</tr>
</u:insertChildren>
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14402 - in branches/community/3.3.X/test-applications/regressionArea: regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432 and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-28 13:46:49 -0400 (Thu, 28 May 2009)
New Revision: 14402
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Bean.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Item.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4432/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4432/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4432.xhtml
Log:
+RF-4432 test added.
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Bean.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Bean.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Bean.java 2009-05-28 17:46:49 UTC (rev 14402)
@@ -0,0 +1,58 @@
+package org.richfaces.regressionarea.issues.rf4432;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.richfaces.model.selection.SimpleSelection;
+
+@Name("rf4432")
+(a)Scope(ScopeType.SESSION)
+public class Bean {
+ private Collection<Item> items;
+ private SimpleSelection selectedItemTableRow;
+ private int currentView = 1;
+
+ public Bean() {
+ items = new ArrayList<Item>();
+ for (int i = 0; i < 10; i++) {
+ items.add(new Item("name " + i, "description " + i));
+ }
+ }
+
+ public Collection<Item> getItems() {
+ return items;
+ }
+
+ public void setItems(Collection<Item> items) {
+ this.items = items;
+ }
+
+ public SimpleSelection getSelectedItemTableRow() {
+ return selectedItemTableRow;
+ }
+
+ public void setSelectedItemTableRow(SimpleSelection selecteditemTableRow) {
+ this.selectedItemTableRow = selecteditemTableRow;
+ }
+
+ public boolean getDrawView1() {
+ return currentView == 1;
+ }
+
+ public boolean getDrawView2() {
+ return currentView == 2;
+ }
+
+ public String goView1() {
+ currentView = 1;
+ return null;
+ }
+
+ public String goView2() {
+ currentView = 2;
+ return null;
+ }
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Item.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Item.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4432/Item.java 2009-05-28 17:46:49 UTC (rev 14402)
@@ -0,0 +1,25 @@
+package org.richfaces.regressionarea.issues.rf4432;
+
+public class Item {
+ private String name;
+ private String description;
+
+ public Item(String name, String desc){
+ this.name = name;
+ this.description = desc;
+ }
+
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4432/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4432/Test.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4432/Test.java 2009-05-28 17:46:49 UTC (rev 14402)
@@ -0,0 +1,29 @@
+package org.richfaces.testng.rf4432;
+
+import org.richfaces.SeleniumTestBase;
+
+public class Test extends SeleniumTestBase {
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception {
+ renderPage();
+
+ AssertPresent("form:sdtItems");
+ AssertNotPresent("form:hello");
+
+ clickAjaxCommandAndWait("//input[@type='button' and @value='Go']");
+
+ AssertNotPresent("form:sdtItems");
+ AssertPresent("form:hello");
+
+ clickAjaxCommandAndWait("//input[@type='button' and @value='Back to table']");
+
+ AssertPresent("form:sdtItems");
+ AssertNotPresent("form:hello");
+ }
+
+ public String getTestUrl() {
+ return "pages/rf4432.xhtml";
+ }
+
+}
\ No newline at end of file
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4432.xhtml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4432.xhtml (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4432.xhtml 2009-05-28 17:46:49 UTC (rev 14402)
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+ <ui:define name="template">
+ <a4j:form id="form">
+ <rich:panel id="pnlMain">
+ <f:facet name="header">
+ <h:outputText value="Panel Name" />
+ </f:facet>
+ <a4j:region id="rgn1" rendered="#{rf4432.drawView1}">
+ <rich:scrollableDataTable id="sdtItems" value="#{rf4432.items}"
+ var="item">
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Name" />
+ </f:facet>
+ <h:outputText value="#{item.name}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText styleClass="headerText" value="Description" />
+ </f:facet>
+ <h:outputText value="#{item.description}" />
+ </rich:column>
+ </rich:scrollableDataTable>
+ <br />
+ <a4j:commandButton action="#{rf4432.goView2}" value="Go"
+ reRender="pnlMain" />
+ </a4j:region>
+
+ <a4j:region id="rgn2" rendered="#{rf4432.drawView2}">
+ <h:outputText value="HELLO TEST" id="hello" />
+ <a4j:commandButton action="#{rf4432.goView1}" value="Back to table"
+ reRender="pnlMain" />
+ </a4j:region>
+ </rich:panel>
+ </a4j:form>
+
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14401 - in branches/community/3.3.X/test-applications/regressionArea: regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4553 and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-05-28 12:55:47 -0400 (Thu, 28 May 2009)
New Revision: 14401
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4553/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4553/Bean.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4553/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4553/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4553.xhtml
Modified:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/navigation.xml
Log:
+RF-4553 test.
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4553/Bean.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4553/Bean.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf4553/Bean.java 2009-05-28 16:55:47 UTC (rev 14401)
@@ -0,0 +1,67 @@
+package org.richfaces.regressionarea.issues.rf4553;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+@Name("rf4553")
+(a)Scope(ScopeType.SESSION)
+public class Bean {
+ private String firstName;
+ private String lastName;
+ private String company;
+ private String notes;
+ private int counter;
+
+ public int getCounter() {
+ return counter++;
+ }
+
+ public void setCounter(int counter) {
+ this.counter = counter;
+ }
+
+ public Bean() {
+ firstName = "";
+ lastName = "";
+ company = "";
+ notes = "";
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ System.out.println("setFirstName(String firstName)");
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ System.out.println("setLastName(String lastName)");
+ this.lastName = lastName;
+ }
+
+ public String getCompany() {
+ return company;
+ }
+
+ public void setCompany(String company) {
+ System.out.println("setCompany(String company)");
+ this.company = company;
+ }
+
+ public String getNotes() {
+ return notes;
+ }
+
+ public void setNotes(String notes) {
+ System.out.println("setNotes(String notes)");
+ this.notes = notes;
+ }
+
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4553/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4553/Test.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf4553/Test.java 2009-05-28 16:55:47 UTC (rev 14401)
@@ -0,0 +1,39 @@
+package org.richfaces.testng.rf4553;
+
+import org.richfaces.SeleniumTestBase;
+
+public class Test extends SeleniumTestBase {
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception {
+ renderPage();
+
+ AssertTextEquals("form:includeID:counter", "1");
+
+ type("//div[@id='divID']/table/tbody/tr[1]/td[2]/input", "John");
+ type("//div[@id='divID']/table/tbody/tr[2]/td[2]/input", "Smith");
+ type("//div[@id='divID']/table/tbody/tr[3]/td[2]/input", "Exadel");
+
+ clickAjaxCommandAndWait("//input[@type='button' and @value='No actions']");
+ AssertTextEquals("form:includeID:counter", "1");
+ clickAjaxCommandAndWait("//input[@type='button' and @value='Next >>']");
+ AssertTextEquals("form:includeID:counter", "2");
+
+ type("form:includeID:notes","Selenium test in process...");
+
+ clickAjaxCommandAndWait("//input[@type='button' and @value='No actions']");
+ AssertTextEquals("form:includeID:counter", "2");
+ clickAjaxCommandAndWait("//input[@type='button' and @value='Next >>']");
+ AssertTextEquals("form:includeID:counter", "3");
+
+ clickAjaxCommandAndWait("//input[@type='button' and @value='No actions']");
+ AssertTextEquals("form:includeID:counter", "3");
+ clickAjaxCommandAndWait("//input[@type='button' and @value='<<Previous']");
+ AssertTextEquals("form:includeID:counter", "4");
+ }
+
+ public String getTestUrl() {
+ return "pages/rf4553.xhtml";
+ }
+
+}
\ No newline at end of file
Modified: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/navigation.xml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/navigation.xml 2009-05-28 16:32:10 UTC (rev 14400)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/WEB-INF/navigation.xml 2009-05-28 16:55:47 UTC (rev 14401)
@@ -11,4 +11,29 @@
<to-view-id>home.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/pages/examples/wstep1.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>next</from-outcome>
+ <to-view-id>/pages/examples/wstep2.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/pages/examples/wstep2.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>previous</from-outcome>
+ <to-view-id>/pages/examples/wstep1.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>next</from-outcome>
+ <to-view-id>/pages/examples/finalStep.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/pages/examples/finalStep.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>previous</from-outcome>
+ <to-view-id>/pages/examples/wstep2.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4553.xhtml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4553.xhtml (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf4553.xhtml 2009-05-28 16:55:47 UTC (rev 14401)
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+ <ui:define name="template">
+ <h:panelGrid width="100%" columns="2">
+ <a4j:keepAlive beanName="rf4553" />
+ <rich:panel styleClass="wizard">
+ <f:facet name="header">
+ <h:outputText value="Using a4j:include for Wizard-like behaviour" />
+ </f:facet>
+ <h:form id="form">
+ <a4j:include viewId="/pages/examples/wstep1.xhtml" id="includeID"/>
+ </h:form>
+ </rich:panel>
+ </h:panelGrid>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14400 - branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-05-28 12:32:10 -0400 (Thu, 28 May 2009)
New Revision: 14400
Modified:
branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java
branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
Log:
https://jira.jboss.org/jira/browse/RF-7268
Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java 2009-05-28 16:04:12 UTC (rev 14399)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java 2009-05-28 16:32:10 UTC (rev 14400)
@@ -64,9 +64,9 @@
if (p1 instanceof Comparable && p2 instanceof Comparable) {
result = ((Comparable<Object>) p1).compareTo(p2);
} else if (p1 == null && p2 != null) {
+ result = -1;
+ } else if (p2 == null && p1 != null) {
result = 1;
- } else if (p2 == null && p1 != null) {
- result = -1;
}
if (asc != null && !asc.booleanValue()) {
Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java 2009-05-28 16:04:12 UTC (rev 14399)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java 2009-05-28 16:32:10 UTC (rev 14400)
@@ -101,9 +101,9 @@
} else if (p1 instanceof Comparable && p2 instanceof Comparable) {
result = ((Comparable<Object>) p1).compareTo(p2);
} else if (p1 == null && p2 != null) {
+ result = -1;
+ } else if (p2 == null && p1 != null) {
result = 1;
- } else if (p2 == null && p1 != null) {
- result = -1;
}
if (ordering.equals(Ordering.DESCENDING)) {
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14399 - in branches/community/3.3.X/ui: drag-drop/src/main/resources/org/richfaces/renderkit/html/css and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-05-28 12:04:12 -0400 (Thu, 28 May 2009)
New Revision: 14399
Modified:
branches/community/3.3.X/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss
branches/community/3.3.X/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss
branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
branches/community/3.3.X/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
Log:
Various Warnings emitted with FireFox and WebDeveloper plugin
https://jira.jboss.org/jira/browse/RF-7197
Modified: branches/community/3.3.X/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss
===================================================================
--- branches/community/3.3.X/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-05-28 15:23:37 UTC (rev 14398)
+++ branches/community/3.3.X/ui/colorPicker/src/main/resources/org/richfaces/renderkit/html/css/colorPicker.xcss 2009-05-28 16:04:12 UTC (rev 14399)
@@ -181,7 +181,7 @@
<u:style name="background-color" skin="controlBackgroundColor"/>
</u:selector>
<u:selector name=".rich-color-picker-ext label">
- <u:style name="color" skin="generalSizeFont"/>
+ <u:style name="color" skin="generalTextColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
Modified: branches/community/3.3.X/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss
===================================================================
--- branches/community/3.3.X/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss 2009-05-28 15:23:37 UTC (rev 14398)
+++ branches/community/3.3.X/ui/drag-drop/src/main/resources/org/richfaces/renderkit/html/css/dragIndicator.xcss 2009-05-28 16:04:12 UTC (rev 14399)
@@ -6,8 +6,8 @@
<f:verbatim><![CDATA[
.drgind_fly{
z-index : 1000;
- top:40;
- left : 40;
+ top : 40px;
+ left : 40px;
position : absolute;
}
.drgind_internal{
Modified: branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2009-05-28 15:23:37 UTC (rev 14398)
+++ branches/community/3.3.X/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/css/fileUpload.xcss 2009-05-28 16:04:12 UTC (rev 14399)
@@ -9,7 +9,7 @@
.rich-fileupload-list-overflow{overflow: auto; overflow-y: auto; overflow-x: hidden;}
.rich-fileupload-name{ width : 100%; height : 58px; padding : 2px 10px 2px 10px;}
-.rich-fileupload-del{ width : 90px; text-align : center; padding-top : 3; padding-bottom : 3;}
+.rich-fileupload-del{ width : 90px; text-align : center; padding-top : 3px; padding-bottom : 3px;}
.rich-fileupload-scroll{ width : 10px; text-align : center;}
input[type="file"][class~="rich-fileupload-hidden"]::-webkit-rich-fileupload-button {
Modified: branches/community/3.3.X/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
===================================================================
--- branches/community/3.3.X/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2009-05-28 15:23:37 UTC (rev 14398)
+++ branches/community/3.3.X/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2009-05-28 16:04:12 UTC (rev 14399)
@@ -8,7 +8,6 @@
<f:verbatim>
.rich-progress-bar-height{height : 13px;}
- .rich-progress-bar-height-dig{height:}
.rich-progress-bar-width{width : 200px}
.rich-progress-bar-block{white-space : nowrap;}
.rich-progress-bar-uploaded{background-repeat : repeat-x;}
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14398 - branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-05-28 11:23:37 -0400 (Thu, 28 May 2009)
New Revision: 14398
Modified:
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of event handlers descriptions;
Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2009-05-28 15:22:44 UTC (rev 14397)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2009-05-28 15:23:37 UTC (rev 14398)
@@ -17,22 +17,22 @@
<property >
<name>ondragstart</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called before drag operation</description>
+ <description>The client side script method to be called when the dragging operation is started</description>
</property>
<property>
<name>ondragend</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called after a drag operation</description>
+ <description>The client side script method to be called when the dragging operation is finished</description>
</property>
<property>
<name>ondropover</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called after a drop operation</description>
+ <description>The client side script method to be called when the draggable object is over the drop zone</description>
</property>
<property>
<name>ondropout</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called after a out operation</description>
+ <description>The client side script method to be called when the draggable object is moved away from the drop zone</description>
</property>
Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2009-05-28 15:22:44 UTC (rev 14397)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2009-05-28 15:23:37 UTC (rev 14398)
@@ -19,22 +19,22 @@
<property >
<name>ondragenter</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called on enter draggable object to zone</description>
+ <description>The client side script method to be called when a draggable object enters the zone</description>
</property>
<property>
<name>ondragexit</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called after a drag object leaves zone</description>
+ <description>The client side script method to be called after a draggable object leaves the zone</description>
</property>
<property>
<name>ondrop</name>
<classname>java.lang.String</classname>
- <description>A JavaScript event handler called after a drag object is dropped to zone</description>
+ <description>The client side script method to be called when a draggable object is dropped into the available zone</description>
</property>
<property>
<name>ondropend</name>
<classname>java.lang.String</classname>
- <description>A JavaScript handler for event fired on a drop even the drop for a given type is not available</description>
+ <description>The client side script method to be called when a draggable object is dropped into any zone</description>
</property>
<property>
<name>dropListener</name>
15 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r14397 - branches/community/3.3.X/ui/dropdown-menu/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-05-28 11:22:44 -0400 (Thu, 28 May 2009)
New Revision: 14397
Modified:
branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
Log:
https://jira.jboss.org/jira/browse/RF-6233 - unification of event handlers descriptions;
Modified: branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-05-28 15:14:40 UTC (rev 14396)
+++ branches/community/3.3.X/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-05-28 15:22:44 UTC (rev 14397)
@@ -237,7 +237,7 @@
<name>oncollapse</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; a menu is collapsed.
+ The client side script method to be called when a menu is collapsed
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -246,7 +246,7 @@
<name>onexpand</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; a menu is expanded.
+ The client side script method to be called when a menu is expanded
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -256,7 +256,7 @@
<name>onmouseout</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; a pointer was moved away.
+ The client side script method to be called when a pointer is moved away from the menu
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -265,7 +265,7 @@
<name>onmousemove</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; a pointer was moved within.
+ The client side script method to be called when a pointer is moved within the menu
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -274,7 +274,7 @@
<name>onmouseover</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; a pointer was moved onto.
+ The client side script method to be called when a pointer is moved onto the menu
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -283,7 +283,7 @@
<name>onitemselect</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; some item was selected.
+ The client side script method to be called when a menu item is selected
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
@@ -292,7 +292,7 @@
<name>ongroupactivate</name>
<classname>java.lang.String</classname>
<description>
- HTML: script expression; some group was activated.
+ The client side script method to be called when some menu group is activated
</description>
<defaultvalue><![CDATA[""]]></defaultvalue>
</property>
15 years, 7 months
- 1
- 0