cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From coli...@apache.org
Subject cvs commit: cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath Cart.xml Category.xml Checkout.xml ConfirmOrder.xml IncludeBottom.xml IncludeMyList.xml IncludeTop.xml Item.xml NewAccountForm.xml NewOrderForm.xml Product.xml SearchProducts.xml ShippingForm.xml SignonForm.xml ViewOrder.xml index.xml
Date Tue, 15 Apr 2003 21:13:23 GMT
coliver     2003/04/15 14:13:23

  Modified:    src/scratchpad/webapp/samples/petstore/view/jxpath Cart.xml
                        Category.xml Checkout.xml ConfirmOrder.xml
                        IncludeBottom.xml IncludeMyList.xml IncludeTop.xml
                        Item.xml NewAccountForm.xml NewOrderForm.xml
                        Product.xml SearchProducts.xml ShippingForm.xml
                        SignonForm.xml ViewOrder.xml index.xml
  Log:
  fixed syntax error
  
  Revision  Changes    Path
  1.5       +21 -21    cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Cart.xml
  
  Index: Cart.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Cart.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Cart.xml	14 Apr 2003 18:48:30 -0000	1.4
  +++ Cart.xml	15 Apr 2003 21:13:22 -0000	1.5
  @@ -6,7 +6,7 @@
   
   <html xmlns:t="http://cocoon.apache.org/transformation/jxpath/1.0">
   <body>
  -<t:import uri="{'view/jxpath/IncludeTop.xml'}" select="{.}"/>
  +<t:import uri="view/jxpath/IncludeTop.xml"/>
   <table border="0" width="100%" cellspacing="0" cellpadding="0">
   <tr><td valign="top" width="20%" align="left">
   <table align="left" bgcolor="#008800" border="0" cellspacing="2" cellpadding="2">
  @@ -22,36 +22,36 @@
     <td><b>Item ID</b></td>  <td><b>Product ID</b></td>
 <td><b>Description</b></td>  <td><b>Quantity</b></td>
 <td><b>List Price</b></td>  <td> </td>
     </tr>
   
  -<t:if test="{number(cartForm/cart/numberOfItems) = 0}"> 
  +<t:if test="#{number(cartForm/cart/numberOfItems) = 0}"> 
   <tr bgcolor="#FFFF88"><td colspan="6"><b>Your cart is empty.</b></td></tr>
   </t:if>
  -<t:for-each select="{cartItems}">
  +<t:for-each select="#{cartItems}">
     <tr bgcolor="#FFFF88">
     <td><b>
  - {item/itemId}
  - <a href="viewItem.do?cartItem={item/itemId}">
  + #{item/itemId}
  + <a href="viewItem.do?cartItem=#{item/itemId}">
   </a></b></td>
  -  <td>{item/productId}</td>
  +  <td>#{item/productId}</td>
     <td>
  -     {item/attr1}
  -     {item/attr2}
  -     {item/attr3}
  -     {item/attr4}
  -     {item/attr5}
  -     {item/product/name}
  +     #{item/attr1}
  +     #{item/attr2}
  +     #{item/attr3}
  +     #{item/attr4}
  +     #{item/attr5}
  +     #{item/product/name}
      </td>
     <td align="center">
  -  <input type="text" size="3" name="{item/itemId}" value="{quantity}" />
  +  <input type="text" size="3" name="#{item/itemId}" value="#{quantity}" />
     </td>
  -  <td align="right">{ format-number(item/listPrice, '$#,##0.00') }</td>
  -  <td><a href="removeItemFromCart.do?workingItemId={item/itemId}">
  +  <td align="right">#{ format-number(item/listPrice, '$#,##0.00') }</td>
  +  <td><a href="removeItemFromCart.do?workingItemId=#{item/itemId}">
     <img border="0" src="images/button_remove.gif" /></a></td>
     </tr>
   </t:for-each>
   <tr bgcolor="#FFFF88">
   <td colspan="5" align="right">
   
  -<b>Sub Total: { format-number(cartForm/cart/subTotal, '$#,##0.00') }</b><br
/>
  +<b>Sub Total: #{ format-number(cartForm/cart/subTotal, '$#,##0.00') }</b><br
/>
   <input type="image" border="0" src="images/button_update_cart.gif" name="update" />
   
   </td><td> </td>
  @@ -59,7 +59,7 @@
   </table>
   </form>
   
  -<t:if test="{number(cartForm/cart/numberOfItems) > 0}">
  +<t:if test="#{number(cartForm/cart/numberOfItems) > 0}">
   <br /><center><a href="checkout.do"><img border="0" src="images/button_checkout.gif"
/></a></center>
   </t:if>
   
  @@ -67,10 +67,10 @@
   
   
   <td valign="top" width="20%" align="right">
  -<t:if test="{accountForm}">
  - <t:if test="{accountForm/account}">
  -  <t:if test="{accountForm/account/username}">
  -    <t:if test="{accountForm/account/listOption}">
  +<t:if test="#{accountForm}">
  + <t:if test="#{accountForm/account}">
  +  <t:if test="#{accountForm/account/username}">
  +    <t:if test="#{accountForm/account/listOption}">
         <t:import uri="view/jxpath/IncludeMyList.xml"/>
       </t:if>
     </t:if>
  
  
  
  1.2       +4 -4      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Category.xml
  
  Index: Category.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Category.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Category.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ Category.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,13 +1,13 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
  -        <category name="{category/name}">
  +        <category name="#{category/name}">
               <jxpath:for-each select="productList" >
  -                <product name="{name}" id="{productId}"/>
  +                <product name="#{name}" id="#{productId}"/>
               </jxpath:for-each>
  -            <situation firstPage="{firstPage}" lastPage="{lastPage}" continuation="{$continuation/id}"/>
  +            <situation firstPage="#{firstPage}" lastPage="#{lastPage}" continuation="#{$continuation/id}"/>
           </category>
       </site>
   </page>
  
  
  
  1.2       +3 -3      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Checkout.xml
  
  Index: Checkout.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Checkout.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Checkout.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ Checkout.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,11 +1,11 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
           <cart name="Checkout Summary">
               <backpointer name="Shopping Cart" do="viewCart.do" />
               <jxpath:for-each select="cartItems" >
  -                <item product-id="{item/productId}" id="{item/itemId}">
  +                <item product-id="#{item/productId}" id="#{item/itemId}">
                       <desc>
                           <jxpath:value-of select="item/attr1"/> 
                           <jxpath:value-of select="item/attr2"/> 
  @@ -19,7 +19,7 @@
                   </item>
               </jxpath:for-each>
               <total><jxpath:value-of select="cartForm/cart/subTotal"/></total>
  -            <nextpointer img="images/button_continue.gif" do="{$continuation/id}.kont"/>
  +            <nextpointer img="images/button_continue.gif" do="#{$continuation/id}.kont"/>
           </cart>
       </site>
   </page>
  
  
  
  1.3       +3 -3      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ConfirmOrder.xml
  
  Index: ConfirmOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ConfirmOrder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfirmOrder.xml	13 Apr 2003 21:52:31 -0000	1.2
  +++ ConfirmOrder.xml	15 Apr 2003 21:13:22 -0000	1.3
  @@ -1,10 +1,10 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <message>Please confirm the information below and then press continue...</message>
  -        <panel header="Order #{order/orderId}" subheader="{order/orderDate}">
  +        <panel header="Order ##{order/orderId}" subheader="#{order/orderDate}">
               <panel label="Payment Details">
                   <field label="Card Type"><jxpath:value-of select="order/cardType"
/></field>
                   <field label="Card Number"><jxpath:value-of select="order/creditCard"
/></field>
  @@ -31,7 +31,7 @@
                   <field label="Country" ><jxpath:value-of select="order/shipCountry"/></field>
               </panel>
           </panel>
  -        <nextpointer img="images/button_continue.gif" do="{$continuation/id}.kont?confirmed=true"/>
  +        <nextpointer img="images/button_continue.gif" do="#{$continuation/id}.kont?confirmed=true"/>
       </site>
   
   </page>
  
  
  
  1.2       +5 -5      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeBottom.xml
  
  Index: IncludeBottom.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeBottom.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IncludeBottom.xml	14 Apr 2003 15:54:40 -0000	1.1
  +++ IncludeBottom.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,14 +1,14 @@
   <c:template xmlns:c="http://cocoon.apache.org/transformation/jxpath/1.0">
   <br />
  -<c:if test="{accountForm/account}">
  -  <c:if test="{accountForm/account/username}">
  -    <c:if test="{accountForm/account/bannerOption}">
  +<c:if test="#{accountForm/account}">
  +  <c:if test="#{accountForm/account/username}">
  +    <c:if test="#{accountForm/account/bannerOption}">
         <table align="center" background="images/bkg-topbar.gif" cellpadding="5" width="100%">
         <tr><td>
  -<c:if test="{accountForm/account/bannerName}"> 
  +<c:if test="#{accountForm/account/bannerName}"> 
         <center>
             <image>
  -          <c:value-of select="{accountForm/account/bannerName}"/>
  +          <c:value-of select="#{accountForm/account/bannerName}"/>
   	  </image>
         </center>
   </c:if>
  
  
  
  1.2       +7 -7      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeMyList.xml
  
  Index: IncludeMyList.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeMyList.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IncludeMyList.xml	14 Apr 2003 15:54:40 -0000	1.1
  +++ IncludeMyList.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,5 +1,5 @@
   <t:template xmlns:t="http://cocoon.apache.org/transformation/jxpath/1.0">
  -<t:if test="{myList}">
  +<t:if test="#{myList}">
   <p> </p>
   <table align="right" bgcolor="#008800" border="0" cellspacing="2" cellpadding="3">
     <tr bgcolor="#CCCCCC"><td>
  @@ -8,21 +8,21 @@
     </td></tr>
     <tr bgcolor="#FFFF88">
     <td>
  -<t:for-each select="{myList}"> 
  -    <a href="viewProduct.do?productId={product/productId}">
  -        {product/name}</a>
  +<t:for-each select="#{myList}"> 
  +    <a href="viewProduct.do?productId=#{product/productId}">
  +        #{product/name}</a>
       <br />
  -    <font size="2">{product/productId}</font>
  +    <font size="2">#{product/productId}</font>
       <br />
   </t:for-each>
     </td>
     </tr>
     <tr>
     <td>
  -<t:if test="{not(accountForm/myListPage/firstPage)}">
  +<t:if test="#{not(accountForm/myListPage/firstPage)}">
       <a href="?page=previous"><font color="white"><B>&lt;&lt;
Prev</B></font></a>
   </t:if>
  -<t:if test="{not(accountForm/myListPage/lastPage)}">
  +<t:if test="#{not(accountForm/myListPage/lastPage)}">
       <a href="?page=next"><font color="white"><B>Next &gt;&gt;</B></font></a>
   </t:if>
     </td>
  
  
  
  1.2       +4 -4      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeTop.xml
  
  Index: IncludeTop.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/IncludeTop.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- IncludeTop.xml	14 Apr 2003 15:54:41 -0000	1.1
  +++ IncludeTop.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -18,7 +18,7 @@
         <img border="0" src="images/separator.gif" />
   
   <t:choose>
  -  <t:when test="{accountForm/signOn}"> 
  +  <t:when test="#{accountForm/signOn}"> 
         <a href="signonForm.do">
         <img border="0" name="img_signin" src="images/sign-in.gif" /></a>
     </t:when>
  @@ -44,10 +44,10 @@
   <t:import uri="view/jxpath/IncludeQuickHeader.xml"/>
   
   <!-- Support for non-traditional but simpler use of errors... -->
  -<t:if test="{errors}">
  -  <t:for-each select="{errors}">
  +<t:if test="#{errors}">
  +  <t:for-each select="#{errors}">
       <B><FONT color="RED">
  -      <BR>{.}</BR>
  +      <BR>#{.}</BR>
       </FONT></B>
     </t:for-each>
   </t:if>
  
  
  
  1.2       +3 -3      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Item.xml
  
  Index: Item.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Item.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Item.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ Item.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  -        <backpointer name="{product/name}" do="viewProduct.do?productId={product/productId}"/>
  -        <item id="{item/itemId}">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
  +        <backpointer name="#{product/name}" do="viewProduct.do?productId=#{product/productId}"/>
  +        <item id="#{item/itemId}">
               <product-desc><jxpath:value-of select="product/descn"/></product-desc>
               <product-name><jxpath:value-of select="product/name"/></product-name>
               <desc>
  
  
  
  1.2       +2 -2      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewAccountForm.xml
  
  Index: NewAccountForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewAccountForm.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NewAccountForm.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ NewAccountForm.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,8 +1,8 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  -        <form method="POST" styleId="workingAccountForm" action="{$continuation/id}.kont">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
  +        <form method="POST" styleId="workingAccountForm" action="#{$continuation/id}.kont">
   <!--
           <input type="hidden" name="validate" value="editAccount" />
           <input type="hidden"  name="account.username" /> -->
  
  
  
  1.4       +11 -11    cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewOrderForm.xml
  
  Index: NewOrderForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/NewOrderForm.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NewOrderForm.xml	13 Apr 2003 22:21:50 -0000	1.3
  +++ NewOrderForm.xml	15 Apr 2003 21:13:22 -0000	1.4
  @@ -1,27 +1,27 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  -        <form method="POST" styleId="workingOrderForm" action="{$continuation/id}.kont">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
  +        <form method="POST" styleId="workingOrderForm" action="#{$continuation/id}.kont">
           <panel>
               <panel label="Payment Details">
                   <select name="order.cardType" label="Card Type">
                       <jxpath:for-each select="creditCardTypes" >
  -                        <option value="{.}"><jxpath:value-of select="." /></option>
  +                        <option value="#{.}"><jxpath:value-of select="." /></option>
                       </jxpath:for-each>
                   </select>
                   <input type="text" name="creditCard" label="Card Number" />
                   <input type="text" name="expiryDate" label="Expiry Date (MM/YYYY)" />
               </panel>
               <panel label="Billing Address">
  -                <input type="text" name="billToFirstName" label="First name" value="{order/billToFirstName}"/>
  -                <input type="text" name="billToLastName" label="Last name" value="{order/billToLastName}"/>
  -                <input type="text" size="40" name="billAddress1"  label="Address 1"
value="{order/billAddress}"/>
  -                <input type="text" size="40" name="billAddress2" label="Address 2" value="{order/billAddress2}"/>
  -                <input type="text" name="billCity" label="City" value="{order/billCity}"/>
  -                <input type="text" name="billState" label="State" value="{order/billState}"/>
  -                <input type="text" name="billZip" label="Zip" value="{order/billZip}"/>
  -                <input type="text" size="15" name="billCountry" label="Country" value="{order/billCountry}"/>
  +                <input type="text" name="billToFirstName" label="First name" value="#{order/billToFirstName}"/>
  +                <input type="text" name="billToLastName" label="Last name" value="#{order/billToLastName}"/>
  +                <input type="text" size="40" name="billAddress1"  label="Address 1"
value="#{order/billAddress}"/>
  +                <input type="text" size="40" name="billAddress2" label="Address 2" value="#{order/billAddress2}"/>
  +                <input type="text" name="billCity" label="City" value="#{order/billCity}"/>
  +                <input type="text" name="billState" label="State" value="#{order/billState}"/>
  +                <input type="text" name="billZip" label="Zip" value="#{order/billZip}"/>
  +                <input type="text" size="15" name="billCountry" label="Country" value="#{order/billCountry}"/>
                   <input type="checkbox" name="shippingAddressRequired" label="Ship to
different address..."/>
               </panel>
           </panel>
  
  
  
  1.2       +5 -5      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Product.xml
  
  Index: Product.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/Product.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Product.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ Product.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,11 +1,11 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  -        <backpointer name="{product/category}" do="viewCategory.do?categoryId={product/category}"/>
  -        <product name="{product/name}">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
  +        <backpointer name="#{product/category}" do="viewCategory.do?categoryId=#{product/category}"/>
  +        <product name="#{product/name}">
               <jxpath:for-each select="itemList" >
  -                <item productId="{productId}" id="{itemId}">
  +                <item productId="#{productId}" id="#{itemId}">
                       <desc>
                           <jxpath:value-of select="attr1"/> 
                           <jxpath:value-of select="attr2"/> 
  @@ -16,7 +16,7 @@
                       <price><jxpath:value-of select="listPrice"/></price>
                   </item>
               </jxpath:for-each>
  -            <situation firstPage="{firstPage}" lastPage="{lastPage}" continuation="{$continuation/id}"/>
  +            <situation firstPage="#{firstPage}" lastPage="#{lastPage}" continuation="#{$continuation/id}"/>
           </product>
       </site>
   
  
  
  
  1.2       +3 -3      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SearchProducts.xml
  
  Index: SearchProducts.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SearchProducts.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SearchProducts.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ SearchProducts.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,15 +1,15 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <search>
               <jxpath:for-each select="searchResultsProductList" >
  -                <product name="{name} id="{productId}">
  +                <product name="#{name}" id="#{productId}">
                       <product-desc><jxpath:value-of select="descn"/></product-desc>
                   </product>
               </jxpath:for-each>
  -            <situation firstPage="{firstPage}" lastPage="{lastPage}" continuation="{$continuation/id}"/>
  +            <situation firstPage="#{firstPage}" lastPage="#{lastPage}" continuation="#{$continuation/id}"/>
           </search>
       </site>
   </page>
  
  
  
  1.2       +2 -2      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ShippingForm.xml
  
  Index: ShippingForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ShippingForm.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ShippingForm.xml	27 Mar 2003 18:59:23 -0000	1.1
  +++ ShippingForm.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,9 +1,9 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
  -        <form method="POST" styleId="workingOrderForm" action="{$continuation/id}.kont">
  +        <form method="POST" styleId="workingOrderForm" action="#{$continuation/id}.kont">
           <panel>
               <panel label="Shipping Address">
                   <input type="text" name="shipToFirstName" label="First name" />
  
  
  
  1.2       +2 -2      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SignonForm.xml
  
  Index: SignonForm.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/SignonForm.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SignonForm.xml	27 Mar 2003 18:59:24 -0000	1.1
  +++ SignonForm.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,8 +1,8 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  -        <form method="POST" label="signon" action="{$continuation/id}.kont">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
  +        <form method="POST" label="signon" action="#{$continuation/id}.kont">
               <message type="warning"><jxpath:value-of select="//message"/></message>
               <input type="text" name="username" value="j2ee" label="Username" />
               <input type="password" name="password" value="j2ee" label="Password" />
  
  
  
  1.3       +3 -3      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ViewOrder.xml
  
  Index: ViewOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/ViewOrder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ViewOrder.xml	13 Apr 2003 21:52:31 -0000	1.2
  +++ ViewOrder.xml	15 Apr 2003 21:13:22 -0000	1.3
  @@ -1,10 +1,10 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
           <backpointer name="Main Menu" do="index.do" />
           <message></message>
  -        <panel header="Order #{order/orderId}" subheader="{order/orderDate}">
  +        <panel header="Order ##{order/orderId}" subheader="#{order/orderDate}">
               <panel label="Payment Details">
                   <field label="Card Type"><jxpath:value-of select="order/cardType"
/></field>
                   <field label="Card Number"><jxpath:value-of select="order/creditCard"
/></field>
  @@ -35,7 +35,7 @@
                   <field empty="2">
                       <cart name="Status">
                           <jxpath:for-each select="itemList" >
  -                            <item product-id="{item/productId}" id="{item/itemId}">
  +                            <item product-id="#{item/productId}" id="#{item/itemId}">
                                   <desc>
                                       <jxpath:value-of select="item/attr1"/> 
                                       <jxpath:value-of select="item/attr2"/> 
  
  
  
  1.2       +2 -2      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jxpath/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	27 Mar 2003 18:59:24 -0000	1.1
  +++ index.xml	15 Apr 2003 21:13:22 -0000	1.2
  @@ -1,14 +1,14 @@
   <?xml version="1.0"?>
   
   <page xmlns:jxpath="http://cocoon.apache.org/transformation/jxpath/1.0">
  -    <site signOn="{accountForm/signOn}" view="jxpath">
  +    <site signOn="#{accountForm/signOn}" view="jxpath">
               <welcome>
                   <jxpath:if test="not(accountForm/signOn)">
                       <firstName><jxpath:value-of select="accountForm/account/firstName"/></firstName>
                   </jxpath:if>
                   <menu>
                       <jxpath:for-each select="categoryList" >
  -                        <category name="{name}" id="{catId}"/>
  +                        <category name="#{name}" id="#{catId}"/>
                       </jxpath:for-each>
                   </menu>
               </welcome>
  
  
  

Mime
View raw message