cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/petstore/samples/flow petstore.js
Date Tue, 09 Mar 2004 10:23:09 GMT
reinhard    2004/03/09 02:23:09

  Modified:    src/blocks/petstore/samples/view/forms editAccountForm_t.xml
                        newOrderForm_d.xml newAccountForm_d.xml
                        newShippingForm_t.xml newAccountForm_t.xml
                        editAccountForm_d.xml newOrderForm_t.xml
                        newShippingForm_d.xml
               src/blocks/petstore/samples/stylesheets ps-woody-default.xsl
               src/blocks/petstore/samples/flow petstore.js
  Log:
  Woody-->CocoonForms (Petstore)
  
  Revision  Changes    Path
  1.3       +67 -67    cocoon-2.1/src/blocks/petstore/samples/view/forms/editAccountForm_t.xml
  
  Index: editAccountForm_t.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/editAccountForm_t.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- editAccountForm_t.xml	6 Mar 2004 02:26:12 -0000	1.2
  +++ editAccountForm_t.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -15,78 +15,78 @@
     limitations under the License.
   -->
   
  -<page xmlns:wt="http://apache.org/cocoon/woody/template/1.0" xmlns:wi="http://apache.org/cocoon/woody/instance/1.0">
  +<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
   	<site signOn="false" view="woody">
  -		<wt:form-template action="#{$continuation/id}.kont" method="POST">
  -			<wi:form layout="grey">
  -				<wi:group>
  -					<wi:label>User Information</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="message">
  -							 <wi:styling class="warnoutput" />
  -						</wt:widget>
  -						<wt:widget id="username">
  -							 <wi:styling class="output" />
  -						</wt:widget>
  -						<wt:widget id="changePwdOption" />
  -						<wt:widget id="password">
  -							 <wi:styling  size="20" type="password"/>
  -						</wt:widget>
  -						<wt:widget id="retypepassword">
  -							 <wi:styling  size="20" type="password"/>
  -						</wt:widget>
  -					</wi:widgets>
  -				</wi:group>
  -				<wi:group>
  -					<wi:label>Account Information</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="firstname">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="lastname">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="email">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="phone">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="addr1">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="addr2">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="city">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="state">
  -							 <wi:styling size="4" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="zip">
  -							 <wi:styling size="10" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="country">
  -							 <wi:styling size="15" maxlength="100" type="text" />
  -						</wt:widget>
  -					</wi:widgets>
  -				</wi:group>
  -				<wi:group>
  -					<wi:label>Profile Information</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="langpref" />
  -						<wt:widget id="favcategory" />
  -						<wt:widget id="mylistopt" />
  -						<wt:widget id="banneropt" />
  -					</wi:widgets>
  -				</wi:group>
  -		</wi:form>
  +		<ft:form-template action="#{$continuation/id}.kont" method="POST">
  +			<fi:form layout="grey">
  +				<fi:group>
  +					<fi:label>User Information</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="message">
  +							 <fi:styling class="warnoutput" />
  +						</ft:widget>
  +						<ft:widget id="username">
  +							 <fi:styling class="output" />
  +						</ft:widget>
  +						<ft:widget id="changePwdOption" />
  +						<ft:widget id="password">
  +							 <fi:styling  size="20" type="password"/>
  +						</ft:widget>
  +						<ft:widget id="retypepassword">
  +							 <fi:styling  size="20" type="password"/>
  +						</ft:widget>
  +					</fi:widgets>
  +				</fi:group>
  +				<fi:group>
  +					<fi:label>Account Information</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="firstname">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="lastname">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="email">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="phone">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="addr1">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="addr2">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="city">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="state">
  +							 <fi:styling size="4" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="zip">
  +							 <fi:styling size="10" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="country">
  +							 <fi:styling size="15" maxlength="100" type="text" />
  +						</ft:widget>
  +					</fi:widgets>
  +				</fi:group>
  +				<fi:group>
  +					<fi:label>Profile Information</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="langpref" />
  +						<ft:widget id="favcategory" />
  +						<ft:widget id="mylistopt" />
  +						<ft:widget id="banneropt" />
  +					</fi:widgets>
  +				</fi:group>
  +		</fi:form>
   		<br />
   		<center>
   			<input border="0" type="image" src="images/button_submit.gif" name="submit" value="Save Account Information" />
   		</center>
  -	 </wt:form-template>
  +	 </ft:form-template>
   	 <p><center><b><a href="listOrders.do">My Orders</a></b></center></p>
   	</site>
   </page>
  
  
  
  1.3       +78 -78    cocoon-2.1/src/blocks/petstore/samples/view/forms/newOrderForm_d.xml
  
  Index: newOrderForm_d.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newOrderForm_d.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- newOrderForm_d.xml	6 Mar 2004 06:16:51 -0000	1.2
  +++ newOrderForm_d.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -14,87 +14,87 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   -->
  -<wd:form
  -	xmlns:wd="http://apache.org/cocoon/woody/definition/1.0"
  +<fd:form
  +	xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
   	xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
   
  -	<wd:widgets>
  +	<fd:widgets>
   
   
  -		<wd:field id="cardType" required="true">
  -			<wd:label>Card Type</wd:label>
  -			<wd:datatype base="string"/>
  -				<wd:selection-list>
  -					<wd:item value="">
  -						<wd:label>Choose Card Type</wd:label>
  -					</wd:item>
  -					<wd:item value="master">
  -						<wd:label>Master Card</wd:label>
  -					</wd:item>
  -					<wd:item value="visa">
  -						<wd:label>Visa Card</wd:label>
  -					</wd:item>
  -					<wd:item value="ae">
  -						<wd:label>American Express</wd:label>
  -					</wd:item>
  -				</wd:selection-list>
  -		</wd:field>
  +		<fd:field id="cardType" required="true">
  +			<fd:label>Card Type</fd:label>
  +			<fd:datatype base="string"/>
  +				<fd:selection-list>
  +					<fd:item value="">
  +						<fd:label>Choose Card Type</fd:label>
  +					</fd:item>
  +					<fd:item value="master">
  +						<fd:label>Master Card</fd:label>
  +					</fd:item>
  +					<fd:item value="visa">
  +						<fd:label>Visa Card</fd:label>
  +					</fd:item>
  +					<fd:item value="ae">
  +						<fd:label>American Express</fd:label>
  +					</fd:item>
  +				</fd:selection-list>
  +		</fd:field>
   		
   		
  -		<wd:field id="creditCard" required="true">
  -			<wd:label>Card Number</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="expiryDate" required="true">
  -			<wd:label>Expiry Date (MM/YYYY)</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="billToFirstName" required="true">
  -			<wd:label>First name</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="billToLastName" required="true">
  -			<wd:label>Last name</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -	
  -		<wd:field id="billAddress1" required="true">
  -			<wd:label>Address 1</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -	
  -		<wd:field id="billAddress2" required="false">
  -			<wd:label>Address 2</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="billCity" required="true">
  -			<wd:label>City</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="billState">
  -			<wd:label>State</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="billZip" required="true">
  -			<wd:label>Zip</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="billCountry" required="true">
  -			<wd:label>Country</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:booleanfield id="shippingAddressRequired">
  -			<wd:label>Ship to different address...</wd:label>
  -		</wd:booleanfield>
  -	</wd:widgets>
  -</wd:form>
  +		<fd:field id="creditCard" required="true">
  +			<fd:label>Card Number</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="expiryDate" required="true">
  +			<fd:label>Expiry Date (MM/YYYY)</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="billToFirstName" required="true">
  +			<fd:label>First name</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="billToLastName" required="true">
  +			<fd:label>Last name</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +	
  +		<fd:field id="billAddress1" required="true">
  +			<fd:label>Address 1</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +	
  +		<fd:field id="billAddress2" required="false">
  +			<fd:label>Address 2</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="billCity" required="true">
  +			<fd:label>City</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="billState">
  +			<fd:label>State</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="billZip" required="true">
  +			<fd:label>Zip</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="billCountry" required="true">
  +			<fd:label>Country</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:booleanfield id="shippingAddressRequired">
  +			<fd:label>Ship to different address...</fd:label>
  +		</fd:booleanfield>
  +	</fd:widgets>
  +</fd:form>
  
  
  
  1.3       +36 -36    cocoon-2.1/src/blocks/petstore/samples/view/forms/newAccountForm_d.xml
  
  Index: newAccountForm_d.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newAccountForm_d.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- newAccountForm_d.xml	6 Mar 2004 06:16:51 -0000	1.2
  +++ newAccountForm_d.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -14,45 +14,45 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   -->
  -<wd:form
  -	xmlns:wd="http://apache.org/cocoon/woody/definition/1.0"
  +<fd:form
  +	xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
   	xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
   
  -	<wd:widgets>
  +	<fd:widgets>
   
  -		<wd:field id="message" required="false">
  -			<wd:label>message:</wd:label>
  -			<wd:datatype base="string">
  -			</wd:datatype>
  -		</wd:field>
  -		<wd:field id="username" required="true">
  -			<wd:label>Username:</wd:label>
  -			<wd:datatype base="string">
  -				<wd:validation>
  -					<wd:length min="2"/>
  -				</wd:validation>
  -			</wd:datatype>
  -		</wd:field>
  +		<fd:field id="message" required="false">
  +			<fd:label>message:</fd:label>
  +			<fd:datatype base="string">
  +			</fd:datatype>
  +		</fd:field>
  +		<fd:field id="username" required="true">
  +			<fd:label>Username:</fd:label>
  +			<fd:datatype base="string">
  +				<fd:validation>
  +					<fd:length min="2"/>
  +				</fd:validation>
  +			</fd:datatype>
  +		</fd:field>
   	
  -		<wd:field id="password" required="true">
  -			<wd:label>Password:</wd:label>
  -			<wd:datatype base="string">
  -				<wd:validation>
  -					<wd:length min="2" max="20"/>
  -				</wd:validation>
  -			</wd:datatype>
  -		</wd:field>
  +		<fd:field id="password" required="true">
  +			<fd:label>Password:</fd:label>
  +			<fd:datatype base="string">
  +				<fd:validation>
  +					<fd:length min="2" max="20"/>
  +				</fd:validation>
  +			</fd:datatype>
  +		</fd:field>
   	
  -		<wd:field id="retypepassword" required="true">
  -			<wd:label>Re-enter password:</wd:label>
  -			<wd:datatype base="string">
  -				<wd:validation>
  -					<wd:assert test="password = retypepassword">
  -						<wd:failmessage>The two passwords are not equal.</wd:failmessage>
  -					</wd:assert>
  -				</wd:validation>
  -			</wd:datatype>
  -		</wd:field>
  +		<fd:field id="retypepassword" required="true">
  +			<fd:label>Re-enter password:</fd:label>
  +			<fd:datatype base="string">
  +				<fd:validation>
  +					<fd:assert test="password = retypepassword">
  +						<fd:failmessage>The two passwords are not equal.</fd:failmessage>
  +					</fd:assert>
  +				</fd:validation>
  +			</fd:datatype>
  +		</fd:field>
   
  -	</wd:widgets>
  -</wd:form>
  +	</fd:widgets>
  +</fd:form>
  
  
  
  1.3       +34 -34    cocoon-2.1/src/blocks/petstore/samples/view/forms/newShippingForm_t.xml
  
  Index: newShippingForm_t.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newShippingForm_t.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- newShippingForm_t.xml	6 Mar 2004 02:26:12 -0000	1.2
  +++ newShippingForm_t.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -15,44 +15,44 @@
     limitations under the License.
   -->
   
  -<page xmlns:wt="http://apache.org/cocoon/woody/template/1.0" xmlns:wi="http://apache.org/cocoon/woody/instance/1.0">
  +<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
   	<site signOn="false" view="woody">
  -		<wt:form-template action="#{$continuation/id}.kont" method="POST">
  -			<wi:form layout="yellow">
  -				<wi:group>
  -					<wi:label>Shipping Address</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="shipToFirstName">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipToLastName">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipAddress1">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipAddress2">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipCity">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipState">
  -							 <wi:styling size="4" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipZip">
  -							 <wi:styling size="10" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shipCountry">
  -							 <wi:styling size="15" maxlength="100" type="text" />
  -						</wt:widget>
  -					</wi:widgets>
  -				</wi:group>
  -		</wi:form>
  +		<ft:form-template action="#{$continuation/id}.kont" method="POST">
  +			<fi:form layout="yellow">
  +				<fi:group>
  +					<fi:label>Shipping Address</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="shipToFirstName">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipToLastName">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipAddress1">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipAddress2">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipCity">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipState">
  +							 <fi:styling size="4" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipZip">
  +							 <fi:styling size="10" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shipCountry">
  +							 <fi:styling size="15" maxlength="100" type="text" />
  +						</ft:widget>
  +					</fi:widgets>
  +				</fi:group>
  +		</fi:form>
   		<br />
   		<p>
   			<input border="0" type="image" src="images/button_submit.gif" name="submit" />
   		</p>
  -	 </wt:form-template>
  +	 </ft:form-template>
   	</site>
   </page>
  
  
  
  1.3       +22 -22    cocoon-2.1/src/blocks/petstore/samples/view/forms/newAccountForm_t.xml
  
  Index: newAccountForm_t.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newAccountForm_t.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- newAccountForm_t.xml	6 Mar 2004 02:26:12 -0000	1.2
  +++ newAccountForm_t.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -15,32 +15,32 @@
     limitations under the License.
   -->
   
  -<page xmlns:wt="http://apache.org/cocoon/woody/template/1.0" xmlns:wi="http://apache.org/cocoon/woody/instance/1.0">
  +<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
   	<site signOn="true" view="woody">
  -		<wt:form-template action="#{$continuation/id}.kont" method="POST">
  -			<wi:form layout="grey">
  -				<wi:group>
  -					<wi:label>Create your New Account</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="message">
  -							 <wi:styling class="warnoutput" />
  -						</wt:widget>
  -						<wt:widget id="username">
  -							 <wi:styling  size="20" maxlength="20" type="text" />
  -						</wt:widget>
  -						<wt:widget id="password">
  -							 <wi:styling  size="20" type="password"/>
  -						</wt:widget>
  -						<wt:widget id="retypepassword">
  -							 <wi:styling  size="20" type="password"/>
  -						</wt:widget>
  -					</wi:widgets>
  -				</wi:group>
  -			</wi:form>
  +		<ft:form-template action="#{$continuation/id}.kont" method="POST">
  +			<fi:form layout="grey">
  +				<fi:group>
  +					<fi:label>Create your New Account</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="message">
  +							 <fi:styling class="warnoutput" />
  +						</ft:widget>
  +						<ft:widget id="username">
  +							 <fi:styling  size="20" maxlength="20" type="text" />
  +						</ft:widget>
  +						<ft:widget id="password">
  +							 <fi:styling  size="20" type="password"/>
  +						</ft:widget>
  +						<ft:widget id="retypepassword">
  +							 <fi:styling  size="20" type="password"/>
  +						</ft:widget>
  +					</fi:widgets>
  +				</fi:group>
  +			</fi:form>
   			<br />
   			<center>
   				<input border="0" type="image" src="images/button_submit.gif" name="submit" value="Save Account Information" />
   			</center>
  -		</wt:form-template>
  +		</ft:form-template>
   	</site>
   </page>
  
  
  
  1.3       +128 -128  cocoon-2.1/src/blocks/petstore/samples/view/forms/editAccountForm_d.xml
  
  Index: editAccountForm_d.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/editAccountForm_d.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- editAccountForm_d.xml	6 Mar 2004 06:16:51 -0000	1.2
  +++ editAccountForm_d.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -14,140 +14,140 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   -->
  -<wd:form
  -	xmlns:wd="http://apache.org/cocoon/woody/definition/1.0"
  +<fd:form
  +	xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
   	xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
   
  -	<wd:widgets>
  +	<fd:widgets>
   
  -		<wd:field id="message" required="false">
  -			<wd:label>message:</wd:label>
  -			<wd:datatype base="string">
  -			</wd:datatype>
  -		</wd:field>
  -
  -		<wd:field id="username">
  -			<wd:label>User ID</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -
  -		<wd:booleanfield id="changePwdOption">
  -			<wd:label>I want to change my Password.</wd:label>
  -		</wd:booleanfield>
  +		<fd:field id="message" required="false">
  +			<fd:label>message:</fd:label>
  +			<fd:datatype base="string">
  +			</fd:datatype>
  +		</fd:field>
  +
  +		<fd:field id="username">
  +			<fd:label>User ID</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +
  +		<fd:booleanfield id="changePwdOption">
  +			<fd:label>I want to change my Password.</fd:label>
  +		</fd:booleanfield>
   		
  -		<wd:field id="password" >
  -			<wd:label>New Password:</wd:label>
  -			<wd:datatype base="string">
  -			</wd:datatype>
  -		</wd:field>
  -	
  -		<wd:field id="retypepassword" >
  -			<wd:label>Re-enter New password:</wd:label>
  -			<wd:datatype base="string">
  -			</wd:datatype>
  -		</wd:field>
  +		<fd:field id="password" >
  +			<fd:label>New Password:</fd:label>
  +			<fd:datatype base="string">
  +			</fd:datatype>
  +		</fd:field>
  +	
  +		<fd:field id="retypepassword" >
  +			<fd:label>Re-enter New password:</fd:label>
  +			<fd:datatype base="string">
  +			</fd:datatype>
  +		</fd:field>
   		
   		
  -		<wd:field id="firstname" required="true">
  -			<wd:label>First Name</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="lastname" required="true">
  -			<wd:label>Last Name</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="email" required="true">
  -			<wd:label>Email</wd:label>
  -			<wd:datatype base="string">
  -				<wd:validation>
  -					<wd:email>
  -						<wd:failmessage>
  +		<fd:field id="firstname" required="true">
  +			<fd:label>First Name</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="lastname" required="true">
  +			<fd:label>Last Name</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="email" required="true">
  +			<fd:label>Email</fd:label>
  +			<fd:datatype base="string">
  +				<fd:validation>
  +					<fd:email>
  +						<fd:failmessage>
   							Please enter a valid e-mail address!
  -						</wd:failmessage>
  -					</wd:email>
  -				</wd:validation>
  -			</wd:datatype>
  -		</wd:field>
  -
  -		<wd:field id="phone" required="true">
  -			<wd:label>Phone</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -
  -		<wd:field id="addr1" required="true">
  -			<wd:label>Address 1</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -	
  -		<wd:field id="addr2" required="false">
  -			<wd:label>Address 2</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="city" required="true">
  -			<wd:label>City</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="state" required="true">
  -			<wd:label>State</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="zip" required="true">
  -			<wd:label>Zip</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="country" required="true">
  -			<wd:label>Country</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -
  -
  -		<wd:field id="langpref">
  -			<wd:label>Language Preference</wd:label>
  -			<wd:datatype base="string"/>
  -				<wd:selection-list>
  -					<wd:item value="english">
  -						<wd:label>english</wd:label>
  -					</wd:item>
  -					<wd:item value="japanese">
  -						<wd:label>japanese</wd:label>
  -					</wd:item>
  -				</wd:selection-list>
  -		</wd:field>
  -
  -		<wd:field id="favcategory">
  -			<wd:label>Favourite Category</wd:label>
  -			<wd:datatype base="string"/>
  -				<wd:selection-list>
  -					<wd:item value="FISH">
  -						<wd:label>FISH</wd:label>
  -					</wd:item>
  -					<wd:item value="DOGS">
  -						<wd:label>DOGS</wd:label>
  -					</wd:item>
  -					<wd:item value="CATS">
  -						<wd:label>CATS</wd:label>
  -					</wd:item>
  -					<wd:item value="BIRDS">
  -						<wd:label>BIRDS</wd:label>
  -					</wd:item>
  -				</wd:selection-list>
  -		</wd:field>
  -
  -		<wd:booleanfield id="mylistopt">
  -			<wd:label>Enable MyList</wd:label>
  -		</wd:booleanfield>
  -
  -		<wd:booleanfield id="banneropt">
  -			<wd:label>Enable MyBanner</wd:label>
  -		</wd:booleanfield>
  +						</fd:failmessage>
  +					</fd:email>
  +				</fd:validation>
  +			</fd:datatype>
  +		</fd:field>
  +
  +		<fd:field id="phone" required="true">
  +			<fd:label>Phone</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +
  +		<fd:field id="addr1" required="true">
  +			<fd:label>Address 1</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +	
  +		<fd:field id="addr2" required="false">
  +			<fd:label>Address 2</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="city" required="true">
  +			<fd:label>City</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="state" required="true">
  +			<fd:label>State</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="zip" required="true">
  +			<fd:label>Zip</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="country" required="true">
  +			<fd:label>Country</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +
  +
  +		<fd:field id="langpref">
  +			<fd:label>Language Preference</fd:label>
  +			<fd:datatype base="string"/>
  +				<fd:selection-list>
  +					<fd:item value="english">
  +						<fd:label>english</fd:label>
  +					</fd:item>
  +					<fd:item value="japanese">
  +						<fd:label>japanese</fd:label>
  +					</fd:item>
  +				</fd:selection-list>
  +		</fd:field>
  +
  +		<fd:field id="favcategory">
  +			<fd:label>Favourite Category</fd:label>
  +			<fd:datatype base="string"/>
  +				<fd:selection-list>
  +					<fd:item value="FISH">
  +						<fd:label>FISH</fd:label>
  +					</fd:item>
  +					<fd:item value="DOGS">
  +						<fd:label>DOGS</fd:label>
  +					</fd:item>
  +					<fd:item value="CATS">
  +						<fd:label>CATS</fd:label>
  +					</fd:item>
  +					<fd:item value="BIRDS">
  +						<fd:label>BIRDS</fd:label>
  +					</fd:item>
  +				</fd:selection-list>
  +		</fd:field>
  +
  +		<fd:booleanfield id="mylistopt">
  +			<fd:label>Enable MyList</fd:label>
  +		</fd:booleanfield>
  +
  +		<fd:booleanfield id="banneropt">
  +			<fd:label>Enable MyBanner</fd:label>
  +		</fd:booleanfield>
   
   
  -	</wd:widgets>
  -</wd:form>
  +	</fd:widgets>
  +</fd:form>
  
  
  
  1.3       +50 -50    cocoon-2.1/src/blocks/petstore/samples/view/forms/newOrderForm_t.xml
  
  Index: newOrderForm_t.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newOrderForm_t.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- newOrderForm_t.xml	6 Mar 2004 02:26:12 -0000	1.2
  +++ newOrderForm_t.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -15,60 +15,60 @@
     limitations under the License.
   -->
   
  -<page xmlns:wt="http://apache.org/cocoon/woody/template/1.0" xmlns:wi="http://apache.org/cocoon/woody/instance/1.0">
  +<page xmlns:ft="http://apache.org/cocoon/forms/1.0#template" xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
   	<site signOn="false" view="woody">
  -		<wt:form-template action="#{$continuation/id}.kont" method="POST">
  -			<wi:form layout="yellow">
  -				<wi:group>
  -					<wi:label>Payment Details</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="cardType">
  -							 <wi:styling size="30" maxlength="20" type="text" />
  -						</wt:widget>
  -						<wt:widget id="creditCard">
  -							 <wi:styling size="30" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="expiryDate">
  -							 <wi:styling size="30" maxlength="100" type="text" />
  -						</wt:widget>
  -					</wi:widgets>
  -				</wi:group>
  -				<wi:group>
  -					<wi:label>Billing Address</wi:label>
  -					<wi:widgets>
  -						<wt:widget id="billToFirstName">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billToLastName">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billAddress1">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billAddress2">
  -							 <wi:styling size="40" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billCity">
  -							 <wi:styling maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billState">
  -							 <wi:styling size="4" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billZip">
  -							 <wi:styling size="10" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="billCountry">
  -							 <wi:styling size="15" maxlength="100" type="text" />
  -						</wt:widget>
  -						<wt:widget id="shippingAddressRequired">
  -						</wt:widget>
  -					</wi:widgets>
  -				</wi:group>
  -		</wi:form>
  +		<ft:form-template action="#{$continuation/id}.kont" method="POST">
  +			<fi:form layout="yellow">
  +				<fi:group>
  +					<fi:label>Payment Details</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="cardType">
  +							 <fi:styling size="30" maxlength="20" type="text" />
  +						</ft:widget>
  +						<ft:widget id="creditCard">
  +							 <fi:styling size="30" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="expiryDate">
  +							 <fi:styling size="30" maxlength="100" type="text" />
  +						</ft:widget>
  +					</fi:widgets>
  +				</fi:group>
  +				<fi:group>
  +					<fi:label>Billing Address</fi:label>
  +					<fi:widgets>
  +						<ft:widget id="billToFirstName">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billToLastName">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billAddress1">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billAddress2">
  +							 <fi:styling size="40" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billCity">
  +							 <fi:styling maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billState">
  +							 <fi:styling size="4" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billZip">
  +							 <fi:styling size="10" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="billCountry">
  +							 <fi:styling size="15" maxlength="100" type="text" />
  +						</ft:widget>
  +						<ft:widget id="shippingAddressRequired">
  +						</ft:widget>
  +					</fi:widgets>
  +				</fi:group>
  +		</fi:form>
   		<br />
   		<p>
   			<input border="0" type="image" src="images/button_submit.gif" name="submit" />
   		</p>
  -	 </wt:form-template>
  +	 </ft:form-template>
   	</site>
   </page>
  
  
  
  1.3       +46 -46    cocoon-2.1/src/blocks/petstore/samples/view/forms/newShippingForm_d.xml
  
  Index: newShippingForm_d.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/forms/newShippingForm_d.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- newShippingForm_d.xml	6 Mar 2004 06:16:51 -0000	1.2
  +++ newShippingForm_d.xml	9 Mar 2004 10:23:08 -0000	1.3
  @@ -14,54 +14,54 @@
     See the License for the specific language governing permissions and
     limitations under the License.
   -->
  -<wd:form
  -	xmlns:wd="http://apache.org/cocoon/woody/definition/1.0"
  +<fd:form
  +	xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
   	xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
   
  -	<wd:widgets>
  +	<fd:widgets>
   
  -		<wd:field id="shipToFirstName" required="true">
  -			<wd:label>First name</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="shipToLastName" required="true">
  -			<wd:label>Last name</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -	
  -		<wd:field id="shipAddress1" required="true">
  -			<wd:label>Address 1</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -	
  -		<wd:field id="shipAddress2" required="false">
  -			<wd:label>Address 2</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="shipCity" required="true">
  -			<wd:label>City</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="shipState">
  -			<wd:label>State</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="shipZip" required="true">
  -			<wd:label>Zip</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  -	
  -		<wd:field id="shipCountry" required="true">
  -			<wd:label>Country</wd:label>
  -			<wd:datatype base="string"/>
  -		</wd:field>
  +		<fd:field id="shipToFirstName" required="true">
  +			<fd:label>First name</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="shipToLastName" required="true">
  +			<fd:label>Last name</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +	
  +		<fd:field id="shipAddress1" required="true">
  +			<fd:label>Address 1</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +	
  +		<fd:field id="shipAddress2" required="false">
  +			<fd:label>Address 2</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="shipCity" required="true">
  +			<fd:label>City</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="shipState">
  +			<fd:label>State</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="shipZip" required="true">
  +			<fd:label>Zip</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
  +	
  +		<fd:field id="shipCountry" required="true">
  +			<fd:label>Country</fd:label>
  +			<fd:datatype base="string"/>
  +		</fd:field>
   
  -	</wd:widgets>
  +	</fd:widgets>
   
  -</wd:form>
  +</fd:form>
  
  
  
  1.3       +55 -55    cocoon-2.1/src/blocks/petstore/samples/stylesheets/ps-woody-default.xsl
  
  Index: ps-woody-default.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/stylesheets/ps-woody-default.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ps-woody-default.xsl	6 Mar 2004 02:26:17 -0000	1.2
  +++ ps-woody-default.xsl	9 Mar 2004 10:23:09 -0000	1.3
  @@ -17,12 +17,12 @@
   <xsl:stylesheet
       version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -    xmlns:wi="http://apache.org/cocoon/woody/instance/1.0">
  +    xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
   
  -    <xsl:template match="wi:field">
  +    <xsl:template match="fi:field">
   
           <xsl:choose>
  -            <xsl:when test="wi:selection-list">
  +            <xsl:when test="fi:selection-list">
                   <xsl:call-template name="field-with-selection-list">
                       <xsl:with-param name="fieldelement" select="."/>
                   </xsl:call-template>
  @@ -34,9 +34,9 @@
               </xsl:otherwise>
           </xsl:choose>
   
  -        <xsl:if test="wi:validation-message">
  +        <xsl:if test="fi:validation-message">
               <xsl:call-template name="validation-message">
  -                <xsl:with-param name="message" select="wi:validation-message"/>
  +                <xsl:with-param name="message" select="fi:validation-message"/>
               </xsl:call-template>
           </xsl:if>
           <xsl:if test="@required='true'">
  @@ -46,9 +46,9 @@
   
       <xsl:template name="field">
           <xsl:param name="fieldelement"/>
  -        <input name="{$fieldelement/@id}" value="{$fieldelement/wi:value}">
  -            <xsl:if test="wi:styling">
  -                <xsl:copy-of select="wi:styling/@*"/>
  +        <input name="{$fieldelement/@id}" value="{$fieldelement/fi:value}">
  +            <xsl:if test="fi:styling">
  +                <xsl:copy-of select="fi:styling/@*"/>
               </xsl:if>
           </input>
       </xsl:template>
  @@ -56,18 +56,18 @@
       <xsl:template name="field-with-selection-list">
           <xsl:param name="fieldelement"/>
   
  -        <xsl:variable name="value" select="$fieldelement/wi:value"/>
  -        <xsl:variable name="liststyle" select="$fieldelement/wi:styling/list-style/text()"/>
  +        <xsl:variable name="value" select="$fieldelement/fi:value"/>
  +        <xsl:variable name="liststyle" select="$fieldelement/fi:styling/list-style/text()"/>
   
           <xsl:choose>
               <xsl:when test="$liststyle='radio'">
  -                <xsl:for-each select="$fieldelement/wi:selection-list/wi:item">
  +                <xsl:for-each select="$fieldelement/fi:selection-list/fi:item">
                       <input type="radio" name="{$fieldelement/@id}" value="{@value}">
                           <xsl:if test="@value = $value">
                               <xsl:attribute name="checked">true</xsl:attribute>
                           </xsl:if>
                       </input>
  -                    <xsl:copy-of select="wi:label/node()"/><br/>
  +                    <xsl:copy-of select="fi:label/node()"/><br/>
                   </xsl:for-each>
               </xsl:when>
               <xsl:otherwise>
  @@ -76,8 +76,8 @@
                       <xsl:if test="$liststyle='listbox'">
                           <xsl:attribute name="size">
                               <xsl:choose>
  -                                <xsl:when test="$fieldelement/wi:styling/listbox-size">
  -                                    <xsl:value-of select="$fieldelement/wi:styling/listbox-size"/>
  +                                <xsl:when test="$fieldelement/fi:styling/listbox-size">
  +                                    <xsl:value-of select="$fieldelement/fi:styling/listbox-size"/>
                                   </xsl:when>
                                   <xsl:otherwise>
                                       <xsl:text>5</xsl:text>
  @@ -85,12 +85,12 @@
                               </xsl:choose>
                           </xsl:attribute>
                       </xsl:if>
  -                    <xsl:for-each select="$fieldelement/wi:selection-list/wi:item">
  +                    <xsl:for-each select="$fieldelement/fi:selection-list/fi:item">
                           <option value="{@value}">
                               <xsl:if test="@value = $value">
                                   <xsl:attribute name="selected">selected</xsl:attribute>
                               </xsl:if>
  -                            <xsl:copy-of select="wi:label/node()"/>
  +                            <xsl:copy-of select="fi:label/node()"/>
                           </option>
                       </xsl:for-each>
                   </select>
  @@ -103,25 +103,25 @@
           &#160;<a href="#" style="color:RED; font-weight: bold; font-size: 24px;" onclick="alert('{normalize-space($message)}')">!</a>
       </xsl:template>
   
  -    <xsl:template match="wi:output">
  -        <xsl:copy-of select="wi:value/node()"/>
  +    <xsl:template match="fi:output">
  +        <xsl:copy-of select="fi:value/node()"/>
       </xsl:template>
   
  -    <xsl:template match="wi:booleanfield">
  +    <xsl:template match="fi:booleanfield">
           <input type="checkbox" value="true" name="{@id}">
  -            <xsl:if test="wi:value/text() = 'true'">
  +            <xsl:if test="fi:value/text() = 'true'">
                   <xsl:attribute name="checked">true</xsl:attribute>
               </xsl:if>
           </input>
       </xsl:template>
   
  -    <xsl:template match="wi:action">
  +    <xsl:template match="fi:action">
           <input type="submit" name="{@id}">
  -            <xsl:attribute name="value"><xsl:value-of select="wi:label/node()"/></xsl:attribute>
  +            <xsl:attribute name="value"><xsl:value-of select="fi:label/node()"/></xsl:attribute>
           </input>
       </xsl:template>
   
  -    <xsl:template match="wi:continuation-id">
  +    <xsl:template match="fi:continuation-id">
           <xsl:choose>
               <xsl:when test="@name">
                   <input name="{@name}" type="hidden" value="{.}"/>
  @@ -132,39 +132,39 @@
           </xsl:choose>
       </xsl:template>
   
  -    <xsl:template match="wi:multivaluefield">
  -        <xsl:if test="wi:validation-message">
  +    <xsl:template match="fi:multivaluefield">
  +        <xsl:if test="fi:validation-message">
               <xsl:call-template name="validation-message">
  -                <xsl:with-param name="message" select="wi:validation-message"/>
  +                <xsl:with-param name="message" select="fi:validation-message"/>
               </xsl:call-template>
           </xsl:if>
           <xsl:variable name="id" select="@id"/>
  -        <xsl:variable name="values" select="wi:values/wi:value/text()"/>
  -        <xsl:for-each select="wi:selection-list/wi:item">
  +        <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"/>
               <input type="checkbox" value="{@value}" name="{$id}">
                   <xsl:if test="$values[.=$value]">
                       <xsl:attribute name="checked">true</xsl:attribute>
                   </xsl:if>
               </input>
  -            <xsl:copy-of select="wi:label/node()"/>
  +            <xsl:copy-of select="fi:label/node()"/>
               <br/>
           </xsl:for-each>
       </xsl:template>
   
  -    <xsl:template match="wi:repeater">
  +    <xsl:template match="fi:repeater">
           <input type="hidden" name="{@id}.size" value="{@size}"/>
           <table border="1">
               <tr>
  -                <xsl:for-each select="wi:headings/wi:heading">
  +                <xsl:for-each select="fi:headings/fi:heading">
                       <th><xsl:value-of select="."/></th>
                   </xsl:for-each>
               </tr>
  -            <xsl:apply-templates select="wi:repeater-row"/>
  +            <xsl:apply-templates select="fi:repeater-row"/>
           </table>
       </xsl:template>
   
  -    <xsl:template match="wi:repeater-row">
  +    <xsl:template match="fi:repeater-row">
           <tr>
               <xsl:for-each select="*">
                   <td>
  @@ -174,22 +174,22 @@
           </tr>
       </xsl:template>
   
  -    <xsl:template match="wi:repeater-size">
  +    <xsl:template match="fi:repeater-size">
           <input type="hidden" name="{@id}.size" value="{@size}"/>
       </xsl:template>
   
  -    <xsl:template match="wi:form-template">
  +    <xsl:template match="fi:form-template">
           <form>
               <xsl:apply-templates select="@*|node()"/>
           </form>
       </xsl:template>
       
  -    <xsl:template match="wi:form[@layout='grey']">
  +    <xsl:template match="fi:form[@layout='grey']">
           <table cellpadding="10" cellspacing="0" align="center" border="1" bgcolor="#dddddd">
               <tr>
                   <td>
  -                    <xsl:for-each select="wi:group">
  -                        <font color="darkgreen"><h3><xsl:value-of select="wi:label"/></h3></font>
  +                    <xsl:for-each select="fi:group">
  +                        <font color="darkgreen"><h3><xsl:value-of select="fi:label"/></h3></font>
                           <table bgcolor="#008800" border="0" cellpadding="3" cellspacing="1">
                               <xsl:call-template name="processWidgets" />
                           </table>
  @@ -199,11 +199,11 @@
           </table>
       </xsl:template>
   
  -    <xsl:template match="wi:form[@layout='yellow']">
  +    <xsl:template match="fi:form[@layout='yellow']">
           <table bgcolor="#008800" border="0" cellpadding="3" cellspacing="1">
  -            <xsl:for-each select="wi:group">
  +            <xsl:for-each select="fi:group">
                   <tr bgcolor="#FFFF88">
  -                    <td colspan="2"><font color="GREEN" size="4"><b><xsl:value-of select="wi:label"/></b></font></td>
  +                    <td colspan="2"><font color="GREEN" size="4"><b><xsl:value-of select="fi:label"/></b></font></td>
                   </tr>
                   <xsl:call-template name="processWidgets" />
               </xsl:for-each>
  @@ -213,7 +213,7 @@
   
   
       <xsl:template name="processWidgets">
  -            <xsl:for-each select="wi:widgets/*">
  +            <xsl:for-each select="fi:widgets/*">
                       <xsl:choose>
                           <xsl:when test="local-name(.) = 'repeater'">
                               <tr bgcolor="#FFFF88">
  @@ -225,31 +225,31 @@
                                   <td colspan="2">
                                       <xsl:apply-templates select="."/>
                                       <xsl:text> </xsl:text>
  -                                    <xsl:copy-of select="wi:label"/>
  +                                    <xsl:copy-of select="fi:label"/>
                                   </td>
                               </tr>
                           </xsl:when>
  -                        <xsl:when test="wi:styling/@class = 'output'">
  +                        <xsl:when test="fi:styling/@class = 'output'">
                               <tr bgcolor="#FFFF88">
                                   <td>
  -                                    <xsl:value-of select="wi:label"/>
  +                                    <xsl:value-of select="fi:label"/>
                                   </td>
                                   <td>
  -                                    <xsl:value-of select="wi:value"/><input type="hidden" name="{@id}" value="{wi:value}" />
  +                                    <xsl:value-of select="fi:value"/><input type="hidden" name="{@id}" value="{fi:value}" />
                                   </td>
                               </tr>
                           </xsl:when>
  -                        <xsl:when test="wi:styling/@class = 'warnoutput'">
  +                        <xsl:when test="fi:styling/@class = 'warnoutput'">
                               <xsl:variable name="tmp">
  -                                <xsl:value-of select="wi:value"/>
  +                                <xsl:value-of select="fi:value"/>
                               </xsl:variable> 
                               <xsl:if test="boolean(normalize-space($tmp))"> 
                                   <tr bgcolor="#FFFF88">
                                       <td>
  -                                        <xsl:value-of select="wi:label"/>
  +                                        <xsl:value-of select="fi:label"/>
                                       </td>
                                       <td>
  -                                        <b><font color="RED"><xsl:value-of select="wi:value"/></font></b>
  +                                        <b><font color="RED"><xsl:value-of select="fi:value"/></font></b>
                                       </td>
                                   </tr>
                               </xsl:if> 
  @@ -257,7 +257,7 @@
                           <xsl:otherwise>
                               <tr bgcolor="#FFFF88">
                                   <td>
  -                                    <xsl:value-of select="wi:label"/>
  +                                    <xsl:value-of select="fi:label"/>
                                   </td>
                                   <td>
                                       <xsl:apply-templates select="."/>
  @@ -270,12 +270,12 @@
   
   
   
  -    <xsl:template match="wi:aggregatefield">
  -        <input name="{@id}" value="{wi:value}"/>
  +    <xsl:template match="fi:aggregatefield">
  +        <input name="{@id}" value="{fi:value}"/>
   
  -        <xsl:if test="wi:validation-message">
  +        <xsl:if test="fi:validation-message">
               <xsl:call-template name="validation-message">
  -                <xsl:with-param name="message" select="wi:validation-message"/>
  +                <xsl:with-param name="message" select="fi:validation-message"/>
               </xsl:call-template>
           </xsl:if>
           <xsl:if test="@required='true'">
  
  
  
  1.7       +1 -1      cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js
  
  Index: petstore.js
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- petstore.js	5 Mar 2004 13:02:03 -0000	1.6
  +++ petstore.js	9 Mar 2004 10:23:09 -0000	1.7
  @@ -17,7 +17,7 @@
   // Page Flow for PetStore Application
   
   // load WOODY support
  -cocoon.load("resource://org/apache/cocoon/woody/flow/javascript/woody2.js");
  +cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/forms.js");
   
   var MAX_RESULTS = 5;
   
  
  
  

Mime
View raw message