JBoss Rich Faces SVN: r3035 - in trunk/test-applications/facelets/src/main: java/calendar and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-21 05:04:24 -0400 (Fri, 21 Sep 2007)
New Revision: 3035
Added:
trunk/test-applications/facelets/src/main/java/rich/
trunk/test-applications/facelets/src/main/java/rich/RichBean.java
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml
Removed:
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
Modified:
trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml
trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
Log:
Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-21 09:04:24 UTC (rev 3035)
@@ -21,7 +21,6 @@
package calendar;
-import java.lang.reflect.Array;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -29,21 +28,17 @@
import java.util.Locale;
import java.util.StringTokenizer;
import java.util.TimeZone;
-
-import javax.faces.component.UIComponent;
import javax.faces.event.ValueChangeEvent;
-import javax.faces.webapp.UIComponentTag;
-
import org.richfaces.event.CurrentDateChangeEvent;
public class CalendarBean {
private static final String [] WEEK_DAY_SHORT = new String[] { "Sun *",
"Mon +", "Tue +", "Wed +", "Thu +", "Fri +", "Sat *" };
- private static final String [] WEEK_DAY = new String[] { "Monday",
- "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday" };
- private static final String [] MOUNT_LABELS = new String[] { "January",
- "February", "March", "April", "May", "June", "July", "August",
+ private static final String [] WEEK_DAY = new String[] { "Monday +",
+ "Tuesday +", "Wednesday +", "Thursday +", "Friday +", "Saturday +", "Sunday +"};
+ private static final String [] MOUNT_LABELS = new String[] { "January +",
+ "February +", "March +", "April +", "May +", "June +", "July +", "August +",
"September", "October", "November", "December" };
private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +",
"Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +",
@@ -76,6 +71,7 @@
private String scrollMode;
private String label;
private String timeZone;
+ private String mode;
private int zindex;
private int counter;
@@ -153,12 +149,14 @@
required = false;
weekDay = "none";
month = "none";
+ mode = "client";
timeZone = "Eastern European Time";
preloadDateRangeBegin = "10.09.2007";
preloadDateRangeEnd = "11.10.2007";
}
public Date getPrDateRangeBegin() {
+ if("ajax".equals(mode)) return null;
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeBegin,".");
ArrayList<Integer> date = new ArrayList<Integer>();
@@ -168,10 +166,10 @@
cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0);
System.out.println(cal.getTime());
return cal.getTime();
-
}
public Date getPrDateRangeEnd() {
+ if("ajax".equals(mode)) return null;
Calendar cal = Calendar.getInstance();
StringTokenizer st = new StringTokenizer(preloadDateRangeEnd, ".");
ArrayList<Integer> date = new ArrayList<Integer>();
@@ -442,4 +440,12 @@
public void setPreloadDateRangeEnd(String preloadDateRangeEnd) {
this.preloadDateRangeEnd = preloadDateRangeEnd;
}
+
+ public String getMode() {
+ return mode;
+ }
+
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
}
Added: trunk/test-applications/facelets/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/rich/RichBean.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2007-09-21 09:04:24 UTC (rev 3035)
@@ -0,0 +1,17 @@
+package rich;
+
+public class RichBean {
+ private String src;
+
+ public RichBean() {
+ src = "/DataFilterSlider/DataFilterSlider.xhtml";
+ }
+
+ public String getSrc() {
+ return src;
+ }
+
+ public void setSrc(String src) {
+ this.src = src;
+ }
+}
Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -54,15 +54,21 @@
scrollMode="#{calendarBean.scrollMode}"
rendered="#{calendarBean.rendered}"
focus="popupModeID"
-
+ mode="#{calendarBean.mode}"
required="#{calendarBean.required}"
requiredMessage="Required Message">
+ <f:facet name="weekDay">
+ <f:verbatim><span style="padding: 2px;" >{weekDayLabel}</span></f:verbatim>
+ </f:facet>
+
<f:facet name="optionalHeader">
<h:outputText value="optionalHeader Facet" />
</f:facet>
+
<f:facet name="optionalFooter">
<h:outputText value="optionalFooter Facet" />
</f:facet>
+
<f:validator validatorId="org.richfaces.CalendarValidator" />
<h:panelGrid columns="2">
@@ -120,7 +126,13 @@
<h:commandButton type="button" value="Select Date"
onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" />
- <h:outputText value="Preload date range begin(d.m.y)" />
+ <h:outputText value="Mode:" />
+ <h:selectOneRadio value="#{calendarBean.mode}" onclick="submit();">
+ <f:selectItem itemLabel="client" itemValue="client"/>
+ <f:selectItem itemLabel="ajax" itemValue="ajax"/>
+ </h:selectOneRadio>
+
+ <h:outputText value="Preload date range begin(d.m.y)" />
<h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/>
<h:outputText value="Preload date range end(d.m.y)" />
Modified: trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/EmptyPage/EmptyPage.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -1,19 +1,18 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html">
- <head>
- <link rel="stylesheet"
- href="#{facesContext.externalContext.requestContextPath}/styles/styles.css"
- type="text/css" />
- </head>
- <f:view>
- <h:form>
- <rich:messages showDetail="true"></rich:messages>
-
- <h:outputText value="#{emptyPage.text}" />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+<head>
+<link rel="stylesheet"
+ href="#{facesContext.externalContext.requestContextPath}/styles/styles.css"
+ type="text/css" />
+</head>
+<f:view>
+ <h:form>
+ <rich:messages showDetail="true"></rich:messages>
- </h:form>
- </f:view>
+ </h:form>
+</f:view>
</html>
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/Rich/RichTest.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -11,7 +11,7 @@
</head>
<body>
<h:form id="richTestID">
- <ui:include src="/Rich/menu.xhtml" />
+ <ui:include src="/rich/menu.xhtml" />
<h:panelGrid columns="2">
<rich:panel>
<f:facet name="header">
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config>
- <managed-bean>
- <managed-bean-name>divBean</managed-bean-name>
- <managed-bean-class>div.DivBean</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-</faces-config>
Deleted: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-EmptyPage.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config>
- <managed-bean>
- <managed-bean-name>emptyPage</managed-bean-name>
- <managed-bean-class>emptyPage.EmptyPage</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-</faces-config>
Copied: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml (from rev 2811, trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml)
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-RichBean.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>richBean</managed-bean-name>
+ <managed-bean-class>rich.RichBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -33,7 +33,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-EmptyPage.xml</param-value>
+ <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -26,7 +26,7 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -20,7 +20,7 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
@@ -56,7 +56,7 @@
<div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1">
<ui:include src="/pages/SelectOneMenuPage.xhtml" />
</div>
- <ui:include src="${divBean.src}" />
+ <ui:include src="${richBean.src}" />
</body>
</f:view>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-21 09:02:19 UTC (rev 3034)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-21 09:04:24 UTC (rev 3035)
@@ -20,7 +20,7 @@
<h:commandLink action="#{skinBean.change}" value="set skin" />
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <h:selectOneMenu value="#{richBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
@@ -53,7 +53,7 @@
</h:panelGrid>
</h:form>
</div>
- <ui:include src="${divBean.src}" />
+ <ui:include src="${richBean.src}" />
</body>
</f:view>
16 years, 8 months
JBoss Rich Faces SVN: r3034 - trunk/test-applications/jsp/src/main/java/div.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-21 05:02:19 -0400 (Fri, 21 Sep 2007)
New Revision: 3034
Removed:
trunk/test-applications/jsp/src/main/java/div/DivBean.java
Log:
Deleted: trunk/test-applications/jsp/src/main/java/div/DivBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-09-21 09:02:13 UTC (rev 3033)
+++ trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-09-21 09:02:19 UTC (rev 3034)
@@ -1,18 +0,0 @@
-package div;
-
-public class DivBean {
-
- private String src;
-
- public DivBean() {
- src = "/Calendar/Calendar.jsp";
- }
-
- public String getSrc() {
- return src;
- }
-
- public void setSrc(String src) {
- this.src = src;
- }
-}
16 years, 8 months
JBoss Rich Faces SVN: r3033 - trunk/test-applications/facelets/src/main/java/div.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-21 05:02:13 -0400 (Fri, 21 Sep 2007)
New Revision: 3033
Removed:
trunk/test-applications/facelets/src/main/java/div/DivBean.java
Log:
Deleted: trunk/test-applications/facelets/src/main/java/div/DivBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/div/DivBean.java 2007-09-21 07:32:50 UTC (rev 3032)
+++ trunk/test-applications/facelets/src/main/java/div/DivBean.java 2007-09-21 09:02:13 UTC (rev 3033)
@@ -1,17 +0,0 @@
-package div;
-
-public class DivBean {
- private String src;
-
- public DivBean() {
- src = "/Calendar/Calendar.xhtml";
- }
-
- public String getSrc() {
- return src;
- }
-
- public void setSrc(String src) {
- this.src = src;
- }
-}
16 years, 8 months
JBoss Rich Faces SVN: r3032 - in trunk/test-applications: qa and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-09-21 03:32:50 -0400 (Fri, 21 Sep 2007)
New Revision: 3032
Added:
trunk/test-applications/qa/
trunk/test-applications/qa/QA test report Build RF3.1.0 RC1.xls
trunk/test-applications/qa/QA test report Build RF3.1.0 RC2.xls
trunk/test-applications/qa/QA test report Build RF3.1.0 RC3.xls
trunk/test-applications/qa/QA test report Build RF3.1.0 RC4.xls
trunk/test-applications/qa/QA test report Build RF3.1.0 RC5.xls
Log:
Copied: trunk/test-applications/qa (from rev 2997, trunk/test-applications/qa)
Copied: trunk/test-applications/qa/QA test report Build RF3.1.0 RC1.xls (from rev 2996, trunk/test-applications/qa/QA test report Build RF3.1.0 RC1.xls)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/qa/QA test report Build RF3.1.0 RC2.xls (from rev 2996, trunk/test-applications/qa/QA test report Build RF3.1.0 RC2.xls)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/qa/QA test report Build RF3.1.0 RC3.xls (from rev 2996, trunk/test-applications/qa/QA test report Build RF3.1.0 RC3.xls)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/qa/QA test report Build RF3.1.0 RC4.xls (from rev 2996, trunk/test-applications/qa/QA test report Build RF3.1.0 RC4.xls)
===================================================================
(Binary files differ)
Copied: trunk/test-applications/qa/QA test report Build RF3.1.0 RC5.xls (from rev 2996, trunk/test-applications/qa/QA test report Build RF3.1.0 RC5.xls)
===================================================================
(Binary files differ)
16 years, 8 months
JBoss Rich Faces SVN: r3031 - trunk/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-09-20 20:30:22 -0400 (Thu, 20 Sep 2007)
New Revision: 3031
Modified:
trunk/samples/pom.xml
Log:
fix Myfaces profile
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-09-20 18:49:55 UTC (rev 3030)
+++ trunk/samples/pom.xml 2007-09-21 00:30:22 UTC (rev 3031)
@@ -1,5 +1,7 @@
<?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/maven-v4_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/maven-v4_0_0.xsd">
<parent>
<artifactId>root</artifactId>
<groupId>org.richfaces</groupId>
@@ -27,7 +29,8 @@
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector
+ implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -374,6 +377,21 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.2.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>${myfaces}</version>
@@ -431,8 +449,8 @@
<module>panelmenu-sample</module>
<module>rich-message-demo</module>
<!--
- <module>scrollableDataTableDemo</module>
- <module>richfaces-ear-demo</module>
- -->
- </modules>
+ <module>scrollableDataTableDemo</module>
+ <module>richfaces-ear-demo</module>
+ -->
+ </modules>
</project>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r3030 - trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-09-20 14:49:55 -0400 (Thu, 20 Sep 2007)
New Revision: 3030
Modified:
trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
Log:
add encodeParams method (RF-949)
Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java
===================================================================
--- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-09-20 17:04:46 UTC (rev 3029)
+++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-09-20 18:49:55 UTC (rev 3030)
@@ -21,6 +21,21 @@
package org.richfaces.renderkit.html;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIParameter;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.PhaseId;
+
+import org.ajax4jsf.Messages;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.ComponentVariables;
import org.ajax4jsf.renderkit.ComponentsVariableResolver;
@@ -29,15 +44,7 @@
import org.richfaces.component.util.ViewUtil;
import org.richfaces.renderkit.CompositeRenderer;
-import javax.faces.component.UIComponent;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.PhaseId;
-import java.io.IOException;
-import java.util.Map;
-
public class MenuItemRendererBase extends CompositeRenderer {
protected Class getComponentClass() {
@@ -77,7 +84,40 @@
}
}
}
-
+ // find and encode UIParameter's components
+ public List encodeParams(FacesContext context, UIMenuItem component) throws IOException {
+
+ UIMenuItem menuItem = component;
+ List params = new ArrayList();
+ StringBuffer buff = new StringBuffer();
+
+ List children = menuItem.getChildren();
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ UIComponent child = (UIComponent) iterator.next();
+
+ if(child instanceof UIParameter){
+
+ UIParameter param = (UIParameter)child;
+ String name = param.getName();
+
+ if (null == name) {
+ throw new IllegalArgumentException(Messages.getMessage(
+ Messages.UNNAMED_PARAMETER_ERROR, component.getClientId(context)));
+ }
+
+ Object value = param.getValue();
+ buff.append("params['");
+ buff.append(name);
+ buff.append("'] = '");
+ buff.append(value);
+ buff.append("';");
+ params.add(buff.toString());
+ }
+ }
+
+ return params;
+ }
+
public void initializeResources(FacesContext context, UIMenuItem menuItem)
throws IOException {
ComponentVariables variables =
@@ -105,11 +145,13 @@
StringBuffer scriptValue = new StringBuffer();
String mode = resolveSubmitMode(menuItem);
+
if (mode.equalsIgnoreCase(MenuComponent.MODE_AJAX)) {
scriptValue.append(AjaxRendererUtils.buildOnClick(
menuItem, context).toString());
} else if (mode.equalsIgnoreCase(MenuComponent.MODE_SERVER)) {
- String id = menuItem.getClientId(context);
+
+ String id = menuItem.getClientId(context);
scriptValue.append('{');
scriptValue.append("var form = A4J.findForm(this);");
scriptValue.append("var params = new Object();");
@@ -118,26 +160,35 @@
scriptValue.append("'] = '");
scriptValue.append(id);
scriptValue.append("';");
+
+ List params = encodeParams(context, menuItem);
+
+ if(!params.isEmpty()){
+ for (Iterator iterator = params.iterator(); iterator.hasNext();) {
+ scriptValue.append((String) iterator.next());
+ }
+ }
+
scriptValue.append("Richfaces.jsFormSubmit('");
scriptValue.append(id);
scriptValue.append("', ");
scriptValue.append("form.id, ");
- Object target = menuItem.getAttributes().get("target");
- if (null != target) {
+ Object target = menuItem.getAttributes().get("target");
+
+ if (null != target) {
scriptValue.append("'"+(String) target+"', ");
- } else {
+ } else {
scriptValue.append("'', ");
}
- scriptValue.append("params);}; return false;");
+ scriptValue.append("params);}; return false;");
} else {
- scriptValue.append(
- getStringAttributeOrEmptyString(menuItem, "onclick"));
+ scriptValue.append(getStringAttributeOrEmptyString(menuItem, "onclick"));
}
if (resource.length() > 0) {
variables.setVariable("onclick", scriptValue.toString());
}
variables.setVariable("menuItemLabelClass", "rich-menu-item-label");
- }
+ }
}
16 years, 8 months
JBoss Rich Faces SVN: r3029 - trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-09-20 13:04:46 -0400 (Thu, 20 Sep 2007)
New Revision: 3029
Modified:
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
Log:
RF-881
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-09-20 16:39:57 UTC (rev 3028)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-09-20 17:04:46 UTC (rev 3029)
@@ -121,7 +121,7 @@
<f:resource f:key="org.richfaces.renderkit.html.images.TreeLineLastImage"/>
</u:style>
</u:selector>
-<u:selector name="p.dr-tree-last-node-marker+* .rich-tree-node-handleicon">
+<u:selector name="p.dr-tree-last-node-marker+*.rich-tree-node-handleicon">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.TreeLineLastImage"/>
</u:style>
16 years, 8 months
JBoss Rich Faces SVN: r3028 - in trunk/ui/scrollableDataTable/src/main: javascript/ClientUI/controls/grid and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-09-20 12:39:57 -0400 (Thu, 20 Sep 2007)
New Revision: 3028
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
Log:
RF-973
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java 2007-09-20 16:34:39 UTC (rev 3027)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java 2007-09-20 16:39:57 UTC (rev 3028)
@@ -68,7 +68,7 @@
String [] selections = stringSelection.split(";");
int length = selections.length;
- if (selections[length-1].length() == 1) {
+ if (selections[length-1].charAt(0) > '9') {
clientSelection.setSelectionFlag(selections[length-1]);
length--;
}
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-20 16:34:39 UTC (rev 3027)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-20 16:39:57 UTC (rev 3028)
@@ -411,7 +411,7 @@
}
if(el) {
- var index = parseInt(el.getAttribute("columnIndex"));
+ var index = parseInt(el.getAttribute("columnindex"));
if(index>=0) {
/*
var dir = this.getColumns()[index].sorted;
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-20 16:34:39 UTC (rev 3027)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-20 16:39:57 UTC (rev 3028)
@@ -12,7 +12,7 @@
component="javax.faces.component.UIComponent"
>
- <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}" sortable="#{component.attributes['sortable']}">
+ <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnindex="#{cell_index}" sortable="#{component.attributes['sortable']}">
<jsp:scriptlet>
16 years, 8 months
JBoss Rich Faces SVN: r3027 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-20 12:34:39 -0400 (Thu, 20 Sep 2007)
New Revision: 3027
Modified:
trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - corrected descriptions for classe, tables names and headers.
Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-09-20 16:34:26 UTC (rev 3026)
+++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-09-20 16:34:39 UTC (rev 3027)
@@ -3,7 +3,7 @@
<sectioninfo>
<keywordset>
<keyword>dragged handle control</keyword>
- <keyword>rich:unputNumberSlider</keyword>
+ <keyword>rich:inputNumberSlider</keyword>
<keyword>HtmlInputNumberSlider</keyword>
</keywordset>
</sectioninfo>
@@ -151,12 +151,16 @@
<property>style classes</property>
</emphasis> used by the inputNumberSlider to your page style sheets</listitem>
</itemizedlist>
+ </section>
+
+ <section>
+ <title>Skin parameters redefinition</title>
<table>
- <title>Skin parameters redefinition:</title>
+ <title>Skin parameters redefinition for a hint</title>
<tgroup cols="2">
<thead>
<row>
- <entry>Skin parameters for a hint</entry>
+ <entry>Skin parameters</entry>
<entry>CSS properties</entry>
</row>
</thead>
@@ -173,7 +177,7 @@
</tgroup>
</table>
<table>
- <title>Parameters for header element:</title>
+ <title>Skin parameters redefinition for a header</title>
<tgroup cols="2">
<thead>
<row>
@@ -191,48 +195,48 @@
</table>
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
+
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
- <title>Custom style classes of inputNumberSlider</title>
+ <title>Style classes</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/slider5.gif"/>
</imageobject>
</mediaobject>
</figure>
- <para>On the screenshot, there are classes names that define specified elements</para>
+
<table>
- <title>Predefined component skin class</title>
+ <title>Classes names that define a component appearance</title>
<tgroup cols="2">
<thead>
<row>
<entry>Class name</entry>
- <entry>Class description</entry>
+ <entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>rich-slider-bound</entry>
- <entry>The class defines panel common style. It's used in the outside <emphasis
- role="bold">
- <property><div></property>
- </emphasis>element</entry>
+ <entry>Defines styles for a wrapper <div> element of the component</entry>
</row>
<row>
<entry>rich-slider-track</entry>
- <entry>a bar to move a pointer</entry>
+ <entry>Defines styles for a bar</entry>
</row>
<row>
<entry>rich-slider-handle</entry>
- <entry>a slider handle</entry>
+ <entry>Defines styles for a slider handle</entry>
</row>
<row>
<entry>rich-slider-input</entry>
- <entry>a text field</entry>
+ <entry>Defines styles for a text field</entry>
</row>
<row>
<entry>rich-slider-tip</entry>
- <entry>a tooltip</entry>
+ <entry>Defines styles for a tooltip</entry>
</row>
</tbody>
</tgroup>
16 years, 8 months
JBoss Rich Faces SVN: r3026 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-09-20 12:34:26 -0400 (Thu, 20 Sep 2007)
New Revision: 3026
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - corrected descriptions for classe, tables names and headers.
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-09-20 16:34:06 UTC (rev 3025)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2007-09-20 16:34:26 UTC (rev 3026)
@@ -112,10 +112,12 @@
</section>
<section>
- <title>Definition custom style classes</title>
+ <title>Definition of Custom Style Classes</title>
+ <para>On the screenshot there are classes names that define styles for component elements.</para>
+
<figure>
- <title>DataOrderedList style classes</title>
+ <title>Style classes</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/dataorderedlist2.gif"/>
@@ -123,25 +125,23 @@
</mediaobject>
</figure>
- <para>On the screenshot there are classes names defining specified elements.</para>
-
<table>
- <title>Component skin class</title>
+ <title>Classes names that define a list appearance</title>
<tgroup cols="2">
<thead>
<row>
<entry>Class name</entry>
- <entry>Class description</entry>
+ <entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry>rich-datalist</entry>
- <entry>Wrapping class for the component</entry>
+ <entry>Defines styles for a wrapping element of the component</entry>
</row>
<row>
<entry>rich-list-item</entry>
- <entry>Customization class for string list</entry>
+ <entry>Defines styles for a list string</entry>
</row>
</tbody>
</tgroup>
16 years, 8 months