JBoss Rich Faces SVN: r17036 - root/core/trunk/bom.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 15:19:00 -0400 (Thu, 13 May 2010)
New Revision: 17036
Modified:
root/core/trunk/bom/pom.xml
Log:
Removed unneeded pom import
Modified: root/core/trunk/bom/pom.xml
===================================================================
--- root/core/trunk/bom/pom.xml 2010-05-13 19:02:35 UTC (rev 17035)
+++ root/core/trunk/bom/pom.xml 2010-05-13 19:19:00 UTC (rev 17036)
@@ -47,13 +47,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
- <version>${richfaces.bom.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-bom</artifactId>
<version>${richfaces.commons.version}</version>
14 years, 4 months
JBoss Rich Faces SVN: r17035 - in root/core/trunk: api and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 15:02:35 -0400 (Thu, 13 May 2010)
New Revision: 17035
Added:
root/core/trunk/api/checkstyle-suppressions.xml
Modified:
root/core/trunk/api/pom.xml
root/core/trunk/impl/pom.xml
root/core/trunk/pom.xml
Log:
Updated to fix checkstyle so that it checks core api/impl
Added: root/core/trunk/api/checkstyle-suppressions.xml
===================================================================
--- root/core/trunk/api/checkstyle-suppressions.xml (rev 0)
+++ root/core/trunk/api/checkstyle-suppressions.xml 2010-05-13 19:02:35 UTC (rev 17035)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" />
+ <suppress checks="FallThrough" files="JSMin.java" />
+ <suppress checks="IllegalCatch" files="UISwitchablePanel.java" />
+ <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java" />
+ <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" />
+ <suppress checks="FallThrough" files="StagingServer.java" />
+ <suppress checks="ModifiedControlVariable" files="Cookie.java" />
+ <suppress checks="IllegalCatch" files="CacheManager.java" />
+ <suppress checks="MissingSwitchDefault" files="JSONTokener.java" />
+ <suppress checks="IllegalCatch" files="AjaxViewRoot.java" />
+ <suppress checks="FallThrough" files="XMLTokener.java" />
+ <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" />
+ <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" />
+ <suppress checks="ModifiedControlVariable" files="URLCodec.java" />
+
+ <!-- TODO it is hot fix for building process, this files belong to the test-base module,
+ and must be removed from here -->
+ <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java" />
+</suppressions>
Modified: root/core/trunk/api/pom.xml
===================================================================
--- root/core/trunk/api/pom.xml 2010-05-13 19:00:00 UTC (rev 17034)
+++ root/core/trunk/api/pom.xml 2010-05-13 19:02:35 UTC (rev 17035)
@@ -46,7 +46,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+
<!-- Provided dependencies -->
<dependency>
<groupId>com.sun.faces</groupId>
@@ -86,4 +86,13 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <!-- Trigger checkstyle checking for this module -->
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: root/core/trunk/impl/pom.xml
===================================================================
--- root/core/trunk/impl/pom.xml 2010-05-13 19:00:00 UTC (rev 17034)
+++ root/core/trunk/impl/pom.xml 2010-05-13 19:02:35 UTC (rev 17035)
@@ -143,11 +143,26 @@
</resources>
<plugins>
+ <!-- Trigger checkstyle checking for this module -->
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+
<!--
+ TODO should be in profile not here. The path in profile
+ is correct
+ -->
+ <plugin>
+ <!-- Configure js documentation plugin -->
+ <groupId>gr.abiss.mvn.plugins</groupId>
+ <artifactId>maven-jstools-plugin</artifactId>
+ </plugin>
+
+ <!--
TODO Centralize this because calendar and context menu
use this too
+ Note: This may be removed by redisgn
-->
- <!-- Note: This may be removed by redisgn -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
@@ -161,16 +176,6 @@
</plugin>
<!--
- TODO should be in profile not here. The path in profile
- is correct
- -->
- <plugin>
- <!-- Configure js documentation plugin -->
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- </plugin>
-
- <!--
The following 2 plugins are specific to impl, and
create, process, and document JavaScript resources NOTE:
these are legacy and they and the resources they
Modified: root/core/trunk/pom.xml
===================================================================
--- root/core/trunk/pom.xml 2010-05-13 19:00:00 UTC (rev 17034)
+++ root/core/trunk/pom.xml 2010-05-13 19:02:35 UTC (rev 17035)
@@ -43,17 +43,5 @@
<module>api</module>
<module>impl</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
14 years, 4 months
JBoss Rich Faces SVN: r17034 - root/commons/trunk/api.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 15:00:00 -0400 (Thu, 13 May 2010)
New Revision: 17034
Modified:
root/commons/trunk/api/pom.xml
Log:
Minor updates in module name and comment
Modified: root/commons/trunk/api/pom.xml
===================================================================
--- root/commons/trunk/api/pom.xml 2010-05-13 18:50:56 UTC (rev 17033)
+++ root/commons/trunk/api/pom.xml 2010-05-13 19:00:00 UTC (rev 17034)
@@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.commons</groupId>
<artifactId>richfaces-commons-api</artifactId>
- <name>RichFaces Commons Api</name>
+ <name>RichFaces Commons API</name>
<dependencies>
<!-- Runtime Dependencies -->
@@ -65,6 +65,7 @@
<build>
<plugins>
+ <!-- Trigger checkstyle checking for this module -->
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
14 years, 4 months
JBoss Rich Faces SVN: r17033 - in root/ui-sandbox/tables/trunk/ui/src: test/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-05-13 14:50:56 -0400 (Thu, 13 May 2010)
New Revision: 17033
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js
root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
Log:
small fix
Modified: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-13 18:45:25 UTC (rev 17032)
+++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-05-13 18:50:56 UTC (rev 17033)
@@ -326,22 +326,26 @@
setColumnWidth(id, width);
}
- this.filter = function(id, filterValue, isClear) {
+ this.filter = function(colunmId, filterValue, isClear) {
if (typeof(filterValue) == "undefined" || filterValue == null) {
filterValue = "";
}
- sendAjax(null, {"rich:filterString" : id + ":" + filterValue + ":" + isClear}); // TODO Maybe, event model should be used here.
+ var map = {}
+ map[id + "rich:filtering"] = colunmId + ":" + filterValue + ":" + isClear;
+ sendAjax(null, map); // TODO Maybe, event model should be used here.
}
this.clearFiltering = function() {
this.filter("", "", true);
}
- this.sort = function(id, sortOrder, isClear) {
+ this.sort = function(colunmId, sortOrder, isClear) {
if (typeof(sortOrder) == "string") {
sortOrder = sortOrder.toUpperCase();
}
- sendAjax(null, {"rich:sortString" : id + ":" + sortOrder + ":" + isClear}); // TODO Maybe, event model should be used here.
+ var map = {}
+ map[id + "rich:sorting"] = colunmId + ":" + sortOrder + ":" + isClear;
+ sendAjax(null, map); // TODO Maybe, event model should be used here.
}
this.clearSorting = function() {
Modified: root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-13 18:45:25 UTC (rev 17032)
+++ root/ui-sandbox/tables/trunk/ui/src/test/java/org/richfaces/renderkit/ExtendedDataTableRendererTest.java 2010-05-13 18:50:56 UTC (rev 17033)
@@ -195,7 +195,7 @@
assertNull(column1Attributes.get("filterValue"));
assertEquals("filterValue2", column2Attributes.get("filterValue"));
facesRequest.withParameter(clientId, clientId);
- facesRequest.withParameter("rich:filterString", "column1:filterValue1:null");
+ facesRequest.withParameter(clientId + "rich:filtering", "column1:filterValue1:null");
renderer.doDecode(facesContext, component);
assertEquals("filterValue1", column1Attributes.get("filterValue"));
assertEquals("filterValue2", column2Attributes.get("filterValue"));
@@ -222,7 +222,7 @@
assertNull(column1Attributes.get("filterValue"));
assertEquals("filterValue2", column2Attributes.get("filterValue"));
facesRequest.withParameter(clientId, clientId);
- facesRequest.withParameter("rich:filterString", "column1:filterValue1:true");
+ facesRequest.withParameter(clientId + "rich:filtering", "column1:filterValue1:true");
renderer.doDecode(facesContext, component);
assertEquals("filterValue1", column1Attributes.get("filterValue"));
assertNull(column2Attributes.get("filterValue"));
14 years, 4 months
JBoss Rich Faces SVN: r17032 - root/build/parent/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 14:45:25 -0400 (Thu, 13 May 2010)
New Revision: 17032
Modified:
root/build/parent/trunk/pom.xml
Log:
Updated TODO to moving a plugin
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
+++ root/build/parent/trunk/pom.xml 2010-05-13 18:45:25 UTC (rev 17032)
@@ -220,7 +220,8 @@
</configuration>
</plugin>
- <!-- docs -->
+ <!-- docs
+ TODO should move to profiles probably a "doc" profile-->
<plugin>
<groupId>gr.abiss.mvn.plugins</groupId>
<artifactId>maven-jstools-plugin</artifactId>
14 years, 4 months
JBoss Rich Faces SVN: r17031 - in root/ui-sandbox/tables/trunk: api and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 14:43:07 -0400 (Thu, 13 May 2010)
New Revision: 17031
Added:
root/ui-sandbox/tables/trunk/bom/
root/ui-sandbox/tables/trunk/bom/pom.xml
root/ui-sandbox/tables/trunk/parent/
root/ui-sandbox/tables/trunk/parent/pom.xml
Modified:
root/ui-sandbox/tables/trunk/api/pom.xml
root/ui-sandbox/tables/trunk/impl/pom.xml
root/ui-sandbox/tables/trunk/pom.xml
root/ui-sandbox/tables/trunk/ui/pom.xml
Log:
Tables module: switch to new build structure
Modified: root/ui-sandbox/tables/trunk/api/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/api/pom.xml 2010-05-13 18:42:53 UTC (rev 17030)
+++ root/ui-sandbox/tables/trunk/api/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
@@ -1,20 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
<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.sandbox.ui.components</groupId>
- <artifactId>tables</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-api</artifactId>
- <name>richfaces table api</name>
+ <parent>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
- <dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-api</artifactId>
+ <name>Richfaces UI Components: Tables API</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- runtime -->
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- todo remove this dependency or move to test scope -->
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</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>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: root/ui-sandbox/tables/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/bom/pom.xml (rev 0)
+++ root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <name>Richfaces UI Components: Tables BOM</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-bom</artifactId>
+ <version>${richfaces.core.api.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Modified: root/ui-sandbox/tables/trunk/impl/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/impl/pom.xml 2010-05-13 18:42:53 UTC (rev 17030)
+++ root/ui-sandbox/tables/trunk/impl/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
@@ -1,29 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
<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.sandbox.ui.components</groupId>
- <artifactId>tables</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-impl</artifactId>
- <name>richfaces tables impl</name>
+ <parent>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-impl</artifactId>
+ <name>Richfaces UI Components: Tables Impl</name>
+ <packaging>jar</packaging>
+
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <artifactId>${parent.artifactId}-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-api</artifactId>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</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>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: root/ui-sandbox/tables/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/parent/pom.xml (rev 0)
+++ root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-parent</artifactId>
+ <name>Richfaces UI Components: Tables Parent Module</name>
+ <packaging>pom</packaging>
+
+ <distributionManagement>
+ <downloadUrl>
+ http://labs.jboss.com/portal/jbossrichfaces/downloads
+ </downloadUrl>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <uniqueVersion>false</uniqueVersion>
+ <url>${releaseRepository}</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <uniqueVersion>true</uniqueVersion>
+ <url>${snapshotRepository}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ <configuration>
+ <library>
+ <prefix>org.richfaces</prefix>
+ <taglib>
+ <uri>http://richfaces.org/tables</uri>
+ <shortName>tables</shortName>
+ <displayName>Table components tags</displayName>
+ </taglib>
+ </library>
+ </configuration>
+ <executions>
+ <execution>
+ <id>cdk-generate-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Archetypes dependency -->
+ <dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-4</version>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Modified: root/ui-sandbox/tables/trunk/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/pom.xml 2010-05-13 18:42:53 UTC (rev 17030)
+++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
@@ -1,35 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.richfaces.sandbox.ui</groupId>
- <artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>tables</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>richfaces tables</name>
+ <name>Richfaces UI Components: Tables Aggregator</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
+ <module>bom</module>
+ <module>parent</module>
<module>api</module>
<module>impl</module>
- <module>ui</module>
- </modules>
+ <module>ui</module>
+ </modules>
</project>
\ No newline at end of file
Modified: root/ui-sandbox/tables/trunk/ui/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/ui/pom.xml 2010-05-13 18:42:53 UTC (rev 17030)
+++ root/ui-sandbox/tables/trunk/ui/pom.xml 2010-05-13 18:43:07 UTC (rev 17031)
@@ -1,34 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+
<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.sandbox.ui.components</groupId>
- <artifactId>tables</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-ui</artifactId>
+ <name>Richfaces UI Components: Tables UI</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces.ui-sandbox</groupId>
+ <artifactId>tables-impl</artifactId>
+ </dependency>
+
+ <!-- JSF with dependencies -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</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>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tests -->
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- todo api? -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-test-stage</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>htmlunit-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-ui</artifactId>
- <name>richfaces tables ui</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <artifactId>${parent.artifactId}-api</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <artifactId>${parent.artifactId}-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </dependency>
- </dependencies>
-
</project>
\ No newline at end of file
14 years, 4 months
JBoss Rich Faces SVN: r17030 - root/core/trunk/parent.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 14:42:53 -0400 (Thu, 13 May 2010)
New Revision: 17030
Modified:
root/core/trunk/parent/pom.xml
Log:
Updated styling for xml 4-spaces for tabs
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-13 18:42:00 UTC (rev 17029)
+++ root/core/trunk/parent/pom.xml 2010-05-13 18:42:53 UTC (rev 17030)
@@ -1,3 +1,4 @@
+
<!--
JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
Inc. and individual contributors by the @authors tag. See the
@@ -35,11 +36,11 @@
<description>
The Parent for all RichFaces core sub-projects. This specifies build and project meta-data. Runtime dependencies are imported via the bom.
</description>
-
+
<properties>
<richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version>
</properties>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -49,7 +50,7 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -67,22 +68,23 @@
<version>1.0.3</version>
</dependency>
- <!--
- These dependencies are usually provided by org.jboss.test-jsf:htmlunit-client,
- but the latest 2.7 HtmlUnit version has problems with jQuery, so we are overriding
- version back to 2.5.
- -->
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit-core-js</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
+ <!--
+ These dependencies are usually provided by
+ org.jboss.test-jsf:htmlunit-client, but the latest 2.7
+ HtmlUnit version has problems with jQuery, so we are
+ overriding version back to 2.5.
+ -->
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit-core-js</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.5.2</version>
14 years, 4 months
JBoss Rich Faces SVN: r17029 - root/core/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-13 14:42:00 -0400 (Thu, 13 May 2010)
New Revision: 17029
Modified:
root/core/trunk/pom.xml
Log:
Removed unused reporting element
Modified: root/core/trunk/pom.xml
===================================================================
--- root/core/trunk/pom.xml 2010-05-13 17:28:02 UTC (rev 17028)
+++ root/core/trunk/pom.xml 2010-05-13 18:42:00 UTC (rev 17029)
@@ -55,13 +55,5 @@
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
14 years, 4 months
JBoss Rich Faces SVN: r17028 - in root/examples/core-demo/trunk/src/main: webapp and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 13:28:02 -0400 (Thu, 13 May 2010)
New Revision: 17028
Modified:
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java
root/examples/core-demo/trunk/src/main/webapp/region.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-8639
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java 2010-05-13 17:27:36 UTC (rev 17027)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java 2010-05-13 17:28:02 UTC (rev 17028)
@@ -23,6 +23,7 @@
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
+import javax.faces.event.AjaxBehaviorEvent;
import javax.faces.model.SelectItem;
/**
@@ -49,6 +50,8 @@
private String nestedRegionValue;
+ private String lastExecutedLinkValue;
+
private String getInitialExecuteValue() {
return (String) POSSIBLE_EXECUTE_OPTIONS[POSSIBLE_EXECUTE_OPTIONS.length - 1].getValue();
}
@@ -104,4 +107,12 @@
public void setOuterExecute(String outerExecute) {
this.outerExecute = outerExecute;
}
+
+ public void handleBehavior(AjaxBehaviorEvent event) {
+ lastExecutedLinkValue = (String) event.getComponent().getAttributes().get("value");
+ }
+
+ public String getLastExecutedLinkValue() {
+ return lastExecutedLinkValue;
+ }
}
Modified: root/examples/core-demo/trunk/src/main/webapp/region.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/region.xhtml 2010-05-13 17:27:36 UTC (rev 17027)
+++ root/examples/core-demo/trunk/src/main/webapp/region.xhtml 2010-05-13 17:28:02 UTC (rev 17028)
@@ -46,11 +46,17 @@
<h:commandLink value="Apply" />
</h:form>
- <h:panelGrid columns="2" id="outputValues">
- Outer: <h:outputText value="#{regionBean.outerValue}" />
- Region: <h:outputText value="#{regionBean.regionValue}" />
- Nested region: <h:outputText value="#{regionBean.nestedRegionValue}" />
- </h:panelGrid>
+ <h:panelGroup layout="block" id="outputValues">
+ <h:panelGrid columns="2" >
+ Outer: <h:outputText value="#{regionBean.outerValue}" />
+ Region: <h:outputText value="#{regionBean.regionValue}" />
+ Nested region: <h:outputText value="#{regionBean.nestedRegionValue}" />
+ </h:panelGrid>
+
+ <div>
+ Last executed link value: #{regionBean.lastExecutedLinkValue}
+ </div>
+ </h:panelGroup>
<button type="button" onclick="randomize()">Generate random values</button>
@@ -58,7 +64,7 @@
<h:inputText value="#{regionBean.outerValue}" />
<h:commandLink value="Out of region">
- <a4j:ajax execute="#{regionBean.outerExecute}" render="outputValues" />
+ <a4j:ajax listener="#{regionBean.handleBehavior}" execute="#{regionBean.outerExecute}" render="outputValues" />
</h:commandLink>
<fieldset>
@@ -68,7 +74,7 @@
<h:inputText value="#{regionBean.regionValue}" />
<h:commandLink value="Region">
- <a4j:ajax execute="#{regionBean.execute}" render="outputValues" />
+ <a4j:ajax listener="#{regionBean.handleBehavior}" execute="#{regionBean.execute}" render="outputValues" />
</h:commandLink>
<fieldset>
@@ -78,7 +84,7 @@
<h:inputText value="#{regionBean.nestedRegionValue}" />
<h:commandLink value="Nested region">
- <a4j:ajax execute="#{regionBean.nestedExecute}" render="outputValues" />
+ <a4j:ajax listener="#{regionBean.handleBehavior}" execute="#{regionBean.nestedExecute}" render="outputValues" />
</h:commandLink>
</a4j:region>
14 years, 4 months
JBoss Rich Faces SVN: r17027 - in root/core/trunk: impl/src/main/java/org/richfaces/context and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-13 13:27:36 -0400 (Thu, 13 May 2010)
New Revision: 17027
Modified:
root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java
root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java
root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java
Log:
https://jira.jboss.org/jira/browse/RF-8639
Modified: root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java
===================================================================
--- root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java 2010-05-13 16:54:13 UTC (rev 17026)
+++ root/core/trunk/api/src/main/java/org/richfaces/component/AjaxContainer.java 2010-05-13 17:27:36 UTC (rev 17027)
@@ -21,7 +21,6 @@
*/
package org.richfaces.component;
-import javax.faces.context.PartialViewContext;
/**
* @author Nick Belaevski
@@ -31,5 +30,7 @@
public static final String META_COMPONENT_ID = "region";
- public static final String DEFAULT_RENDER_ID = PartialViewContext.ALL_PARTIAL_PHASE_CLIENT_IDS;
+ public static final String META_CLIENT_ID = MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR + META_COMPONENT_ID;
+
+ public static final String DEFAULT_RENDER_ID = "@this";
}
Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13 16:54:13 UTC (rev 17026)
+++ root/core/trunk/impl/src/main/java/org/richfaces/context/ComponentIdResolver.java 2010-05-13 17:27:36 UTC (rev 17027)
@@ -129,6 +129,11 @@
return metaComponentSubstitutions.get(metaComponentId);
}
+ //used in unit tests
+ static void setMetaComponentSubstitutions(Map<String, String> substitutionsMap) {
+ metaComponentSubstitutions = substitutionsMap;
+ }
+
private String computeClientId(FacesContext context,
UIComponent topMatchComponent, String id) {
Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java 2010-05-13 16:54:13 UTC (rev 17026)
+++ root/core/trunk/impl/src/main/java/org/richfaces/context/ExecuteComponentCallback.java 2010-05-13 17:27:36 UTC (rev 17027)
@@ -24,7 +24,7 @@
import javax.faces.component.UIComponent;
import org.ajax4jsf.component.AjaxClientBehavior;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.richfaces.component.AjaxContainer;
/**
* @author akolonitsky
@@ -33,7 +33,7 @@
class ExecuteComponentCallback extends ComponentCallback {
ExecuteComponentCallback(String behaviorEvent) {
- super(behaviorEvent, AjaxRendererUtils.THIS);
+ super(behaviorEvent, AjaxContainer.META_CLIENT_ID);
}
@Override
Modified: root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java
===================================================================
--- root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java 2010-05-13 16:54:13 UTC (rev 17026)
+++ root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTest.java 2010-05-13 17:27:36 UTC (rev 17027)
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertEquals;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -37,6 +38,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.richfaces.component.MetaComponentResolver;
/**
* @author Nick Belaevski
@@ -44,6 +46,12 @@
*/
public class ComponentIdResolverTest {
+ static final String META_COMPONENT_ID = "testId";
+
+ static final String META_COMPONENT_ID_SUBSTITUTION = "@substitutedTestId";
+
+ private static final String META_CLIENT_ID = MetaComponentResolver.META_COMPONENT_SEPARATOR_CHAR + META_COMPONENT_ID;
+
private FacesEnvironment environment;
private FacesRequest facesRequest;
@@ -54,6 +62,9 @@
@Before
public void setUp() throws Exception {
+ ComponentIdResolver.setMetaComponentSubstitutions(
+ Collections.singletonMap(META_COMPONENT_ID, META_COMPONENT_ID_SUBSTITUTION));
+
environment = FacesEnvironment.createEnvironment();
environment.withResource("/test.xhtml", getClass().getResource(
@@ -197,7 +208,7 @@
@Test
public void testFindViaMetadataResolverInContext() throws Exception {
ComponentIdResolver resolver = createComponentIdResolver();
- resolver.addId("@region");
+ resolver.addId(META_CLIENT_ID);
resolver.resolve(evaluateComponentExpression("#{testBean.outputInRegion}"));
@@ -208,12 +219,12 @@
@Test
public void testFindViaMetadataResolverOutContext() throws Exception {
ComponentIdResolver resolver = createComponentIdResolver();
- resolver.addId("@region");
+ resolver.addId(META_CLIENT_ID);
resolver.resolve(evaluateComponentExpression("#{testBean.outputOutRegion}"));
Set<String> resolvedIds = resolver.getResolvedIds();
- assertEquals(asSet("@all"), resolvedIds);
+ assertEquals(asSet(META_COMPONENT_ID_SUBSTITUTION), resolvedIds);
}
@Test
Modified: root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java
===================================================================
--- root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java 2010-05-13 16:54:13 UTC (rev 17026)
+++ root/core/trunk/impl/src/test/java/org/richfaces/context/ComponentIdResolverTestBean.java 2010-05-13 17:27:36 UTC (rev 17027)
@@ -36,7 +36,7 @@
private static class UIRegion extends UIComponentBase implements MetaComponentResolver {
public String resolveClientId(FacesContext facesContext, UIComponent contextComponent, String metaComponentId) {
- if ("region".equals(metaComponentId)) {
+ if (ComponentIdResolverTest.META_COMPONENT_ID.equals(metaComponentId)) {
return getClientId(facesContext);
}
return null;
14 years, 4 months