Author: ekoneil
Date: Fri Apr 15 12:09:57 2005
New Revision: 161512
URL: http://svn.apache.org/viewcvs?view=rev&rev=161512
Log:
Additional petstore cleanup.
- replaces image buttons with real buttons (for easier i18n)
BB: self
DRT: none
Test: petstore runs, buttons look right, pages navigable
Removed:
incubator/beehive/trunk/samples/petstoreWeb/images/button_add_to_cart.gif
incubator/beehive/trunk/samples/petstoreWeb/images/button_checkout.gif
incubator/beehive/trunk/samples/petstoreWeb/images/button_continue.gif
incubator/beehive/trunk/samples/petstoreWeb/images/button_previous.gif
incubator/beehive/trunk/samples/petstoreWeb/images/button_register_now.gif
incubator/beehive/trunk/samples/petstoreWeb/images/button_remove.gif
incubator/beehive/trunk/samples/petstoreWeb/images/button_update_cart.gif
incubator/beehive/trunk/samples/petstoreWeb/images/my_account.gif
incubator/beehive/trunk/samples/petstoreWeb/images/search.gif
Modified:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/createUpdate.jsp
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/listAddresses.jsp
incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp
incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp
incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp
incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp
incubator/beehive/trunk/samples/petstoreWeb/checkout/shipping.jsp
incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/item.jsp
incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml Fri
Apr 15 12:09:57 2005
@@ -77,11 +77,15 @@
classpathRef="webapp.build.classpath"/>
<!-- copy resources -->
- <echo>Copy all .properties and .xml files</echo>
+ <echo>Copy all .properties and .xml files</echo>
<copy todir="${webapp.dir}/WEB-INF/classes">
<fileset dir="${webapp.dir}/WEB-INF/src"
includes="**/*.properties"/>
<fileset dir="${webapp.dir}/WEB-INF/src" includes="**/*.xml"/>
</copy>
+ <echo>Copy .sql file</echo>
+ <copy todir="${webapp.dir}/WEB-INF/classes/sql">
+ <fileset dir="${webapp.dir}/WEB-INF/src/sql" includes="**/*.sql"/>
+ </copy>
</target>
<target name="clean" description="Clean the petstoreWeb">
@@ -108,6 +112,7 @@
To run the webapp, two steps need to occur:
- copy the Beehive runtime to the webapp
+- include derby.jar in WEB-INF/lib
- build the webapp
Once the webapp is built, it's ready to deploy onto your application container.
Modified:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties?view=diff&r1=161511&r2=161512
==============================================================================
---
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties
(original)
+++
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/resources/view.properties
Fri Apr 15 12:09:57 2005
@@ -24,7 +24,7 @@
newOrderLabel=New Order
orderNumberLabel=Order Number
-orderDateFormat=E, M dd, yyyy hh:mm a
+orderDateFormat=EEEE, MMMM dd, yyyy hh:mm a
orderStatus=Order Status
priceFormat=$#,##0.00
@@ -106,3 +106,17 @@
adminTitle=Admin Tools for Local Host
adminInit=Initialize the DB (recreates all tables and data)
adminStop=Stop Derby DB (stops the DB to allow redeploy)
+
+buttonSubmit=Submit
+buttonRegisterNow=Register Now
+buttonAddToCart=Add to Cart
+buttonRemove=Remove
+buttonUpdateCart=Update Cart
+buttonProceedToCheckout=Proceed to Checkout
+buttonContinue=Continue
+buttonPrevious=Previous
+buttonEdit=Edit
+buttonAddAddress=Add Address
+buttonUpdate=Update
+buttonInsert=Insert
+buttonCancel=Cancel
Modified:
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/createUpdate.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/addresses/createUpdate.jsp?view=diff&r1=161511&r2=161512
==============================================================================
---
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/createUpdate.jsp
(original)
+++
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/createUpdate.jsp
Fri Apr 15 12:09:57 2005
@@ -99,14 +99,14 @@
<CENTER>
<c:choose>
<c:when test="${actionForm.addressId == -1}">
- <netui:imageButton
src="${pageContext.request.contextPath}/images/insert.gif"/>
+ <netui:button
value="${bundle.view.buttonInsert}" />
</c:when>
<c:otherwise>
- <netui:imageButton
src="${pageContext.request.contextPath}/images/update.gif"/>
+ <netui:button
value="${bundle.view.buttonUpdate}" />
</c:otherwise>
</c:choose>
- <netui:imageAnchor action="begin" border="0"
src="${pageContext.request.contextPath}/images/cancel.gif" />
+ <netui:button
value="${bundle.view.buttonCancel}"
onClick="javascript:window.location.href='${pageContext.request.contextPath}/account/addresses/begin.do';"
/>
</CENTER>
</td>
</tr>
Modified:
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/listAddresses.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/addresses/listAddresses.jsp?view=diff&r1=161511&r2=161512
==============================================================================
---
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/listAddresses.jsp
(original)
+++
incubator/beehive/trunk/samples/petstoreWeb/account/addresses/listAddresses.jsp
Fri Apr 15 12:09:57 2005
@@ -43,11 +43,18 @@
<netui:span
value="${container.item.country}" /><br/>
<netui:span
value="${container.item.phone}" /><br/>
<center>
- <netui:imageAnchor
action="createUpdateAddress" border="0"
src="${pageContext.request.contextPath}/images/edit.gif">
- <netui:parameter
name="addressId" value="${container.item.addressId}"/>
-
</netui:imageAnchor>
- <a
href="javascript:VerifyDelete('${container.item.name}',
${container.item.addressId});"><img border="0"
src="${pageContext.request.contextPath}/images/delete.gif"/></a>
- </center>
+ <table>
+ <tr>
+
<td><netui:form action="createUpdateAddress">
+
<input type="hidden" name="addressId"
value="${container.item.addressId}"/>
+
<netui:button value="${bundle.view.buttonEdit}"/>
+
</netui:form>
+
</td>
+
<td> <netui:button value="${bundle.view.buttonRemove}"
onClick="javascript:VerifyDelete('${container.item.name}',
${container.item.addressId});" />
+
</td>
+ </tr>
+ </table>
+ </center>
</td>
</tr>
</netui-data:repeaterItem>
@@ -57,9 +64,9 @@
</netui-data:repeater>
<br/>
<center>
- <netui:imageAnchor action="createUpdateAddress"
border="0" src="${pageContext.request.contextPath}/images/insert.gif" />
- <br/>
- <br/>
+ <netui:form action="createUpdateAddress">
+ <netui:button
value="${bundle.view.buttonAddAddress}" />
+ </netui:form>
<c:if test="${sharedFlow.rootSharedFlow.account.status
== 'checking_out'}">
<netui:anchor
action="rootSharedFlow.globalCheckOut.do">
<b>${bundle.view.checkoutReturn}</b>
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/create/create.jsp Fri
Apr 15 12:09:57 2005
@@ -7,6 +7,7 @@
<netui-data:declarePageInput name="categoryNames" type="java.lang.String[]"/>
<netui-data:declarePageInput name="languages" type="java.lang.String[]"/>
+<netui-data:declareBundle
bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
@@ -115,7 +116,7 @@
</tr>
</table>
<br/>
- <netui:imageButton
src="${pageContext.request.contextPath}/images/button_submit.gif"/>
+ <netui:button value="${bundle.view.buttonSubmit}" />
</center>
</netui:form>
</netui-template:section>
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/edit.jsp Fri Apr
15 12:09:57 2005
@@ -6,6 +6,7 @@
<netui-data:declarePageInput name="categoryNames" type="java.lang.String[]"/>
<netui-data:declarePageInput name="languages" type="java.lang.String[]"/>
+<netui-data:declareBundle
bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav"> </netui-template:section>
@@ -99,7 +100,7 @@
<tr>
<td>
<center>
- <netui:imageButton
src="${pageContext.request.contextPath}/images/button_submit.gif"/>
+ <netui:button value="${bundle.view.buttonSubmit}" />
<br/>
<br/>
<netui:anchor
action="rootSharedFlow.globalViewAddresses.do">
Modified: incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp Fri Apr 15
12:09:57 2005
@@ -39,12 +39,12 @@
</tr>
<tr>
<td colspan="2" align="center">
- <netui:imageButton
src="${pageContext.request.contextPath}/images/button_submit.gif"/>
+ <netui:button value="${bundle.view.buttonSubmit}" />
</td>
</tr>
</table>
</netui:form>
- <netui:imageAnchor action="rootSharedFlow.globalViewCreateAccount"
border="0"
src="${pageContext.request.contextPath}/images/button_register_now.gif"/>
+ <netui:anchor value="${bundle.view.buttonRegisterNow}"
action="rootSharedFlow.globalViewCreateAccount"/>
</center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp Fri Apr 15
12:09:57 2005
@@ -20,9 +20,17 @@
<p>
<center>
- <netui:imageAnchor action="viewCreateOrder" border="0"
src="${pageContext.request.contextPath}/images/button_previous.gif" />
-
- <netui:imageAnchor action="confirm" border="0"
src="${pageContext.request.contextPath}/images/button_continue.gif" />
- </center>
+ <table>
+ <tr>
+ <td><netui:form action="viewCreateOrder">
+ <netui:button value="<<
${bundle.view.buttonPrevious}" />
+ </netui:form></td>
+ <td><netui:form action="confirm">
+ <netui:button
value="${bundle.view.buttonContinue} >>" />
+ </netui:form></td>
+ </tr>
+ </table>
+
+ </center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/newOrder.jsp Fri Apr
15 12:09:57 2005
@@ -100,7 +100,7 @@
</tr>
</table>
<p/>
- <netui:imageButton align="center"
src="${pageContext.request.contextPath}/images/button_continue.gif"/>
+ <netui:button value="${bundle.view.buttonContinue} >>" />
</center>
</netui:form>
</netui-template:section>
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/shipping.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/shipping.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/shipping.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/shipping.jsp Fri Apr
15 12:09:57 2005
@@ -1,56 +0,0 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0";
prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0";
prefix="netui-template"%>
-
-<netui-template:template templatePage="/site/template.jsp">
- <netui-template:section name="body">
- <netui:errors/>
- <netui:form action="shipping">
- <table class="tablegreen">
- <tr class="rowyellow">
- <td colspan=2>
- <font color=green size=4><B>Shipping Address</B></font>
- </td>
- </tr>
- <tr class="rowyellow">
- <td>First name:</td>
- <td><netui:textBox
dataSource="actionForm.order.shippingAddress.firstName"/></td>
- </tr>
- <tr class="rowyellow">
- <td>Last name:</td>
- <td><netui:textBox
dataSource="actionForm.order.shippingAddress.lastName"/></td>
- </tr>
- <tr class="rowyellow">
- <td>Address 1:</td>
- <td><netui:textBox size="40"
dataSource="actionForm.order.shippingAddress.addr1"/></td>
- </tr>
- <tr class="rowyellow">
- <td>Address 2:</td>
- <td><netui:textBox size="40"
dataSource="actionForm.order.shippingAddress.addr2"/></td>
- </tr>
- <tr class="rowyellow">
- <td>City: </td>
- <td><netui:textBox
dataSource="actionForm.order.shippingAddress.city"/></td>
- </tr>
- <tr class="rowyellow">
- <td>State:</td>
- <td><netui:textBox
dataSource="actionForm.order.shippingAddress.state" size="4"/></td>
- </tr>
- <tr class="rowyellow">
- <td>Zip:</td>
- <td><netui:textBox size="10"
dataSource="actionForm.order.shippingAddress.zip"/></td>
- </tr>
- <tr class="rowyellow">
- <td>Country: </td>
- <td><netui:textBox size="15"
dataSource="actionForm.order.shippingAddress.country"/></td>
- </tr>
- </table>
- <P>
- <center>
- <netui:imageButton
src="${pageContext.request.contextPath}/images/button_submit.gif"/>
- </center>
- </p>
- </netui:form>
- </netui-template:section>
-</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp Fri Apr
15 12:09:57 2005
@@ -71,6 +71,8 @@
</tr>
</table>
<br/>
- <netui:imageAnchor action="createNewOrder" border="0"
src="${pageContext.request.contextPath}/images/button_continue.gif"/>
+ <netui:form action="createNewOrder">
+ <netui:button value="${bundle.view.buttonContinue} >>" />
+ </netui:form>
</center> </netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/cart.jsp Fri Apr 15
12:09:57 2005
@@ -77,9 +77,7 @@
</netui:span>
</td>
<td class="celldata">
- <netui:imageAnchor action="removeItemFromCart" border="0"
src="${pageContext.request.contextPath}/images/button_remove.gif">
- <netui:parameter name="workingItemId"
value="${container.item.item.itemId}"/>
- </netui:imageAnchor>
+ <netui:button value="${bundle.view.buttonRemove}"
onClick="javascript:window.location.href='${pageContext.request.contextPath}/shop/removeItemFromCart.do?workingItemId=${container.item.item.itemId}';"
/>
</td>
</tr>
</netui-data:repeater>
@@ -89,7 +87,7 @@
<netui:span value="${actionForm.cart.subTotal}">
<netui:formatNumber pattern="${bundle.view.priceFormat}"/>
</netui:span> </b><br />
- <netui:imageButton
src="${pageContext.request.contextPath}/images/button_update_cart.gif"/>
+ <netui:button
value="${bundle.view.buttonUpdateCart}" />
</td>
<td class="celldata"> </td>
</tr>
@@ -102,8 +100,8 @@
</c:choose>
</table>
<c:if test="${actionForm.cart.lineItems != null &&
fn:length(actionForm.cart.lineItems) > 0}">
- <br/>
- <netui:imageAnchor action="checkout" border="0"
src="${pageContext.request.contextPath}/images/button_checkout.gif"/>
+ <br/>
+ <netui:button value="${bundle.view.buttonProceedToCheckout} >>"
action="checkout" />
</c:if>
</netui:form>
</center>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/index.jsp Fri Apr 15
12:09:57 2005
@@ -23,9 +23,9 @@
<netui-data:repeater dataSource="pageInput.categories">
<tr class="rowyellow">
<td>
- <netui:imageAnchor action="viewCategory" border="0"
src="${pageContext.request.contextPath}/images/${container.item.image}">
+ <netui:anchor action="viewCategory" value="${container.item.name}">
<netui:parameter name="catId" value="${container.item.catId}"/>
- </netui:imageAnchor>
+ </netui:anchor>
<br/>
<netui:span styleClass="meditaliclabel"
value="${container.item.description}"/>
</td>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/item.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/shop/item.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/item.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/item.jsp Fri Apr 15
12:09:57 2005
@@ -61,9 +61,10 @@
</tr>
<tr class="rowyellow">
<td class="celldata">
- <netui:imageAnchor action="addItemToCart" border="0"
src="${pageContext.request.contextPath}/images/button_add_to_cart.gif">
- <netui:parameter name="workingItemId"
value="${pageInput.item.itemId}"/>
- </netui:imageAnchor>
+ <netui:form action="addItemToCart" method="get">
+ <input type="hidden" name="workingItemId"
value="${pageInput.item.itemId}"/>
+ <netui:button value="${bundle.view.buttonAddToCart}" />
+ </netui:form>
</td>
</tr>
</table>
Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp?view=diff&r1=161511&r2=161512
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/shop/product.jsp Fri Apr 15
12:09:57 2005
@@ -52,10 +52,10 @@
</netui:span>
</td>
<td class="celldata">
- <netui:imageAnchor action="addItemToCart" border="0"
-
src="${pageContext.request.contextPath}/images/button_add_to_cart.gif">
- <netui:parameter name="workingItemId"
value="${container.item.itemId}"/>
- </netui:imageAnchor>
+ <netui:form action="addItemToCart" method="get">
+ <input type="hidden" name="workingItemId"
value="${container.item.itemId}"/>
+ <netui:button value="${bundle.view.buttonAddToCart}"
/>
+ </netui:form>
</td>
</tr>
</netui-data:repeater>
