You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2008/09/26 22:48:53 UTC
svn commit: r699497 - in /myfaces/trinidad/trunk_1.2.x: ./
trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/
trinidad-examples/trinidad-demo/src/main/webapp/components/
trinidad-examples/trinidad-demo/src/main/webapp/demos/
trinidad-examples/tri...
Author: arobinson74
Date: Fri Sep 26 13:48:53 2008
New Revision: 699497
URL: http://svn.apache.org/viewvc?rev=699497&view=rev
Log:
Merge of revision 699496 for bug TRINIDAD-1086
Modified:
myfaces/trinidad/trunk_1.2.x/ (props changed)
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/tree.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/treeTable.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/trunk_1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 13:48:53 2008
@@ -1 +1 @@
-/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406
+/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=699497&r1=699496&r2=699497&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml Fri Sep 26 13:48:53 2008
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<!DOCTYPE faces-config PUBLIC
"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
@@ -64,7 +64,7 @@
<supported-locale>zh_CN</supported-locale>
<supported-locale>zh_TW</supported-locale>
</locale-config>
-
+
</application>
<component>
<component-type>org.apache.myfaces.trinidaddemo.DateField</component-type>
@@ -89,7 +89,7 @@
<validator-id>org.apache.myfaces.trinidaddemo.PasswordValidator</validator-id>
<validator-class>org.apache.myfaces.trinidaddemo.convertValidate.PasswordValidator</validator-class>
</validator>
-
+
<!-- Global preferences object that proxies to others -->
<managed-bean>
<managed-bean-name>prefs</managed-bean-name>
@@ -110,7 +110,7 @@
application
</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>dateRestrictionValidator</managed-bean-name>
<managed-bean-class>
@@ -172,7 +172,7 @@
session
</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>fileDownload</managed-bean-name>
<managed-bean-class>
@@ -263,13 +263,13 @@
</managed-bean>
- <!--managed-bean>
+ <managed-bean>
<managed-bean-name>data2</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.DataBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
- </managed-bean-->
-
-
+ </managed-bean>
+
+
<!-- processChoiceBar Demo start -->
<managed-bean>
<managed-bean-name>processChoiceBarPageList</managed-bean-name>
@@ -298,7 +298,7 @@
</managed-property>
<managed-property>
<property-name>wrappedData</property-name>
- <value>#{processChoiceBarPageList}</value>
+ <value>#{processChoiceBarPageList}</value>
</managed-property>
</managed-bean>
@@ -405,9 +405,8 @@
</managed-property>
<managed-property>
<property-name>wrappedData</property-name>
- <value>#{processTrainTree}</value>
+ <value>#{processTrainTree}</value>
</managed-property>
- <!-- to see the plusOne version of this working, comment below -->
<managed-property>
<property-name>maxPathKey</property-name>
<value>TRAIN_DEMO_MAX_PATH_KEY</value>
@@ -422,7 +421,7 @@
<managed-property>
<property-name>viewId</property-name>
<value>/components/train.jspx</value>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>outcome</property-name>
<value>guide.train</value>
@@ -481,7 +480,7 @@
<managed-property>
<property-name>label</property-name>
<value>Fourth Step</value>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>children</property-name>
<list-entries>
@@ -490,7 +489,7 @@
<value>#{processTrain4b}</value>
<value>#{processTrain4c}</value>
</list-entries>
- </managed-property>
+ </managed-property>
</managed-bean>
<managed-bean>
<managed-bean-name>processTrain4a</managed-bean-name>
@@ -718,7 +717,7 @@
</managed-bean>
<managed-bean>
- <managed-bean-name>tree</managed-bean-name>
+ <managed-bean-name>demoTree</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.TreeModelAdapter</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
@@ -779,21 +778,19 @@
<managed-bean-class>org.apache.myfaces.trinidaddemo.ClientValidationBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>converterValidator</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.ConverterValidatorBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>messageCustomization</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.CustomMessageConvertValidateBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
-
<!-- BEGIN component tree -->
<managed-bean>
<managed-bean-name>componentTreeBean</managed-bean-name>
@@ -816,7 +813,7 @@
<value>group.jspx</value>
<value>inputFile.jspx</value>
<value>inputHidden.jspx</value>
- <value>inputNumberSpinbox.jspx</value>
+ <value>inputNumberSpinbox.jspx</value>
<value>inputText.jspx</value>
<value>iterator.jspx</value>
<value>message.jspx</value>
@@ -923,40 +920,40 @@
</managed-bean>
<!-- START menuModel/Page component demo -->
-
-
+
+
<!--
This demo shows how much can be defined declaritively, a real application
does not need to use a managed bean to define each item.
-
+
This is a visual representation of the data tree being built below
-
+
a1 a2 a3 a4
- / \ / \
- a1b1 a1b2 a2b1 a2b2
- / \ / \
- a1b1c1 a1b1c2 a1b2c1 a1b2c2
+ / \ / \
+ a1b1 a1b2 a2b1 a2b2
+ / \ / \
+ a1b1c1 a1b1c2 a1b2c1 a1b2c2
| |
a1b1c1d1 a1b1c2d1
-
+
To add a new page you need to:
- - stop the servlet engine
- - create a new .jspx page
- - In faces-config.xml
- - add a navigation case for the new page
- - using the managed bean facility create a node to add to the menuModel
+ - stop the servlet engine
+ - create a new .jspx page
+ - In faces-config.xml
+ - add a navigation case for the new page
+ - using the managed bean facility create a node to add to the menuModel
- either attach the node created above to a parent node or add it as a root node
-
+
-->
-
-
+
+
<!-- create the menuModel nodes -->
-
+
<managed-bean>
<managed-bean-name>navItem_a1b1c1d1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a1b1c1d1</value>
@@ -969,12 +966,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1b1c1d1</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a1b1c2d1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a1b1c2d1</value>
@@ -987,19 +984,19 @@
<property-name>outcome</property-name>
<value>guide.page_a1b1c2d1</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a1b1c1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>children</property-name>
<list-entries>
<value-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</value-class>
<value>#{navItem_a1b1c1d1}</value>
</list-entries>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>label</property-name>
<value>a1b1c1</value>
@@ -1012,19 +1009,19 @@
<property-name>outcome</property-name>
<value>guide.page_a1b1c1</value>
</managed-property>
- </managed-bean>
+ </managed-bean>
<managed-bean>
<managed-bean-name>navItem_a1b1c2</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>children</property-name>
<list-entries>
<value-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</value-class>
<value>#{navItem_a1b1c2d1}</value>
</list-entries>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>label</property-name>
<value>a1b1c2</value>
@@ -1037,12 +1034,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1b1c2</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a1b2c1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a1b2c1</value>
@@ -1055,12 +1052,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1b2c1</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a1b2c2</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a1b2c2</value>
@@ -1073,12 +1070,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1b2c2</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a1b1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>children</property-name>
<list-entries>
@@ -1086,7 +1083,7 @@
<value>#{navItem_a1b1c1}</value>
<value>#{navItem_a1b1c2}</value>
</list-entries>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>label</property-name>
<value>a1b1</value>
@@ -1099,12 +1096,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1b1</value>
</managed-property>
- </managed-bean>
+ </managed-bean>
<managed-bean>
<managed-bean-name>navItem_a1b2</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>children</property-name>
<list-entries>
@@ -1112,7 +1109,7 @@
<value>#{navItem_a1b2c1}</value>
<value>#{navItem_a1b2c2}</value>
</list-entries>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>label</property-name>
<value>a1b2</value>
@@ -1125,12 +1122,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1b2</value>
</managed-property>
- </managed-bean>
+ </managed-bean>
<managed-bean>
<managed-bean-name>navItem_a2b1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a2b1</value>
@@ -1143,13 +1140,13 @@
<property-name>outcome</property-name>
<value>guide.page_a2b1</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a2b2</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a2b2</value>
@@ -1162,12 +1159,12 @@
<property-name>outcome</property-name>
<value>guide.page_a2b2</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>children</property-name>
<list-entries>
@@ -1188,12 +1185,12 @@
<property-name>outcome</property-name>
<value>guide.page_a1</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>navItem_a2</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>children</property-name>
<list-entries>
@@ -1214,12 +1211,12 @@
<property-name>outcome</property-name>
<value>guide.page_a2</value>
</managed-property>
- </managed-bean>
+ </managed-bean>
<managed-bean>
<managed-bean-name>navItem_a3</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a3</value>
@@ -1236,12 +1233,12 @@
<property-name>ico</property-name>
<value>/components/images/globalhelp.gif</value>
</managed-property>
- </managed-bean>
+ </managed-bean>
<managed-bean>
<managed-bean-name>navItem_a4</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.DemoNavigationItem</managed-bean-class>
- <managed-bean-scope>none</managed-bean-scope>
+ <managed-bean-scope>none</managed-bean-scope>
<managed-property>
<property-name>label</property-name>
<value>a4</value>
@@ -1258,10 +1255,10 @@
<property-name>ico</property-name>
<value>/components/images/globalhelp.gif</value>
</managed-property>
- </managed-bean>
+ </managed-bean>
<!-- create the treemodel -->
-
+
<managed-bean>
<managed-bean-name>navTreeList</managed-bean-name>
<managed-bean-class>
@@ -1278,7 +1275,7 @@
<value>#{navItem_a4}</value>
</list-entries>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>navTreeModel</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidad.model.ChildPropertyTreeModel</managed-bean-class>
@@ -1294,7 +1291,7 @@
</managed-bean>
<!-- create the menuModel -->
-
+
<managed-bean>
<managed-bean-name>viewIdMenuModel</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidad.model.ViewIdPropertyMenuModel</managed-bean-class>
@@ -1306,13 +1303,13 @@
<managed-property>
<property-name>wrappedData</property-name>
<value>#{navTreeModel}</value>
- </managed-property>
- </managed-bean>
-
+ </managed-property>
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>menuModel</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.nav.MenuModelAdapter</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>model</property-name>
<value>#{viewIdMenuModel}</value>
@@ -1331,23 +1328,23 @@
<value>#{navItem_a2b1.viewId}</value>
</list-entries>
</managed-property>
-
+
</managed-bean>
-
-
-
+
+
+
<!-- create the navigation rules -->
- <navigation-rule>
+ <navigation-rule>
<navigation-case>
<from-outcome>guide.page</from-outcome>
<to-view-id>/components/page.jspx</to-view-id>
<redirect/>
- </navigation-case>
+ </navigation-case>
<navigation-case>
<from-outcome>guide.page_a1</from-outcome>
<to-view-id>/components/page_a1.jspx</to-view-id>
<redirect/>
- </navigation-case>
+ </navigation-case>
<navigation-case>
<from-outcome>guide.page_a2</from-outcome>
<to-view-id>/components/page_a2.jspx</to-view-id>
@@ -1357,7 +1354,7 @@
<from-outcome>guide.page_a3</from-outcome>
<to-view-id>/components/page_a3.jspx</to-view-id>
<redirect/>
- </navigation-case>
+ </navigation-case>
<navigation-case>
<from-outcome>guide.page_a4</from-outcome>
<to-view-id>/components/page_a4.jspx</to-view-id>
@@ -1416,7 +1413,7 @@
</navigation-rule>
<!-- process pages -->
-
+
<managed-bean>
<managed-bean-name>processItem_p1</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.survey.SurveyPage</managed-bean-class>
@@ -1424,7 +1421,7 @@
<managed-property>
<property-name>viewId</property-name>
<value>/components/page_p1.jspx</value>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>outcome</property-name>
<value>guide.page_p1</value>
@@ -1441,7 +1438,7 @@
<managed-property>
<property-name>viewId</property-name>
<value>/components/page_p2.jspx</value>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>outcome</property-name>
<value>guide.page_p2</value>
@@ -1458,7 +1455,7 @@
<managed-property>
<property-name>viewId</property-name>
<value>/components/page_p3.jspx</value>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>outcome</property-name>
<value>guide.page_p3</value>
@@ -1475,7 +1472,7 @@
<managed-property>
<property-name>viewId</property-name>
<value>/components/page_p4.jspx</value>
- </managed-property>
+ </managed-property>
<managed-property>
<property-name>outcome</property-name>
<value>guide.page_p4</value>
@@ -1484,8 +1481,8 @@
<property-name>label</property-name>
<value>Fourth Step</value>
</managed-property>
- </managed-bean>
-
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>processPageList</managed-bean-name>
<managed-bean-class>
@@ -1513,12 +1510,9 @@
</managed-property>
<managed-property>
<property-name>wrappedData</property-name>
- <value>#{processPageList}</value>
+ <value>#{processPageList}</value>
</managed-property>
- <!--managed-property>
- <property-name>maxPathKey</property-name>
- <value>MY_PROCESS_TRAIN_MAX_KEY</value>
- </managed-property-->
+
</managed-bean>
<navigation-rule>
@@ -1558,7 +1552,7 @@
session
</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>surveyPageList</managed-bean-name>
<managed-bean-class>
@@ -1588,7 +1582,7 @@
</managed-property>
<managed-property>
<property-name>wrappedData</property-name>
- <value>#{surveyPageList}</value>
+ <value>#{surveyPageList}</value>
</managed-property>
</managed-bean>
@@ -1677,7 +1671,7 @@
<value>survey5</value>
</managed-property>
</managed-bean>
-
+
<navigation-rule>
<navigation-case>
<from-outcome>survey1</from-outcome>
@@ -1704,8 +1698,8 @@
<to-view-id>/surveydemo/surveyPage5.jspx</to-view-id>
<redirect/>
</navigation-case>
- </navigation-rule>
-
+ </navigation-rule>
+
<navigation-rule>
<from-view-id>/surveydemo/surveyStart.jspx</from-view-id>
<navigation-case>
@@ -1833,7 +1827,7 @@
<from-outcome>guide</from-outcome>
<to-view-id>/componentDemos.jspx</to-view-id>
<redirect/>
- </navigation-case>
+ </navigation-case>
<navigation-case>
<from-outcome>emaildemo</from-outcome>
@@ -1888,7 +1882,7 @@
<to-view-id>/convertValidate/index.jspx</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
<from-outcome>messageCustomization</from-outcome>
<to-view-id>/convertValidate/convertValidateMessageCustomization.jspx</to-view-id>
@@ -2045,7 +2039,7 @@
<to-view-id>/components/commandNavigationItem.jspx</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
<from-outcome>guide.panelBox</from-outcome>
<to-view-id>/components/panelBox.jspx</to-view-id>
@@ -2165,8 +2159,8 @@
<to-view-id>/components/goLink.jspx</to-view-id>
<redirect/>
</navigation-case>
-
-
+
+
<navigation-case>
<from-outcome>guide.group</from-outcome>
<to-view-id>/components/group.jspx</to-view-id>
@@ -2198,7 +2192,7 @@
</navigation-case>
<!-- the navegation rules for page are next to the menu managed beans -->
-
+
<navigation-case>
<from-outcome>guide.panelFormLayout</from-outcome>
<to-view-id>/components/panelFormLayout.jspx</to-view-id>
@@ -2263,14 +2257,14 @@
<from-outcome>guide.processChoiceBar</from-outcome>
<to-view-id>/components/processChoiceBar.jspx</to-view-id>
<redirect/>
- </navigation-case>
-
+ </navigation-case>
+
<navigation-case>
<from-outcome>guide.processChoiceBar2</from-outcome>
<to-view-id>/components/processChoiceBar2.jspx</to-view-id>
<redirect/>
- </navigation-case>
-
+ </navigation-case>
+
<navigation-case>
<from-outcome>guide.processChoiceBar3</from-outcome>
<to-view-id>/components/processChoiceBar3.jspx</to-view-id>
@@ -2405,7 +2399,7 @@
<to-view-id>/components/selectManyCheckbox.jspx</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
<from-outcome>guide.selectManyListbox</from-outcome>
<to-view-id>/components/selectManyListbox.jspx</to-view-id>
@@ -2546,7 +2540,7 @@
<to-view-id>/demos/panelPageSkinDemo.jspx</to-view-id>
<redirect/>
</navigation-case>
-
+
<navigation-case>
<from-outcome>demos.dialog</from-outcome>
<to-view-id>/demos/launchDialog.jspx</to-view-id>
@@ -2605,7 +2599,7 @@
<navigation-case>
<from-outcome>addRow</from-outcome>
<to-view-id>/demos/tableDemos/addRow.jspx</to-view-id>
- </navigation-case>
+ </navigation-case>
<navigation-case>
<from-outcome>totalRow</from-outcome>
<to-view-id>/demos/tableDemos/totalRow.jspx</to-view-id>
@@ -2643,12 +2637,6 @@
<managed-bean-scope>
request
</managed-bean-scope>
-<!-- Can't use this: https://javaserverfaces.dev.java.net/issues/show_bug.cgi?id=22
- <managed-property>
- <property-name>message</property-name>
- <value>#{pageFlowScope.currentMessage}</value>
- </managed-property>
--->
</managed-bean>
<managed-bean>
@@ -2696,22 +2684,22 @@
<!--Table Demos-->
<managed-bean>
<managed-bean-name>Backer</managed-bean-name>
- <managed-bean-class>
- org.apache.myfaces.trinidaddemo.tableDemos.EmployeeTableBean
+ <managed-bean-class>
+ org.apache.myfaces.trinidaddemo.tableDemos.EmployeeTableBean
</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>TotalBacker</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.tableDemos.EmployeeTableBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>csv</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.tableDemos.CSVBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
@@ -3009,7 +2997,7 @@
<value>Ca</value>
<value>20</value>
<value>Alkaline Earth</value>
-
+
<value>Florine</value>
<value>Fl</value>
<value>9</value>
@@ -3055,7 +3043,7 @@
</list-entries>
</managed-property>
</managed-bean>
-
+
<managed-bean>
<managed-bean-name>skinTranslationMap</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.resource.SkinTranslationMapDemo</managed-bean-class>
@@ -3070,7 +3058,6 @@
<managed-bean-name>testTriggers</managed-bean-name>
<managed-bean-class>org.apache.myfaces.trinidaddemo.TestRelativePartialTriggers</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
- <!--oracle-jdev-comment:managed-bean-jsp-link:1demos/testRelativePartialTriggers.jspx-->
</managed-bean>
<managed-bean>
@@ -3078,5 +3065,5 @@
<managed-bean-class>org.apache.myfaces.trinidaddemo.DemoAccessibilityProfileBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/tree.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/tree.jspx?rev=699497&r1=699496&r2=699497&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/tree.jspx (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/tree.jspx Fri Sep 26 13:48:53 2008
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
@@ -42,11 +42,11 @@
</tr:panelGroupLayout>
<tr:outputFormatted styleUsage="instruction" value="<b>tree</b>"/>
<!--
- <tr:tree value="#{tree.model}" binding="#{editor.component}" />
- <jsp:directive.include file="editor.jspf" />
+ <tr:tree value="#{demoTree.model}" binding="#{editor.component}" />
+ <jsp:directive.include file="editor.jspf" />
-->
<tr:outputFormatted styleUsage="instruction" value="<b>Tree with TreeModel</b>"/>
- <tr:tree binding="#{editor.component}" var="foo" value="#{tree.model}">
+ <tr:tree binding="#{editor.component}" var="foo" value="#{demoTree.model}">
<f:facet name="nodeStamp">
<tr:inputText value="#{foo.text}" shortDesc="Enter text"/>
</f:facet>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/treeTable.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/treeTable.jspx?rev=699497&r1=699496&r2=699497&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/treeTable.jspx (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/treeTable.jspx Fri Sep 26 13:48:53 2008
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
@@ -40,16 +40,16 @@
text="Skinning Key Documentation"/>
</tr:panelGroupLayout>
<!--
- <tr:treeTable var="foo" value="#{tree.model}" binding="#{editor.component}">
+ <tr:treeTable var="foo" value="#{demoTree.model}" binding="#{editor.component}">
<f:facet name="nodeStamp">
<tr:outputText value="#{foo.text}"/>
</f:facet>
</tr:treeTable>
- <jsp:directive.include file="editor.jspf" />
+ <jsp:directive.include file="editor.jspf" />
-->
<tr:outputFormatted styleUsage="instruction"
value="<b>Editable treeTable with Record Set Navigation</b>"/>
- <tr:treeTable binding="#{editor.component}" var="foo" value="#{tree.model}"
+ <tr:treeTable binding="#{editor.component}" var="foo" value="#{demoTree.model}"
rendered="true" rowsByDepth="3" summary="Demo of treeTable">
<f:facet name="nodeStamp">
<tr:column>
@@ -77,7 +77,7 @@
</tr:treeTable>
<jsp:directive.include file="editor.jspf"/>
<tr:outputFormatted styleUsage="instruction" value="<b>No Focus Column</b>"/>
- <tr:treeTable var="foo" value="#{tree.model}" rendered="true" summary="Second treeTable">
+ <tr:treeTable var="foo" value="#{demoTree.model}" rendered="true" summary="Second treeTable">
<f:facet name="nodeStamp">
<tr:column>
<f:facet name="header">
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx?rev=699497&r1=699496&r2=699497&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/changeDemos/attributeChange_Implicit.jspx Fri Sep 26 13:48:53 2008
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:f="http://java.sun.com/jsf/core"
@@ -30,7 +30,7 @@
<tr:panelPage>
<f:facet name="navigationGlobal">
<tr:navigationPane hint="buttons">
- <tr:commandNavigationItem
+ <tr:commandNavigationItem
text="Return to Change Persistence demo index page"
immediate="true"
action="demos.changePersistence"/>
@@ -43,21 +43,21 @@
<f:facet name="separator">
<tr:separator/>
</f:facet>
- <tr:showDetail
- id="hs1"
+ <tr:showDetail
+ id="hs1"
partialTriggers="hs1"
disclosedText="Click to hide me"
undisclosedText="Click to disclose me">
<h:outputText value="This showDetail is now Disclosed"/>
</tr:showDetail>
- <tr:table
- summary="Periodic table"
+ <tr:table
+ summary="Periodic table"
id="ta1"
binding="#{tableActions.table}"
rowSelection="multiple"
value="#{periodicTable.tableData}" var="row" rows="10">
<f:facet name="footer">
- <tr:commandButton
+ <tr:commandButton
text="Report"
actionListener="#{tableActions.performReport}"/>
</f:facet>
@@ -74,7 +74,7 @@
<tr:outputText value="#{row.symbol}"/>
</tr:column>
</tr:table>
- <tr:tree id="tr1" var="foo" value="#{tree.model}">
+ <tr:tree id="tr1" var="foo" value="#{demoTree.model}">
<f:facet name="nodeStamp">
<tr:inputText simple="true" shortDesc="Example" value="#{foo.text}"/>
</f:facet>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx?rev=699497&r1=699496&r2=699497&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx Fri Sep 26 13:48:53 2008
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:f="http://java.sun.com/jsf/core"
@@ -186,7 +186,7 @@
</tr:panelHeader>
</tr:showDetailItem>
</tr:panelTabbed>
- <tr:tree var="foo" value="#{tree.model}">
+ <tr:tree var="foo" value="#{demoTree.model}">
<f:facet name="nodeStamp">
<tr:outputText value="#{foo.text}"/>
</f:facet>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx?rev=699497&r1=699496&r2=699497&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx Fri Sep 26 13:48:53 2008
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:f="http://java.sun.com/jsf/core"
@@ -30,11 +30,11 @@
<f:facet name="separator">
<tr:separator/>
</f:facet>
-
+
<tr:commandLink immediate="true" text="Component Guide"
action="guide"/>
<tr:outputFormatted styleUsage="instruction" value="<b>Simple messages demo</b>"/>
-
+
<tr:messages/>
<tr:inputText label="Label:">
@@ -42,18 +42,18 @@
<tr:outputText value="Type 'cat' to see an error in the message box"/>
</f:facet>
<f:converter converterId="javax.faces.BigInteger"/>
- </tr:inputText>
-
+ </tr:inputText>
+
<tr:commandButton text="Submit"/>
<tr:outputFormatted styleUsage="instruction"
value="<b>basic panelPage </b>"/>
-
+
<tr:panelPage binding="#{editor.component}">
<f:facet name="navigation1">
<tr:navigationPane hint="tabs">
<tr:commandNavigationItem text="tab 1" action="guide.navigationPane"/>
- <tr:commandNavigationItem text="tab 2" action="guide.navigationPane"
+ <tr:commandNavigationItem text="tab 2" action="guide.navigationPane"
selected="true" />
<tr:commandNavigationItem text="tab 3" action="guide.navigationPane"/>
<tr:commandNavigationItem text="tab 4" action="guide.navigationPane"/>
@@ -64,7 +64,7 @@
</f:facet>
<f:facet name="navigation2">
<tr:navigationPane hint="bar">
- <tr:commandNavigationItem text="item 1" action="guide.navigationPane"
+ <tr:commandNavigationItem text="item 1" action="guide.navigationPane"
selected="true" />
<tr:commandNavigationItem text="item 2" action="guide.navigationPane"
disabled="true" />
@@ -74,7 +74,7 @@
</f:facet>
<f:facet name="navigation3">
<tr:navigationPane hint="list">
- <tr:commandNavigationItem text="item 1" action="guide.navigationPane"
+ <tr:commandNavigationItem text="item 1" action="guide.navigationPane"
selected="true" />
<tr:commandNavigationItem text="item 2" action="guide.navigationPane"
disabled="true" />
@@ -117,10 +117,10 @@
<tr:outputText value="Content here" />
</tr:panelHeader>
</tr:panelPage>
-
-
+
+
<tr:outputFormatted styleUsage="instruction" value="<b>SelectManyShuttle bound to list</b>"/>
-
+
<tr:selectManyShuttle id="shuttle2" valuePassThru="true"
leadingHeader="Available values:"
trailingHeader="Selected values:"
@@ -130,24 +130,24 @@
<tr:selectItem label="Second" value="bar"/>
<tr:selectItem label="Third" value="baz"/>
</tr:selectManyShuttle>
-
+
<tr:outputFormatted styleUsage="instruction" value="<b>SelectOrderShuttle bound to list</b>"/>
-
+
<tr:selectOrderShuttle id="shuttle3" valuePassThru="true"
leadingHeader="Available values:"
trailingHeader="Selected values:"
valueChangeListener="#{list.valueChanged}"
- value="#{list.objectList}" leadingDescShown="true"
+ value="#{list.objectList}" leadingDescShown="true"
>
<tr:selectItem label="First" value="foo"/>
<tr:selectItem label="Second" value="bar"/>
<tr:selectItem label="Third" value="baz"/>
</tr:selectOrderShuttle>
-
-
- <tr:outputFormatted styleUsage="instruction"
+
+
+ <tr:outputFormatted styleUsage="instruction"
value="<b>Editable treeTable with Record Set Navigation</b>"/>
- <tr:treeTable var="foo" value="#{tree.model}" rendered="true"
+ <tr:treeTable var="foo" value="#{demoTree.model}" rendered="true"
rowsByDepth="3" summary="Demo of treeTable"
>
<f:facet name="nodeStamp">
@@ -178,9 +178,9 @@
</tr:treeTable>
<tr:commandButton text="Submit"/>
-
+
<tr:outputFormatted styleUsage="instruction" value="<b>Giant treeTable</b>"/>
- <tr:treeTable var="foo" value="#{largeTree.model}"
+ <tr:treeTable var="foo" value="#{largeTree.model}"
summary="Giant treeTable"
rendered='true'>
<f:facet name="nodeStamp">
@@ -215,12 +215,12 @@
<h:outputText value="#{foo.depth}"/>
</tr:column>
</tr:treeTable>
-
+
<jsp:directive.include file="../components/editor.jspf" />
-
- </tr:panelGroupLayout>
-
- </tr:form>
+
+ </tr:panelGroupLayout>
+
+ </tr:form>
</tr:document>
</f:view>
</jsp:root>
Propchange: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 13:48:53 2008
@@ -1 +1 @@
-/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406
+/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
Propchange: myfaces/trinidad/trunk_1.2.x/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 26 13:48:53 2008
@@ -1 +1 @@
-/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406
+/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496