Modified: cocoon/whiteboard/forms/samples/forms/form_model_gui_binding.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/form_model_gui_binding.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/form_model_gui_binding.xml (original) +++ cocoon/whiteboard/forms/samples/forms/form_model_gui_binding.xml Fri Mar 4 07:47:41 2005 @@ -59,7 +59,7 @@ <fb:new id="output-class"/> <fb:new id="repeater-class"/> <fb:new id="row-action-class"/> - <fb:new id="struct-class"/> + <fb:new id="group-class"/> <fb:new id="submit-class"/> <fb:new id="union-class"/> </fb:union> @@ -70,10 +70,10 @@ <fb:insert-node> <fd:action/> </fb:insert-node> - <fb:struct id="action" path="fd:action"> + <fb:group id="action" path="fd:action"> <fb:value id="label" path="fd:label"/> <fb:value id="id" path="@id"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -82,12 +82,12 @@ <fb:insert-node> <fd:aggregatefield/> </fb:insert-node> - <fb:struct id="aggregatefield" path="fd:aggregatefield"> + <fb:group id="aggregatefield" path="fd:aggregatefield"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> <fb:insert-node><fd:widgets/></fb:insert-node> <fb:new id="widgets-class"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -96,10 +96,10 @@ <fb:insert-node> <fd:booleanfield/> </fb:insert-node> - <fb:struct id="booleanfield" path="fd:booleanfield"> + <fb:group id="booleanfield" path="fd:booleanfield"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -108,11 +108,11 @@ <fb:insert-node> <fd:class/> </fb:insert-node> - <fb:struct id="class" path="fd:class"> + <fb:group id="class" path="fd:class"> <fb:value id="id" path="@id"/> <fb:insert-node><fd:widgets/></fb:insert-node> <fb:new id="widgets-class"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -121,13 +121,13 @@ <fb:insert-node> <fd:field/> </fb:insert-node> - <fb:struct id="field" path="fd:field"> + <fb:group id="field" path="fd:field"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> <fb:value id="required" path="@required"> <fd:convertor datatype="boolean"/> </fb:value> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -136,9 +136,9 @@ <fb:insert-node> <fd:new/> </fb:insert-node> - <fb:struct id="new" path="fd:new"> + <fb:group id="new" path="fd:new"> <fb:value id="id" path="@id"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -147,10 +147,10 @@ <fb:insert-node> <fd:output/> </fb:insert-node> - <fb:struct id="output" path="fd:output"> + <fb:group id="output" path="fd:output"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -159,7 +159,7 @@ <fb:insert-node> <fd:repeater/> </fb:insert-node> - <fb:struct id="repeater" path="fd:repeater"> + <fb:group id="repeater" path="fd:repeater"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> <fb:value id="initial-size" path="@initial-size"> @@ -167,7 +167,7 @@ </fb:value> <fb:insert-node><fd:widgets/></fb:insert-node> <fb:new id="widgets-class"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -176,24 +176,24 @@ <fb:insert-node> <fd:row-action/> </fb:insert-node> - <fb:struct id="row-action" path="fd:row-action"> + <fb:group id="row-action" path="fd:row-action"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> - <fb:class id="struct-class"> - <fb:case id="struct" path="."> + <fb:class id="group-class"> + <fb:case id="group" path="."> <fb:insert-node> - <fd:struct/> + <fd:group/> </fb:insert-node> - <fb:struct id="struct" path="fd:struct"> + <fb:group id="group" path="fd:group"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> <fb:insert-node><fd:widgets/></fb:insert-node> <fb:new id="widgets-class"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -202,10 +202,10 @@ <fb:insert-node> <fd:submit/> </fb:insert-node> - <fb:struct id="submit" path="fd:submit"> + <fb:group id="submit" path="fd:submit"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> - </fb:struct> + </fb:group> </fb:case> </fb:class> @@ -214,12 +214,12 @@ <fb:insert-node> <fd:union/> </fb:insert-node> - <fb:struct id="union" path="fd:union"> + <fb:group id="union" path="fd:union"> <fb:value id="id" path="@id"/> <fb:value id="label" path="fd:label"/> <fb:insert-node><fd:widgets/></fb:insert-node> <fb:new id="widgets-class"/> - </fb:struct> + </fb:group> </fb:case> </fb:class>
Modified: cocoon/whiteboard/forms/samples/forms/form_model_gui_data.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/form_model_gui_data.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/form_model_gui_data.xml (original) +++ cocoon/whiteboard/forms/samples/forms/form_model_gui_data.xml Fri Mar 4 07:47:41 2005 @@ -54,13 +54,13 @@ <fd:row-action id="samp-row-action"><fd:label>Sample RowAction</fd:label></fd:row-action> - <fd:struct id="samp-struct"> - <fd:label>Sample Struct</fd:label> + <fd:group id="samp-group"> + <fd:label>Sample Group</fd:label> <fd:widgets> - <fd:booleanfield id="samp-struct-booleanfield"><fd:label>Sample Struct BooleanField</fd:label></fd:booleanfield> - <fd:field id="samp-struct-field" required="true"><fd:label>Sample Struct Field</fd:label></fd:field> + <fd:booleanfield id="samp-group-booleanfield"><fd:label>Sample Group BooleanField</fd:label></fd:booleanfield> + <fd:field id="samp-group-field" required="true"><fd:label>Sample Group Field</fd:label></fd:field> </fd:widgets> - </fd:struct> + </fd:group> <fd:submit id="samp-submit"><fd:label>Sample Submit</fd:label></fd:submit> Modified: cocoon/whiteboard/forms/samples/forms/form_model_gui_model.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/form_model_gui_model.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/form_model_gui_model.xml (original) +++ cocoon/whiteboard/forms/samples/forms/form_model_gui_model.xml Fri Mar 4 07:47:41 2005 @@ -32,11 +32,11 @@ <fd:new id="widgets-class"/> <!-- - <fd:struct id="form"> + <fd:group id="form"> <fd:widgets> <fd:new id="widgets-class"/> </fd:widgets> - </fd:struct> + </fd:group> --> <fd:class id="widgets-class"> @@ -47,10 +47,10 @@ <fd:new id="widget-row-class"/> </fd:widgets> </fd:repeater> - <fd:repeater-action id="addWidget" action-command="add-row" repeater="widgets"> + <fd:repeater-action id="addWidget" command="add-row" repeater="widgets"> <fd:label>New</fd:label> </fd:repeater-action> - <fd:repeater-action id="removeWidgets" action-command="delete-rows" repeater="widgets" select="select"> + <fd:repeater-action id="removeWidgets" command="delete-rows" repeater="widgets" select="select"> <fd:label>Delete</fd:label> </fd:repeater-action> </fd:widgets> @@ -73,7 +73,7 @@ <fd:item value="output"><fd:label>Output</fd:label></fd:item> <fd:item value="repeater"><fd:label>Repeater</fd:label></fd:item> <fd:item value="row-action"><fd:label>RowAction</fd:label></fd:item> - <fd:item value="struct"><fd:label>Struct</fd:label></fd:item> + <fd:item value="group"><fd:label>Group</fd:label></fd:item> <fd:item value="submit"><fd:label>Submit</fd:label></fd:item> <fd:item value="union"><fd:label>Union</fd:label></fd:item> </fd:selection-list> @@ -83,15 +83,15 @@ <fd:label>Type</fd:label> <fd:widgets> - <fd:struct id="action"> + <fd:group id="action"> <fd:label>Action</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="aggregatefield"> + <fd:group id="aggregatefield"> <fd:label>AggregateField</fd:label> <fd:widgets> <fd:new id="id-class"/> @@ -99,49 +99,49 @@ <fd:new id="required-class"/> <fd:new id="widgets-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="booleanfield"> + <fd:group id="booleanfield"> <fd:label>BooleanField</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="class"> + <fd:group id="class"> <fd:label>Class</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="widgets-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="field"> + <fd:group id="field"> <fd:label>Field</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> <fd:new id="required-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="new"> + <fd:group id="new"> <fd:label>New</fd:label> <fd:widgets> <fd:new id="id-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="output"> + <fd:group id="output"> <fd:label>Output</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="repeater"> + <fd:group id="repeater"> <fd:label>Repeater</fd:label> <fd:widgets> <fd:new id="id-class"/> @@ -149,41 +149,41 @@ <fd:new id="initial-size-class"/> <fd:new id="widgets-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="row-action"> + <fd:group id="row-action"> <fd:label>RowAction</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="struct"> - <fd:label>Struct</fd:label> + <fd:group id="group"> + <fd:label>Group</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> <fd:new id="widgets-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="submit"> + <fd:group id="submit"> <fd:label>Submit</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="union"> + <fd:group id="union"> <fd:label>Union</fd:label> <fd:widgets> <fd:new id="id-class"/> <fd:new id="label-class"/> <fd:new id="widgets-class"/> </fd:widgets> - </fd:struct> + </fd:group> </fd:widgets> Modified: cocoon/whiteboard/forms/samples/forms/form_model_gui_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/form_model_gui_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/form_model_gui_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/form_model_gui_template.xml Fri Mar 4 07:47:41 2005 @@ -30,7 +30,7 @@ <title>Form GUI</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:class id="id-class"><ft:widget-label id="id"/>:<ft:widget id="id"/></ft:class> <ft:class id="label-class"><ft:widget-label id="label"/>:<ft:widget id="label"/></ft:class> @@ -52,92 +52,92 @@ </ft:case> <ft:case id="action"> - <ft:struct id="action"> + <ft:group id="action"> <ft:new id="id-class"/> <ft:new id="label-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="aggregatefield"> - <ft:struct id="aggregatefield"> + <ft:group id="aggregatefield"> <ft:new id="id-class"/> <ft:new id="label-class"/> <ft:new id="widgets-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="booleanfield"> - <ft:struct id="booleanfield"> + <ft:group id="booleanfield"> <ft:new id="id-class"/> <ft:new id="label-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="class"> - <ft:struct id="class"> + <ft:group id="class"> <ft:new id="id-class"/> <ft:new id="widgets-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="field"> - <ft:struct id="field"> + <ft:group id="field"> <ft:new id="id-class"/> <ft:new id="label-class"/> <ft:new id="required-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="new"> - <ft:struct id="new"> + <ft:group id="new"> <ft:new id="id-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="output"> - <ft:struct id="output"> + <ft:group id="output"> <ft:new id="id-class"/> <ft:new id="label-class"/> - </ft:struct> + </ft:group> </ft:case> - <ft:case id="struct"> - <ft:struct id="struct"> + <ft:case id="group"> + <ft:group id="group"> <ft:new id="id-class"/> <ft:new id="label-class"/> <ft:new id="widgets-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="repeater"> - <ft:struct id="repeater"> + <ft:group id="repeater"> <ft:new id="id-class"/> <ft:new id="label-class"/> <ft:new id="initial-size-class"/> <ft:new id="widgets-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="row-action"> - <ft:struct id="row-action"> + <ft:group id="row-action"> <ft:new id="id-class"/> <ft:new id="label-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="submit"> - <ft:struct id="submit"> + <ft:group id="submit"> <ft:new id="id-class"/> <ft:new id="label-class"/> - </ft:struct> + </ft:group> </ft:case> <ft:case id="union"> - <ft:struct id="union"> + <ft:group id="union"> <ft:new id="id-class"/> <ft:new id="label-class"/> <ft:new id="widgets-class"/> - </ft:struct> + </ft:group> </ft:case> </ft:union> Modified: cocoon/whiteboard/forms/samples/forms/htmlarea_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/htmlarea_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/htmlarea_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/htmlarea_template.xml Fri Mar 4 07:47:41 2005 @@ -18,7 +18,7 @@ xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";> <title>HTMLArea</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <div style="width:500px"> <ft:widget-label id="data1"/><br/> <ft:widget id="data1"> Modified: cocoon/whiteboard/forms/samples/forms/multipage_binding.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/multipage_binding.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/multipage_binding.xml (original) +++ cocoon/whiteboard/forms/samples/forms/multipage_binding.xml Fri Mar 4 07:47:41 2005 @@ -23,24 +23,24 @@ xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"; path="result"> - <fb:struct id="page1" path="."> + <fb:group id="page1" path="."> <fb:value id="email" path="email"/> <fb:value id="fourchars" path="fourchars"/> <fb:value id="birthdate" path="birthdate"> <fd:convertor datatype="date" type="formatting" style="short"/> </fb:value> - </fb:struct> + </fb:group> - <fb:struct id="page2" path="."> + <fb:group id="page2" path="."> <fb:value id="number1" path="number1"/> <fb:value id="number2" path="number2"/> <fb:value id="account" path="account"/> <fb:value id="cowheight" path="cowheight"/> - </fb:struct> + </fb:group> - <fb:struct id="page3" path="."> + <fb:group id="page3" path="."> <fb:value id="somebool" path="somebool"/> <fb:multi-value id="drinks" parent-path="drinks" row-path="drink"/> - </fb:struct> + </fb:group> </fb:context> Modified: cocoon/whiteboard/forms/samples/forms/multipage_model.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/multipage_model.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/multipage_model.xml (original) +++ cocoon/whiteboard/forms/samples/forms/multipage_model.xml Fri Mar 4 07:47:41 2005 @@ -24,7 +24,7 @@ <fd:widgets> - <fd:struct id="page1"> + <fd:group id="page1"> <fd:widgets> <fd:field id="email" required="true"> <fd:datatype base="string"/> @@ -77,7 +77,7 @@ </fd:validation> </fd:field> - <fd:action id="next" action-command="foo"> + <fd:action id="next"> <fd:label>Next</fd:label> <fd:on-action> <fd:javascript> @@ -90,9 +90,9 @@ </fd:on-action> </fd:action> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="page2" state="invisible"> + <fd:group id="page2" state="invisible"> <fd:widgets> <fd:field id="number1" required="true"> <fd:label>Please enter a number<br/> @@ -150,7 +150,7 @@ </fd:selection-list> </fd:field> - <fd:action id="prev" action-command="foo"> + <fd:action id="prev"> <fd:label>Previous</fd:label> <fd:on-action> <fd:javascript> @@ -161,7 +161,7 @@ </fd:javascript> </fd:on-action> </fd:action> - <fd:action id="next" action-command="foo"> + <fd:action id="next"> <fd:label>Next</fd:label> <fd:on-action> <fd:javascript> @@ -174,9 +174,9 @@ </fd:on-action> </fd:action> </fd:widgets> - </fd:struct> + </fd:group> - <fd:struct id="page3" state="invisible"> + <fd:group id="page3" state="invisible"> <fd:widgets> <fd:booleanfield id="somebool"> <fd:label>Put me <em>on</em> or <em>off</em>.</fd:label> @@ -198,7 +198,7 @@ </fd:selection-list> </fd:multivaluefield> - <fd:action id="prev" action-command="foo"> + <fd:action id="prev"> <fd:label>Previous</fd:label> <fd:on-action> <fd:javascript> @@ -210,11 +210,11 @@ </fd:on-action> </fd:action> - <fd:submit id="ok" action-command="foo"> + <fd:submit id="ok"> <fd:label>Finish</fd:label> </fd:submit> </fd:widgets> - </fd:struct> + </fd:group> </fd:widgets> Modified: cocoon/whiteboard/forms/samples/forms/multipage_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/multipage_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/multipage_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/multipage_template.xml Fri Mar 4 07:47:41 2005 @@ -26,10 +26,10 @@ <title>Sample multipage form</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <div style="width: 70%; margin: 10px 50px 50px 50px;"> - <ft:struct id="page1"> + <ft:group id="page1"> <!-- group with automatic two-column layout --> <fi:group> <fi:label>String fields</fi:label> @@ -47,9 +47,9 @@ <br/> <ft:widget id="next"/> - </ft:struct> + </ft:group> - <ft:struct id="page2"> + <ft:group id="page2"> <fi:group> <fi:label>Number fields</fi:label> <fi:styling type="fieldset" layout="columns"/> @@ -68,9 +68,9 @@ <br/> <ft:widget id="prev"/> <ft:widget id="next"/> - </ft:struct> + </ft:group> - <ft:struct id="page3"> + <ft:group id="page3"> <fi:group> <fi:styling type="fieldset" layout="columns"/> <fi:label>Boolean fields</fi:label> @@ -85,7 +85,7 @@ <br/> <ft:widget id="prev"/> <ft:widget id="ok"/> - </ft:struct> + </ft:group> </div> </ft:form-template> Modified: cocoon/whiteboard/forms/samples/forms/registration_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/registration_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/registration_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/registration_template.xml Fri Mar 4 07:47:41 2005 @@ -18,7 +18,8 @@ xmlns:fi="http://apache.org/cocoon/forms/1.0#instance";> <title>Registration</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="continue" method="POST"> + <ft:continuation-id/> <fi:group> <fi:styling layout="columns"/> <fi:items> Modified: cocoon/whiteboard/forms/samples/forms/tasktree.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/tasktree.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/tasktree.xml (original) +++ cocoon/whiteboard/forms/samples/forms/tasktree.xml Fri Mar 4 07:47:41 2005 @@ -35,7 +35,7 @@ <fd:new id="task-class"/> </fd:widgets> </fd:repeater> - <fd:repeater-action id="addsub" repeater="tasks" action-command="add-row"> + <fd:repeater-action id="addsub" repeater="tasks" command="add-row"> <fd:label>Add subtasks</fd:label> <fd:hint>Creates a task subtree</fd:hint> </fd:repeater-action> @@ -45,8 +45,8 @@ <!-- a task --> <fd:class id="task-class"> <fd:widgets> - <!-- FIXME: doesn't work if there's not an enclosing struct --> - <fd:struct id="task"> + <!-- FIXME: doesn't work if there's not an enclosing group --> + <fd:group id="task"> <fd:widgets> <fd:field id="title"> <fd:datatype base="string"/> @@ -59,16 +59,16 @@ </fd:field> <!-- these actions will act on the "tasks" repeater in which this class is inlined --> - <fd:row-action id="add" action-command="add-after"> + <fd:row-action id="add" command="add-after"> <fd:label>+</fd:label> </fd:row-action> - <fd:row-action id="up" action-command="move-up"> + <fd:row-action id="up" command="move-up"> <fd:label>^</fd:label> </fd:row-action> - <fd:row-action id="down" action-command="move-down"> + <fd:row-action id="down" command="move-down"> <fd:label>v</fd:label> </fd:row-action> - <fd:row-action id="delete" action-command="delete"> + <fd:row-action id="delete" command="delete"> <fd:label>X</fd:label> </fd:row-action> @@ -76,7 +76,7 @@ <fd:new id="tasklist-class"/> </fd:widgets> - </fd:struct> + </fd:group> </fd:widgets> </fd:class> @@ -88,7 +88,7 @@ <!-- the top-level tasks --> <fd:new id="tasklist-class"/> - <fd:submit id="ok" action-command="foo"> + <fd:submit id="ok"> <fd:label>OK</fd:label> </fd:submit> Modified: cocoon/whiteboard/forms/samples/forms/tasktree_binding.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/tasktree_binding.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/tasktree_binding.xml (original) +++ cocoon/whiteboard/forms/samples/forms/tasktree_binding.xml Fri Mar 4 07:47:41 2005 @@ -15,9 +15,9 @@ limitations under the License. --> -<!--+ - | @version $Id$ - +--> +<!-- + @version $Id$ +--> <fb:context xmlns:fb="http://apache.org/cocoon/forms/1.0#binding"; xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"; @@ -31,7 +31,7 @@ </fb:class> <fb:class id="task-class"> - <fb:struct id="task" path="."> + <fb:group id="task" path="."> <fb:value id="title" path="title"/> <fb:value id="start" path="@start"> <fd:convertor datatype="date" type="formatting" style="short"/> @@ -40,7 +40,7 @@ <fd:convertor datatype="date" type="formatting" style="short"/> </fb:value> <fb:new id="tasklist-class"/> - </fb:struct> + </fb:group> </fb:class> <fb:value id="name" path="name"/> Modified: cocoon/whiteboard/forms/samples/forms/tasktree_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/tasktree_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/tasktree_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/tasktree_template.xml Fri Mar 4 07:47:41 2005 @@ -65,11 +65,11 @@ </style> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:class id="task-class"> <div class="section"> - <ft:struct id="task"> + <ft:group id="task"> <span class="actions"> <ft:widget id="down"><fi:styling type="image" src="resources/img/move_down.gif"/></ft:widget> <ft:widget id="up"><fi:styling type="image" src="resources/img/move_up.gif"/></ft:widget> @@ -83,7 +83,7 @@ <!-- Recurse --> <ft:new id="tasklist-class"/> - </ft:struct> + </ft:group> </div> </ft:class> Modified: cocoon/whiteboard/forms/samples/forms/upload_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/upload_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/upload_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/upload_template.xml Fri Mar 4 07:47:41 2005 @@ -21,7 +21,7 @@ <para> For this example to work, you must enable uploads in your web.xml file. </para> - <ft:form-template action="#{$continuation/id}.continue" method="POST" enctype="multipart/form-data"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST" enctype="multipart/form-data"> <fi:group> <fi:styling layout="columns"/> <fi:items> Modified: cocoon/whiteboard/forms/samples/forms/xdoceditor_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/forms/xdoceditor_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/forms/xdoceditor_template.xml (original) +++ cocoon/whiteboard/forms/samples/forms/xdoceditor_template.xml Fri Mar 4 07:47:41 2005 @@ -38,7 +38,7 @@ </style> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <p>This is an example of how dynamic templates (using the JX macros) allow to change the page structure depending on the form contents. By adding or removing rows in the repeater Modified: cocoon/whiteboard/forms/samples/resources/forms-field-styling.xsl URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/resources/forms-field-styling.xsl?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/resources/forms-field-styling.xsl (original) +++ cocoon/whiteboard/forms/samples/resources/forms-field-styling.xsl Fri Mar 4 07:47:41 2005 @@ -55,6 +55,13 @@ </xsl:template> <!--+ + | Field in "output" state: display its value + +--> + <xsl:template match="fi:[EMAIL PROTECTED]'output']" priority="3"> + <xsl:value-of select="fi:value/node()"/> + </xsl:template> + + <!--+ | Common stuff like fi:validation-message, @required. +--> <xsl:template match="fi:*" mode="common"> @@ -299,17 +306,15 @@ </xsl:template> <!--+ - | fi:booleanfield with @type 'output' : rendered as text + | fi:booleanfield with @state 'output': rendered as an inactive checkbox (this doesn't + | use text but avoids i18n problems related to hardcoding 'yes'/'no' or 'true'/'false' +--> - <xsl:template match="fi:booleanfield[fi:styling/@type='output']"> - <xsl:choose> - <xsl:when test="fi:value = 'true'"> - yes - </xsl:when> - <xsl:otherwise> - no - </xsl:otherwise> - </xsl:choose> + <xsl:template match="fi:[EMAIL PROTECTED]'output' or fi:styling/@type='output']" priority="3"> + <input type="checkbox" title="{fi:hint}" disabled="disabled"> + <xsl:if test="fi:value = 'true'"> + <xsl:attribute name="checked">checked</xsl:attribute> + </xsl:if> + </input> </xsl:template> <!--+ @@ -394,6 +399,19 @@ </xsl:template> <!--+ + | fi:multivaluefield in 'output' state + +--> + <xsl:template match="fi:[EMAIL PROTECTED]'output']" priority="3"> + <xsl:variable name="values" select="fi:values/fi:value/text()"/> + <xsl:for-each select="fi:selection-list/fi:item"> + <xsl:variable name="value" select="@value"/> + <xsl:if test="$values[. = $value]"> + <xsl:value-of select="fi:label/node()"/> + </xsl:if> + </xsl:for-each> + </xsl:template> + + <!--+ | fi:upload +--> <xsl:template match="fi:upload"> @@ -414,6 +432,13 @@ </xsl:otherwise> </xsl:choose> <xsl:apply-templates select="." mode="common"/> + </xsl:template> + + <!--+ + | fi:upload, output state + +--> + <xsl:template match="fi:[EMAIL PROTECTED]'output']" priority="3"> + <xsl:copy-of select="fi:value/node()"/> </xsl:template> <!--+ Modified: cocoon/whiteboard/forms/samples/sitemap.xmap URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/sitemap.xmap?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/sitemap.xmap (original) +++ cocoon/whiteboard/forms/samples/sitemap.xmap Fri Mar 4 07:47:41 2005 @@ -153,12 +153,21 @@ </map:call> </map:match> + <!-- Start a flowscript scenario --> <map:match pattern="do-*.flow"> <map:call function="do_{1}"/> </map:match> + <!-- Continue a scenario. The continuation id is passed in the URL + (typically used for GET requests) --> <map:match pattern="*.continue"> <map:call continuation="{1}"/> + </map:match> + + <!-- Continue a scenario. The continuation id is passed as a request + parameter (typically used for POST request) --> + <map:match pattern="continue"> + <map:call continuation="{request-param:continuation-id}"/> </map:match> <!-- Modified: cocoon/whiteboard/forms/samples/swan/forms/binding_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/swan/forms/binding_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/swan/forms/binding_template.xml (original) +++ cocoon/whiteboard/forms/samples/swan/forms/binding_template.xml Fri Mar 4 07:47:41 2005 @@ -28,7 +28,7 @@ <title>Swan Form Binding Editor</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:import prefix="binding" uri="forms/binding_mt.xml"/> Modified: cocoon/whiteboard/forms/samples/swan/forms/model_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/swan/forms/model_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/swan/forms/model_template.xml (original) +++ cocoon/whiteboard/forms/samples/swan/forms/model_template.xml Fri Mar 4 07:47:41 2005 @@ -28,7 +28,7 @@ <title>Swan Form Model Editor</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:import prefix="model" uri="forms/model_mt.xml"/> Modified: cocoon/whiteboard/forms/samples/swan/forms/sitemap_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/swan/forms/sitemap_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/swan/forms/sitemap_template.xml (original) +++ cocoon/whiteboard/forms/samples/swan/forms/sitemap_template.xml Fri Mar 4 07:47:41 2005 @@ -28,7 +28,7 @@ <title>Swan Cocoon Sitemap Editor</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:import prefix="sitemap" uri="forms/sitemap_mt.xml"/> Modified: cocoon/whiteboard/forms/samples/swan/forms/template_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/swan/forms/template_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/swan/forms/template_template.xml (original) +++ cocoon/whiteboard/forms/samples/swan/forms/template_template.xml Fri Mar 4 07:47:41 2005 @@ -28,7 +28,7 @@ <title>Swan Form Template Editor</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:import prefix="template" uri="forms/template_mt.xml"/> Modified: cocoon/whiteboard/forms/samples/swan/forms/xreport_template.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/swan/forms/xreport_template.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/swan/forms/xreport_template.xml (original) +++ cocoon/whiteboard/forms/samples/swan/forms/xreport_template.xml Fri Mar 4 07:47:41 2005 @@ -28,7 +28,7 @@ <title>Swan xReporter Report Editor</title> <content> - <ft:form-template action="#{$continuation/id}.continue" method="POST"> + <ft:form-template action="#{$cocoon/continuation/id}.continue" method="POST"> <ft:import prefix="xreport" uri="forms/xreport_mt.xml"/> Modified: cocoon/whiteboard/forms/samples/welcome.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/samples/welcome.xml?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/samples/welcome.xml (original) +++ cocoon/whiteboard/forms/samples/welcome.xml Fri Mar 4 07:47:41 2005 @@ -37,6 +37,7 @@ <sample name="Various (Flowscript)" href="form1.flow">The same sample as above using Flowscript.</sample> <sample name="Registration" href="registration">A simple registration form.</sample> <sample name="Car selector" href="carselector">Illustrates programmatically changing selectionlists.</sample> + <sample name="XHR Car selector" href="xhr_carselector">Same sample, using XmlHttpRequest to reduce client/server roundtrips.</sample> <sample name="Country selector" href="countryselector">Illustrates programmatically changing flow-jxpath selectionlists.</sample> <sample name="Upload" href="upload">Shows an upload widget used with Flowscript</sample> <sample name="Form Model GUI" href="form_model_gui.flow">Illustrates the use of Class, New, Struct, and Union.</sample> @@ -60,6 +61,7 @@ <sample name="3. Aggregate Binding" href="binding-03aggregate.flow">fb:aggregate</sample> <sample name="4. Heavy Form" href="binding-04heavy-XML.flow">Form with lots of select boxes - test memory utilization, performance</sample> <sample name="5. Custom Bindings using Java or Javascript" href="binding-05custom.flow">fb:javascript and fb:custom</sample> + <sample name="6. XML binding using namespaces" href="binding-06namespaced-XML.flow">Using XML binding with complex namespaced XML</sample> <!-- TODO: provide more tutorial samples like these: <sample name="6. MultiValue/Repeater Binding" href="binding-03multi.flow">fb:multi-value</sample> <sample name="7. Repeater Binding" href="binding-06repeater.flow">fb:repeater</sample> Modified: cocoon/whiteboard/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilderTestCase.java URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilderTestCase.java?view=diff&r1=156170&r2=156171 ============================================================================== --- cocoon/whiteboard/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilderTestCase.java (original) +++ cocoon/whiteboard/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilderTestCase.java Fri Mar 4 07:47:41 2005 @@ -39,15 +39,10 @@ * @see junit.framework.TestCase#setUp() */ protected void setUp() throws Exception { + super.setUp(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); parser = factory.newDocumentBuilder(); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - protected void tearDown() throws Exception { } public EnumConvertorBuilderTestCase(String name) {
