cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/petstore/samples sitemap.xmap
Date Tue, 11 Nov 2003 17:49:02 GMT
joerg       2003/11/11 09:49:01

  Modified:    src/blocks/petstore/samples/view/jxpath ViewOrder.xml
                        Cart.xml ListOrders.xml
               src/blocks/petstore/samples/view/jexl ViewOrder.xml
                        ListOrders.xml Cart.xml
               src/blocks/petstore/samples sitemap.xmap
  Log:
  fixed formatting issues after applying bug 24463: the prices must not be formatted by JEXL
or JXPath, but only in the stylesheet
  
  Revision  Changes    Path
  1.3       +3 -3      cocoon-2.1/src/blocks/petstore/samples/view/jxpath/ViewOrder.xml
  
  Index: ViewOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/ViewOrder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ViewOrder.xml	11 Nov 2003 12:09:52 -0000	1.2
  +++ ViewOrder.xml	11 Nov 2003 17:49:01 -0000	1.3
  @@ -39,11 +39,11 @@
                           <c:forEach select="#{lineItemList}" >
                               <lineItem  linenum="#{linenum}"  id="#{itemId}">
                                   <quantity>#{quantity}</quantity>
  -                                <unitprice><c:formatNumber value="#{unitprice}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></unitprice>
  -                                <total><c:formatNumber value="#{total}" pattern="###,##0.00"
currencyCode="USD" type="currency"/></total>
  +                                <unitprice>#{unitprice}</unitprice>
  +                                <total>#{total}</total>
                               </lineItem>
                           </c:forEach>
  -                        <total><c:formatNumber value="#{archivedOrder/totalPrice}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></total>
  +                        <total>#{archivedOrder/totalPrice}</total>
                       </cart>
                   </field>
               </panel>
  
  
  
  1.3       +3 -3      cocoon-2.1/src/blocks/petstore/samples/view/jxpath/Cart.xml
  
  Index: Cart.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/Cart.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Cart.xml	11 Nov 2003 12:09:52 -0000	1.2
  +++ Cart.xml	11 Nov 2003 17:49:01 -0000	1.3
  @@ -8,11 +8,11 @@
                   <item productId="#{item/productId}" id="#{item/itemId}">
                       <desc>#{item/attr1} #{item/attr2} #{item/attr3} #{item/attr4}
#{item/attr5} #{item/product/name}</desc>
                       <quantity>#{quantity}</quantity>
  -                    <listPrice><c:formatNumber value="#{item/listPrice}" pattern="###,##0.00"
currencyCode="USD" type="currency"/></listPrice>
  -                    <total><c:formatNumber value="#{total}" pattern="###,##0.00"
currencyCode="USD" type="currency"/></total>
  +                    <listPrice>#{item/listPrice}</listPrice>
  +                    <total>#{total}</total>
                   </item>
               </c:forEach>
  -            <subTotal label="Sub Total" label1="Total"><c:formatNumber value="#{cartForm/cart/subTotal}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></subTotal>
  +            <subTotal label="Sub Total" label1="Total">#{cartForm/cart/subTotal}</subTotal>
               <c:if test="#{label = 'Checkout Summary'}">
                   <nextpointer img="images/button_continue.gif" do="#{$continuation/id}.kont"/>
               </c:if>
  
  
  
  1.2       +1 -1      cocoon-2.1/src/blocks/petstore/samples/view/jxpath/ListOrders.xml
  
  Index: ListOrders.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/ListOrders.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ListOrders.xml	11 Nov 2003 12:09:52 -0000	1.1
  +++ ListOrders.xml	11 Nov 2003 17:49:01 -0000	1.2
  @@ -5,7 +5,7 @@
           <orderlist name="My Orders">
               <c:forEach select="#{orderList}" >
                   <order id="#{orderid}" status="#{status}">
  -                    <total><c:formatNumber value="#{totalprice}" pattern="###,##0.00"
currencyCode="USD" type="currency"/></total>
  +                    <total>#{totalprice}</total>
                       <date>#{orderdate}</date>
                   </order>
               </c:forEach>
  
  
  
  1.3       +3 -3      cocoon-2.1/src/blocks/petstore/samples/view/jexl/ViewOrder.xml
  
  Index: ViewOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/ViewOrder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ViewOrder.xml	11 Nov 2003 12:09:52 -0000	1.2
  +++ ViewOrder.xml	11 Nov 2003 17:49:01 -0000	1.3
  @@ -39,11 +39,11 @@
                           <c:forEach var="lineItem" items="${lineItemList}" >
                               <lineItem  linenum="${lineItem.linenum}" id="${lineItem.itemId}">
                                   <quantity>${lineItem.quantity}</quantity>
  -                                <unitprice><c:formatNumber value="${lineItem.unitprice}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></unitprice>
  -                                <total><c:formatNumber value="${lineItem.total}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></total>
  +                                <unitprice>${lineItem.unitprice}</unitprice>
  +                                <total>${lineItem.total}</total>
                               </lineItem>
                           </c:forEach>
  -                        <total label="Total"><c:formatNumber value="${archivedOrder.totalprice}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></total>
  +                        <total label="Total">${archivedOrder.totalprice}</total>
                       </cart>
                   </field>
               </panel>
  
  
  
  1.2       +1 -1      cocoon-2.1/src/blocks/petstore/samples/view/jexl/ListOrders.xml
  
  Index: ListOrders.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/ListOrders.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ListOrders.xml	11 Nov 2003 12:09:52 -0000	1.1
  +++ ListOrders.xml	11 Nov 2003 17:49:01 -0000	1.2
  @@ -5,7 +5,7 @@
           <orderlist name="My Orders">
               <c:forEach var="order" items="${orderList}" >
                   <order id="${order.orderid}" orderdate="${order.orderdate}" status="${order.status}">
  -                    <total><c:formatNumber value="${order.totalprice}" pattern="###,##0.00"
currencyCode="USD" type="currency"/></total>
  +                    <total>${order.totalprice}</total>
                       <date>${order.orderdate}</date>
                   </order>
               </c:forEach>
  
  
  
  1.3       +3 -3      cocoon-2.1/src/blocks/petstore/samples/view/jexl/Cart.xml
  
  Index: Cart.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/Cart.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Cart.xml	11 Nov 2003 12:09:52 -0000	1.2
  +++ Cart.xml	11 Nov 2003 17:49:01 -0000	1.3
  @@ -8,11 +8,11 @@
                   <item productId="${cartItem.item.productId}" id="${cartItem.item.itemId}">
                       <desc>${cartItem.item.attr1} ${cartItem.item.attr2} ${cartItem.item.attr3}
${cartItem.item.attr4} ${cartItem.item.attr5} ${cartItem.product.name}</desc>
                       <quantity>${cartItem.quantity}</quantity>
  -                    <listPrice><c:formatNumber value="${cartItem.item.listPrice}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></listPrice>
  -                    <total><c:formatNumber value="${cartItem.total}" pattern="###,##0.00"
currencyCode="USD" type="currency"/></total>
  +                    <listPrice>${cartItem.item.listPrice}</listPrice>
  +                    <total>${cartItem.total}</total>
                   </item>
               </c:forEach>
  -            <subTotal label="Sub Total" label1="Total"><c:formatNumber value="${cartForm.cart.subTotal}"
pattern="###,##0.00" currencyCode="USD" type="currency"/></subTotal>
  +            <subTotal label="Sub Total" label1="Total">${cartForm.cart.subTotal}</subTotal>
               <c:if test="${label == 'Checkout Summary'}">
                   <nextpointer img="images/button_continue.gif" do="${continuation.id}.kont"/>
               </c:if>
  
  
  
  1.7       +8 -8      cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/sitemap.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sitemap.xmap	11 Nov 2003 12:09:51 -0000	1.6
  +++ sitemap.xmap	11 Nov 2003 17:49:01 -0000	1.7
  @@ -39,6 +39,10 @@
   
   <!-- ======================== Resources ============================ -->
     <map:resources>
  +    <map:resource name="html">
  +      <map:transform src="stylesheets/site2html.xsl"/>
  +      <map:serialize type="html"/>
  +    </map:resource>
     </map:resources>
   
   <!-- ======================== Flow ================================= -->
  @@ -69,19 +73,16 @@
       <map:pipeline>
         <map:match pattern="view/*.xsp">
           <map:generate src="view/xsp/{1}.xsp" type="serverpages" label="debug"/>
  -        <map:transform src="stylesheets/site2html.xsl" />
  -        <map:serialize type="html"/>
  +        <map:call resource="html"/>
         </map:match>
         <map:match pattern="view/*.jxpath">
           <map:generate src="view/jxpath/{1}.xml" type="file" />
           <map:transform type="jx"  label="debug"/>
  -        <map:transform src="stylesheets/site2html.xsl" />
  -        <map:serialize type="html"/>
  +        <map:call resource="html"/>
         </map:match>
         <map:match pattern="view/*.jexl">
           <map:generate src="view/jexl/{1}.xml" type="jx"  label="debug"/>
  -        <map:transform src="stylesheets/site2html.xsl" />
  -        <map:serialize type="html"/>
  +        <map:call resource="html"/>
         </map:match>
         <map:match pattern="view/*.vm">
           <map:generate src="view/templates/{1}.vm" type="velocity" label="debug"/>
  @@ -90,8 +91,7 @@
         <map:match pattern="view/*.cforms">
           <map:generate src="view/forms/{1}_t.xml" label="debug"/>
           <map:transform type="woody" label="debug1"/>
  -        <map:transform src="stylesheets/site2html.xsl" />
  -        <map:serialize type="html"/>
  +        <map:call resource="html"/>
         </map:match>
       </map:pipeline>
   
  
  
  

Mime
View raw message