JBoss Rich Faces SVN: r10418 - in trunk/ui/beanValidator/src/main/java/org/richfaces: validator and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2008-09-12 05:55:45 -0400 (Fri, 12 Sep 2008)
New Revision: 10418
Modified:
trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java
trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
Log:
Fix RF-4451 bug
Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java
===================================================================
--- trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java 2008-09-11 18:01:12 UTC (rev 10417)
+++ trunk/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java 2008-09-12 09:55:45 UTC (rev 10418)
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -18,6 +19,7 @@
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIInput;
import javax.faces.component.UIMessage;
+import javax.faces.component.UIMessages;
import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
@@ -45,6 +47,7 @@
public static final String COMPONENT_FAMILY = "org.richfaces.BeanValidator";
public static final String BEAN_VALIDATOR_FACET = "org.richfaces.validator.";
+
@Override
public void setParent(UIComponent parent) {
@@ -122,8 +125,8 @@
public void encodeAjax(FacesContext context) throws IOException {
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
Set<String> renderedAreas = ajaxContext.getAjaxRenderedAreas();
- List<UIMessage> messages = getMessages(context);
- for (UIMessage message : messages) {
+ List<UIComponent> allMessages = getMessages(context);
+ for (UIComponent message : allMessages) {
if (message.isRendered()) {
message.encodeAll(context);
renderedAreas.add(message.getClientId(context));
@@ -133,8 +136,8 @@
AjaxRendererUtils.encodeAreas(context, this);
}
- public List<UIMessage> getMessages(FacesContext context) {
- ArrayList<UIMessage> messages = new ArrayList<UIMessage>();
+ public List<UIComponent> getMessages(FacesContext context) {
+ ArrayList<UIComponent> messages = new ArrayList<UIComponent>();
UIComponent form = AjaxRendererUtils.getNestingForm(this);
if (null == form) {
form = context.getViewRoot();
@@ -149,19 +152,22 @@
* @param component
* @param messages
*/
- protected void findMessages(UIComponent component, ArrayList<UIMessage> messages) {
+ protected void findMessages(UIComponent component, ArrayList<UIComponent> messages) {
// TODO create more intellectual search, symmenric for an UIMessage
// algoritm.
Iterator<UIComponent> facetsAndChildren = component.getFacetsAndChildren();
while (facetsAndChildren.hasNext()) {
UIComponent child = (UIComponent) facetsAndChildren.next();
- if (child instanceof UIMessage) {
- UIMessage message = (UIMessage) child;
- String messageFor = message.getFor();
+ if (child instanceof UIMessage || child instanceof UIMessages) {
+ UIComponent message = (UIComponent) child;
+ Object messag = message.getAttributes().get("for");
+ String messageFor = messag != null ? messag.toString() : null ;
+
if (null != messageFor && messageFor.equals(getParent().getId())) {
messages.add(message);
}
- } else {
+ }
+ else {
findMessages(child, messages);
}
}
Modified: trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
===================================================================
--- trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2008-09-11 18:01:12 UTC (rev 10417)
+++ trunk/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2008-09-12 09:55:45 UTC (rev 10418)
@@ -83,8 +83,10 @@
// send all validation messages.
for (String msg : messages) {
// TODO - create Summary message ?
+ String summaryString = getSummary()!=null?getSummary():msg;
+
context.addMessage(component.getClientId(context), new FacesMessage(
- FacesMessage.SEVERITY_ERROR, getSummary(), msg));
+ FacesMessage.SEVERITY_ERROR, summaryString , msg));
}
}
}
16 years, 3 months
JBoss Rich Faces SVN: r10417 - in trunk: docs and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-11 14:01:12 -0400 (Thu, 11 Sep 2008)
New Revision: 10417
Modified:
trunk/deployRelease.sh
trunk/docs/pom.xml
trunk/markRelease.sh
trunk/prepareRelease.sh
Log:
https://jira.jboss.org/jira/browse/RF-4456
Modified: trunk/deployRelease.sh
===================================================================
--- trunk/deployRelease.sh 2008-09-11 15:31:11 UTC (rev 10416)
+++ trunk/deployRelease.sh 2008-09-11 18:01:12 UTC (rev 10417)
@@ -1,26 +1,26 @@
PROJECT_DIR=`pwd`
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy -N
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy -N
cd $PROJECT_DIR/cdk
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/framework
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/ui
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy -N
-mvn -s ~/.m2t/settings.xml -P local,release clean install
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy -N
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean install
cd $PROJECT_DIR/docs
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/ui/assembly
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/extensions
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/samples
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy -N
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy -N
cd $PROJECT_DIR/samples/laguna
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/samples/glassX
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/samples/darkX
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
cd $PROJECT_DIR/samples/richfaces-demo
-mvn -s ~/.m2t/settings.xml -P local,release clean deploy
+mvn -s ~/.m2t/settings.xml -P local,docs,release clean deploy
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2008-09-11 15:31:11 UTC (rev 10416)
+++ trunk/docs/pom.xml 2008-09-11 18:01:12 UTC (rev 10417)
@@ -53,20 +53,25 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>highlight</module>
+ <module>xslt</module>
+ <!--
+ <module>docbook</module>
+ <module>maven-docbook-plugin</module>
+ -->
+ <module>userguide</module>
+ <module>cdkguide</module>
+ <module>faq</module>
+ <module>migrationguide</module>
- <modules>
- <module>highlight</module>
- <module>xslt</module>
- <!--
- <module>docbook</module>
- <module>maven-docbook-plugin</module>
- -->
- <module>userguide</module>
- <module>cdkguide</module>
- <module>faq</module>
- <module>migrationguide</module>
+ </modules>
+ </profile>
+ </profiles>
- </modules>
<build>
<pluginManagement>
<plugins>
Modified: trunk/markRelease.sh
===================================================================
--- trunk/markRelease.sh 2008-09-11 15:31:11 UTC (rev 10416)
+++ trunk/markRelease.sh 2008-09-11 18:01:12 UTC (rev 10417)
@@ -1,7 +1,7 @@
#!/bin/sh
mvn scm:checkout -DconnectionType=developerConnection
cd target/checkout
-mvn release:branch -DdryRun=true -DautoVersionSubmodules=true \
+mvn release:branch -P docs -DdryRun=true -DautoVersionSubmodules=true \
-DbranchName=$1 -DupdateBranchVersions=true \
-DupdateVersionsToSnapshot=false \
-DupdateWorkingCopyVersions=false \
Modified: trunk/prepareRelease.sh
===================================================================
--- trunk/prepareRelease.sh 2008-09-11 15:31:11 UTC (rev 10416)
+++ trunk/prepareRelease.sh 2008-09-11 18:01:12 UTC (rev 10417)
@@ -1,8 +1,8 @@
#!/bin/sh
mvn scm:checkout -DconnectionType=developerConnection
cd target/checkout
-mvn release:prepare -P release -DautoVersionSubmodules=true \
- -Darguments="-P release" \
+mvn release:prepare -P docs,release -DautoVersionSubmodules=true \
+ -Darguments="-P docs,release" \
-Dtag=$1 -DpreparationGoals="install" \
-DtagBase=https://svn.jboss.org/repos/richfaces/tags <<-EOF
$1
16 years, 3 months
JBoss Rich Faces SVN: r10416 - trunk/test-applications/jsp/src/main/java/dataScroller.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-11 11:31:11 -0400 (Thu, 11 Sep 2008)
New Revision: 10416
Modified:
trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
Log:
Correct data for filtering testing.
Modified: trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-09-11 15:24:56 UTC (rev 10415)
+++ trunk/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2008-09-11 15:31:11 UTC (rev 10416)
@@ -1,6 +1,7 @@
package dataScroller;
import java.util.ArrayList;
+import java.util.Random;
import javax.faces.event.ActionEvent;
@@ -138,13 +139,13 @@
sortMode = "single";
sortOrder = Ordering.ASCENDING;
selfSorted = true;
- currentSortOrder = "ASCENDING";
-
+ currentSortOrder = "ASCENDING";
dataTable = new ArrayList();
for(int i=0;i<1000;i++)
{
- dataTable.add(new Data("Random",i));
+
+ dataTable.add(new Data(Data.Random(6),i));
}
}
16 years, 3 months
JBoss Rich Faces SVN: r10415 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-09-11 11:24:56 -0400 (Thu, 11 Sep 2008)
New Revision: 10415
Modified:
trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
Log:
https://jira.jboss.org/jira/browse/RF-2613 -APIs are market as implemented
Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-09-11 15:21:31 UTC (rev 10414)
+++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-09-11 15:24:56 UTC (rev 10415)
@@ -431,20 +431,20 @@
</row>
<!--List managing API -->
<row>
- <entry role="tbi">up()</entry>
- <entry role="tbi">Moves up selected item in the list (to be implemented)</entry>
+ <entry>up()</entry>
+ <entry>Moves up selected item in the list</entry>
</row>
<row>
- <entry role="tbi">down()</entry>
- <entry role="tbi">Moves down selected item in the list (to be implemented)</entry>
+ <entry>down()</entry>
+ <entry>Moves down selected item in the list</entry>
</row>
<row>
- <entry role="tbi">top()</entry>
- <entry role="tbi">Moves top selected item in the list (to be implemented)</entry>
+ <entry>top()</entry>
+ <entry>Moves top selected item in the list</entry>
</row>
<row>
- <entry role="tbi">bottom()</entry>
- <entry role="tbi">Moves bottom selected item in the list (to be implemented)</entry>
+ <entry>bottom()</entry>
+ <entry>Moves bottom selected item in the list</entry>
</row>
<row>
<entry>copy()</entry>
16 years, 3 months
JBoss Rich Faces SVN: r10414 - trunk/test-applications/jsp/src/main/webapp/DataOrderedList.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-11 11:21:31 -0400 (Thu, 11 Sep 2008)
New Revision: 10414
Modified:
trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp
Log:
headerClass & footerClass attributes was removed.
Modified: trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2008-09-11 13:34:21 UTC (rev 10413)
+++ trunk/test-applications/jsp/src/main/webapp/DataOrderedList/DataOrderedList.jsp 2008-09-11 15:21:31 UTC (rev 10414)
@@ -5,11 +5,11 @@
<f:subview id="dataOrderedListSubviewID">
<rich:dataOrderedList id="doListID" binding="#{dataOrderedList.htmlDataOrderedList}" value="#{dataOrderedList.arr}" var="arr" first="#{dataOrderedList.first}"
- rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}"
+ rendered="#{dataOrderedList.rendered}" title="#{dataOrderedList.title}" type="#{dataOrderedList.type}" dir="#{dataOrderedList.dir}"
rows="#{dataOrderedList.rows}"
- footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" style="#{style.style}" styleClass="#{style.styleClass}" >
+ rowClasses="#{style.rowClasses}" style="#{style.style}" styleClass="#{style.styleClass}" >
<f:facet name="header">
- <h:outputText value="Africa(header):" />
+ <h:outputText value="Africa(header):" />
</f:facet>
<h:outputText value="#{arr.str0} " />
<h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
16 years, 3 months
JBoss Rich Faces SVN: r10413 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-11 09:34:21 -0400 (Thu, 11 Sep 2008)
New Revision: 10413
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
Log:
Bundle resource correction.
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2008-09-11 12:39:48 UTC (rev 10412)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2008-09-11 13:34:21 UTC (rev 10413)
@@ -22,6 +22,13 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
+ <from-view-id>/CustomizePage/first.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>next</from-outcome>
+ <to-view-id>/CustomizePage/second.jsp</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
<from-view-id>*</from-view-id>
<navigation-case>
<from-outcome>main</from-outcome>
@@ -31,9 +38,10 @@
<application>
<locale-config>
<default-locale>en</default-locale>
- </locale-config>
+ <supported-locale>de</supported-locale>
+ </locale-config>
</application>
- <lifecycle>
+ <lifecycle>
<phase-listener id="phaseTracker">util.phaseTracker.PhaseTracker</phase-listener>
</lifecycle>
</faces-config>
16 years, 3 months
JBoss Rich Faces SVN: r10412 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-11 08:39:48 -0400 (Thu, 11 Sep 2008)
New Revision: 10412
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
Log:
-GekkoDateConverter
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2008-09-11 12:37:17 UTC (rev 10411)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2008-09-11 12:39:48 UTC (rev 10412)
@@ -31,5 +31,5 @@
<converter>
<converter-id>dateValueConverter</converter-id>
<converter-class>util.converter.DateValueConverter</converter-class>
- </converter>
+ </converter>
</faces-config>
16 years, 3 months
JBoss Rich Faces SVN: r10411 - trunk/test-applications/jsp/src/main/java/calendar.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-11 08:37:17 -0400 (Thu, 11 Sep 2008)
New Revision: 10411
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
Log:
-GekkoDate custom component.
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-09-11 12:36:02 UTC (rev 10410)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-09-11 12:37:17 UTC (rev 10411)
@@ -101,19 +101,8 @@
private boolean resetTimeOnDateSelect;
private String defaultTime;
private boolean ignoreDupResponses;
- private HtmlCalendar htmlCalendar = null;
- private GekkoDate myCustomDate;
+ private HtmlCalendar htmlCalendar = null;
- public GekkoDate getMyCustomDate() {
- return myCustomDate;
- }
-
-
- public void setMyCustomDate(GekkoDate myCustomDate) {
- this.myCustomDate = myCustomDate;
- }
-
-
public HtmlCalendar getHtmlCalendar() {
return htmlCalendar;
}
16 years, 3 months
JBoss Rich Faces SVN: r10410 - trunk/test-applications/jsp/src/main/java/calendar.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-09-11 08:36:02 -0400 (Thu, 11 Sep 2008)
New Revision: 10410
Modified:
trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
Log:
Modified: trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-09-11 12:31:47 UTC (rev 10409)
+++ trunk/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2008-09-11 12:36:02 UTC (rev 10410)
@@ -102,7 +102,18 @@
private String defaultTime;
private boolean ignoreDupResponses;
private HtmlCalendar htmlCalendar = null;
+ private GekkoDate myCustomDate;
+ public GekkoDate getMyCustomDate() {
+ return myCustomDate;
+ }
+
+
+ public void setMyCustomDate(GekkoDate myCustomDate) {
+ this.myCustomDate = myCustomDate;
+ }
+
+
public HtmlCalendar getHtmlCalendar() {
return htmlCalendar;
}
@@ -218,7 +229,7 @@
timeZone = "Eastern European Time";
preloadDateRangeBegin = "11.11.2007"; //d.m.y
preloadDateRangeEnd = "01.01.2008";
- ignoreDupResponses = true;
+ ignoreDupResponses = true;
}
16 years, 3 months
JBoss Rich Faces SVN: r10409 - trunk/ui/modal-panel/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-09-11 08:31:47 -0400 (Thu, 11 Sep 2008)
New Revision: 10409
Modified:
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-4295
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-09-10 19:59:42 UTC (rev 10408)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-09-11 12:31:47 UTC (rev 10409)
@@ -205,12 +205,9 @@
<classname>boolean</classname>
<defaultvalue>false</defaultvalue>
</property>
- <property>
+ <property hidden="true">
<name>validatorMessage</name>
<classname>java.lang.String</classname>
- <description> A ValueExpression enabled attribute that, if present, will be used as the
- text of the validator message, replacing any message that comes from the validator
- </description>
</property>
<property hidden="true">
<name>converterMessage</name>
@@ -284,7 +281,14 @@
<name>converter</name>
<classname>javax.faces.convert.Converter</classname>
</property>
-
+ <property exist="false" existintag="false" hidden="true" >
+ <name>value</name>
+ <classname>java.lang.Object</classname>
+ </property>
+ <property exist="false" existintag="false" hidden="true" >
+ <name>validator</name>
+ <classname>javax.faces.validator.Validator</classname>
+ </property>
<property>
<name>trimOverlayedElements</name>
<classname>boolean</classname>
16 years, 3 months