You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/02/13 19:41:18 UTC
svn commit: r153653 [2/3] - in incubator/beehive/trunk/samples/petstoreWeb:
./ WEB-INF/ WEB-INF/src/
WEB-INF/src/org/apache/beehive/samples/petstore/controller/
WEB-INF/src/org/apache/beehive/samples/petstore/controls/
WEB-INF/src/org/apache/beehive/samples/petstore/controls/exceptions/
WEB-INF/src/org/apache/beehive/samples/petstore/controls/internal/
WEB-INF/src/org/apache/beehive/samples/petstore/forms/
WEB-INF/src/org/apache/beehive/samples/petstore/model/
WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/
WEB-INF/tags/beehive/petstore/ account/create/ account/edit/ auth/
checkout/ search/ shop/ site/ webappRoot/
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/forms/SearchForm.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/forms/SearchForm.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/forms/SearchForm.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/forms/SearchForm.java Sun Feb 13 10:41:07 2005
@@ -1,12 +1,17 @@
-package org.apache.beehive.samples.petstore.forms;
+package org.apache.beehive.samples.petstore.forms;
import org.apache.beehive.netui.pageflow.FormData;
public class SearchForm
- extends FormData
-{
+ extends FormData {
+
private String _keyword = null;
- public String getKeyword() {return _keyword;}
- public void setKeyword(String keyword) {_keyword = keyword;}
+ public String getKeyword() {
+ return _keyword;
+ }
+
+ public void setKeyword(String keyword) {
+ _keyword = keyword;
+ }
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Account.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Account.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Account.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Account.java Sun Feb 13 10:41:07 2005
@@ -1,4 +1,3 @@
-package org.apache.beehive.samples.petstore.model;
/*
* Copyright 2004 The Apache Software Foundation.
*
@@ -16,13 +15,14 @@
*
* $Header:$
*/
+package org.apache.beehive.samples.petstore.model;
/**
*
*/
public class Account
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private String _userId;
private String _password;
private String _email;
@@ -40,148 +40,119 @@
private boolean _myListOpt;
private boolean _bannerOpt;
- public Account()
- {
+ public Account() {
}
- public String getPassword()
- {
+ public String getPassword() {
return _password;
}
- public void setPassword(String password)
- {
- _password = password;
+ public void setPassword(String password) {
+ _password = password;
}
- public Address getAddress()
- {
+ public Address getAddress() {
return _address;
}
- public void setAddress(Address address)
- {
+ public void setAddress(Address address) {
_address = address;
}
- public String getUserId()
- {
+ public String getUserId() {
return _userId;
}
- public void setUserId(String userId)
- {
+ public void setUserId(String userId) {
_userId = userId;
}
- public String getEmail()
- {
+ public String getEmail() {
return _email;
}
- public void setEmail(String email)
- {
+ public void setEmail(String email) {
_email = email;
}
- public String getFirstName()
- {
+ public String getFirstName() {
return _firstName;
}
- public void setFirstName(String firstName)
- {
+ public void setFirstName(String firstName) {
_firstName = firstName;
}
- public String getLastName()
- {
+ public String getLastName() {
return _lastName;
}
- public void setLastName(String lastName)
- {
+ public void setLastName(String lastName) {
_lastName = lastName;
}
- public String getStatus()
- {
+ public String getStatus() {
return _status;
}
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
_status = status;
}
- public String getPhone()
- {
+ public String getPhone() {
return _phone;
}
- public void setPhone(String phone)
- {
+ public void setPhone(String phone) {
_phone = phone;
}
- public void setFavCategory(String favCategory)
- {
+ public void setFavCategory(String favCategory) {
_favCategory = favCategory;
}
- public String getFavCategory()
- {
+ public String getFavCategory() {
return _favCategory;
}
- public void setLangPref(String langPref)
- {
+ public void setLangPref(String langPref) {
_langPref = langPref;
}
- public String getLangPref()
- {
+ public String getLangPref() {
return _langPref;
}
- public String getBannerData()
- {
+ public String getBannerData() {
return _bannerData;
}
- public void setBannerData(String bannerData)
- {
+ public void setBannerData(String bannerData) {
_bannerData = bannerData;
}
- public boolean isMyListOpt()
- {
+ public boolean isMyListOpt() {
return _myListOpt;
}
- public void setMyListOpt(boolean myListOpt)
- {
+ public void setMyListOpt(boolean myListOpt) {
_myListOpt = myListOpt;
}
- public boolean isBannerOpt()
- {
+ public boolean isBannerOpt() {
return _bannerOpt;
}
- public void setBannerOpt(boolean bannerOpt)
- {
+ public void setBannerOpt(boolean bannerOpt) {
_bannerOpt = bannerOpt;
}
- public String getBannerName()
- {
+ public String getBannerName() {
return _bannerName;
}
- public void setBannerName(String bannerName)
- {
+ public void setBannerName(String bannerName) {
_bannerName = bannerName;
}
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Address.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Address.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Address.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Address.java Sun Feb 13 10:41:07 2005
@@ -17,8 +17,8 @@
*/
package org.apache.beehive.samples.petstore.model;
-public class Address
-{
+public class Address {
+
private String _firstName;
private String _lastName;
@@ -30,25 +30,22 @@
private String _zip;
private String _country;
- public Address() {}
+ public Address() {
+ }
- public String getLastName()
- {
+ public String getLastName() {
return _lastName;
}
- public void setLastName(String lastName)
- {
+ public void setLastName(String lastName) {
_lastName = lastName;
}
- public String getFirstName()
- {
+ public String getFirstName() {
return _firstName;
}
- public void setFirstName(String firstName)
- {
+ public void setFirstName(String firstName) {
_firstName = firstName;
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Cart.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Cart.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Cart.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Cart.java Sun Feb 13 10:41:07 2005
@@ -24,22 +24,19 @@
*
*/
public class Cart
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private List<LineItem> _itemList;
- public Cart()
- {
+ public Cart() {
_itemList = new ArrayList<LineItem>();
}
- public List<LineItem> getLineItems()
- {
+ public List<LineItem> getLineItems() {
return _itemList;
}
- public int getNumberOfItems()
- {
+ public int getNumberOfItems() {
return _itemList.size();
}
@@ -47,11 +44,9 @@
* Add an item to the cart. If the item does not exist in the cart,
* it is added to the cart and the CartItem's quantity is incremented.
*/
- public void addItem(Item item)
- {
+ public void addItem(Item item) {
LineItem lineItem = getLineItem(item.getItemId());
- if(lineItem == null)
- {
+ if(lineItem == null) {
lineItem = new LineItem();
lineItem.setItem(item);
lineItem.setQuantity(0);
@@ -61,13 +56,11 @@
lineItem.incrementQuantity();
}
- public boolean containsItemId(String itemId)
- {
+ public boolean containsItemId(String itemId) {
return (getLineItem(itemId) != null);
}
- public Item removeItemById(String itemId)
- {
+ public Item removeItemById(String itemId) {
LineItem lineItem = getLineItem(itemId);
if(lineItem != null)
@@ -76,8 +69,7 @@
return lineItem.getItem();
}
- public void incrementQuantityByItemId(String itemId)
- {
+ public void incrementQuantityByItemId(String itemId) {
LineItem lineItem = getLineItem(itemId);
if(lineItem == null)
@@ -88,8 +80,7 @@
getSubTotal();
}
- public void setQuantityByItemId(String itemId, int quantity)
- {
+ public void setQuantityByItemId(String itemId, int quantity) {
LineItem lineItem = getLineItem(itemId);
if(lineItem == null)
@@ -98,13 +89,11 @@
lineItem.setQuantity(quantity);
}
- public BigDecimal getSubTotal()
- {
+ public BigDecimal getSubTotal() {
BigDecimal subTotal = new BigDecimal("0");
Iterator items = _itemList.iterator();
- while (items.hasNext())
- {
+ while(items.hasNext()) {
LineItem lineItem = (LineItem)items.next();
Item item = lineItem.getItem();
BigDecimal listPrice = item.getListPrice();
@@ -118,10 +107,8 @@
/**
* Internal method to lookup a CartItem based on an itemId.
*/
- private LineItem getLineItem(String itemId)
- {
- for(int i = 0; i < _itemList.size(); i++)
- {
+ private LineItem getLineItem(String itemId) {
+ for(int i = 0; i < _itemList.size(); i++) {
if(_itemList.get(i).getItem().getItemId().equals(itemId))
return _itemList.get(i);
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Category.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Category.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Category.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Category.java Sun Feb 13 10:41:07 2005
@@ -18,59 +18,49 @@
package org.apache.beehive.samples.petstore.model;
public class Category
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private String _catId;
private String _name;
private String _description;
private String _image;
- public Category()
- {
+ public Category() {
}
- public String getCatId()
- {
+ public String getCatId() {
return _catId;
}
- public void setCatId(String catId)
- {
+ public void setCatId(String catId) {
_catId = catId.trim();
}
- public String getImage()
- {
+ public String getImage() {
return _image;
}
- public void setImage(String image)
- {
+ public void setImage(String image) {
_image = image;
}
- public String getName()
- {
+ public String getName() {
return _name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
_name = name;
}
- public String getDescription()
- {
+ public String getDescription() {
return _description;
}
- public void setDescription(String description)
- {
+ public void setDescription(String description) {
_description = description;
}
- public String toString()
- {
+ public String toString() {
return getCatId();
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Item.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Item.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Item.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Item.java Sun Feb 13 10:41:07 2005
@@ -23,8 +23,8 @@
*
*/
public class Item
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private Product _product;
private String _itemId;
@@ -38,142 +38,115 @@
private BigDecimal _listPrice;
private BigDecimal _unitCost;
-
+
private int _supplier;
private int _inventoryQuantity;
- public String getItemId()
- {
+ public String getItemId() {
return _itemId;
}
- public void setItemId(String itemId)
- {
+ public void setItemId(String itemId) {
_itemId = itemId.trim();
}
- public void setQty(int qty)
- {
+ public void setQty(int qty) {
_inventoryQuantity = qty;
}
- public int getQty()
- {
+ public int getQty() {
return _inventoryQuantity;
}
- public Product getProduct()
- {
+ public Product getProduct() {
return _product;
}
- public void setProduct(Product product)
- {
+ public void setProduct(Product product) {
_product = product;
}
- public String getProductId()
- {
+ public String getProductId() {
return _productId;
}
- public void setProductId(String productId)
- {
+ public void setProductId(String productId) {
_productId = productId;
}
- public void setSupplier(int supplier)
- {
+ public void setSupplier(int supplier) {
_supplier = supplier;
}
- public int getSupplier()
- {
+ public int getSupplier() {
return _supplier;
}
- public BigDecimal getListPrice()
- {
+ public BigDecimal getListPrice() {
return _listPrice;
}
- public void setListPrice(BigDecimal listPrice)
- {
+ public void setListPrice(BigDecimal listPrice) {
_listPrice = listPrice;
}
- public BigDecimal getUnitCost()
- {
+ public BigDecimal getUnitCost() {
return _unitCost;
}
- public void setUnitCost(BigDecimal unitCost)
- {
+ public void setUnitCost(BigDecimal unitCost) {
_unitCost = unitCost;
}
- public String getStatus()
- {
+ public String getStatus() {
return _status;
}
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
_status = status;
}
- public String getAttr1()
- {
+ public String getAttr1() {
return _attr1;
}
- public void setAttr1(String attr1)
- {
+ public void setAttr1(String attr1) {
_attr1 = attr1;
}
- public String getAttr2()
- {
+ public String getAttr2() {
return _attr2;
}
- public void setAttr2(String attr2)
- {
+ public void setAttr2(String attr2) {
_attr2 = attr2;
}
- public String getAttr3()
- {
+ public String getAttr3() {
return _attr3;
}
- public void setAttr3(String attr3)
- {
+ public void setAttr3(String attr3) {
_attr3 = attr3;
}
- public String getAttr4()
- {
+ public String getAttr4() {
return _attr4;
}
- public void setAttr4(String attr4)
- {
+ public void setAttr4(String attr4) {
_attr4 = attr4;
}
- public String getAttr5()
- {
+ public String getAttr5() {
return _attr5;
}
- public void setAttr5(String attr5)
- {
+ public void setAttr5(String attr5) {
_attr5 = attr5;
}
- public String toString()
- {
+ public String toString() {
return "(" + getItemId().trim() + "-" + getProductId().trim() + ")";
}
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/LineItem.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/LineItem.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/LineItem.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/LineItem.java Sun Feb 13 10:41:07 2005
@@ -23,21 +23,19 @@
*
*/
public class LineItem
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private int _lineNum;
private int _quantity;
private int _orderId = -1;
private Item _item;
- public LineItem()
- {
+ public LineItem() {
super();
}
- public LineItem(int orderId, int lineNum, Item item)
- {
+ public LineItem(int orderId, int lineNum, Item item) {
this();
_orderId = orderId;
_lineNum = lineNum;
@@ -45,18 +43,15 @@
_quantity = 0;
}
- public int getOrderId()
- {
+ public int getOrderId() {
return _orderId;
}
- public String getItemId()
- {
+ public String getItemId() {
return _item.getItemId();
}
- public boolean isInStock()
- {
+ public boolean isInStock() {
return _item.getQty() > 0;
}
@@ -64,52 +59,43 @@
return _item;
}
- public void setItem(Item item)
- {
+ public void setItem(Item item) {
_item = item;
calculateTotal();
}
- public int getLineNum()
- {
+ public int getLineNum() {
return _lineNum;
}
- public void setLineNum(int lineNum)
- {
+ public void setLineNum(int lineNum) {
_lineNum = lineNum;
}
- public int getQuantity()
- {
+ public int getQuantity() {
return _quantity;
}
- public void setQuantity(int quantity)
- {
+ public void setQuantity(int quantity) {
_quantity = quantity;
calculateTotal();
}
- public BigDecimal getUnitPrice()
- {
+ public BigDecimal getUnitPrice() {
return _item.getListPrice();
}
- public BigDecimal getTotal()
- {
+ public BigDecimal getTotal() {
return calculateTotal();
}
- public void incrementQuantity()
- {
+ public void incrementQuantity() {
_quantity++;
}
- private BigDecimal calculateTotal()
- {
+ private BigDecimal calculateTotal() {
BigDecimal total = null;
- if (_item != null && _item.getListPrice() != null)
+ if(_item != null && _item.getListPrice() != null)
total = _item.getListPrice().multiply(new BigDecimal(_quantity));
return total;
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Order.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Order.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Order.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Order.java Sun Feb 13 10:41:07 2005
@@ -21,8 +21,8 @@
import java.util.*;
public class Order
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private int _orderId;
private Date _orderDate;
@@ -46,13 +46,11 @@
private Address _shippingAddress = null;
private Address _billingAddress = null;
- public Order(int orderId)
- {
+ public Order(int orderId) {
_orderId = orderId;
}
- public void initOrder(Account account, Cart cart)
- {
+ public void initOrder(Account account, Cart cart) {
_account = account;
_billingAddress = account.getAddress();
_cart = cart;
@@ -60,27 +58,27 @@
_totalPrice = _cart.getSubTotal();
}
- public Account getAccount() {return _account;}
+ public Account getAccount() {
+ return _account;
+ }
- public Cart getCart() {return _cart;}
+ public Cart getCart() {
+ return _cart;
+ }
- public int getOrderId()
- {
+ public int getOrderId() {
return _orderId;
}
- public void setOrderId(int orderId)
- {
+ public void setOrderId(int orderId) {
_orderId = orderId;
}
- public Date getOrderDate()
- {
+ public Date getOrderDate() {
return _orderDate;
}
- public void setOrderDate(Date orderDate)
- {
+ public void setOrderDate(Date orderDate) {
_orderDate = orderDate;
}
@@ -88,78 +86,63 @@
return _time;
}
- public void setTime(Date time)
- {
+ public void setTime(Date time) {
_time = time;
}
- public String getCourier()
- {
+ public String getCourier() {
return _courier;
}
- public void setCourier(String courier)
- {
+ public void setCourier(String courier) {
_courier = courier;
}
- public BigDecimal getTotalPrice()
- {
+ public BigDecimal getTotalPrice() {
return _totalPrice;
}
- public void setTotalPrice(BigDecimal totalPrice)
- {
+ public void setTotalPrice(BigDecimal totalPrice) {
_totalPrice = totalPrice;
}
- public String getCreditCard()
- {
+ public String getCreditCard() {
return _creditCard;
}
- public void setCreditCard(String creditCard)
- {
+ public void setCreditCard(String creditCard) {
_creditCard = creditCard;
}
- public String getExprDate()
- {
+ public String getExprDate() {
return _exprDate;
}
- public void setExprDate(String exprDate)
- {
+ public void setExprDate(String exprDate) {
_exprDate = exprDate;
}
- public String getCardType()
- {
+ public String getCardType() {
return _cardType;
}
- public void setCardType(String cardType)
- {
+ public void setCardType(String cardType) {
_cardType = cardType;
}
- public String getLocale()
- {
+ public String getLocale() {
return _locale;
}
- public void setLocale(String locale)
- {
+ public void setLocale(String locale) {
_locale = locale;
}
- public String getStatus()
- {
+ public String getStatus() {
return _status;
}
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
_status = status;
}
@@ -167,49 +150,41 @@
return _lineNum;
}
- public void setLineNum(int lineNum)
- {
+ public void setLineNum(int lineNum) {
_lineNum = lineNum;
}
- public void setShippingAddressIsBillingAddress(boolean shippingAddressIsBillingAddress)
- {
+ public void setShippingAddressIsBillingAddress(boolean shippingAddressIsBillingAddress) {
_shippingAddressIsBillingAddress = shippingAddressIsBillingAddress;
}
- public boolean getShippingAddressIsBillingAddress()
- {
+ public boolean getShippingAddressIsBillingAddress() {
return _shippingAddressIsBillingAddress;
}
- public Address getShippingAddress()
- {
+ public Address getShippingAddress() {
if(_shippingAddress == null)
_shippingAddress = createAddress();
return _shippingAddress;
}
- public void setShippingAddress(Address shippingAddress)
- {
+ public void setShippingAddress(Address shippingAddress) {
_shippingAddress = shippingAddress;
}
- public Address getBillingAddress()
- {
+ public Address getBillingAddress() {
if(_billingAddress == null)
_billingAddress = createAddress();
return _billingAddress;
}
- public void setBillingAddress(Address billingAddress)
- {
+ public void setBillingAddress(Address billingAddress) {
_billingAddress = billingAddress;
}
- private Address createAddress()
- {
+ private Address createAddress() {
return new Address();
}
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Product.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Product.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Product.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Product.java Sun Feb 13 10:41:07 2005
@@ -18,31 +18,27 @@
package org.apache.beehive.samples.petstore.model;
public class Product
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private String _productId;
private String _category;
private String _name;
private String _description;
private String _image;
- public String getProductId()
- {
+ public String getProductId() {
return _productId;
}
- public void setProductId(String productId)
- {
+ public void setProductId(String productId) {
_productId = productId.trim();
}
- public String getImage()
- {
+ public String getImage() {
return _image;
}
- public void setImage(String image)
- {
+ public void setImage(String image) {
_image = image;
}
@@ -54,28 +50,23 @@
_category = category;
}
- public String getName()
- {
+ public String getName() {
return _name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
_name = name;
}
- public String getDescription()
- {
+ public String getDescription() {
return _description;
}
- public void setDescription(String description)
- {
+ public void setDescription(String description) {
_description = description;
}
-
- public String toString()
- {
+
+ public String toString() {
return getName();
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Sequence.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Sequence.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Sequence.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/Sequence.java Sun Feb 13 10:41:07 2005
@@ -18,23 +18,20 @@
package org.apache.beehive.samples.petstore.model;
public class Sequence
- implements java.io.Serializable
-{
+ implements java.io.Serializable {
+
private String _name;
private int _nextId = 0;
- public Sequence(String name)
- {
+ public Sequence(String name) {
_name = name;
}
- public String getName()
- {
+ public String getName() {
return _name;
}
- public int getNextId()
- {
+ public int getNextId() {
return _nextId++;
}
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Category.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Category.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Category.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Category.java Sun Feb 13 10:41:07 2005
@@ -1,6 +1,4 @@
/*
- * Category.java
- *
* Copyright 2001-2004 The Apache Software Foundation.
*
*
@@ -16,32 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
- * Original author: Jonathan Colwell
*/
package org.apache.beehive.samples.petstore.model.ws;
import java.awt.Image;
-/*******************************************************************************
- *
- *
- * @author Jonathan Colwell
- */
-public class Category
+public class Category
extends org.apache.beehive.samples.petstore.model.Category {
private Image mAttachedImage;
//private Product[] mProducts;
- public Category()
- {
+ public Category() {
super();
}
- public Category(org.apache.beehive.samples.petstore.model.Category cat)
- {
+ public Category(org.apache.beehive.samples.petstore.model.Category cat) {
super();
setCatId(cat.getCatId());
@@ -50,37 +39,18 @@
setImage(cat.getImage());
}
- public Category(org.apache.beehive.samples.petstore.model.Category cat,
- Image img
- /*, Product[] products*/
- )
- {
+ public Category(org.apache.beehive.samples.petstore.model.Category cat, Image img) {
this(cat);
setAttachedImage(img);
- //setProductList(products);
}
- public Image getAttachedImage()
- {
+ public Image getAttachedImage() {
return mAttachedImage;
}
- public void setAttachedImage(Image img)
- {
+ public void setAttachedImage(Image img) {
mAttachedImage = img;
}
-
- /*
- public Product[] getProductList()
- {
- return mProducts;
- }
-
- public void setProductList(Product[] products)
- {
- mProducts = products;
- }
- */
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Product.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Product.java?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Product.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/model/ws/Product.java Sun Feb 13 10:41:07 2005
@@ -1,6 +1,4 @@
/*
- * Product.java
- *
* Copyright 2001-2004 The Apache Software Foundation.
*
*
@@ -15,31 +13,23 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- *
- * Original author: Jonathan Colwell
+ *
*/
package org.apache.beehive.samples.petstore.model.ws;
import java.awt.Image;
-/*******************************************************************************
- *
- *
- * @author Jonathan Colwell
- */
-public class Product extends org.apache.beehive.samples.petstore.model.Product {
+public class Product
+ extends org.apache.beehive.samples.petstore.model.Product {
private Image mAttachedImage;
-
- public Product()
- {
+
+ public Product() {
super();
}
- public Product(org.apache.beehive.samples.petstore.model.Product prod)
- {
+ public Product(org.apache.beehive.samples.petstore.model.Product prod) {
super();
setProductId(prod.getProductId());
@@ -49,14 +39,9 @@
setImage(prod.getImage());
}
- public Product(org.apache.beehive.samples.petstore.model.Product prod,
- Image img
- /*, Item[] items*/
- )
- {
+ public Product(org.apache.beehive.samples.petstore.model.Product prod, Image img) {
this(prod);
-
- //setItemList(items);
+
setAttachedImage(img);
}
@@ -67,15 +52,4 @@
public void setAttachedImage(Image img) {
mAttachedImage = img;
}
- /*
- public Item[] getItemList()
- {
- return mItems;
- }
-
- public void setItemList(Item[] items)
- {
- mItems = items;
- }
- */
}
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/categoryNavHeader.tag Sun Feb 13 10:41:07 2005
@@ -9,37 +9,37 @@
to render each of the category links with a lookup
to find the readable name for a category given an id
--%>
-<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+<netui:anchor action="rootSharedFlow.globalViewCategory" styleClass="boldanchor">
Fish
<netui:parameter name="catId" value="FISH"/>
</netui:anchor>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+<netui:anchor action="rootSharedFlow.globalViewCategory" styleClass="boldanchor">
Dogs
<netui:parameter name="catId" value="DOGS"/>
</netui:anchor>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+<netui:anchor action="rootSharedFlow.globalViewCategory" styleClass="boldanchor">
Reptiles
<netui:parameter name="catId" value="REPTILES"/>
</netui:anchor>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+<netui:anchor action="rootSharedFlow.globalViewCategory" styleClass="boldanchor">
Cats
<netui:parameter name="catId" value="CATS"/>
</netui:anchor>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
-<netui:anchor action="globalViewCategory" styleClass="boldanchor">
+<netui:anchor action="rootSharedFlow.globalViewCategory" styleClass="boldanchor">
Birds
<netui:parameter name="catId" value="BIRDS"/>
</netui:anchor>
-</center>
+</center>
\ No newline at end of file
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/footer.tag
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/footer.tag?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/footer.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/footer.tag Sun Feb 13 10:41:07 2005
@@ -17,4 +17,5 @@
</tr>
</tbody>
</table>
+ </p>
</c:if>
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/tags/beehive/petstore/headerMenu.tag Sun Feb 13 10:41:07 2005
@@ -14,23 +14,23 @@
<tr>
<td align="left" width="60%">
<%-- shop --%>
- <netui:imageAnchor action="globalShop" border="0" src="${contextPath}/images/logo-topbar.gif" height="60" width="287"/>
+ <netui:imageAnchor action="rootSharedFlow.globalShop" border="0" src="${contextPath}/images/logo-topbar.gif" height="60" width="287"/>
</td>
<td valign="top" align="right" nowrap="nowrap">
<br clear="all"/>
<%-- view cart --%>
- <netui:imageAnchor action="globalViewCart" border="0" src="${contextPath}/images/cart.gif"/>
+ <netui:imageAnchor action="rootSharedFlow.globalViewCart" border="0" src="${contextPath}/images/cart.gif"/>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
<c:choose>
<c:when test="${sharedFlow.account == null}">
<%-- sharedFlow.signon --%>
- <netui:anchor styleClass="boldanchor" action="signon">
+ <netui:anchor styleClass="boldanchor" action="rootSharedFlow.signon">
Sign In
</netui:anchor>
</c:when>
<c:otherwise>
<%-- sharedFlow.signoff --%>
- <netui:anchor styleClass="boldanchor" action="signoff">
+ <netui:anchor styleClass="boldanchor" action="rootSharedFlow.signoff">
Sign Out
</netui:anchor>
<netui:image border="0" src="${pageContext.request.contextPath}/images/separator.gif"/>
@@ -40,12 +40,11 @@
</c:otherwise>
</c:choose>
<netui:image border="0" src="${contextPath}/images/separator.gif"/>
- <netui:imageAnchor action="globalShowHelp" border="0" src="${contextPath}/images/help.gif"/>
+ <netui:imageAnchor action="rootSharedFlow.globalShowHelp" border="0" src="${contextPath}/images/help.gif"/>
</td>
<td valign="top" align="left" border="0">
<br clear="all"/>
- <netui:anchor action="search">AnchorSearch</netui:anchor>
- <netui:form action="search">
+ <netui:form action="rootSharedFlow.search">
<netui:textBox dataSource="actionForm.keyword" size="14"/>
<netui:anchor styleClass="boldanchor" formSubmit="true">
Search
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/web.xml?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/web.xml Sun Feb 13 10:41:07 2005
@@ -32,9 +32,7 @@
<servlet>
<servlet-name>AxisServlet</servlet-name>
- <servlet-class>
- org.apache.axis.transport.http.AxisServlet
- </servlet-class>
+ <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
</servlet>
<!-- Standard Action Servlet Configuration (with debugging) -->
@@ -74,7 +72,6 @@
<url-pattern>*.do</url-pattern>
</servlet-mapping>
-
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
@@ -83,24 +80,6 @@
<error-code>500</error-code>
<location>/error.jsp</location>
</error-page>
-
- <jsp-config>
- <!-- Define the NetUI tag library TLDs -->
- <taglib>
- <taglib-uri>http://beehive.apache.org/netui/tags-html-1.0</taglib-uri>
- <taglib-location>/WEB-INF/beehive-netui-tags-html.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>http://beehive.apache.org/netui/tags-databinding-1.0</taglib-uri>
- <taglib-location>/WEB-INF/beehive-netui-tags-databinding.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>http://beehive.apache.org/netui/tags-template-1.0</taglib-uri>
- <taglib-location>/WEB-INF/beehive-netui-tags-template.tld</taglib-location>
- </taglib>
- </jsp-config>
<!--
<security-constraint>
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf Sun Feb 13 10:41:07 2005
@@ -26,6 +26,7 @@
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
+import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.samples.petstore.controller.AccountController;
import org.apache.beehive.samples.petstore.controls.AccountControl;
import org.apache.beehive.samples.petstore.controls.CatalogControl;
@@ -38,56 +39,53 @@
import org.apache.beehive.samples.petstore.model.Address;
@Jpf.Controller(
- sharedFlowRefs={
- @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class)
+ sharedFlowRefs = {
+ @Jpf.SharedFlowRef(name = "rootSharedFlow", type = webappRoot.SharedFlow.class)
},
- messageBundles={@Jpf.MessageBundle(bundlePath = "org.apache.beehive.samples.petstore.resources.account")}
+ messageBundles = {@Jpf.MessageBundle(bundlePath = "org.apache.beehive.samples.petstore.resources.account")}
)
public class Controller
- extends AccountController
-{
- @org.apache.beehive.controls.api.bean.Control()
- protected CatalogControl _catalogControl;
+ extends AccountController {
- @org.apache.beehive.controls.api.bean.Control()
- protected AccountControl _accountControl;
+ @Control()
+ private CatalogControl _catalogControl;
- @Jpf.SharedFlowField(name="rootSharedFlow")
+ @Control()
+ private AccountControl _accountControl;
+
+ @Jpf.SharedFlowField(name = "rootSharedFlow")
private webappRoot.SharedFlow _sharedFlow = null;
private boolean _isUsernameTaken;
private CreateAccountForm _createForm = null;
- public boolean isUsernameTaken()
- {
+ public boolean isUsernameTaken() {
return _isUsernameTaken;
}
@Jpf.Action(
- forwards = {
- @Jpf.Forward(name = "viewCreateAccount", path = "viewCreateAccount.do")
+ forwards = {
+ @Jpf.Forward(name = "viewCreateAccount", path = "viewCreateAccount.do")
}
- )
- protected Forward begin()
- {
+ )
+ protected Forward begin() {
return new Forward("viewCreateAccount");
}
@Jpf.Action(
forwards = {
@Jpf.Forward(name = "success", path = "create.jsp",
- actionOutputs = {
- @Jpf.ActionOutput(name = "languages",
- type = java.lang.String[].class,
- required = true),
- @Jpf.ActionOutput(name = "categoryNames",
- type = java.util.List.class,
- required = true)
- })
+ actionOutputs = {
+ @Jpf.ActionOutput(name = "languages",
+ type = java.lang.String[].class,
+ required = true),
+ @Jpf.ActionOutput(name = "categoryNames",
+ type = java.util.List.class,
+ required = true)
+ })
}
)
- protected Forward viewCreateAccount()
- {
+ protected Forward viewCreateAccount() {
Account account = new Account();
account.setAddress(new Address());
@@ -99,25 +97,20 @@
return forward;
}
- // @todo: the "failure" forward below is broken in WLW
@Jpf.Action(
useFormBean = "_createForm",
forwards = {
- @Jpf.Forward(
- redirect = true,
- name = "shop",
- path = "/shop/Controller.jpf"
- )
- },
- validationErrorForward = @Jpf.Forward(name = "failure", navigateTo = Jpf.NavigateTo.currentPage)
+ @Jpf.Forward(redirect = true,
+ name = "shop",
+ path = "/shop/Controller.jpf")
+ },
+ validationErrorForward = @Jpf.Forward(name = "failure", navigateTo = Jpf.NavigateTo.currentPage)
)
protected Forward createAccount(CreateAccountForm form)
- throws AccountAlreadyExistsException, InvalidIdentifierException, UserAlreadyExistsException, NoSuchAccountException
- {
+ throws AccountAlreadyExistsException, InvalidIdentifierException, UserAlreadyExistsException, NoSuchAccountException {
// ensure unique user name
_isUsernameTaken = false;
- if(_accountControl.checkAccountExists(form.getUserId()))
- {
+ if(_accountControl.checkAccountExists(form.getUserId())) {
_isUsernameTaken = true;
return new Forward("failure");
}
@@ -131,57 +124,48 @@
}
public static class CreateAccountForm
- extends AccountForm
- {
+ extends AccountForm {
+
private String _repeatedPassword;
- public CreateAccountForm()
- {
+ public CreateAccountForm() {
super();
}
-
- public CreateAccountForm(Account account)
- {
+
+ public CreateAccountForm(Account account) {
super(account);
}
- public void setUserId(String userId)
- {
+ public void setUserId(String userId) {
getAccount().setUserId(userId);
}
-
- public String getPassword()
- {
+
+ public String getPassword() {
return getAccount().getPassword();
}
- public void setPassword(String password)
- {
+ public void setPassword(String password) {
getAccount().setPassword(password);
}
- public String getRepeatedPassword()
- {
+ public String getRepeatedPassword() {
return _repeatedPassword;
}
- public void setRepeatedPassword(String repeatedPassword)
- {
+ public void setRepeatedPassword(String repeatedPassword) {
_repeatedPassword = repeatedPassword;
}
- public ActionErrors validate(ActionMapping mapping, HttpServletRequest request)
- {
+ public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) {
ActionErrors errors = new ActionErrors();
Account account = getAccount();
account.setStatus("OK");
addErrorIfStringEmpty(errors, "userId", "account.error.userid.required", account.getUserId());
- if (account.getPassword() == null ||
+ if(account.getPassword() == null ||
account.getPassword().length() < 1 ||
- !account.getPassword().equals(getRepeatedPassword()))
- {
+ !account.getPassword().equals(getRepeatedPassword())) {
errors.add("repeatedPassword", new ActionError("account.error.password.missing"));
}
@@ -190,41 +174,4 @@
return errors;
}
}
-}
-
-@Jpf.ViewProperties(value = {
- "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/account/create/Controller.jpf'/>",
- "<pageflow-object id='page:create.jsp'>",
- " <property value='420' name='x'/>",
- " <property value='220' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='message-resource:null#org.apache.beehive.samples.petstore.resources.account#@pageflow:/account/create/Controller.jpf@'/>",
- "<pageflow-object id='action:begin.do'>",
- " <property value='80' name='x'/>",
- " <property value='220' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:viewCreateAccount.do'><property name='x' value='240'/><property name='y' value='220'/></pageflow-object>",
- "<pageflow-object id='action:createAccount.do#account.create.Controller.CreateAccountForm'><property name='x' value='600'/><property name='y' value='220'/></pageflow-object>",
- "<pageflow-object id='control:org.apache.beehive.samples.petstore.controls.CatalogControl#_catalogControl'/>",
- "<pageflow-object id='control:org.apache.beehive.samples.petstore.controls.AccountControl#_accountControl'/>",
- "<pageflow-object id='forward:path#viewCreateAccount#viewCreateAccount.do#@action:begin.do@'><property name='elbowsX' value='116,160,160,204'/><property name='elbowsY' value='212,212,212,212'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='viewCreateAccount'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#create.jsp#@action:viewCreateAccount.do@'><property name='elbowsX' value='276,330,330,384'/><property name='elbowsY' value='212,212,212,212'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='external-jpf:/shop/Controller.jpf'>",
- " <property value='740' name='x'/>",
- " <property value='180' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:path#shop#/shop/Controller.jpf#@action:createAccount.do#account.create.Controller.CreateAccountForm@'><property name='elbowsX' value='636,670,670,704'/><property name='elbowsY' value='212,212,172,172'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='shop'/></pageflow-object>",
- "<pageflow-object id='return-to:@forward:returnTo#failure#currentPage#@action:createAccount.do#account.create.Controller.CreateAccountForm@@'><property name='x' value='740'/><property name='y' value='280'/></pageflow-object>",
- "<pageflow-object id='forward:returnTo#failure#currentPage#@action:createAccount.do#account.create.Controller.CreateAccountForm@'><property name='elbowsX' value='636,670,670,704'/><property name='elbowsY' value='223,223,272,272'/><property name='fromPort' value='East_2'/><property name='toPort' value='West_1'/><property name='label' value='failure'/></pageflow-object>",
- "<pageflow-object id='action-output:languages#@forward:path#success#create.jsp#@action:viewCreateAccount.do@@'/>",
- "<pageflow-object id='action-output:categoryNames#@forward:path#success#create.jsp#@action:viewCreateAccount.do@@'/>",
- "<pageflow-object id='action-call:@page:create.jsp@#@action:createAccount.do#account.create.Controller.CreateAccountForm@'><property name='elbowsX' value='456,510,510,564'/><property name='elbowsY' value='212,212,212,212'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/></pageflow-object>",
- "<pageflow-object id='formbean:CreateAccountForm'/>",
- "</view-properties>"
-})
-interface VIEW_PROPERTIES
-{
-}
-
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf Sun Feb 13 10:41:07 2005
@@ -33,12 +33,13 @@
import org.apache.beehive.samples.petstore.forms.AccountForm;
import org.apache.beehive.samples.petstore.forms.OrderForm;
import org.apache.beehive.samples.petstore.controller.AccountController;
+import org.apache.beehive.controls.api.bean.Control;
@Jpf.Controller(
sharedFlowRefs={
@Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class)
},
- messageBundles = {
+ messageBundles = {
@Jpf.MessageBundle(bundlePath = "org.apache.beehive.samples.petstore.resources.account")
},
simpleActions={
@@ -46,12 +47,12 @@
}
)
public class Controller
- extends AccountController
-{
- @org.apache.beehive.controls.api.bean.Control()
+ extends AccountController {
+
+ @Control()
private OrderControl _orderControl;
- @org.apache.beehive.controls.api.bean.Control()
+ @Control()
private AccountControl _accountControl;
@Jpf.SharedFlowField(name="rootSharedFlow")
@@ -61,9 +62,9 @@
private Order[] orders;
@Jpf.Action(
- forwards = {
+ forwards = {
@Jpf.Forward(name = "update", path = "edit.jsp",
- actionOutputs = {
+ actionOutputs = {
@Jpf.ActionOutput(name = "languages",
type = java.lang.String[].class,
required = true),
@@ -73,8 +74,7 @@
})
}
)
- protected Forward viewUpdateAccount()
- {
+ protected Forward viewUpdateAccount() {
_sharedFlow.ensureLogin();
_updateForm = new UpdateAccountForm(_sharedFlow.getAccount());
@@ -88,18 +88,17 @@
@Jpf.Action(
useFormBean = "_updateForm",
- forwards = {
+ forwards = {
@Jpf.Forward(
- redirect = true,
- name = "success",
+ redirect = true,
+ name = "success",
path = "/shop/Controller.jpf"
)
- },
+ },
validationErrorForward = @Jpf.Forward(name = "failure", navigateTo = Jpf.NavigateTo.currentPage)
)
protected Forward updateAccount(UpdateAccountForm form)
- throws InvalidIdentifierException, NoSuchAccountException, NoSuchUserException
- {
+ throws InvalidIdentifierException, NoSuchAccountException, NoSuchUserException {
_sharedFlow.ensureLogin();
Account account = AccountForm.getAccount(form);
@@ -112,13 +111,12 @@
}
@Jpf.Action(
- forwards = {
+ forwards = {
@Jpf.Forward(name = "success", path = "/checkout/viewOrder.do")
}
)
protected Forward viewOrder()
- throws NoSuchOrderException
- {
+ throws NoSuchOrderException {
_sharedFlow.ensureLogin();
Order order = _orderControl.getOrder(getRequest().getParameter("orderId"));
@@ -132,15 +130,14 @@
@Jpf.Action(
forwards = {
@Jpf.Forward(name = "success", path = "listOrders.jsp",
- actionOutputs = {
+ actionOutputs = {
@Jpf.ActionOutput(name = "orders",
type = org.apache.beehive.samples.petstore.model.Order[].class,
required = false)
})
}
)
- protected Forward listOrders()
- {
+ protected Forward listOrders() {
_sharedFlow.ensureLogin();
orders = _orderControl.getOrdersByUserId(_sharedFlow.getAccount().getUserId());
@@ -154,104 +151,39 @@
*
*/
public static class UpdateAccountForm
- extends AccountForm
- {
+ extends AccountForm {
+
private String _newPassword;
private String _repeatedPassword;
- public UpdateAccountForm()
- {
+ public UpdateAccountForm() {
super();
}
-
- public UpdateAccountForm(Account account)
- {
+
+ public UpdateAccountForm(Account account) {
super(account);
}
-
- public ActionErrors validate(ActionMapping mapping, HttpServletRequest request)
- {
+
+ public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) {
ActionErrors errors = new ActionErrors();
baseValidate(errors, mapping, request);
return errors;
}
- public String getNewPassword()
- {
+ public String getNewPassword() {
return _newPassword;
}
- public void setNewPassword(String value)
- {
+ public void setNewPassword(String value) {
_newPassword = value;
}
- public String getRepeatedPassword()
- {
+ public String getRepeatedPassword() {
return _repeatedPassword;
}
- public void setRepeatedPassword(String value)
- {
+ public void setRepeatedPassword(String value) {
_repeatedPassword = value;
}
}
-}
-
-@Jpf.ViewProperties(value = {
- "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/account/edit/Controller.jpf'/>",
- "<pageflow-object id='page:edit.jsp'>",
- " <property value='260' name='x'/>",
- " <property value='140' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:listOrders.jsp'>",
- " <property value='260' name='x'/>",
- " <property value='400' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='message-resource:null#org.apache.beehive.samples.petstore.resources.account#@pageflow:/account/edit/Controller.jpf@'/>",
- "<pageflow-object id='action:viewUpdateAccount.do'>",
- " <property value='80' name='x'/>",
- " <property value='140' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:updateAccount.do#account.edit.Controller.UpdateAccountForm'><property name='x' value='480'/><property name='y' value='140'/></pageflow-object>",
- "<pageflow-object id='action:viewOrder.do'>",
- " <property value='260' name='x'/>",
- " <property value='540' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:listOrders.do'>",
- " <property value='260' name='x'/>",
- " <property value='260' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='control:org.apache.beehive.samples.petstore.controls.OrderControl#_orderControl'/>",
- "<pageflow-object id='control:org.apache.beehive.samples.petstore.controls.AccountControl#_accountControl'/>",
- "<pageflow-object id='forward:path#update#edit.jsp#@action:viewUpdateAccount.do@'>",
- " <property value='116,170,170,224' name='elbowsX'/>",
- " <property value='132,132,132,132' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='update' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='external-jpf:/shop/Controller.jpf'>",
- " <property value='680' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:path#success#/shop/Controller.jpf#@action:updateAccount.do#account.edit.Controller.UpdateAccountForm@'><property name='elbowsX' value='516,580,580,644'/><property name='elbowsY' value='132,132,72,72'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='return-to:@forward:returnTo#failure#currentPage#@action:updateAccount.do#account.edit.Controller.UpdateAccountForm@@'><property name='x' value='680'/><property name='y' value='220'/></pageflow-object>",
- "<pageflow-object id='forward:returnTo#failure#currentPage#@action:updateAccount.do#account.edit.Controller.UpdateAccountForm@'><property name='elbowsX' value='516,580,580,644'/><property name='elbowsY' value='143,143,212,212'/><property name='fromPort' value='East_2'/><property name='toPort' value='West_1'/><property name='label' value='failure'/></pageflow-object>",
- "<pageflow-object id='action:/checkout/viewOrder.do#org.apache.beehive.samples.petstore.forms.CheckoutForm'><property name='x' value='520'/><property name='y' value='540'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#/checkout/viewOrder.do#@action:viewOrder.do@'><property name='elbowsX' value='296,390,390,484'/><property name='elbowsY' value='532,532,532,532'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#listOrders.jsp#@action:listOrders.do@'><property name='elbowsX' value='260,260,260,260'/><property name='elbowsY' value='304,330,330,356'/><property name='fromPort' value='South_1'/><property name='toPort' value='North_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='action-output:languages#@forward:path#update#edit.jsp#@action:viewUpdateAccount.do@@'/>",
- "<pageflow-object id='action-output:categoryNames#@forward:path#update#edit.jsp#@action:viewUpdateAccount.do@@'/>",
- "<pageflow-object id='action-output:orders#@forward:path#success#listOrders.jsp#@action:listOrders.do@@'/>",
- "<pageflow-object id='action-call:@page:edit.jsp@#@action:listOrders.do@'><property name='elbowsX' value='260,260,260,260'/><property name='elbowsY' value='184,200,200,216'/><property name='fromPort' value='South_1'/><property name='toPort' value='North_1'/></pageflow-object>",
- "<pageflow-object id='action-call:@page:edit.jsp@#@action:updateAccount.do#account.edit.Controller.UpdateAccountForm@'><property name='elbowsX' value='296,370,370,444'/><property name='elbowsY' value='132,132,132,132'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/></pageflow-object>",
- "<pageflow-object id='formbean:UpdateAccountForm'/>",
- "</view-properties>"
-})
-interface VIEW_PROPERTIES
-{
-}
-
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/listOrders.jsp Sun Feb 13 10:41:07 2005
@@ -9,7 +9,7 @@
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <beehive-petstore:catalogNav action="globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
+ <beehive-petstore:catalogNav action="rootSharedFlow.globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
</netui-template:section>
<netui-template:section name="body">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf Sun Feb 13 10:41:07 2005
@@ -43,8 +43,7 @@
@Jpf.Forward(name = "success", path = "login.jsp")
}
)
- protected Forward begin(ReturnToForm initForm)
- {
+ protected Forward begin(ReturnToForm initForm) {
_initForm = initForm;
return new Forward("success");
}
@@ -54,8 +53,7 @@
@Jpf.Forward(name = "success", path = "login.jsp")
}
)
- protected Forward viewLogin()
- {
+ protected Forward viewLogin() {
return new Forward("success");
}
@@ -69,8 +67,7 @@
)
}
)
- protected Forward securityCheck(SecurityCheckForm form)
- {
+ protected Forward securityCheck(SecurityCheckForm form) {
_sharedFlow.handleLogin(form.getj_username());
if(!_sharedFlow.isUserLoggedIn())
@@ -84,96 +81,32 @@
@Jpf.Forward(name = "success", path = "/Controller.jpf")
}
)
- protected Forward logout()
- {
+ protected Forward logout() {
_sharedFlow.handleLogout();
return new Forward("success");
}
public static class SecurityCheckForm
- extends FormData
- {
+ extends FormData {
+
private String _j_username;
private String _j_password;
- public void setj_password(String j_password)
- {
+ public void setj_password(String j_password) {
_j_password = j_password;
}
- public String getj_password()
- {
+ public String getj_password() {
return _j_password;
}
- public void setj_username(String j_username)
- {
+ public void setj_username(String j_username) {
_j_username = j_username;
}
- public String getj_username()
- {
+ public String getj_username() {
return _j_username;
}
}
}
-
-@Jpf.ViewProperties(value = {
- "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/auth/Controller.jpf'/>",
- "<pageflow-object id='page:login.jsp'>",
- " <property value='380' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='page:loginError.jsp'>",
- " <property value='580' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='formbean:SecurityCheckForm'/>",
- "<pageflow-object id='action:begin.do#org.apache.beehive.samples.petstore.forms.ReturnToForm'><property name='x' value='120'/><property name='y' value='200'/></pageflow-object>",
- "<pageflow-object id='action:viewLogin.do'>",
- " <property value='380' name='x'/>",
- " <property value='80' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:logout.do'>",
- " <property value='120' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='formbean:org.apache.beehive.samples.petstore.forms.ReturnToForm'/>",
- "<pageflow-object id='forward:path#success#login.jsp#@action:begin.do#org.apache.beehive.samples.petstore.forms.ReturnToForm@'><property name='elbowsX' value='156,250,250,344'/><property name='elbowsY' value='192,192,192,192'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#login.jsp#@action:viewLogin.do@'>",
- " <property value='380,380,380,380' name='elbowsX'/>",
- " <property value='124,140,140,156' name='elbowsY'/>",
- " <property value='South_1' name='fromPort'/>",
- " <property value='North_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='external-jpf:/Controller.jpf'>",
- " <property value='380' name='x'/>",
- " <property value='380' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:path#success#/Controller.jpf#@action:logout.do@'>",
- " <property value='156,250,250,344' name='elbowsX'/>",
- " <property value='372,372,372,372' name='elbowsY'/>",
- " <property value='East_1' name='fromPort'/>",
- " <property value='West_1' name='toPort'/>",
- " <property value='success' name='label'/>",
- "</pageflow-object>",
- "<pageflow-object id='action:globalViewCreateAccount.do'><property name='x' value='580'/><property name='y' value='500'/></pageflow-object>",
- "<pageflow-object id='action-call:@page:login.jsp@#@action:globalViewCreateAccount.do@'><property name='elbowsX' value='416,480,480,544'/><property name='elbowsY' value='192,192,492,492'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/></pageflow-object>",
- "<pageflow-object id='action:securityCheck.do#auth.Controller.SecurityCheckForm'><property name='x' value='120'/><property name='y' value='460'/></pageflow-object>",
- "<pageflow-object id='forward:path#failure#loginError.jsp#@action:securityCheck.do#auth.Controller.SecurityCheckForm@'><property name='elbowsX' value='580,580,580,580'/><property name='elbowsY' value='244,290,290,336'/><property name='fromPort' value='South_1'/><property name='toPort' value='North_1'/><property name='label' value='failure'/></pageflow-object>",
- "<pageflow-object id='exit:loginDone'>",
- " <property value='720' name='x'/>",
- " <property value='200' name='y'/>",
- "</pageflow-object>",
- "<pageflow-object id='forward:returnAction#success#loginDone#@action:securityCheck.do#auth.Controller.SecurityCheckForm@'><property name='elbowsX' value='616,650,650,684'/><property name='elbowsY' value='192,192,192,192'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='action-call:@page:login.jsp@#@action:securityCheck.do#auth.Controller.SecurityCheckForm@'><property name='elbowsX' value='344,250,250,156'/><property name='elbowsY' value='203,203,441,441'/><property name='fromPort' value='West_2'/><property name='toPort' value='East_0'/></pageflow-object>",
- "</view-properties>"
-})
-interface VIEW_PROPERTIES
-{
-}
-
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=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/auth/login.jsp Sun Feb 13 10:41:07 2005
@@ -40,7 +40,7 @@
</tr>
</table>
</netui:form>
- <netui:imageAnchor action="globalViewCreateAccount" border="0" src="${pageContext.request.contextPath}/images/button_register_now.gif"/>
+ <netui:imageAnchor action="rootSharedFlow.globalViewCreateAccount" border="0" src="${pageContext.request.contextPath}/images/button_register_now.gif"/>
</center>
</netui-template:section>
</netui-template:template>
Modified: incubator/beehive/trunk/samples/petstoreWeb/auth/loginError.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/auth/loginError.jsp?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/auth/loginError.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/auth/loginError.jsp Sun Feb 13 10:41:07 2005
@@ -15,7 +15,7 @@
<b>${bundle.view.loginErrorMessage}</b>
<b><netui:anchor href="login.jsp">${bundle.view.loginLabel}</netui:anchor></b>
- <b><netui:anchor action="globalViewCreateAccount.do">${bundle.view.createAccountLabel}</netui:anchor></b>
+ <b><netui:anchor action="rootSharedFlow.globalViewCreateAccount.do">${bundle.view.createAccountLabel}</netui:anchor></b>
</p>
</center>
</netui-template:section>
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf Sun Feb 13 10:41:07 2005
@@ -17,9 +17,6 @@
*/
package checkout;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
@@ -32,6 +29,7 @@
import org.apache.beehive.samples.petstore.model.Order;
import org.apache.beehive.samples.petstore.forms.OrderForm;
import org.apache.beehive.samples.petstore.forms.CheckoutForm;
+import org.apache.beehive.controls.api.bean.Control;
@Jpf.Controller(
nested=true,
@@ -48,10 +46,10 @@
public class Controller
extends PageFlowController
{
- @org.apache.beehive.controls.api.bean.Control()
+ @Control()
private CatalogControl _catalogControl;
- @org.apache.beehive.controls.api.bean.Control()
+ @Control()
private OrderControl _orderControl;
@Jpf.SharedFlowField(name="rootSharedFlow")
@@ -80,7 +78,8 @@
@Jpf.ActionOutput(name = "order",
type = org.apache.beehive.samples.petstore.model.Order.class,
required = true)
- })
+ }
+ )
}
)
protected Forward viewCreateOrder()
@@ -230,57 +229,4 @@
return new Forward("viewShipping", checkoutForm);
else return new Forward("viewConfirm");
}
-}
-
-@Jpf.ViewProperties(value = {
- "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
- "<view-properties>",
- "<pageflow-object id='pageflow:/checkout/Controller.jpf'/>",
- "<pageflow-object id='page:confirm.jsp'><property name='x' value='620'/><property name='y' value='460'/></pageflow-object>",
- "<pageflow-object id='page:newOrder.jsp'><property name='x' value='100'/><property name='y' value='300'/></pageflow-object>",
- "<pageflow-object id='page:shipping.jsp'><property name='x' value='480'/><property name='y' value='100'/></pageflow-object>",
- "<pageflow-object id='page:viewCart.jsp'><property name='x' value='220'/><property name='y' value='400'/></pageflow-object>",
- "<pageflow-object id='page:viewOrder.jsp'><property name='x' value='300'/><property name='y' value='580'/></pageflow-object>",
- "<pageflow-object id='message-resource:null#org.apache.beehive.samples.petstore.resources.order#@pageflow:/checkout/Controller.jpf@'/>",
- "<pageflow-object id='action:begin.do'><property name='x' value='60'/><property name='y' value='400'/></pageflow-object>",
- "<pageflow-object id='action:viewCreateOrder.do'><property name='x' value='100'/><property name='y' value='100'/></pageflow-object>",
- "<pageflow-object id='action:done.do'><property name='x' value='100'/><property name='y' value='1140'/></pageflow-object>",
- "<pageflow-object id='action:viewConfirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm'><property name='x' value='240'/><property name='y' value='100'/></pageflow-object>",
- "<pageflow-object id='action:confirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm'><property name='x' value='760'/><property name='y' value='280'/></pageflow-object>",
- "<pageflow-object id='action:viewShipping.do#org.apache.beehive.samples.petstore.forms.CheckoutForm'><property name='x' value='640'/><property name='y' value='360'/></pageflow-object>",
- "<pageflow-object id='action:viewOrder.do#org.apache.beehive.samples.petstore.forms.CheckoutForm'><property name='x' value='440'/><property name='y' value='380'/></pageflow-object>",
- "<pageflow-object id='action:shipping.do#org.apache.beehive.samples.petstore.forms.OrderForm'><property name='x' value='680'/><property name='y' value='80'/></pageflow-object>",
- "<pageflow-object id='action:order.do#org.apache.beehive.samples.petstore.forms.CheckoutForm'><property name='x' value='540'/><property name='y' value='260'/></pageflow-object>",
- "<pageflow-object id='control:org.apache.beehive.samples.petstore.controls.CatalogControl#_catalogControl'/>",
- "<pageflow-object id='control:org.apache.beehive.samples.petstore.controls.OrderControl#_orderControl'/>",
- "<pageflow-object id='forward:path#success#viewCart.jsp#@action:begin.do@'><property name='elbowsX' value='96,140,140,184'/><property name='elbowsY' value='392,392,392,392'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#newOrder.jsp#@action:viewCreateOrder.do@'><property name='elbowsX' value='100,100,100,100'/><property name='elbowsY' value='144,200,200,256'/><property name='fromPort' value='South_1'/><property name='toPort' value='North_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='exit:checkoutDone'><property name='x' value='240'/><property name='y' value='1140'/></pageflow-object>",
- "<pageflow-object id='forward:returnAction#done#checkoutDone#@action:done.do@'><property name='elbowsX' value='136,170,170,204'/><property name='elbowsY' value='1132,1132,1132,1132'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='done'/></pageflow-object>",
- "<pageflow-object id='forward:path#confirm#confirm.jsp#@action:viewConfirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='276,430,430,584'/><property name='elbowsY' value='92,92,452,452'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/><property name='label' value='confirm'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#viewOrder.jsp#@action:confirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='724,530,530,336'/><property name='elbowsY' value='272,272,561,561'/><property name='fromPort' value='West_1'/><property name='toPort' value='East_0'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#shipping.jsp#@action:viewShipping.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='604,560,560,516'/><property name='elbowsY' value='352,352,103,103'/><property name='fromPort' value='West_1'/><property name='toPort' value='East_2'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#viewOrder.jsp#@action:viewOrder.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='404,370,370,336'/><property name='elbowsY' value='372,372,572,572'/><property name='fromPort' value='West_1'/><property name='toPort' value='East_1'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#success#viewConfirm.do#@action:shipping.do#org.apache.beehive.samples.petstore.forms.OrderForm@'><property name='elbowsX' value='644,460,460,276'/><property name='elbowsY' value='72,72,103,103'/><property name='fromPort' value='West_1'/><property name='toPort' value='East_2'/><property name='label' value='success'/></pageflow-object>",
- "<pageflow-object id='forward:path#viewShipping#viewShipping.do#@action:order.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='576,590,590,604'/><property name='elbowsY' value='252,252,341,341'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_0'/><property name='label' value='viewShipping'/></pageflow-object>",
- "<pageflow-object id='forward:path#viewConfirm#viewConfirm.do#@action:order.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='504,390,390,276'/><property name='elbowsY' value='241,241,103,103'/><property name='fromPort' value='West_0'/><property name='toPort' value='East_2'/><property name='label' value='viewConfirm'/></pageflow-object>",
- "<pageflow-object id='return-to:@forward:returnTo#failure#currentPage#@action:order.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'><property name='x' value='700'/><property name='y' value='200'/></pageflow-object>",
- "<pageflow-object id='forward:returnTo#failure#currentPage#@action:order.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='576,620,620,664'/><property name='elbowsY' value='263,263,192,192'/><property name='fromPort' value='East_2'/><property name='toPort' value='West_1'/><property name='label' value='failure'/></pageflow-object>",
- "<pageflow-object id='action-output:creditCardTypes#@forward:path#success#newOrder.jsp#@action:viewCreateOrder.do@@'/>",
- "<pageflow-object id='action-output:order#@forward:path#success#newOrder.jsp#@action:viewCreateOrder.do@@'/>",
- "<pageflow-object id='action-output:order#@forward:path#confirm#confirm.jsp#@action:viewConfirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'/>",
- "<pageflow-object id='action-output:checkout#@forward:path#confirm#confirm.jsp#@action:viewConfirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'/>",
- "<pageflow-object id='action-output:checkout#@forward:path#success#viewOrder.jsp#@action:confirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'/>",
- "<pageflow-object id='action-output:order#@forward:path#success#viewOrder.jsp#@action:confirm.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'/>",
- "<pageflow-object id='action-output:order#@forward:path#success#viewOrder.jsp#@action:viewOrder.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'/>",
- "<pageflow-object id='action-output:checkout#@forward:path#success#viewOrder.jsp#@action:viewOrder.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@@'/>",
- "<pageflow-object id='action-call:@page:newOrder.jsp@#@action:order.do#org.apache.beehive.samples.petstore.forms.CheckoutForm@'><property name='elbowsX' value='136,320,320,504'/><property name='elbowsY' value='292,292,263,263'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_2'/></pageflow-object>",
- "<pageflow-object id='action-call:@page:shipping.jsp@#@action:shipping.do#org.apache.beehive.samples.petstore.forms.OrderForm@'><property name='elbowsX' value='516,580,580,644'/><property name='elbowsY' value='92,92,61,61'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_0'/></pageflow-object>",
- "<pageflow-object id='formbean:org.apache.beehive.samples.petstore.forms.CheckoutForm'/>",
- "<pageflow-object id='formbean:org.apache.beehive.samples.petstore.forms.OrderForm'/>",
- "</view-properties>"
-})
-interface VIEW_PROPERTIES
-{
-}
-
+}
\ No newline at end of file
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=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/confirm.jsp Sun Feb 13 10:41:07 2005
@@ -7,13 +7,10 @@
<netui-data:declarePageInput name="checkout" type="java.lang.Boolean"/>
<netui-data:declarePageInput name="order" type="org.apache.beehive.samples.petstore.model.Order"/>
-
-
-
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <beehive-petstore:catalogNav action="globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
+ <beehive-petstore:catalogNav action="rootSharedFlow.globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
</netui-template:section>
<netui-template:section name="body">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
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=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/viewCart.jsp Sun Feb 13 10:41:07 2005
@@ -7,7 +7,7 @@
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <beehive-petstore:catalogNav action="globalViewCart" labelValue="${bundle.view.shoppingCartLabel}"/>
+ <beehive-petstore:catalogNav action="rootSharedFlow.globalViewCart" labelValue="${bundle.view.shoppingCartLabel}"/>
</netui-template:section>
<netui-template:section name="body">
Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/viewOrder.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/viewOrder.jsp?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/viewOrder.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/viewOrder.jsp Sun Feb 13 10:41:07 2005
@@ -11,7 +11,7 @@
<netui-template:template templatePage="/site/template.jsp">
<netui-template:section name="leftnav">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
- <beehive-petstore:catalogNav action="globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
+ <beehive-petstore:catalogNav action="rootSharedFlow.globalShop" labelValue="${bundle.view.mainMenuLabel}"/>
</netui-template:section>
<netui-template:section name="body">
<netui-data:declareBundle bundlePath="org.apache.beehive.samples.petstore.resources.view" name="view"/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/index.jsp?view=diff&r1=153652&r2=153653
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/index.jsp (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/index.jsp Sun Feb 13 10:41:07 2005
@@ -17,10 +17,10 @@
<netui:body>
<beehive-petstore:headerMenu contextPath="${pageContext.request.contextPath}"/>
<center>
- <table border=0 cellSpacing=100 width="100%">
+ <table border="0" cellSpacing="100" width="100%">
<tbody>
<tr>
- <td width=100%>
+ <td width="100%">
<p align="center">
<netui:span styleClass="boldlabel" value="${bundle.view.welcome}"/>
<br/>