JBoss Rich Faces SVN: r14775 - in branches/sandbox/rf4_build: cdk/trunk and 36 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2009-07-02 14:29:10 -0400 (Thu, 02 Jul 2009)
New Revision: 14775
Added:
branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/src/
branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/src/main/
branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/src/main/java/
branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/src/test/
branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/src/test/java/
Modified:
branches/sandbox/rf4_build/cdk/trunk/archetypes/pom.xml
branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-multimodule/pom.xml
branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-singlemodule/pom.xml
branches/sandbox/rf4_build/cdk/trunk/plugins/maven-cdk-plugin/pom.xml
branches/sandbox/rf4_build/cdk/trunk/plugins/pom.xml
branches/sandbox/rf4_build/cdk/trunk/pom.xml
branches/sandbox/rf4_build/docs/trunk/pom.xml
branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml
branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml
branches/sandbox/rf4_build/examples/trunk/components/pom.xml
branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml
branches/sandbox/rf4_build/examples/trunk/photoalbum/pom.xml
branches/sandbox/rf4_build/examples/trunk/pom.xml
branches/sandbox/rf4_build/examples/trunk/richfaces-demo/pom.xml
branches/sandbox/rf4_build/framework/trunk/api/pom.xml
branches/sandbox/rf4_build/framework/trunk/impl/pom.xml
branches/sandbox/rf4_build/framework/trunk/pom.xml
branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml
branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml
branches/sandbox/rf4_build/make.sh
branches/sandbox/rf4_build/ui/trunk/components/calendar/api/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/calendar/ui/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/tree/api/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/tree/ui/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml
branches/sandbox/rf4_build/ui/trunk/pom.xml
branches/sandbox/rf4_build/ui/trunk/skins/pom.xml
branches/sandbox/rf4_build/ui/trunk/themes/pom.xml
branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml
Log:
review build system
Modified: branches/sandbox/rf4_build/cdk/trunk/archetypes/pom.xml
===================================================================
--- branches/sandbox/rf4_build/cdk/trunk/archetypes/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/cdk/trunk/archetypes/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,7 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-archetypes</artifactId>
<packaging>pom</packaging>
+ <name>maven archetypes</name>
<modules>
<module>ui-singlemodule</module>
Modified: branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-multimodule/pom.xml
===================================================================
--- branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-multimodule/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-multimodule/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,6 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk.maven-archetypes</groupId>
<artifactId>richfaces-ui-multimodule-archetype</artifactId>
+ <name>maven ui multimodule archetype</name>
<build>
<extensions>
Modified: branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-singlemodule/pom.xml
===================================================================
--- branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-singlemodule/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/cdk/trunk/archetypes/ui-singlemodule/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,6 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.cdk.maven-archetypes</groupId>
<artifactId>richfaces-ui-singlemodule-archetype</artifactId>
+ <name>maven ui singlemodule archetype</name>
<build>
<extensions>
Modified: branches/sandbox/rf4_build/cdk/trunk/plugins/maven-cdk-plugin/pom.xml
===================================================================
--- branches/sandbox/rf4_build/cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,5 +14,6 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
<packaging>maven-plugin</packaging>
+ <name>maven plugin for JSF components code generation</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/cdk/trunk/plugins/pom.xml
===================================================================
--- branches/sandbox/rf4_build/cdk/trunk/plugins/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/cdk/trunk/plugins/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,8 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-plugins</artifactId>
<packaging>pom</packaging>
+ <name>maven plugin CDK plugins</name>
+
<modules>
<module>maven-cdk-plugin</module>
Modified: branches/sandbox/rf4_build/cdk/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/cdk/trunk/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/cdk/trunk/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -4,16 +4,17 @@
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>cdk</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces</groupId>
+ <artifactId>cdk</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>pom</packaging>
+ <name>JSF components development kit</name>
- <modules>
- <module>plugins</module>
- <module>archetypes</module>
- </modules>
+ <modules>
+ <module>plugins</module>
+ <module>archetypes</module>
+ </modules>
<build>
<plugins>
<plugin>
@@ -33,6 +34,6 @@
<extensions>true</extensions>
</plugin>
</plugins>
- </build>
+ </build>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/docs/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/docs/trunk/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -9,6 +9,7 @@
<artifactId>docs</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>project documentation</name>
<properties>
<docs.version>${project.version}</docs.version>
Modified: branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/components/calendar-demo/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,7 @@
<groupId>org.richfaces.examples.components</groupId>
<artifactId>${example.componentName}-demo</artifactId>
<packaging>war</packaging>
+ <name>richfaces calendar demo</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/components/panel-demo/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -7,13 +7,14 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.examples.components</groupId>
<artifactId>${example.componentName}-demo</artifactId>
<packaging>war</packaging>
+ <name>richfaces panel demo</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/examples/trunk/components/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/components/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/components/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -13,6 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.examples</groupId>
<artifactId>components</artifactId>
+ <name>richfaces developers samples</name>
<packaging>pom</packaging>
<modules>
Modified: branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/components/tree-demo/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,7 @@
<groupId>org.richfaces.examples.components</groupId>
<artifactId>${example.componentName}-demo</artifactId>
<packaging>war</packaging>
+ <name>richfaces tree demo</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/examples/trunk/photoalbum/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/photoalbum/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/photoalbum/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,5 +14,6 @@
<groupId>org.richfaces.examples</groupId>
<artifactId>photoalbum</artifactId>
<packaging>ear</packaging>
+ <name>photoalbum demo application Root</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/examples/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -9,6 +9,7 @@
<artifactId>examples</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>richfaces components examples</name>
<properties>
Modified: branches/sandbox/rf4_build/examples/trunk/richfaces-demo/pom.xml
===================================================================
--- branches/sandbox/rf4_build/examples/trunk/richfaces-demo/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/examples/trunk/richfaces-demo/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,5 +14,6 @@
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-demo</artifactId>
<packaging>war</packaging>
+ <name>richfaces demo application </name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/framework/trunk/api/pom.xml
===================================================================
--- branches/sandbox/rf4_build/framework/trunk/api/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/framework/trunk/api/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -13,5 +13,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
+ <name>JSF ajax framework API</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/framework/trunk/impl/pom.xml
===================================================================
--- branches/sandbox/rf4_build/framework/trunk/impl/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/framework/trunk/impl/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -13,6 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
+ <name>JSF ajax framework implementation</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/framework/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/framework/trunk/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -7,12 +7,14 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>framework-version-matrix</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>version-matrix/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>framework</artifactId>
+ <name>JSF ajax framework</name>
<packaging>pom</packaging>
<dependencyManagement>
@@ -20,17 +22,17 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>${framework.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>${framework.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test-base</artifactId>
- <version>${framework.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -40,30 +42,37 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</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>jstl</groupId>
<artifactId>jstl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
<modules>
+ <module>version-matrix</module>
<module>api</module>
<module>test-base</module>
<module>impl</module>
Modified: branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml
===================================================================
--- branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/framework/trunk/test-base/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,11 +14,13 @@
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test-base</artifactId>
<packaging>jar</packaging>
+ <name>ajax4jsf test framework</name>
<dependencies>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml
===================================================================
--- branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/framework/trunk/version-matrix/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,13 +14,8 @@
<artifactId>framework-version-matrix</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>JSF ajax framework version matrix</name>
- <properties>
- <jsf.version>2.0.0-PR2_3</jsf.version>
- <framework.version>${project.version}</framework.version>
- <cdk.version>${project.version}</cdk.version>
- </properties>
-
<repositories>
<repository>
<id>repository.jboss.org</id>
@@ -75,19 +70,16 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
- <scope>provided</scope>
+ <version>2.0.0-PR2_3</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>${jsf.version}</version>
- <scope>provided</scope>
+ <version>2.0.0-PR2_3</version>
</dependency>
<!-- Dependencies of JSF 2.0 -->
@@ -97,25 +89,21 @@
<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>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
- <scope>provided</scope>
</dependency>
<!-- end -->
Modified: branches/sandbox/rf4_build/make.sh
===================================================================
--- branches/sandbox/rf4_build/make.sh 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/make.sh 2009-07-02 18:29:10 UTC (rev 14775)
@@ -2,33 +2,7 @@
PROJECT_DIR=`pwd`
TAG_DIR='trunk'
-VERSION_MATRIX='version-matrix'
-settings=$PROJECT_DIR/settings.xml
-case "`uname`" in
- CYGWIN*) settings=`cygpath -w $settings` ;;
-esac
-
-
-for MODULE in 'framework' 'ui'
-do
- echo
- echo -e "\033[40m\033[1;32m---------------------------------\033[0m"
- echo -e "\033[40m\033[1;32mMaking $MODULE/$TAG_DIR/version-matrix \033[0m"
- echo -e "\033[40m\033[1;32m---------------------------------\033[0m"
- echo
-
- cd $PROJECT_DIR/$MODULE/$TAG_DIR/$VERSION_MATRIX
-
- if mvn -s $settings clean install; then
- echo
- else
- exit $?
- fi
-
-done
-
-
for MODULE in 'cdk' 'framework' 'ui' 'docs' 'examples'
do
@@ -40,7 +14,7 @@
cd $PROJECT_DIR/$MODULE/$TAG_DIR
- if mvn -s $settings clean install; then
+ if mvn eclipse:clean; then
echo
else
exit $?
Modified: branches/sandbox/rf4_build/ui/trunk/components/calendar/api/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/calendar/api/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/calendar/api/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,5 +12,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${parent.artifactId}-api</artifactId>
+ <name>richfaces calendar api</name>
</project>
\ No newline at end of file
Added: branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/pom.xml (rev 0)
+++ branches/sandbox/rf4_build/ui/trunk/components/calendar/impl/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -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}-impl</artifactId>
+ <name>richfaces calendar impl</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}-api</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/calendar/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,7 @@
<groupId>org.richfaces.ui.components</groupId>
<artifactId>calendar</artifactId>
<packaging>pom</packaging>
+ <name>richfaces calendar</name>
<modules>
<module>api</module>
Modified: branches/sandbox/rf4_build/ui/trunk/components/calendar/ui/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/calendar/ui/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/calendar/ui/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,6 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${parent.artifactId}-ui</artifactId>
+ <name>richfaces calendar ui</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/panel/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -13,6 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui.components</groupId>
<artifactId>panel-ui</artifactId>
+ <name>richfaces panel</name>
<packaging>jar</packaging>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/components/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,7 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>components</artifactId>
<packaging>pom</packaging>
+ <name>richfaces components</name>
<!--dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
Modified: branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,6 +14,7 @@
<groupId>org.richfaces.ui.components</groupId>
<artifactId>tree</artifactId>
<packaging>pom</packaging>
+ <name>richfaces tree</name>
<modules>
<module>tree/api</module>
Modified: branches/sandbox/rf4_build/ui/trunk/components/tree/tree/api/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/tree/api/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/tree/api/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,5 +12,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${parent.artifactId}-api</artifactId>
+ <name>richfaces tree api</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/components/tree/tree/ui/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/tree/ui/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/tree/ui/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -13,6 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${parent.artifactId}-ui</artifactId>
<packaging>jar</packaging>
+ <name>richfaces tree ui</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,5 +12,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${parent.artifactId}Model-api</artifactId>
+ <name>richfaces tree model api</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -12,6 +12,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>${parent.artifactId}Model-ui</artifactId>
+ <name>richfaces tree model ui</name>
<dependencies>
<dependency>
Modified: branches/sandbox/rf4_build/ui/trunk/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -8,11 +8,13 @@
<groupId>org.richfaces</groupId>
<artifactId>ui-version-matrix</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>version-matrix/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
<artifactId>ui</artifactId>
+ <name>richfaces ui</name>
<packaging>pom</packaging>
<build>
@@ -43,26 +45,32 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</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>jstl</groupId>
<artifactId>jstl</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
@@ -76,6 +84,7 @@
</dependencies>
<modules>
+ <module>version-matrix</module>
<module>components</module>
<module>skins</module>
<module>themes</module>
Modified: branches/sandbox/rf4_build/ui/trunk/skins/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/skins/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/skins/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,5 +14,6 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>skins</artifactId>
<packaging>pom</packaging>
+ <name>richfaces skins</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/themes/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/themes/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/themes/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -14,5 +14,6 @@
<groupId>org.richfaces.ui</groupId>
<artifactId>themes</artifactId>
<packaging>pom</packaging>
+ <name>richfaces themes</name>
</project>
\ No newline at end of file
Modified: branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml 2009-07-02 16:51:15 UTC (rev 14774)
+++ branches/sandbox/rf4_build/ui/trunk/version-matrix/pom.xml 2009-07-02 18:29:10 UTC (rev 14775)
@@ -13,15 +13,9 @@
<groupId>org.richfaces</groupId>
<artifactId>ui-version-matrix</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <name>richfaces ui components version matrix</name>
<packaging>pom</packaging>
- <properties>
- <jsf.version>2.0.0-PR2_3</jsf.version>
- <ui.version>${project.version}</ui.version>
- <framework.version>${project.version}</framework.version>
- <cdk.version>${project.version}</cdk.version>
- </properties>
-
<repositories>
<repository>
<id>repository.jboss.org</id>
@@ -75,25 +69,22 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>${framework.version}</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-test-base</artifactId>
- <version>${framework.version}</version>
- <scope>test</scope>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
- <scope>provided</scope>
+ <version>2.0.0-PR2_3</version>
</dependency>
<!-- Dependencies of JSF 2.0 -->
@@ -103,25 +94,21 @@
<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>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
- <scope>provided</scope>
</dependency>
<!-- end -->
@@ -142,7 +129,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>${cdk.version}</version>
+ <version>${project.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
15 years, 6 months
JBoss Rich Faces SVN: r14774 - in branches/community/3.3.X/cdk/generator/src/main: resources/META-INF/templates/templatecompiler and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2009-07-02 12:51:15 -0400 (Thu, 02 Jul 2009)
New Revision: 14774
Modified:
branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm
Log:
RF-7332
Modified: branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java 2009-07-02 16:48:00 UTC (rev 14773)
+++ branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java 2009-07-02 16:51:15 UTC (rev 14774)
@@ -64,10 +64,8 @@
Node baseNode = nnm.getNamedItem("base");
if (baseNode != null) {
base = ELParser.compileEL(baseNode.getNodeValue(), componentBean);
- } else {
- base = "";
}
-
+
try {
this.getComponentBean().addVariable(variableName, VARIABLE_TYPE.getName());
} catch (CompilationException e) {
Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm 2009-07-02 16:48:00 UTC (rev 14773)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm 2009-07-02 16:51:15 UTC (rev 14774)
@@ -1 +1 @@
-$type $variable = new $type($base);
\ No newline at end of file
+$type $variable = new $type(#if ($base) (java.util.Map)$base #end);
\ No newline at end of file
Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm 2009-07-02 16:48:00 UTC (rev 14773)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm 2009-07-02 16:51:15 UTC (rev 14774)
@@ -1 +1 @@
-$type $variable = new $type($base);
\ No newline at end of file
+$type $variable = new $type(#if ($base) (java.util.Map)$base #end);
\ No newline at end of file
15 years, 6 months
JBoss Rich Faces SVN: r14773 - branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-07-02 12:48:00 -0400 (Thu, 02 Jul 2009)
New Revision: 14773
Modified:
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java
Log:
Resources: ResourceImpl - added name initialization in ctor
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2009-07-02 16:14:22 UTC (rev 14772)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2009-07-02 16:48:00 UTC (rev 14773)
@@ -201,6 +201,8 @@
Class<?> resourceClass = Class.forName(resourceName, true, contextClassLoader);
if (Resource.class.isAssignableFrom(resourceClass)) {
resource = (Resource) resourceClass.newInstance();
+
+ //TODO remove this?
resource.setResourceName(resourceName);
}
} catch (ClassNotFoundException e1) {
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java 2009-07-02 16:14:22 UTC (rev 14772)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java 2009-07-02 16:48:00 UTC (rev 14773)
@@ -57,6 +57,12 @@
private boolean useLocalLastModified = false;
+ public ResourceImpl() {
+ super();
+
+ this.setResourceName(getClass().getName());
+ }
+
/**
* @param resourceContext current {@link ResourceContext}
* @return Returns the contentLength.
15 years, 6 months
JBoss Rich Faces SVN: r14772 - in branches/jsf2.0/framework/impl/src/main: resources/META-INF and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-07-02 12:14:22 -0400 (Thu, 02 Jul 2009)
New Revision: 14772
Removed:
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodecAware.java
Modified:
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodec.java
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java
branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/TestResource.java
branches/jsf2.0/framework/impl/src/main/resources/META-INF/resource-handler.faces-config.xml
Log:
Resources:
1. faces-config.xml containing ResourceHandler has got its name
2. ResourceCodec and related classes refactoring
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/DefaultResourceCodec.java 2009-07-02 16:14:22 UTC (rev 14772)
@@ -7,6 +7,12 @@
class DefaultResourceCodec implements ResourceCodec {
+ private static final ResourceCodec CODEC = new DefaultResourceCodec();
+
+ private DefaultResourceCodec() {
+
+ }
+
public String encodeResource(String resourceName, Object resourceData) {
return Util.encodeResourceData(resourceName, resourceData);
}
@@ -18,4 +24,9 @@
public Object decodeResourceData(String resourceKey) {
return Util.getResourceData(resourceKey);
}
+
+ public static ResourceCodec getInstance() {
+ return CODEC;
+ }
+
}
\ No newline at end of file
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodec.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodec.java 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodec.java 2009-07-02 16:14:22 UTC (rev 14772)
@@ -14,4 +14,5 @@
public String decodeResourceName(String resourceKey);
public Object decodeResourceData(String resourceKey);
+
}
Deleted: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodecAware.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodecAware.java 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceCodecAware.java 2009-07-02 16:14:22 UTC (rev 14772)
@@ -1,14 +0,0 @@
-/**
- *
- */
-package org.richfaces.resource;
-
-/**
- * @author Nick Belaevski
- * @since 4.0
- */
-public interface ResourceCodecAware {
-
- public void setResourceCodec(ResourceCodec codec);
-
-}
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2009-07-02 16:14:22 UTC (rev 14772)
@@ -28,6 +28,7 @@
import java.util.Map;
import java.util.Map.Entry;
+import javax.faces.application.ProjectStage;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
import javax.faces.component.StateHolder;
@@ -48,18 +49,33 @@
private ResourceHandler defaultHandler;
- private ResourceCodec codec;
-
public ResourceHandlerImpl(ResourceHandler defaultHandler) {
- this(defaultHandler, new DefaultResourceCodec());
+ this.defaultHandler = defaultHandler;
}
- public ResourceHandlerImpl(ResourceHandler defaultHandler, ResourceCodec resourceCodec) {
- super();
-
- this.defaultHandler = defaultHandler;
- this.codec = resourceCodec;
+ private static final String RESOURCE_CODEC_ATTRIBUTE_NAME =
+ ResourceHandlerImpl.class.getName() + ":ResourceCodec";
+
+ protected static void setResourceCodec(ResourceCodec codec) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap();
+ Object oldCodec = applicationMap.put(RESOURCE_CODEC_ATTRIBUTE_NAME, codec);
+
+ if (oldCodec != null && codec != null && !oldCodec.equals(codec) &&
+ ProjectStage.Development.equals(facesContext.getApplication().getProjectStage())) {
+
+ //TODO log "codec should be typically set once per application lifetime"
+ }
}
+
+ public static ResourceCodec getResourceCodec(FacesContext context) {
+ Map<String, Object> applicationMap = context.getExternalContext().getApplicationMap();
+ ResourceCodec resourceCodec = (ResourceCodec) applicationMap.get(RESOURCE_CODEC_ATTRIBUTE_NAME);
+ if (resourceCodec == null) {
+ resourceCodec = DefaultResourceCodec.getInstance();
+ }
+ return resourceCodec;
+ }
protected String getResourceKey(FacesContext context) {
String resourceName = Util.decodeResourceURL(context);
@@ -108,7 +124,7 @@
return;
}
- ResourceCodec resourceCodec = getResourceCodec();
+ ResourceCodec resourceCodec = ResourceHandlerImpl.getResourceCodec(context);
String resourceName = resourceCodec.decodeResourceName(resourceKey);
if (resourceName == null) {
sendNotFound(context);
@@ -187,10 +203,6 @@
resource = (Resource) resourceClass.newInstance();
resource.setResourceName(resourceName);
}
-
- if (resource instanceof ResourceCodecAware) {
- ((ResourceCodecAware) resource).setResourceCodec(getResourceCodec());
- }
} catch (ClassNotFoundException e1) {
// TODO Auto-generated catch block
} catch (InstantiationException e1) {
@@ -233,8 +245,4 @@
public boolean libraryExists(String libraryName) {
return defaultHandler.libraryExists(libraryName);
}
-
- protected ResourceCodec getResourceCodec() {
- return codec;
- }
}
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/ResourceImpl.java 2009-07-02 16:14:22 UTC (rev 14772)
@@ -47,7 +47,7 @@
* @author Nick Belaevski
* @since 4.0
*/
-public abstract class ResourceImpl extends Resource implements ResourceCodecAware {
+public abstract class ResourceImpl extends Resource {
public static final String URL_PROTOCOL = "jsfResource";
@@ -57,8 +57,6 @@
private boolean useLocalLastModified = false;
- private ResourceCodec resourceCodec;
-
/**
* @param resourceContext current {@link ResourceContext}
* @return Returns the contentLength.
@@ -153,6 +151,7 @@
}
}
+ ResourceCodec resourceCodec = ResourceHandlerImpl.getResourceCodec(context);
String resourceUri = ResourceHandlerImpl.RICHFACES_RESOURCE_IDENTIFIER +
resourceCodec.encodeResource(getResourceName(), resourceData);
@@ -321,7 +320,4 @@
return userCopyIsStale(context);
}
- public void setResourceCodec(ResourceCodec codec) {
- this.resourceCodec = codec;
- }
}
Modified: branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/TestResource.java
===================================================================
--- branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/TestResource.java 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/java/org/richfaces/resource/TestResource.java 2009-07-02 16:14:22 UTC (rev 14772)
@@ -13,7 +13,6 @@
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
-import org.ajax4jsf.resource.ResourceImpl;
import org.richfaces.VersionBean;
import org.richfaces.VersionBean.Version;
Modified: branches/jsf2.0/framework/impl/src/main/resources/META-INF/resource-handler.faces-config.xml
===================================================================
--- branches/jsf2.0/framework/impl/src/main/resources/META-INF/resource-handler.faces-config.xml 2009-07-02 16:04:40 UTC (rev 14771)
+++ branches/jsf2.0/framework/impl/src/main/resources/META-INF/resource-handler.faces-config.xml 2009-07-02 16:14:22 UTC (rev 14772)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<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">
+ <name>richfaces</name>
+
<application>
<resource-handler>org.richfaces.resource.ResourceHandlerImpl</resource-handler>
</application>
15 years, 6 months
JBoss Rich Faces SVN: r14771 - branches/community/3.3.X/docs/userguide/en/src/main/resources/images.
by richfaces-svn-commits@lists.jboss.org
Author: atsebro
Date: 2009-07-02 12:04:40 -0400 (Thu, 02 Jul 2009)
New Revision: 14771
Added:
branches/community/3.3.X/docs/userguide/en/src/main/resources/images/mediaOutput_init.png
Log:
Added: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/mediaOutput_init.png
===================================================================
(Binary files differ)
Property changes on: branches/community/3.3.X/docs/userguide/en/src/main/resources/images/mediaOutput_init.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 6 months
JBoss Rich Faces SVN: r14770 - in branches/community/3.3.X: cdk/generator/src/main/resources/META-INF/templates/templatecompiler and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2009-07-02 11:29:54 -0400 (Thu, 02 Jul 2009)
New Revision: 14770
Modified:
branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm
branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm
branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-7332
Modified: branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/cdk/generator/src/main/java/org/ajax4jsf/templatecompiler/elements/std/ScriptObjectTemplateElement.java 2009-07-02 15:29:54 UTC (rev 14770)
@@ -25,6 +25,7 @@
import org.ajax4jsf.templatecompiler.builder.CompilationContext;
import org.ajax4jsf.templatecompiler.builder.CompilationException;
+import org.ajax4jsf.templatecompiler.el.ELParser;
import org.ajax4jsf.templatecompiler.elements.A4JRendererElementsFactory;
import org.ajax4jsf.templatecompiler.elements.TemplateElementBase;
import org.apache.velocity.VelocityContext;
@@ -44,6 +45,8 @@
private String variableName;
+ private String base;
+
private static final Class<?> VARIABLE_TYPE = HashMap.class;
public ScriptObjectTemplateElement(final Node element,
@@ -58,6 +61,13 @@
variableName = varNode.getNodeValue();
+ Node baseNode = nnm.getNamedItem("base");
+ if (baseNode != null) {
+ base = ELParser.compileEL(baseNode.getNodeValue(), componentBean);
+ } else {
+ base = "";
+ }
+
try {
this.getComponentBean().addVariable(variableName, VARIABLE_TYPE.getName());
} catch (CompilationException e) {
@@ -76,6 +86,7 @@
VelocityContext context = new VelocityContext();
context.put("variable", this.variableName);
context.put("type", VARIABLE_TYPE.getName().replace('$', '.'));
+ context.put("base", this.base);
return this.getComponentBean().processTemplate(getTemplateName(), context);
}
Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/templatecompiler/scriptObject.vm 2009-07-02 15:29:54 UTC (rev 14770)
@@ -1 +1 @@
-$type $variable = new $type();
\ No newline at end of file
+$type $variable = new $type($base);
\ No newline at end of file
Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/templatecompiler/scriptObject.vm 2009-07-02 15:29:54 UTC (rev 14770)
@@ -1 +1 @@
-$type $variable = new $type();
\ No newline at end of file
+$type $variable = new $type($base);
\ No newline at end of file
Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2009-07-02 15:29:54 UTC (rev 14770)
@@ -54,7 +54,6 @@
import org.ajax4jsf.event.AjaxEvent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.richfaces.component.util.MessageUtil;
import org.richfaces.event.CurrentDateChangeEvent;
import org.richfaces.event.CurrentDateChangeListener;
import org.richfaces.model.CalendarDataModel;
@@ -95,25 +94,10 @@
public static final String COMPONENT_FAMILY = "org.richfaces.Calendar";
/**
- * Default value of "defaultTime" attribute
- */
- private static String DEFAULT_TIME_VALUE = "hours:12,minutes:0";
-
- /**
* Default pattern for defaultTime
*/
private static String DEFAULT_TIME_PATTERN = "HH:mm";
- /**
- * Constant "hours"
- */
- private static String HOURS_VALUE = "hours";
-
- /**
- * Constant "minutes"
- */
- private static String MINUTES_VALUE = "minutes";
-
public static final String AJAX_MODE = "ajax";
public static final String CLIENT_MODE = "client";
@@ -213,6 +197,10 @@
public abstract void setVerticalOffset(int verticalOffset);
+ public abstract int getFirstWeekDay();
+
+ public abstract void setFirstWeekDay(int firstWeekDay);
+
public abstract int getHorizontalOffset();
public abstract void setHorizontalOffset(int horizontalOffset);
@@ -331,34 +319,6 @@
return result;
}
- /**
- * Returns hours and minutes from "defaultTime" attribute as a String
- * with special format:
- * hours:"value_hours",minutes:"value_minutes"
- *
- * @return hours and minutes from "defaultTime" attribute
- */
- public String getPreparedDefaultTime() {
- Date date = getFormattedDefaultTime();
-
- if (date == null) {
- return DEFAULT_TIME_VALUE;
- }
- StringBuilder result = new StringBuilder();
-
- Calendar calendar = getCalendar();
- calendar.setTime(date);
-
- result.append("{").append(HOURS_VALUE).append(":");
- result.append(calendar.get(Calendar.HOUR_OF_DAY));
- result.append(",");
- result.append(MINUTES_VALUE).append(":");
- result.append(calendar.get(Calendar.MINUTE)).append("}");
-
- return result.toString();
-
- }
-
public void updateCurrentDate(FacesContext context, Object currentDate) {
if (context == null) {
@@ -705,6 +665,10 @@
}
}
+ public Locale getAsLocale() {
+ return getAsLocale(getLocale());
+ }
+
public Locale getAsLocale(Object locale) {
if (locale instanceof Locale) {
@@ -730,91 +694,6 @@
}
}
- protected int getDefaultFirstWeekDay() {
- Calendar cal = getCalendar();
- return cal.getFirstDayOfWeek() - cal.getActualMinimum(Calendar.DAY_OF_WEEK);
- }
-
- protected int getDefaultMinDaysInFirstWeek() {
- return getCalendar().getMinimalDaysInFirstWeek();
- }
- /**
- * Gets what the minimal days required in the first week of the year
- are; e.g., if the first week is defined as one that contains the first
- day of the first month of a year, this method returns 1. If the
- minimal days required must be a full week, this method returns 7.
- * Setter for minDaysInFirstWeek
- * @param minDaysInFirstWeek - new value
- */
- public void setMinDaysInFirstWeek( int __minDaysInFirstWeek ){
- this._minDaysInFirstWeek = __minDaysInFirstWeek;
- this._minDaysInFirstWeekSet = true;
- }
-
-
- /**
- * Gets what the minimal days required in the first week of the year
- are; e.g., if the first week is defined as one that contains the first
- day of the first month of a year, this method returns 1. If the
- minimal days required must be a full week, this method returns 7.
- * Getter for minDaysInFirstWeek
- * @return minDaysInFirstWeek value from local variable or value bindings
- */
- public int getMinDaysInFirstWeek( ){
- if(this._minDaysInFirstWeekSet){
- return this._minDaysInFirstWeek;
- }
- ValueExpression ve = getValueExpression("minDaysInFirstWeek");
- if (ve != null) {
- Integer value = (Integer) ve.getValue(getFacesContext().getELContext());
- if (null == value) {
- return getDefaultMinDaysInFirstWeek();
- }
- return (value.intValue());
- } else {
- return getDefaultMinDaysInFirstWeek();
- }
- }
- /**
- * Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.
- * Setter for firstWeekDay
- * @param firstWeekDay - new value
- */
- public void setFirstWeekDay( int __firstWeekDay ){
- this._firstWeekDay = __firstWeekDay;
- this._firstWeekDaySet = true;
- }
-
-
- /**
- * Gets what the first day of the week is; e.g., SUNDAY in the U.S., MONDAY in France.
- * Getter for firstWeekDay
- * @return firstWeekDay value from local variable or value bindings
- */
- public int getFirstWeekDay( ){
- int result;
- if (this._firstWeekDaySet) {
- result = this._firstWeekDay;
- }else{
- ValueExpression ve = getValueExpression("firstWeekDay");
- if (ve != null) {
-
- Integer value = (Integer) ve.getValue(getFacesContext().getELContext());
- result = (value.intValue());
- } else {
- result = getDefaultFirstWeekDay();
- }
- }
- if (result < 0 || result > 6) {
- getFacesContext().getExternalContext()
- .log(result + " value of firstWeekDay attribute is not a legal one for component: "
- + MessageUtil.getLabel(getFacesContext(), this)
- + ". Default value was applied.");
- result = getDefaultFirstWeekDay();
- }
- return result;
- }
-
public Object saveState(FacesContext context) {
return new Object [] {
super.saveState(context),
Modified: branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2009-07-02 15:29:54 UTC (rev 14770)
@@ -28,7 +28,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
@@ -59,6 +59,8 @@
import org.apache.commons.logging.LogFactory;
import org.richfaces.component.UICalendar;
import org.richfaces.component.util.ComponentUtil;
+import org.richfaces.component.util.MessageUtil;
+import org.richfaces.context.RequestContext;
import org.richfaces.event.CurrentDateChangeEvent;
/**
@@ -76,6 +78,16 @@
protected static final String WEEK_DAY_LABELS = "weekDayLabels";
/**
+ * Constant "hours"
+ */
+ private static String HOURS_VALUE = "hours";
+
+ /**
+ * Constant "minutes"
+ */
+ private static String MINUTES_VALUE = "minutes";
+
+ /**
* The constant used to resolve id of hidden input placed on the page
* for storing current date in "MM/yyyy" format.
* Actual id of hidden input used on the page is #{clientId}InputCurrentDate
@@ -88,6 +100,7 @@
public static final String CALENDAR_BUNDLE = "org.richfaces.renderkit.calendar";
+ private static final String LOCALES_KEY = "rich:locales";
private final static Log log = LogFactory
.getLog(CalendarRendererBase.class);
@@ -178,8 +191,24 @@
*
* @return hours and minutes from "defaultTime" attribute
*/
- public String getPreparedDefaultTime(UICalendar calendar) {
- return calendar.getPreparedDefaultTime();
+ public String getPreparedDefaultTime(UICalendar component) {
+ Date date = component.getFormattedDefaultTime();
+ StringBuilder result = new StringBuilder();
+ if (date != null) {
+ Calendar calendar = component.getCalendar();
+ calendar.setTime(date);
+ int hours = calendar.get(Calendar.HOUR_OF_DAY);
+ int minutes = calendar.get(Calendar.MINUTE);
+
+ if (hours != 12 || minutes != 0) {
+ result.append("{").append(HOURS_VALUE).append(":");
+ result.append(hours);
+ result.append(",");
+ result.append(MINUTES_VALUE).append(":");
+ result.append(minutes).append("}");
+ }
+ }
+ return result.toString();
}
/**
@@ -492,23 +521,22 @@
return returnValue;
}
- public void writeSymbols(FacesContext facesContext, UICalendar calendar)
+ public void writeDefaultSymbols(FacesContext facesContext, UICalendar calendar)
throws IOException {
- ResponseWriter writer = facesContext.getResponseWriter();
- Map<String, String[]> symbolsMap = getSymbolsMap(facesContext, calendar);
- Iterator<Map.Entry<String, String[]>> entryIterator = symbolsMap.entrySet().iterator();
- writer.writeText(",\n", null);
- while (entryIterator.hasNext()) {
- Map.Entry<String, String[]> entry = (Map.Entry<String, String[]>) entryIterator.next();
-
- /*writer.writeText(ScriptUtils.toScript(entry.getKey()), null);
- writer.writeText(": ", null);*/
- writer.writeText(ScriptUtils.toScript(entry.getValue()), null);
-
- if (entryIterator.hasNext()) {
- writer.writeText(",\n", null);
- }
+ RequestContext context = RequestContext.getInstance(facesContext);
+ Set<String> locales = (Set<String>)context.getAttribute(LOCALES_KEY);
+ if (locales == null) {
+ locales = new HashSet<String>(1);
+ context.setAttribute(LOCALES_KEY, locales);
}
+ String locale = calendar.getAsLocale().toString();
+ if (!locales.contains(locale)) {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ writer.writeText("Richfaces.Calendar.addLocale('" + locale + "', ", null);
+ writer.writeText(ScriptUtils.toScript(getDefaultSymbolsMap(calendar)), null);
+ writer.writeText(");\n", null);
+ locales.add(locale);
+ }
}
private static String[] shiftDates(int minimum, int maximum, String[] labels) {
@@ -523,10 +551,29 @@
return shiftedLabels;
}
- protected Map<String, String[]> getSymbolsMap(FacesContext facesContext, UICalendar calendar) {
- Map<String, String[]> map = new LinkedHashMap<String, String[]>();
+ protected Map<String, Object> getSymbolsMap(FacesContext facesContext, UICalendar calendar) {
+ Map<String, Object> map = new LinkedHashMap<String, Object>();
+ RendererUtils utils = getUtils();
+ utils.addToScriptHash(map, WEEK_DAY_LABELS, ComponentUtil.asArray(calendar.getWeekDayLabels()));
+ utils.addToScriptHash(map, WEEK_DAY_LABELS_SHORT, ComponentUtil.asArray(calendar.getWeekDayLabelsShort()));
+ utils.addToScriptHash(map, MONTH_LABELS, ComponentUtil.asArray(calendar.getMonthLabels()));
+ utils.addToScriptHash(map, MONTH_LABELS_SHORT, ComponentUtil.asArray(calendar.getMonthLabelsShort()));
+ int day = calendar.getFirstWeekDay();
+ if (0 <= day && day <= 6) {
+ utils.addToScriptHash(map, "firstWeekDay", day);
+ } else if (day != Integer.MIN_VALUE) {
+ facesContext.getExternalContext()
+ .log(day + " value of firstWeekDay attribute is not a legal one for component: "
+ + MessageUtil.getLabel(facesContext, calendar) + ". Default value was applied.");
+ }
- Locale locale = calendar.getAsLocale(calendar.getLocale());
+ return map;
+ }
+
+ protected Map<String, Object> getDefaultSymbolsMap(UICalendar calendar) {
+ Map<String, Object> map = new LinkedHashMap<String, Object>();
+
+ Locale locale = calendar.getAsLocale();
Calendar cal = calendar.getCalendar();
int maximum = cal.getActualMaximum(Calendar.DAY_OF_WEEK);
int minimum = cal.getActualMinimum(Calendar.DAY_OF_WEEK);
@@ -535,52 +582,28 @@
int monthMin = cal.getActualMinimum(Calendar.MONTH);
DateFormatSymbols symbols = new DateFormatSymbols(locale);
- String[] weekDayLabels = ComponentUtil.asArray(calendar
- .getWeekDayLabels());
- if (weekDayLabels == null) {
- weekDayLabels = symbols.getWeekdays();
- weekDayLabels = shiftDates(minimum, maximum, weekDayLabels);
- }
+ String[] weekDayLabels = symbols.getWeekdays();
+ weekDayLabels = shiftDates(minimum, maximum, weekDayLabels);
- String[] weekDayLabelsShort = ComponentUtil.asArray(calendar
- .getWeekDayLabelsShort());
- if (weekDayLabelsShort == null) {
- weekDayLabelsShort = symbols.getShortWeekdays();
- weekDayLabelsShort = shiftDates(minimum, maximum,
- weekDayLabelsShort);
- }
+ String[] weekDayLabelsShort = symbols.getShortWeekdays();
+ weekDayLabelsShort = shiftDates(minimum, maximum, weekDayLabelsShort);
- String[] monthLabels = ComponentUtil.asArray(calendar.getMonthLabels());
- if (monthLabels == null) {
- monthLabels = symbols.getMonths();
- monthLabels = shiftDates(monthMin, monthMax, monthLabels);
- }
+ String[] monthLabels = symbols.getMonths();
+ monthLabels = shiftDates(monthMin, monthMax, monthLabels);
- String[] monthLabelsShort = ComponentUtil.asArray(calendar
- .getMonthLabelsShort());
- if (monthLabelsShort == null) {
- monthLabelsShort = symbols.getShortMonths();
- monthLabelsShort = shiftDates(monthMin, monthMax, monthLabelsShort);
- }
+ String[] monthLabelsShort = symbols.getShortMonths();
+ monthLabelsShort = shiftDates(monthMin, monthMax, monthLabelsShort);
map.put(WEEK_DAY_LABELS, weekDayLabels);
map.put(WEEK_DAY_LABELS_SHORT, weekDayLabelsShort);
map.put(MONTH_LABELS, monthLabels);
map.put(MONTH_LABELS_SHORT, monthLabelsShort);
+ map.put("minDaysInFirstWeek", cal.getMinimalDaysInFirstWeek());
+ map.put("firstWeekDay", cal.getFirstDayOfWeek() - cal.getActualMinimum(Calendar.DAY_OF_WEEK));
return map;
}
- public String getFirstWeekDay(FacesContext context, UICalendar calendar)
- throws IOException {
- return String.valueOf(calendar.getFirstWeekDay());
- }
-
- public String getMinDaysInFirstWeek(FacesContext context,
- UICalendar calendar) throws IOException {
- return String.valueOf(calendar.getMinDaysInFirstWeek());
- }
-
public String getCurrentDateAsString(FacesContext context,
UICalendar calendar, Date date) throws IOException {
Modified: branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-07-02 15:29:54 UTC (rev 14770)
@@ -333,6 +333,12 @@
: ['January','February','March','April','May','June','July','August','September','October','November','December']);
};
+Richfaces.Calendar.addLocale = function (locale, symbols) {
+ if (!Richfaces.Calendar[locale]) {
+ Richfaces.Calendar[locale] = symbols;
+ }
+};
+
/*Richfaces.Calendar.getDefaultWeekDayNames = function(shortNames)
{
return (shortNames
@@ -529,7 +535,7 @@
Calendar = Class.create();
Object.extend(Calendar.prototype, {
- initialize: function(id, defaultTime, minDaysInFirstWeek, firstWeekDay, weekDayLabels, weekDayLabelsShort, monthLabels, monthLabelsShort, options, markups) {
+ initialize: function(id, locale, options, markups) {
// dayListMarkup - day cell markup
// context: {day, date, weekNumber, weekDayNumber, isWeekend, isCurrentMonth, elementId, component}
// weekNumberMarkup - week number cell markup
@@ -585,6 +591,7 @@
this.id = id;
this.params = Object.clone(Richfaces.Calendar.defaultOptions);
+ Object.extend(this.params, Richfaces.Calendar[locale]);
Object.extend(this.params, options);
Object.extend(this.params, markups);
// labels
@@ -595,13 +602,6 @@
if (!value[name]) value[name] = defaultLabels[name];
}
this.params.labels = value;
- this.params.firstWeekDay = firstWeekDay;
- this.params.minDaysInFirstWeek = minDaysInFirstWeek;
- this.params.defaultTime = defaultTime;
- this.params.weekDayLabels = weekDayLabels;
- this.params.weekDayLabelsShort = weekDayLabelsShort;
- this.params.monthLabels = monthLabels;
- this.params.monthLabelsShort = monthLabelsShort;
this.popupOffset = {dx:this.params.horizontalOffset, dy:this.params.verticalOffset};
@@ -2408,7 +2408,8 @@
style: "z-index: 3;",
showApplyButton: false,
selectedDate: null,
- currentDate: null
+ currentDate: null,
+ defaultTime: {hours:12,minutes:0}
};
// must be :defaultTime, minDaysInFirstWeek, firstWeekday, weekDayLabels, weekDayLabelsShort, monthLabels, monthLabelsShort
\ No newline at end of file
Modified: branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2009-07-02 15:13:23 UTC (rev 14769)
+++ branches/community/3.3.X/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2009-07-02 15:29:54 UTC (rev 14770)
@@ -155,8 +155,8 @@
</div>
<div style="display: none;" id="#{clientId}Script">
- <c:scriptObject var="options">
- <c:scriptOption attributes="enableManualInput, disabled, readonly, resetTimeOnDateSelect, showApplyButton, styleClass" />
+ <c:scriptObject var="options" base="#{this:getSymbolsMap(context, component)}">
+ <c:scriptOption attributes="enableManualInput, disabled, readonly, resetTimeOnDateSelect, showApplyButton, styleClass, minDaysInFirstWeek" />
<c:scriptOption attributes="popup" defaultValue="true" />
<c:scriptOption attributes="showInput" defaultValue="true" />
<c:scriptOption attributes="ajaxSingle" defaultValue="true" />
@@ -182,14 +182,12 @@
<c:scriptOption attributes="ondateselected, ondateselect, ontimeselect, ontimeselected, onchanged, ondatemouseover, ondatemouseout, onexpand, oncollapse, oncurrentdateselect, oncurrentdateselected" wrapper="eventHandler" />
<c:scriptOption name="labels" value="#{this:getLabels(context, component)}" />
+ <c:scriptOption name="defaultTime" value="#{this:getPreparedDefaultTime(component)}" />
</c:scriptObject>
<script type="text/javascript">
+ <f:call name="writeDefaultSymbols" />
new Calendar('#{clientId}',
- #{this:getPreparedDefaultTime(component)},
- #{this:getMinDaysInFirstWeek(context, component)},
- #{this:getFirstWeekDay(context, component)}
- <f:call name="writeSymbols" />,
-
+ "#{component.asLocale}",
<c:if test="#{not empty options}">
<f:writeAsScript value="#{options}" />
</c:if>
15 years, 6 months
JBoss Rich Faces SVN: r14769 - branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules.
by richfaces-svn-commits@lists.jboss.org
Author: msorokin
Date: 2009-07-02 11:13:23 -0400 (Thu, 02 Jul 2009)
New Revision: 14769
Modified:
branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml
Log:
https://jira.jboss.org/jira/browse/RF-5768
Data Model and Page flows
Modified: branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml
===================================================================
--- branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml 2009-07-02 13:56:08 UTC (rev 14768)
+++ branches/community/3.3.X/docs/photo_album_app_guide/en/src/main/docbook/modules/overview.xml 2009-07-02 15:13:23 UTC (rev 14769)
@@ -13,6 +13,35 @@
<para>
Work in progress...
</para>
+ <section>
+ <title>Page flows: implementation details</title>
+
+ <para>
+ This section covers how the particular elements that govern page flow are implemented in the application.
+ </para>
+ <section>
+ <title>Registering</title>
+ <para>
+ Registering in is basically the first step a user takes in the application. Have a look at a piece of code from <code>\includes\index\</code>
+ </para>
+
+ <programlisting role="XML"><![CDATA[...
+<h:panelGroup rendered="#{!identity.loggedIn}" styleClass="top-right-bottom-menu-item-link" layout="block">
+ <h:form style="margin: 0px">
+ <a4j:commandLink value="#{messages['login.register']}"actionListener="#{authenticator.goToRegister}" reRender="mainArea" />
+ </h:form>
+</h:panelGroup>
+...]]></programlisting>
+ <para>When the button is hit the <code>goToRegister</code> method is evoked and the <code>START_REGISTER_EVENT</code> is raised. These action display the registration form that is included from <code>\includes\register.xhtml</code>. </para>
+
+
+ <para>The <emphasis role="bold"><property><a4j:commandLink></property></emphasis> displays the link to the registration form and invokes the <code>goToRegister</code> method.
+ </para>
+ <para>When all fields are filled out with correct values the <code>register(user)</code> is triggered and a new user is set. </para>
+ </section>
+
+ </section>
+
</section>
<section id="dataModel">
<title>Data Model</title>
15 years, 6 months
JBoss Rich Faces SVN: r14768 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: ochikvina
Date: 2009-07-02 09:56:08 -0400 (Thu, 02 Jul 2009)
New Revision: 14768
Modified:
branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNode.xml
Log:
https://jira.jboss.org/jira/browse/RF-7445 - adding the .rich-tree-h-ic-img class to style classes table and an example of its usage;
Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNode.xml
===================================================================
--- branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNode.xml 2009-07-02 12:53:10 UTC (rev 14767)
+++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/included/treeNode.xml 2009-07-02 13:56:08 UTC (rev 14768)
@@ -346,6 +346,10 @@
<entry>rich-tree-node-icon</entry>
<entry>Defines styles for a tree node icon</entry>
</row>
+ <row>
+ <entry>rich-tree-h-ic-img</entry>
+ <entry>Defines styles for an image of a tree node</entry>
+ </row>
<row>
<entry>rich-tree-node-icon-leaf</entry>
<entry>Defines styles for a tree node icon leaf</entry>
@@ -386,12 +390,20 @@
</tbody>
</tgroup>
</table>
-
+
<para>In order to redefine the style for all <emphasis role="bold">
<property><rich:treeNode></property>
</emphasis> components on a page using CSS, it's enough to create classes with the
same names and define the necessary properties in them.</para>
+ <para>For instance, if you need to change the size of a tree node image, you should redefine the <code>.rich-tree-h-ic-img</code> class properties:</para>
+ <programlisting role="CSS"><![CDATA[...
+.rich-tree-h-ic-img{
+ width:30px;
+ height:30px;
+}
+...]]></programlisting>
+
<para>To change the style of particular <emphasis role="bold">
<property><rich:treeNode></property>
</emphasis> components define your own style classes in the corresponding <emphasis
15 years, 6 months
JBoss Rich Faces SVN: r14767 - branches/community/3.3.X/ui/assembly.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2009-07-02 08:53:10 -0400 (Thu, 02 Jul 2009)
New Revision: 14767
Modified:
branches/community/3.3.X/ui/assembly/pom.xml
Log:
RF-7397 RF-7443
Modified: branches/community/3.3.X/ui/assembly/pom.xml
===================================================================
--- branches/community/3.3.X/ui/assembly/pom.xml 2009-07-02 11:40:26 UTC (rev 14766)
+++ branches/community/3.3.X/ui/assembly/pom.xml 2009-07-02 12:53:10 UTC (rev 14767)
@@ -195,9 +195,15 @@
${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/combolist-min.js
</include>
<include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceinputstyles-min.js
+ </include>
+ <include>
${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceinput-min.js
</include>
<include>
+ ${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceselectstyles-min.js
+ </include>
+ <include>
${project.build.directory}/compressed/org/richfaces/renderkit/html/scripts/inplaceselectlist-min.js
</include>
<include>
15 years, 6 months
JBoss Rich Faces SVN: r14766 - in branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel: api and 7 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2009-07-02 07:40:26 -0400 (Thu, 02 Jul 2009)
New Revision: 14766
Added:
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/src/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/src/main/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/src/main/java/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/src/test/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/src/test/java/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/src/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/src/main/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/src/main/java/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/src/test/
branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/src/test/java/
Log:
add api/ui modules
Added: branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml (rev 0)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/api/pom.xml 2009-07-02 11:40:26 UTC (rev 14766)
@@ -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}Model-api</artifactId>
+
+</project>
\ No newline at end of file
Added: branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml
===================================================================
--- branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml (rev 0)
+++ branches/sandbox/rf4_build/ui/trunk/components/tree/treeModel/ui/pom.xml 2009-07-02 11:40:26 UTC (rev 14766)
@@ -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>tree</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>${parent.artifactId}Model-ui</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <artifactId>${parent.artifactId}Model-api</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
15 years, 6 months