JBoss Rich Faces SVN: r21993 - in modules/tests/metamer/trunk: ftest and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 14:20:20 -0500 (Mon, 28 Feb 2011)
New Revision: 21993
Modified:
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
tied on release versions - richfaces:4.0.0.20110227-CR1, richfaces-selenium:1.5.2.SP5
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 17:58:27 UTC (rev 21992)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 19:20:20 UTC (rev 21993)
@@ -25,7 +25,7 @@
<parent>
<artifactId>functional-test-jboss-ci-template</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.2.SP5</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 17:58:27 UTC (rev 21992)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 19:20:20 UTC (rev 21993)
@@ -37,7 +37,7 @@
<dependency>
<artifactId>root</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.3-SNAPSHOT</version>
+ <version>1.5.2.SP5</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-28 17:58:27 UTC (rev 21992)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-28 19:20:20 UTC (rev 21993)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110227-CR1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.0.0-SNAPSHOT</version.richfaces>
+ <version.richfaces>4.0.0.20110227-CR1</version.richfaces>
</properties>
<dependencyManagement>
13 years, 11 months
JBoss Rich Faces SVN: r21992 - branches/4.0.X/core/impl/src/main/java/org/richfaces/el.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2011-02-28 12:58:27 -0500 (Mon, 28 Feb 2011)
New Revision: 21992
Modified:
branches/4.0.X/core/impl/src/main/java/org/richfaces/el/CapturingELResolver.java
Log:
https://issues.jboss.org/browse/RF-10637
Modified: branches/4.0.X/core/impl/src/main/java/org/richfaces/el/CapturingELResolver.java
===================================================================
--- branches/4.0.X/core/impl/src/main/java/org/richfaces/el/CapturingELResolver.java 2011-02-28 15:51:43 UTC (rev 21991)
+++ branches/4.0.X/core/impl/src/main/java/org/richfaces/el/CapturingELResolver.java 2011-02-28 17:58:27 UTC (rev 21992)
@@ -38,7 +38,7 @@
@Override
public Object getValue(ELContext context, Object base, Object property) {
- if ((base != null) && (property != null)) {
+ if (property != null) {
this.base = base;
this.property = property;
}
@@ -48,7 +48,7 @@
@Override
public Class<?> getType(ELContext context, Object base, Object property) {
- if ((base != null) && (property != null)) {
+ if (property != null) {
this.base = base;
this.property = property;
}
13 years, 11 months
JBoss Rich Faces SVN: r21991 - branches/4.0.X/examples/richfaces-showcase/src/main/webapp/resources/css.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-02-28 10:51:43 -0500 (Mon, 28 Feb 2011)
New Revision: 21991
Modified:
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/resources/css/application.css
Log:
RF-10539: invisible text for disabled inputtextes is fixed for wine theme
Modified: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/resources/css/application.css
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-28 15:22:22 UTC (rev 21990)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/resources/css/application.css 2011-02-28 15:51:43 UTC (rev 21991)
@@ -247,3 +247,7 @@
.navigation .rf-tab-lbl{
font:normal 12px "Lucida Sans Unicode", "Lucida Grande", Geneva,Verdana,Arial,sans-serif;
}
+
+textarea[disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled] {
+ -webkit-text-fill-color: #B6AD84;
+}
13 years, 11 months
JBoss Rich Faces SVN: r21990 - modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 10:22:22 -0500 (Mon, 28 Feb 2011)
New Revision: 21990
Modified:
modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml
Log:
updated tomcat version to 6.0.29
Modified: modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml
===================================================================
--- modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml 2011-02-28 15:13:22 UTC (rev 21989)
+++ modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml 2011-02-28 15:22:22 UTC (rev 21990)
@@ -379,6 +379,23 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>container-tomcat6x-installation-jboss-ci</id>
+ <activation>
+ <property>
+ <name>containerId</name>
+ <value>tomcat6x</value>
+ </property>
+ </activation>
+ <properties>
+ <jbci.container.version>6.0.29</jbci.container.version>
+ <jbci.container.installer.url.unix>file:/qa/tools/src/apache/apache-tomcat-${jbci.container.version}.zip</jbci.container.installer.url.unix>
+ <jbci.container.installer.url.windows>file:t:\src\apache\apache-tomcat-${jbci.container.version}.zip</jbci.container.installer.url.windows>
+ <jbci.container.dir>apache-tomcat-${jbci.container.version}</jbci.container.dir>
+ <jbci.container.dir.deflatted>${jbci.container.dir}</jbci.container.dir.deflatted>
+ <jbci.container.dir.unflatted>${jbci.container.dir}</jbci.container.dir.unflatted>
+ </properties>
+ </profile>
<profile>
<id>tomcat6x-mojarra</id>
<properties>
13 years, 11 months
JBoss Rich Faces SVN: r21989 - modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 10:13:22 -0500 (Mon, 28 Feb 2011)
New Revision: 21989
Modified:
modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml
Log:
fixed metamer release version
Modified: modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml
===================================================================
--- modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml 2011-02-28 15:12:19 UTC (rev 21988)
+++ modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/ftest/pom.xml 2011-02-28 15:13:22 UTC (rev 21989)
@@ -80,8 +80,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.0.0.20110227-CR1</deployable.version>
- <ftest.source.version>4.0.0.20110227-CR1</ftest.source.version>
+ <deployable.version>4.0.0.20110228-CR1</deployable.version>
+ <ftest.source.version>4.0.0.20110228-CR1</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
<jsf.config>Mojarra-2.0</jsf.config>
13 years, 11 months
JBoss Rich Faces SVN: r21988 - in branches/4.0.X/examples/richfaces-showcase/src/main: java/org/richfaces/demo/togglepanel and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-02-28 10:12:19 -0500 (Mon, 28 Feb 2011)
New Revision: 21988
Added:
branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/togglepanel/
branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/togglepanel/Profile.java
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/finalStep.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard-sample.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep1.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep2.xhtml
branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/wizard.xhtml
Removed:
branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java
branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java
Modified:
branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
Log:
added new "wizard" togglePanel demo.
clean-up for unused DayStatistic class from old graphValidator demo.
Added: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/togglepanel/Profile.java
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/togglepanel/Profile.java (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/togglepanel/Profile.java 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,47 @@
+package org.richfaces.demo.togglepanel;
+
+import java.io.Serializable;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ViewScoped;
+
+@ManagedBean
+@ViewScoped
+public class Profile implements Serializable{
+ private String firstName;
+ private String lastName;
+ private String company;
+ private String notes;
+
+ public String getCompany() {
+ return company;
+ }
+
+ public void setCompany(String company) {
+ this.company = company;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getNotes() {
+ return notes;
+ }
+
+ public void setNotes(String notes) {
+ this.notes = notes;
+ }
+}
Deleted: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java 2011-02-28 15:05:14 UTC (rev 21987)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/DayStatistics.java 2011-02-28 15:12:19 UTC (rev 21988)
@@ -1,59 +0,0 @@
-/**
- *
- */
-package org.richfaces.demo.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-/**
- * @author Ilya Shaikovsky
- *
- */
-@ManagedBean
-@RequestScoped
-public class DayStatistics {
-
- private List<PassTime> dayPasstimes = new ArrayList<PassTime>();
-
- public DayStatistics() {
- dayPasstimes.add(new PassTime("Sport", 0));
- dayPasstimes.add(new PassTime("Entertainment", 0));
- dayPasstimes.add(new PassTime("Sleeping", 0));
- dayPasstimes.add(new PassTime("Games", 0));
- }
-
- public List<PassTime> getDayPasstimes() {
- return dayPasstimes;
- }
-
- public void setDayPasstimes(List<PassTime> dayPasstimes) {
- this.dayPasstimes = dayPasstimes;
- }
-
- @NotNull
- @Min(value = 1, message = "Please fill at list one entry")
- @Max(value = 24, message = "Only 24h in a day!")
- public Integer getTotalTime() {
- Integer result = new Integer(0);
- for (PassTime passtime : dayPasstimes) {
- result += passtime.getTime();
- }
- return result;
- }
-
- public void store(ActionEvent event) {
- FacesContext.getCurrentInstance().addMessage(
- event.getComponent().getClientId(FacesContext.getCurrentInstance()),
- new FacesMessage(FacesMessage.SEVERITY_INFO, "Changes Stored Successfully", "Changes Stored Successfully"));
- }
-}
Deleted: branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java 2011-02-28 15:05:14 UTC (rev 21987)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/java/org/richfaces/demo/validation/PassTime.java 2011-02-28 15:12:19 UTC (rev 21988)
@@ -1,41 +0,0 @@
-package org.richfaces.demo.validation;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.NotEmpty;
-
-public class PassTime {
-
- @NotEmpty
- @Length(max = 15, min = 3)
- private String title;
- @NotNull
- @Min(0)
- @Max(12)
- private Integer time;
-
- public PassTime(String title, Integer time) {
- setTitle(title);
- setTime(time);
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Integer getTime() {
- return time;
- }
-
- public void setTime(Integer time) {
- this.time = time;
- }
-
-}
Modified: branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-02-28 15:05:14 UTC (rev 21987)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -193,14 +193,10 @@
<id>graphValidator</id>
<name>rich:graphValidator</name>
<samples>
- <sample>
+ <sample new="true">
<id>passwordValidation</id>
<name>Password Validation</name>
</sample>
- <sample>
- <id>dayStatisticValidation</id>
- <name>Day pass-times validation</name>
- </sample>
</samples>
</demo>
<demo>
@@ -381,6 +377,10 @@
<id>simple</id>
<name>Simple Toggle Panel</name>
</sample>
+ <sample new="true">
+ <id>wizard</id>
+ <name>Wizard creation</name>
+ </sample>
</samples>
</demo>
<demo>
Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/finalStep.xhtml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/finalStep.xhtml (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/finalStep.xhtml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,27 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <div style="position:relative;height:140px">
+ <h:panelGrid
+ columns="2" columnClasses="wfcol1">
+ <h:outputText value="First Name:" />
+ <h:outputText value="#{profile.firstName}" />
+ <h:outputText value="Last Name:" />
+ <h:outputText value="#{profile.lastName}" />
+ <h:outputText value="Company:" />
+ <h:outputText value="#{profile.company}" />
+ <h:outputText value="Notes:" />
+ <h:outputText value="#{profile.notes}" />
+ </h:panelGrid>
+ <div class="navPanel">
+ <a4j:commandButton value="<<Previous" style="float:left">
+ <rich:toggleControl targetItem="@prev" event="click"/>
+ </a4j:commandButton>
+ </div>
+ </div>
+
+</ui:composition>
Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard-sample.xhtml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard-sample.xhtml (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard-sample.xhtml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <style type="text/css">
+ .col1 { vertical-align:top; }
+ .col2 { vertical-align:top; width:450px; }
+ .wizard { width:400px; }
+ .wform td { vertical-align:top; }
+ .wfcol1 { text-align: right; white-space:nowrap;}
+ .wfcol2 { }
+ .wfcol3 { }
+ .s1row td { height:30px; }
+ .rich-message { color:red; }
+
+ .navPanel {
+ position:absolute;
+ bottom:0;
+ height:23px;
+ margin:0;
+ padding:2px;
+ }
+
+ </style>
+ <br/>
+ <h:panelGrid width="100%" columns="2" columnClasses="col1,col2">
+ <rich:panel styleClass="wizard">
+ <f:facet name="header">
+ <h:outputText value="Using rich:togglePanel for Wizard-like behaviour" />
+ </f:facet>
+ <h:form>
+ <rich:togglePanel switchType="ajax">
+ <rich:togglePanelItem>
+ <ui:include src="/richfaces/togglePanel/samples/wstep1.xhtml" />
+ </rich:togglePanelItem>
+ <rich:togglePanelItem>
+ <ui:include src="/richfaces/togglePanel/samples/wstep2.xhtml" />
+ </rich:togglePanelItem>
+ <rich:togglePanelItem>
+ <ui:include src="/richfaces/togglePanel/samples/finalStep.xhtml" />
+ </rich:togglePanelItem>
+ </rich:togglePanel>
+ </h:form>
+ </rich:panel>
+
+ </h:panelGrid>
+ <br/>
+</ui:composition>
\ No newline at end of file
Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard.xhtml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard.xhtml (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wizard.xhtml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,43 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <style type="text/css">
+ .col1 { vertical-align:top; }
+ .col2 { vertical-align:top; width:450px; }
+ .wizard { width:400px; }
+ .wform td { vertical-align:top; }
+ .wfcol1 { text-align: right; white-space:nowrap;}
+ .wfcol2 { }
+ .wfcol3 { }
+ .s1row td { height:30px; }
+ .rich-message { color:red; }
+
+ .navPanel {
+ position:absolute;
+ bottom:0;
+ height:23px;
+ margin:0;
+ padding:2px;
+ }
+
+ </style>
+ <br/>
+ <h:panelGrid width="100%" columns="2" columnClasses="col1,col2">
+ <a4j:keepAlive beanName="profile" />
+ <rich:panel styleClass="wizard">
+ <f:facet name="header">
+ <h:outputText value="Using a4j:include for Wizard-like behaviour" />
+ </f:facet>
+ <h:form>
+ <a4j:include viewId="/richfaces/include/examples/wstep1.xhtml" />
+ </h:form>
+ </rich:panel>
+
+ </h:panelGrid>
+ <br/>
+
+</ui:composition>
\ No newline at end of file
Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep1.xhtml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep1.xhtml (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep1.xhtml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,28 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <div style="position:relative;height:140px">
+ <h:panelGrid rowClasses="s1row" columns="3" columnClasses="wfcol1,wfcol2,wfcol3">
+ <h:outputText value="First Name:" />
+ <h:inputText id="fn" value="#{profile.firstName}" label="First Name" required="true" />
+ <rich:message for="fn" />
+
+ <h:outputText value="Last Name:" />
+ <h:inputText id="ln" value="#{profile.lastName}" label="Last Name" required="true" />
+ <rich:message for="ln" />
+
+ <h:outputText value="Company:" />
+ <h:inputText id="comp" value="#{profile.company}" label="Company" required="true" />
+ <rich:message for="comp"/>
+ </h:panelGrid>
+ <div class="navPanel" style="width:100%;">
+ <a4j:commandButton style="float:right" value="Next >>">
+ <rich:toggleControl targetItem="@next" event="click"/>
+ </a4j:commandButton>
+ </div>
+ </div>
+</ui:composition>
\ No newline at end of file
Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep2.xhtml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep2.xhtml (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/samples/wstep2.xhtml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,25 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <div style="position:relative;height:140px">
+ <h:panelGrid columns="3" columnClasses="wfcol1,wfcol2,wfcol3">
+ <h:outputText value="Notes:" />
+ <h:inputTextarea cols="20" rows="4" id="notes" value="#{profile.notes}" label="Notes" required="true" />
+ <rich:message for="notes" />
+ </h:panelGrid>
+ <div class="navPanel" style="width:100%;">
+ <a4j:commandButton value="<<Previous" style="float:left">
+ <rich:toggleControl targetItem="@prev" event="click"/>
+ </a4j:commandButton>
+ <a4j:commandButton value="Next >>" style="float:right">
+ <rich:toggleControl targetItem="@next" event="click"/>
+ </a4j:commandButton>
+ </div>
+
+
+ </div>
+</ui:composition>
\ No newline at end of file
Added: branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/wizard.xhtml
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/wizard.xhtml (rev 0)
+++ branches/4.0.X/examples/richfaces-showcase/src/main/webapp/richfaces/togglePanel/wizard.xhtml 2011-02-28 15:12:19 UTC (rev 21988)
@@ -0,0 +1,57 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition>
+ <p>And here is simple wizard example constructed using <b>rich:togglePanel</b>
+ component.</p>
+ <p>Main advantages of using that component for wizard creation:</p>
+ <ul>
+ <li>You're not defining any navigation rules and not managing
+ current page shown in your code. You just inserting
+ <b>rich:togglePanelItem</b> components in needed order and switching between
+ them. Current page could be stored using activeItem additionally.</li>
+ <li>You not bound anywhere in controls to which panel you need to
+ switch. Just the <b>@next</b> and <b>@prev</b> shortcuts used. In that case you
+ could easilly add/remove additional panels without making changes in
+ switching code. Though you still could use names in targetItem in case
+ really need to perform switch to any concrete one. or could use two
+ more shortcuts - <b>@first</b>, <b>@last</b>.</li>
+ <li>Opposite to 3.3.x where toggle controls were encoded as links
+ - in RF 4.x <b>rich:toggleControl</b> is just a behavior so any control could
+ be used for switching.</li>
+ </ul>
+
+ <ui:include src="#{demoNavigator.sampleIncludeURI}" />
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" />
+ <ui:param name="sourceType" value="xhtml" />
+ <ui:param name="openLabel" value="View Source" />
+ <ui:param name="hideLabel" value="Hide Source" />
+ </ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src"
+ value="/richfaces/togglePanel/samples/wstep1.xhtml" />
+ <ui:param name="sourceType" value="xhtml" />
+ <ui:param name="openLabel" value="Show Step 1 Source" />
+ <ui:param name="hideLabel" value="Hide Step 1 Source" />
+ </ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src"
+ value="/richfaces/togglePanel/samples/wstep2.xhtml" />
+ <ui:param name="sourceType" value="xhtml" />
+ <ui:param name="openLabel" value="View Step 2 Source" />
+ <ui:param name="hideLabel" value="Hide Step 2 Source" />
+ </ui:include>
+ <ui:include src="/templates/includes/source-view.xhtml">
+ <ui:param name="src"
+ value="/richfaces/togglePanel/samples/finalStep.xhtml" />
+ <ui:param name="sourceType" value="xhtml" />
+ <ui:param name="openLabel" value="View Final Step Source" />
+ <ui:param name="hideLabel" value="Hide Final Step Source" />
+ </ui:include>
+</ui:composition>
+
+</html>
\ No newline at end of file
13 years, 11 months
JBoss Rich Faces SVN: r21987 - in modules/tests/metamer/trunk: ftest and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 10:05:14 -0500 (Mon, 28 Feb 2011)
New Revision: 21987
Modified:
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
tied back to development versions
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 15:05:14 UTC (rev 21987)
@@ -25,7 +25,7 @@
<parent>
<artifactId>functional-test-jboss-ci-template</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.2.SP5</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -80,8 +80,8 @@
<properties>
<context.path>/metamer/</context.path>
<deployable.classifier>mojarra</deployable.classifier>
- <deployable.version>4.0.0.20110227-CR1</deployable.version>
- <ftest.source.version>4.0.0.20110227-CR1</ftest.source.version>
+ <deployable.version>4.0.0-SNAPSHOT</deployable.version>
+ <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version>
<testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml>
<container.home>target/installs/${container.dir.deflatted}/${container.dir.unflatted}</container.home>
<jsf.config>Mojarra-2.0</jsf.config>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 15:05:14 UTC (rev 21987)
@@ -37,7 +37,7 @@
<dependency>
<artifactId>root</artifactId>
<groupId>org.jboss.test.richfaces-selenium</groupId>
- <version>1.5.2.SP5</version>
+ <version>1.5.3-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-28 15:05:14 UTC (rev 21987)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces.examples</groupId>
<artifactId>richfaces-example-parent</artifactId>
- <version>4.0.0.20110227-CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
@@ -124,7 +124,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<richfaces.checkstyle.version>2</richfaces.checkstyle.version>
- <version.richfaces>4.0.0.20110227-CR1</version.richfaces>
+ <version.richfaces>4.0.0-SNAPSHOT</version.richfaces>
</properties>
<dependencyManagement>
13 years, 11 months
JBoss Rich Faces SVN: r21986 - in modules/tests/metamer/trunk: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 09:56:45 -0500 (Mon, 28 Feb 2011)
New Revision: 21986
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-02-28 14:56:33 UTC (rev 21985)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0.20110228-CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 14:56:33 UTC (rev 21985)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
@@ -30,14 +30,14 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.0.0.20110228-CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
</scm>
<licenses>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 14:56:33 UTC (rev 21985)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0.20110228-CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-28 14:56:33 UTC (rev 21985)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-28 14:56:45 UTC (rev 21986)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0.20110228-CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url>
</scm>
<distributionManagement>
13 years, 11 months
JBoss Rich Faces SVN: r21985 - modules/tests/metamer/tags.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 09:56:33 -0500 (Mon, 28 Feb 2011)
New Revision: 21985
Added:
modules/tests/metamer/tags/metamer-4.0.0.20110228-CR1/
Log:
[maven-scm] copy for tag metamer-4.0.0.20110228-CR1
13 years, 11 months
JBoss Rich Faces SVN: r21984 - in modules/tests/metamer/trunk: application and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2011-02-28 09:56:10 -0500 (Mon, 28 Feb 2011)
New Revision: 21984
Modified:
modules/tests/metamer/trunk/application/pom.xml
modules/tests/metamer/trunk/ftest-source/pom.xml
modules/tests/metamer/trunk/ftest/pom.xml
modules/tests/metamer/trunk/pom.xml
Log:
[maven-release-plugin] prepare release metamer-4.0.0.20110228-CR1
Modified: modules/tests/metamer/trunk/application/pom.xml
===================================================================
--- modules/tests/metamer/trunk/application/pom.xml 2011-02-28 14:51:36 UTC (rev 21983)
+++ modules/tests/metamer/trunk/application/pom.xml 2011-02-28 14:56:10 UTC (rev 21984)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110228-CR1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/ftest/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 14:51:36 UTC (rev 21983)
+++ modules/tests/metamer/trunk/ftest/pom.xml 2011-02-28 14:56:10 UTC (rev 21984)
@@ -30,14 +30,14 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-ftest</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110228-CR1</version>
<name>Metamer: RichFaces Testing Application - Functional Test</name>
<packaging>pom</packaging>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/tr...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk...</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk/ftest</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
</scm>
<licenses>
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 14:51:36 UTC (rev 21983)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2011-02-28 14:56:10 UTC (rev 21984)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110228-CR1</version>
</parent>
<groupId>org.richfaces.tests</groupId>
Modified: modules/tests/metamer/trunk/pom.xml
===================================================================
--- modules/tests/metamer/trunk/pom.xml 2011-02-28 14:51:36 UTC (rev 21983)
+++ modules/tests/metamer/trunk/pom.xml 2011-02-28 14:56:10 UTC (rev 21984)
@@ -31,7 +31,7 @@
<groupId>org.richfaces.tests</groupId>
<artifactId>metamer-root</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.20110228-CR1</version>
<packaging>pom</packaging>
<name>Metamer: RichFaces Testing Application - Project Root</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/modules/tests/metamer/ta...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/modules/tests/metamer/tags/...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/RichFaces/modules/tests/metamer/tags/meta...</url>
</scm>
<distributionManagement>
13 years, 11 months