Author: tmjee Date: Sun Apr 9 07:39:15 2006 New Revision: 392739 URL: http://svn.apache.org/viewcvs?rev=392739&view=rev Log: changed jsp taglib prefix from ww to saf and uri from /webwork to /struts-action
Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml incubator/webwork2/webapps/shopping-cart/src/main/webapp/cart.jsp incubator/webwork2/webapps/shopping-cart/src/main/webapp/category-main.jsp incubator/webwork2/webapps/shopping-cart/src/main/webapp/category.jsp incubator/webwork2/webapps/shopping-cart/src/main/webapp/categorySet.jsp Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml?rev=392739&r1=392738&r2=392739&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml Sun Apr 9 07:39:15 2006 @@ -8,7 +8,7 @@ <pattern>/js/*</pattern> <pattern>/images/*</pattern> <pattern>/dojo/*</pattern> - <pattern>/webwork/*</pattern> + <pattern>/struts/*</pattern> <pattern>/catalog/remote/*</pattern> </excludes> Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/cart.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/cart.jsp?rev=392739&r1=392738&r2=392739&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/cart.jsp (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/cart.jsp Sun Apr 9 07:39:15 2006 @@ -3,11 +3,11 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="saf" uri="/struts-action" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <p class="boxTitle">Shopping Cart</p> <div id="cartTable"> - <div><span class="cartLabel">Number of Items:</span><span class="cartValue"><ww:property value="numCartItems"/></span></div> - <div><span class="cartLabel">Total:</span><span class="cartValue"> $<ww:property value="cartTotal" /></span></div> + <div><span class="cartLabel">Number of Items:</span><span class="cartValue"><saf:property value="numCartItems"/></span></div> + <div><span class="cartLabel">Total:</span><span class="cartValue"> $<saf:property value="cartTotal" /></span></div> </div> Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/category-main.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/category-main.jsp?rev=392739&r1=392738&r2=392739&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/category-main.jsp (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/category-main.jsp Sun Apr 9 07:39:15 2006 @@ -3,7 +3,7 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="saf" uri="/struts-action" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <html> <head><title>Category</title> @@ -11,7 +11,7 @@ </head> <body id="page-home"> -<%--<ww:action name="activeCategory" namespace="/catalog/remote" executeResult="true" />--%> -<ww:div id="main" href="/catalog/remote/activeCategory.action" theme="ajax" listenTopics="categorySelected" loadingText="loading..." /> +<%--<saf:action name="activeCategory" namespace="/catalog/remote" executeResult="true" />--%> +<saf:div id="main" href="/catalog/remote/activeCategory.action" theme="ajax" listenTopics="categorySelected" loadingText="loading..." /> </body> </html> Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/category.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/category.jsp?rev=392739&r1=392738&r2=392739&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/category.jsp (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/category.jsp Sun Apr 9 07:39:15 2006 @@ -3,46 +3,46 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="saf" uri="/struts-action" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<ww:if test="category != null"> - <h3><ww:if test="category.parent != null"><ww:property value="category.parent.name"/> > </ww:if><ww:property value="category.name"/></h3> +<saf:if test="category != null"> + <h3><saf:if test="category.parent != null"><saf:property value="category.parent.name"/> > </saf:if><saf:property value="category.name"/></h3> - <ww:set name="categoryProducts" value="%{catalog.findProductsByCategory(category)}"/> - <ww:if test="(#categoryProducts != null) && (#categoryProducts.size > 0)"> + <saf:set name="categoryProducts" value="%{catalog.findProductsByCategory(category)}"/> + <saf:if test="(#categoryProducts != null) && (#categoryProducts.size > 0)"> <div> - <ww:iterator value="#categoryProducts"> - <ww:form id="qtyForm_%{id}" name="qtyForm_%{id}" namespace="/catalog/remote" action="updateQuantity" method="POST" theme="ajax" validate="true"> - <ww:hidden name="productId" value="%{id}"/> + <saf:iterator value="#categoryProducts"> + <saf:form id="qtyForm_%{id}" name="qtyForm_%{id}" namespace="/catalog/remote" action="updateQuantity" method="POST" theme="ajax" validate="true"> + <saf:hidden name="productId" value="%{id}"/> <div class="product"> <div class="productDetails"> <div class="productHeader"> <tr> - <td><div class="productName"><ww:property value="name"/></div></td> - <td><div class="productPrice">$<ww:property value="price" /></div></td> + <td><div class="productName"><saf:property value="name"/></div></td> + <td><div class="productPrice">$<saf:property value="price" /></div></td> </tr> </div> <tr><td colspan="2"> - <div class="productDescription"><ww:property value="description"/></div> + <div class="productDescription"><saf:property value="description"/></div> </td></tr> </div> <tr><td colspan="2"> <p class="productQuantity"> - Quantity: <ww:textfield id="quantity" name="quantity" theme="simple" size="2" value="0"/> - <ww:submit id="qtySubmit" name="qtySubmit" value="Update" theme="ajax" notifyTopics="cartUpdated" onLoadJS="document.qtyForm_%{id}.reset();" /> + Quantity: <saf:textfield id="quantity" name="quantity" theme="simple" size="2" value="0"/> + <saf:submit id="qtySubmit" name="qtySubmit" value="Update" theme="ajax" notifyTopics="cartUpdated" onLoadJS="document.qtyForm_%{id}.reset();" /> </p> </td></tr> </div> - </ww:form> - </ww:iterator> + </saf:form> + </saf:iterator> </div> - </ww:if> - <ww:else> + </saf:if> + <saf:else> <b>There are no products in this category</b> - </ww:else> -</ww:if> -<ww:else> + </saf:else> +</saf:if> +<saf:else> <h2>WebWork Ajax Catalog</h2> <p>Please choose a category to start shopping.</p> -</ww:else> +</saf:else> Modified: incubator/webwork2/webapps/shopping-cart/src/main/webapp/categorySet.jsp URL: http://svn.apache.org/viewcvs/incubator/webwork2/webapps/shopping-cart/src/main/webapp/categorySet.jsp?rev=392739&r1=392738&r2=392739&view=diff ============================================================================== --- incubator/webwork2/webapps/shopping-cart/src/main/webapp/categorySet.jsp (original) +++ incubator/webwork2/webapps/shopping-cart/src/main/webapp/categorySet.jsp Sun Apr 9 07:39:15 2006 @@ -3,6 +3,6 @@ response.setHeader("Cache-Control", "no-cache"); response.setDateHeader("Expires", 0); %> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="saf" uri="/struts-action" %> <%@ page contentType="text/plain;charset=UTF-8" language="java" %> -Category set to <ww:property value="categoryId"/> +Category set to <saf:property value="categoryId"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]