Author: SergeySmirnov
Date: 2007-08-17 20:53:48 -0400 (Fri, 17 Aug 2007)
New Revision: 2331
Removed:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/effect/source/
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml.l4t
Log:
demo updates
Modified:
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
---
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-18
00:53:12 UTC (rev 2330)
+++
trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-18
00:53:48 UTC (rev 2331)
@@ -55,7 +55,7 @@
loadScript= ajaxResources, Script, /images/ico_common.gif,
/images/cn_Script.gif,
RichFacesComponentsLibrary.html#loadScript,
jbossajax4jsf/freezone/docs/tlddoc/a4j/loadScript.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIResource.html,
/richfaces/script.jsf
loadStyle= ajaxResources, Style, /images/ico_common.gif,
/images/cn_Style.gif,
RichFacesComponentsLibrary.html#loadStyle,
jbossajax4jsf/freezone/docs/tlddoc/a4j/loadStyle.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIResource.html,
/richfaces/style.jsf
keepAlive= ajaxResources, Keep Alive, /images/ico_common.gif,
/images/cn_KeepAlive.gif,
RichFacesComponentsLibrary.html#keepAlive,
jbossajax4jsf/freezone/docs/tlddoc/a4j/keepAlive.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/taglib/html/jsp/KeepAliveTag.html,
/richfaces/keepAlive.jsf
-include= ajaxOutput, Include, /images/ico_common.gif,
/images/cn_Include.gif,
RichFacesComponentsLibrary.html#include,
jbossajax4jsf/freezone/docs/tlddoc/a4j/include.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIInclude.html,
/richfaces/comingSoon.jsf
+include= ajaxOutput, Include, /images/ico_common.gif,
/images/cn_include.gif,
RichFacesComponentsLibrary.html#include,
jbossajax4jsf/freezone/docs/tlddoc/a4j/include.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIInclude.html,
/richfaces/include.jsf
mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif,
/images/cn_MediaOutput.gif,
RichFacesComponentsLibrary.html#mediaOutput,
jbossajax4jsf/freezone/docs/tlddoc/a4j/mediaOutput.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/resource/UIMediaOutput.html,
/richfaces/comingSoon.jsf
outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif,
/images/cn_OutputPanel.gif,
RichFacesComponentsLibrary.html#outputPanel,
jbossajax4jsf/freezone/docs/tlddoc/a4j/outputPanel.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxOutputPanel.html,
/richfaces/outputPanel.jsf
repeat= richDataIterators, Repeat, /images/ico_common.gif,
/images/cn_Repeat.gif,
RichFacesComponentsLibrary.html#repeat,
jbossajax4jsf/freezone/docs/tlddoc/a4j/repeat.html,
jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/repeat/UIRepeat.html,
/richfaces/comingSoon.jsf
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-08-18
00:53:12 UTC (rev 2330)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-08-18
00:53:48 UTC (rev 2331)
@@ -18,6 +18,11 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<managed-bean>
+ <managed-bean-name>profile</managed-bean-name>
+ <managed-bean-class>org.richfaces.demo.wizard.Profile</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>userBean</managed-bean-name>
<managed-bean-class>org.richfaces.demo.ajaxsupport.UserBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
@@ -199,4 +204,30 @@
<managed-bean-class>org.richfaces.demo.extendeddatamodel.AuctionDataProvider</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <navigation-rule>
+ <from-view-id>/richfaces/include/examples/wstep1.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>next</from-outcome>
+ <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/richfaces/include/examples/wstep2.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>previous</from-outcome>
+ <to-view-id>/richfaces/include/examples/wstep1.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>next</from-outcome>
+ <to-view-id>/richfaces/include/examples/finalStep.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/richfaces/include/examples/finalStep.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>previous</from-outcome>
+ <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
</faces-config>
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml.l4t
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-08-18
00:53:12 UTC (rev 2330)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml.l4t 2007-08-18
00:53:48 UTC (rev 2331)
@@ -1,2 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
+<PROCESS ENTITY="JSFProcess">
+ <PROCESS-ITEM ENTITY="JSFProcessGroup"
+ NAME="rules:#richfaces#include#examples#wstep1.xhtml"
+ PATH="/richfaces/include/examples/wstep1.xhtml"
SHAPE="32,17,0,0">
+ <PROCESS-ITEM ENTITY="JSFProcessItem"
+ ID="rules:#richfaces#include#examples#wstep1.xhtml:0" NAME="item"
PATH="/richfaces/include/examples/wstep1.xhtml">
+ <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
+ ID="next::#richfaces#include#examples#wstep2.xhtml"
NAME="output"
+ PATH="/richfaces/include/examples/wstep2.xhtml"
+ TARGET="rules:#richfaces#include#examples#wstep2.xhtml"
TITLE="next"/>
+ </PROCESS-ITEM>
+ </PROCESS-ITEM>
+ <PROCESS-ITEM ENTITY="JSFProcessGroup"
+ NAME="rules:#richfaces#include#examples#wstep2.xhtml"
+ PATH="/richfaces/include/examples/wstep2.xhtml"
SHAPE="256,33,0,0">
+ <PROCESS-ITEM ENTITY="JSFProcessItem"
+ ID="rules:#richfaces#include#examples#wstep2.xhtml:0" NAME="item"
PATH="/richfaces/include/examples/wstep2.xhtml">
+ <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
+ ID="previous::#richfaces#include#examples#wstep1.xhtml"
+ NAME="output" PATH="/richfaces/include/examples/wstep1.xhtml"
+ TARGET="rules:#richfaces#include#examples#wstep1.xhtml"
TITLE="previous"/>
+ <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
+ ID="next::#richfaces#include#examples#finalStep.xhtml"
+ NAME="output1"
PATH="/richfaces/include/examples/finalStep.xhtml"
+ TARGET="rules:#richfaces#include#examples#finalStep.xhtml"
TITLE="next"/>
+ </PROCESS-ITEM>
+ </PROCESS-ITEM>
+ <PROCESS-ITEM ENTITY="JSFProcessGroup"
+ NAME="rules:#richfaces#include#examples#finalStep.xhtml"
+ PATH="/richfaces/include/examples/finalStep.xhtml"
SHAPE="480,17,0,0">
+ <PROCESS-ITEM ENTITY="JSFProcessItem"
+ ID="rules:#richfaces#include#examples#finalStep.xhtml:0"
NAME="item" PATH="/richfaces/include/examples/finalStep.xhtml">
+ <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
+ ID="previous::#richfaces#include#examples#wstep2.xhtml"
+ NAME="output" PATH="/richfaces/include/examples/wstep2.xhtml"
+ TARGET="rules:#richfaces#include#examples#wstep2.xhtml"
TITLE="previous"/>
+ </PROCESS-ITEM>
+ </PROCESS-ITEM>
+</PROCESS>