coliver 2003/12/09 18:00:17
Modified: src/blocks/petstore/samples/view/jexl Cart.xml Category.xml
ConfirmOrder.xml Product.xml SearchProducts.xml
SignonForm.xml
src/blocks/petstore/samples/view/jxpath Cart.xml
Category.xml ConfirmOrder.xml Product.xml
SearchProducts.xml SignonForm.xml
Log:
Update to new jxtemplate api
Revision Changes Path
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Cart.xml 11 Nov 2003 17:49:01 -0000 1.3
+++ Cart.xml 10 Dec 2003 02:00:17 -0000 1.4
@@ -14,7 +14,7 @@
</c:forEach>
<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"/>
+ <nextpointer img="images/button_continue.gif"
do="${cocoon.continuation.id}.kont"/>
</c:if>
<c:if test="${label == 'Shopping Cart'}">
<nextpointer do="checkout.do"
img="images/button_checkout.gif" />
1.2 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jexl/Category.xml
Index: Category.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/Category.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Category.xml 10 Jul 2003 23:48:51 -0000 1.1
+++ Category.xml 10 Dec 2003 02:00:17 -0000 1.2
@@ -7,7 +7,7 @@
<c:forEach var="prod" items="${productList}" >
<product name="${prod.name}" id="${prod.productId}"/>
</c:forEach>
- <situation firstPage="${firstPage}" lastPage="${lastPage}"
continuation="${continuation.id}"/>
+ <situation firstPage="${firstPage}" lastPage="${lastPage}"
continuation="${cocoon.continuation.id}"/>
</category>
</site>
</page>
1.3 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jexl/ConfirmOrder.xml
Index: ConfirmOrder.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/ConfirmOrder.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfirmOrder.xml 11 Nov 2003 12:09:52 -0000 1.2
+++ ConfirmOrder.xml 10 Dec 2003 02:00:17 -0000 1.3
@@ -31,7 +31,7 @@
<field label="Country" >${order.shipCountry}</field>
</panel>
</panel>
- <nextpointer img="images/button_continue.gif"
do="${continuation.id}.kont?confirmed=true"/>
+ <nextpointer img="images/button_continue.gif"
do="${cocoon.continuation.id}.kont?confirmed=true"/>
</site>
</page>
1.2 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jexl/Product.xml
Index: Product.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/Product.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Product.xml 10 Jul 2003 23:48:51 -0000 1.1
+++ Product.xml 10 Dec 2003 02:00:17 -0000 1.2
@@ -16,7 +16,7 @@
<price>${item.listPrice}</price>
</item>
</c:forEach>
- <situation firstPage="${firstPage}" lastPage="${lastPage}"
continuation="${continuation.id}"/>
+ <situation firstPage="${firstPage}" lastPage="${lastPage}"
continuation="${cocoon.continuation.id}"/>
</product>
</site>
1.3 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jexl/SearchProducts.xml
Index: SearchProducts.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/SearchProducts.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SearchProducts.xml 11 Nov 2003 12:09:52 -0000 1.2
+++ SearchProducts.xml 10 Dec 2003 02:00:17 -0000 1.3
@@ -9,7 +9,7 @@
<product-desc>${item.descn}</product-desc>
</product>
</c:forEach>
- <situation firstPage="${firstPage}" lastPage="${lastPage}"
continuation="${continuation.id}"/>
+ <situation firstPage="${firstPage}" lastPage="${lastPage}"
continuation="${cocoon.continuation.id}"/>
</search>
</site>
</page>
1.3 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jexl/SignonForm.xml
Index: SignonForm.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jexl/SignonForm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SignonForm.xml 11 Nov 2003 12:09:52 -0000 1.2
+++ SignonForm.xml 10 Dec 2003 02:00:17 -0000 1.3
@@ -2,7 +2,7 @@
<page xmlns:c="http://apache.org/cocoon/templates/jx/1.0";>
<site signOn="${accountForm.signOn}" view="jexl">
- <form method="POST" label="signon" action="${continuation.id}.kont">
+ <form method="POST" label="signon"
action="${cocoon.continuation.id}.kont">
<message type="warning">${message}</message>
<input type="text" name="username" value="j2ee" label="Username"
/>
<input type="password" name="password" value="j2ee"
label="Password" />
1.4 +1 -1
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Cart.xml 11 Nov 2003 17:49:01 -0000 1.3
+++ Cart.xml 10 Dec 2003 02:00:17 -0000 1.4
@@ -14,7 +14,7 @@
</c:forEach>
<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"/>
+ <nextpointer img="images/button_continue.gif"
do="#{$cocoon/continuation/id}.kont"/>
</c:if>
<c:if test="#{label = 'Shopping Cart'}">
<nextpointer do="checkout.do"
img="images/button_checkout.gif" />
1.2 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jxpath/Category.xml
Index: Category.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/Category.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Category.xml 10 Jul 2003 23:48:51 -0000 1.1
+++ Category.xml 10 Dec 2003 02:00:17 -0000 1.2
@@ -7,7 +7,7 @@
<c:forEach select="#{productList}" >
<product name="#{name}" id="#{productId}"/>
</c:forEach>
- <situation firstPage="#{firstPage}" lastPage="#{lastPage}"
continuation="#{$continuation/id}"/>
+ <situation firstPage="#{firstPage}" lastPage="#{lastPage}"
continuation="#{$cocoon/continuation/id}"/>
</category>
</site>
</page>
1.3 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jxpath/ConfirmOrder.xml
Index: ConfirmOrder.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/ConfirmOrder.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConfirmOrder.xml 11 Nov 2003 12:09:52 -0000 1.2
+++ ConfirmOrder.xml 10 Dec 2003 02:00:17 -0000 1.3
@@ -31,7 +31,7 @@
<field label="Country" >#{order/shipCountry}</field>
</panel>
</panel>
- <nextpointer img="images/button_continue.gif"
do="#{$continuation/id}.kont?confirmed=true"/>
+ <nextpointer img="images/button_continue.gif"
do="#{$cocoon/continuation/id}.kont?confirmed=true"/>
</site>
</page>
1.2 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jxpath/Product.xml
Index: Product.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/Product.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Product.xml 10 Jul 2003 23:48:51 -0000 1.1
+++ Product.xml 10 Dec 2003 02:00:17 -0000 1.2
@@ -16,7 +16,7 @@
<price>#{listPrice}</price>
</item>
</c:forEach>
- <situation firstPage="#{firstPage}" lastPage="#{lastPage}"
continuation="#{$continuation/id}"/>
+ <situation firstPage="#{firstPage}" lastPage="#{lastPage}"
continuation="#{$cocoon/continuation/id}"/>
</product>
</site>
1.2 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jxpath/SearchProducts.xml
Index: SearchProducts.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/SearchProducts.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SearchProducts.xml 10 Jul 2003 23:48:51 -0000 1.1
+++ SearchProducts.xml 10 Dec 2003 02:00:17 -0000 1.2
@@ -9,7 +9,7 @@
<product-desc>#{descn}</product-desc>
</product>
</c:forEach>
- <situation firstPage="#{firstPage}" lastPage="#{lastPage}"
continuation="#{$continuation/id}"/>
+ <situation firstPage="#{firstPage}" lastPage="#{lastPage}"
continuation="#{$cocoon/continuation/id}"/>
</search>
</site>
</page>
1.3 +1 -1
cocoon-2.1/src/blocks/petstore/samples/view/jxpath/SignonForm.xml
Index: SignonForm.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/petstore/samples/view/jxpath/SignonForm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SignonForm.xml 11 Nov 2003 12:09:52 -0000 1.2
+++ SignonForm.xml 10 Dec 2003 02:00:17 -0000 1.3
@@ -2,7 +2,7 @@
<page xmlns:c="http://apache.org/cocoon/templates/jx/1.0";>
<site signOn="#{accountForm/signOn}" view="jxpath">
- <form method="POST" label="signon" action="#{$continuation/id}.kont">
+ <form method="POST" label="signon"
action="#{$cocoon/continuation/id}.kont">
<message type="warning">#{message}</message>
<input type="text" name="username" value="j2ee" label="Username"
/>
<input type="password" name="password" value="j2ee"
label="Password" />
