[pal-cvs 2828] [573] fixed admin pages

svnno****@sourc***** svnno****@sourc*****
2007年 9月 20日 (木) 18:05:59 JST


Revision: 573
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=573
Author:   shinsuke
Date:     2007-09-20 18:05:57 +0900 (Thu, 20 Sep 2007)

Log Message:
-----------
fixed admin pages

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCommentBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusHistoryBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsReviewDescriptionBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCommentDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusHistoryDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsReviewDescriptionDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReviewDescription.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDescriptionDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCommentCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusHistoryCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsReviewDescriptionCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCommentCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusHistoryCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsReviewDescriptionCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCommentCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusHistoryCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ReviewDescriptionCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ManufacturerService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/TaxService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ManufacturerServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/TaxServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -1,5 +1,7 @@
 package jp.sf.pal.pompei;
 
+import java.math.BigDecimal;
+
 public class PompeiConstants {
     public static final String JPEG = ".jpg";
 
@@ -29,11 +31,11 @@
 
     public static final String TOP_CATEGORY = "top";
 
-    public static final String CATEGORIES_ID = "categoriesId";
+    public static final String CATEGORY_ID = "categoryId";
 
     public static final String BREADCRUMB = "breadcrumb";
 
-    public static final String PRODUCTS_DESCRIPTION_LIST = "productsDescriptionList";
+    public static final String PRODUCT_DESCRIPTION_LIST = "productDescriptionList";
 
     public static final String COD_PAYMENT_METHOD = "COD";
 
@@ -56,4 +58,6 @@
     public static final String DELIVERY_METHOD_ID = "deliveryMethodId";
 
     public static final String CUSTOMERS_BASKET_ID_LIST = "customersBasketIdList";
+
+    public static final BigDecimal ROOT_CATEGORY_ID = new BigDecimal(1);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCommentBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCommentBhv.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCommentBhv.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -28,7 +28,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, TITLE, TEXT
+ *     ORDER_FORM_ID, TITLE, COMMENT
  * 
  * [foreign-property]
  *     orderForm
@@ -660,7 +660,7 @@
 
         if (names.contains("orderFormId")) { destinationMyEntity.setOrderFormId(sourceMyEntity.getOrderFormId()); }
         if (names.contains("title")) { destinationMyEntity.setTitle(sourceMyEntity.getTitle()); }
-        if (names.contains("text")) { destinationMyEntity.setText(sourceMyEntity.getText()); }
+        if (names.contains("comment")) { destinationMyEntity.setComment(sourceMyEntity.getComment()); }
 
     }
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusHistoryBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusHistoryBhv.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusHistoryBhv.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -28,7 +28,7 @@
  *     ORDER_STATUS_HISTORY_ID
  * 
  * [column-property]
- *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS
+ *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT
  * 
  * [foreign-property]
  *     orderForm, orderStatus
@@ -683,7 +683,7 @@
         if (names.contains("orderStatusId")) { destinationMyEntity.setOrderStatusId(sourceMyEntity.getOrderStatusId()); }
         if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); }
         if (names.contains("customerNotified")) { destinationMyEntity.setCustomerNotified(sourceMyEntity.getCustomerNotified()); }
-        if (names.contains("comments")) { destinationMyEntity.setComments(sourceMyEntity.getComments()); }
+        if (names.contains("comment")) { destinationMyEntity.setComment(sourceMyEntity.getComment()); }
 
     }
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -30,7 +30,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -2287,19 +2287,20 @@
         final java.util.Set<String> names = sourceMyEntity.getModifiedPropertyNames();
 
         if (names.contains("productId")) { destinationMyEntity.setProductId(sourceMyEntity.getProductId()); }
+        if (names.contains("model")) { destinationMyEntity.setModel(sourceMyEntity.getModel()); }
         if (names.contains("quantity")) { destinationMyEntity.setQuantity(sourceMyEntity.getQuantity()); }
-        if (names.contains("model")) { destinationMyEntity.setModel(sourceMyEntity.getModel()); }
+        if (names.contains("price")) { destinationMyEntity.setPrice(sourceMyEntity.getPrice()); }
+        if (names.contains("weight")) { destinationMyEntity.setWeight(sourceMyEntity.getWeight()); }
+        if (names.contains("image")) { destinationMyEntity.setImage(sourceMyEntity.getImage()); }
         if (names.contains("thumbnail")) { destinationMyEntity.setThumbnail(sourceMyEntity.getThumbnail()); }
-        if (names.contains("image")) { destinationMyEntity.setImage(sourceMyEntity.getImage()); }
-        if (names.contains("price")) { destinationMyEntity.setPrice(sourceMyEntity.getPrice()); }
+        if (names.contains("stock")) { destinationMyEntity.setStock(sourceMyEntity.getStock()); }
+        if (names.contains("ordered")) { destinationMyEntity.setOrdered(sourceMyEntity.getOrdered()); }
+        if (names.contains("status")) { destinationMyEntity.setStatus(sourceMyEntity.getStatus()); }
         if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); }
         if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); }
         if (names.contains("dateAvailable")) { destinationMyEntity.setDateAvailable(sourceMyEntity.getDateAvailable()); }
-        if (names.contains("weight")) { destinationMyEntity.setWeight(sourceMyEntity.getWeight()); }
-        if (names.contains("status")) { destinationMyEntity.setStatus(sourceMyEntity.getStatus()); }
         if (names.contains("taxClassId")) { destinationMyEntity.setTaxClassId(sourceMyEntity.getTaxClassId()); }
         if (names.contains("manufacturerId")) { destinationMyEntity.setManufacturerId(sourceMyEntity.getManufacturerId()); }
-        if (names.contains("ordered")) { destinationMyEntity.setOrdered(sourceMyEntity.getOrdered()); }
 
     }
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsReviewDescriptionBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsReviewDescriptionBhv.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsReviewDescriptionBhv.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -28,7 +28,7 @@
  *     REVIEW_ID, LANGUAGE_ID
  * 
  * [column-property]
- *     REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT
+ *     REVIEW_ID, LANGUAGE_ID, COMMENT
  * 
  * [foreign-property]
  *     language, review
@@ -676,7 +676,7 @@
 
         if (names.contains("reviewId")) { destinationMyEntity.setReviewId(sourceMyEntity.getReviewId()); }
         if (names.contains("languageId")) { destinationMyEntity.setLanguageId(sourceMyEntity.getLanguageId()); }
-        if (names.contains("reviewText")) { destinationMyEntity.setReviewText(sourceMyEntity.getReviewText()); }
+        if (names.contains("comment")) { destinationMyEntity.setComment(sourceMyEntity.getComment()); }
 
     }
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCommentDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCommentDao.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCommentDao.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -11,7 +11,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, TITLE, TEXT
+ *     ORDER_FORM_ID, TITLE, COMMENT
  * 
  * [foreign-property]
  *     orderForm
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select ORDER_FORM_ID, TITLE, TEXT from ORDER_COMMENT";
+    public static final String getListAll_SQL = "select ORDER_FORM_ID, TITLE, COMMENT from ORDER_COMMENT";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<OrderComment> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select ORDER_FORM_ID, TITLE, TEXT from ORDER_COMMENT where ORDER_COMMENT.ORDER_FORM_ID = /*orderFormId*/null";
+    public static final String getEntity_SQL = "select ORDER_FORM_ID, TITLE, COMMENT from ORDER_COMMENT where ORDER_COMMENT.ORDER_FORM_ID = /*orderFormId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "orderFormId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusHistoryDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusHistoryDao.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusHistoryDao.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -11,7 +11,7 @@
  *     ORDER_STATUS_HISTORY_ID
  * 
  * [column-property]
- *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS
+ *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT
  * 
  * [foreign-property]
  *     orderForm, orderStatus
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS from ORDER_STATUS_HISTORY";
+    public static final String getListAll_SQL = "select ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT from ORDER_STATUS_HISTORY";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<OrderStatusHistory> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS from ORDER_STATUS_HISTORY where ORDER_STATUS_HISTORY.ORDER_STATUS_HISTORY_ID = /*orderStatusHistoryId*/null";
+    public static final String getEntity_SQL = "select ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT from ORDER_STATUS_HISTORY where ORDER_STATUS_HISTORY.ORDER_STATUS_HISTORY_ID = /*orderStatusHistoryId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "orderStatusHistoryId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -11,7 +11,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED from PRODUCT";
+    public static final String getListAll_SQL = "select PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID from PRODUCT";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<Product> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED from PRODUCT where PRODUCT.PRODUCT_ID = /*productId*/null";
+    public static final String getEntity_SQL = "select PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID from PRODUCT where PRODUCT.PRODUCT_ID = /*productId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "productId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsReviewDescriptionDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsReviewDescriptionDao.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsReviewDescriptionDao.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -11,7 +11,7 @@
  *     REVIEW_ID, LANGUAGE_ID
  * 
  * [column-property]
- *     REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT
+ *     REVIEW_ID, LANGUAGE_ID, COMMENT
  * 
  * [foreign-property]
  *     language, review
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT from REVIEW_DESCRIPTION";
+    public static final String getListAll_SQL = "select REVIEW_ID, LANGUAGE_ID, COMMENT from REVIEW_DESCRIPTION";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<ReviewDescription> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT from REVIEW_DESCRIPTION where REVIEW_DESCRIPTION.REVIEW_ID = /*reviewId*/null and REVIEW_DESCRIPTION.LANGUAGE_ID = /*languageId*/null";
+    public static final String getEntity_SQL = "select REVIEW_ID, LANGUAGE_ID, COMMENT from REVIEW_DESCRIPTION where REVIEW_DESCRIPTION.REVIEW_ID = /*reviewId*/null and REVIEW_DESCRIPTION.LANGUAGE_ID = /*languageId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "reviewId, languageId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -66,7 +66,7 @@
     /** The value of shortDescription. VARCHAR(100) */
     protected String _shortDescription;
 
-    /** The value of longDescription. VARCHAR(1000) */
+    /** The value of longDescription. LONG VARCHAR(32700) */
     protected String _longDescription;
 
     // ===================================================================================
@@ -230,12 +230,12 @@
         this._shortDescription = shortDescription;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(1000) */
+    /** Column Annotation for S2Dao. LONG VARCHAR(32700) */
     public static final String longDescription_COLUMN = "LONG_DESCRIPTION";
 
     /**
      * Get the value of longDescription. <br />
-     * {VARCHAR(1000)}
+     * {LONG VARCHAR(32700)}
      * 
      * @return The value of longDescription. (Nullable)
      */
@@ -245,7 +245,7 @@
 
     /**
      * Set the value of longDescription. <br />
-     * {VARCHAR(1000)}
+     * {LONG VARCHAR(32700)}
      * 
      * @param longDescription The value of longDescription. (Nullable)
      */

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,7 +14,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, TITLE, TEXT
+ *     ORDER_FORM_ID, TITLE, COMMENT
  * 
  * [foreign-property]
  *     orderForm
@@ -60,8 +60,8 @@
     /** The value of title. VARCHAR(255) : NotNull */
     protected String _title;
 
-    /** The value of text. LONG VARCHAR(32700) : NotNull */
-    protected String _text;
+    /** The value of comment. LONG VARCHAR(32700) : NotNull */
+    protected String _comment;
 
     // ===================================================================================
     //                                                                         Constructor
@@ -177,27 +177,27 @@
     }
 
     /** Column Annotation for S2Dao. LONG VARCHAR(32700) : NotNull */
-    public static final String text_COLUMN = "TEXT";
+    public static final String comment_COLUMN = "COMMENT";
 
     /**
-     * Get the value of text. <br />
+     * Get the value of comment. <br />
      * {LONG VARCHAR(32700) : NotNull}
      * 
-     * @return The value of text. (Nullable)
+     * @return The value of comment. (Nullable)
      */
-    public String getText() {
-        return _text;
+    public String getComment() {
+        return _comment;
     }
 
     /**
-     * Set the value of text. <br />
+     * Set the value of comment. <br />
      * {LONG VARCHAR(32700) : NotNull}
      * 
-     * @param text The value of text. (Nullable)
+     * @param comment The value of comment. (Nullable)
      */
-    public void setText(String text) {
-        _modifiedProperties.addPropertyName("text");
-        this._text = text;
+    public void setComment(String comment) {
+        _modifiedProperties.addPropertyName("comment");
+        this._comment = comment;
     }
 
 
@@ -372,7 +372,7 @@
 
         sb.append(delimiter).append(getOrderFormId());
         sb.append(delimiter).append(getTitle());
-        sb.append(delimiter).append(getText());
+        sb.append(delimiter).append(getComment());
 
         sb.delete(0, delimiter.length());
         sb.insert(0, "{").append("}");

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,7 +14,7 @@
  *     ORDER_STATUS_HISTORY_ID
  * 
  * [column-property]
- *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS
+ *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT
  * 
  * [foreign-property]
  *     orderForm, orderStatus
@@ -72,8 +72,8 @@
     /** The value of customerNotified. INTEGER : Default=[0] */
     protected java.math.BigDecimal _customerNotified;
 
-    /** The value of comments. LONG VARCHAR(32700) */
-    protected String _comments;
+    /** The value of comment. LONG VARCHAR(32700) */
+    protected String _comment;
 
     // ===================================================================================
     //                                                                         Constructor
@@ -261,27 +261,27 @@
     }
 
     /** Column Annotation for S2Dao. LONG VARCHAR(32700) */
-    public static final String comments_COLUMN = "COMMENTS";
+    public static final String comment_COLUMN = "COMMENT";
 
     /**
-     * Get the value of comments. <br />
+     * Get the value of comment. <br />
      * {LONG VARCHAR(32700)}
      * 
-     * @return The value of comments. (Nullable)
+     * @return The value of comment. (Nullable)
      */
-    public String getComments() {
-        return _comments;
+    public String getComment() {
+        return _comment;
     }
 
     /**
-     * Set the value of comments. <br />
+     * Set the value of comment. <br />
      * {LONG VARCHAR(32700)}
      * 
-     * @param comments The value of comments. (Nullable)
+     * @param comment The value of comment. (Nullable)
      */
-    public void setComments(String comments) {
-        _modifiedProperties.addPropertyName("comments");
-        this._comments = comments;
+    public void setComment(String comment) {
+        _modifiedProperties.addPropertyName("comment");
+        this._comment = comment;
     }
 
 
@@ -509,7 +509,7 @@
         sb.append(delimiter).append(getOrderStatusId());
         sb.append(delimiter).append(getDateAdded());
         sb.append(delimiter).append(getCustomerNotified());
-        sb.append(delimiter).append(getComments());
+        sb.append(delimiter).append(getComment());
 
         sb.delete(0, delimiter.length());
         sb.insert(0, "{").append("}");

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,7 +14,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -60,21 +60,33 @@
     /** The value of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     protected java.math.BigDecimal _productId;
 
+    /** The value of model. VARCHAR(32) */
+    protected String _model;
+
     /** The value of quantity. INTEGER : NotNull */
     protected java.math.BigDecimal _quantity;
 
-    /** The value of model. VARCHAR(32) */
-    protected String _model;
+    /** The value of price. DECIMAL(15) : NotNull */
+    protected java.math.BigDecimal _price;
 
-    /** The value of thumbnail. VARCHAR(64) */
-    protected String _thumbnail;
+    /** The value of weight. DECIMAL(5) */
+    protected java.math.BigDecimal _weight;
 
     /** The value of image. VARCHAR(64) */
     protected String _image;
 
-    /** The value of price. DECIMAL(15) : NotNull */
-    protected java.math.BigDecimal _price;
+    /** The value of thumbnail. VARCHAR(64) */
+    protected String _thumbnail;
 
+    /** The value of stock. INTEGER */
+    protected java.math.BigDecimal _stock;
+
+    /** The value of ordered. INTEGER : NotNull : Default=[0] */
+    protected java.math.BigDecimal _ordered;
+
+    /** The value of status. INTEGER : NotNull */
+    protected java.math.BigDecimal _status;
+
     /** The value of dateAdded. TIMESTAMP : NotNull */
     protected java.sql.Timestamp _dateAdded;
 
@@ -84,21 +96,12 @@
     /** The value of dateAvailable. TIMESTAMP */
     protected java.sql.Timestamp _dateAvailable;
 
-    /** The value of weight. DECIMAL(5) : NotNull */
-    protected java.math.BigDecimal _weight;
-
-    /** The value of status. INTEGER : NotNull */
-    protected java.math.BigDecimal _status;
-
     /** The value of taxClassId. INTEGER : FK to TAX_CLASS */
     protected java.math.BigDecimal _taxClassId;
 
     /** The value of manufacturerId. INTEGER : FK to MANUFACTURER */
     protected java.math.BigDecimal _manufacturerId;
 
-    /** The value of ordered. INTEGER : NotNull : Default=[0] */
-    protected java.math.BigDecimal _ordered;
-
     // ===================================================================================
     //                                                                         Constructor
     //                                                                         ===========
@@ -188,6 +191,30 @@
         this._productId = productId;
     }
 
+    /** Column Annotation for S2Dao. VARCHAR(32) */
+    public static final String model_COLUMN = "MODEL";
+
+    /**
+     * Get the value of model. <br />
+     * {VARCHAR(32)}
+     * 
+     * @return The value of model. (Nullable)
+     */
+    public String getModel() {
+        return _model;
+    }
+
+    /**
+     * Set the value of model. <br />
+     * {VARCHAR(32)}
+     * 
+     * @param model The value of model. (Nullable)
+     */
+    public void setModel(String model) {
+        _modifiedProperties.addPropertyName("model");
+        this._model = model;
+    }
+
     /** Column Annotation for S2Dao. INTEGER : NotNull */
     public static final String quantity_COLUMN = "QUANTITY";
 
@@ -212,52 +239,52 @@
         this._quantity = quantity;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) */
-    public static final String model_COLUMN = "MODEL";
+    /** Column Annotation for S2Dao. DECIMAL(15) : NotNull */
+    public static final String price_COLUMN = "PRICE";
 
     /**
-     * Get the value of model. <br />
-     * {VARCHAR(32)}
+     * Get the value of price. <br />
+     * {DECIMAL(15) : NotNull}
      * 
-     * @return The value of model. (Nullable)
+     * @return The value of price. (Nullable)
      */
-    public String getModel() {
-        return _model;
+    public java.math.BigDecimal getPrice() {
+        return _price;
     }
 
     /**
-     * Set the value of model. <br />
-     * {VARCHAR(32)}
+     * Set the value of price. <br />
+     * {DECIMAL(15) : NotNull}
      * 
-     * @param model The value of model. (Nullable)
+     * @param price The value of price. (Nullable)
      */
-    public void setModel(String model) {
-        _modifiedProperties.addPropertyName("model");
-        this._model = model;
+    public void setPrice(java.math.BigDecimal price) {
+        _modifiedProperties.addPropertyName("price");
+        this._price = price;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(64) */
-    public static final String thumbnail_COLUMN = "THUMBNAIL";
+    /** Column Annotation for S2Dao. DECIMAL(5) */
+    public static final String weight_COLUMN = "WEIGHT";
 
     /**
-     * Get the value of thumbnail. <br />
-     * {VARCHAR(64)}
+     * Get the value of weight. <br />
+     * {DECIMAL(5)}
      * 
-     * @return The value of thumbnail. (Nullable)
+     * @return The value of weight. (Nullable)
      */
-    public String getThumbnail() {
-        return _thumbnail;
+    public java.math.BigDecimal getWeight() {
+        return _weight;
     }
 
     /**
-     * Set the value of thumbnail. <br />
-     * {VARCHAR(64)}
+     * Set the value of weight. <br />
+     * {DECIMAL(5)}
      * 
-     * @param thumbnail The value of thumbnail. (Nullable)
+     * @param weight The value of weight. (Nullable)
      */
-    public void setThumbnail(String thumbnail) {
-        _modifiedProperties.addPropertyName("thumbnail");
-        this._thumbnail = thumbnail;
+    public void setWeight(java.math.BigDecimal weight) {
+        _modifiedProperties.addPropertyName("weight");
+        this._weight = weight;
     }
 
     /** Column Annotation for S2Dao. VARCHAR(64) */
@@ -284,30 +311,102 @@
         this._image = image;
     }
 
-    /** Column Annotation for S2Dao. DECIMAL(15) : NotNull */
-    public static final String price_COLUMN = "PRICE";
+    /** Column Annotation for S2Dao. VARCHAR(64) */
+    public static final String thumbnail_COLUMN = "THUMBNAIL";
 
     /**
-     * Get the value of price. <br />
-     * {DECIMAL(15) : NotNull}
+     * Get the value of thumbnail. <br />
+     * {VARCHAR(64)}
      * 
-     * @return The value of price. (Nullable)
+     * @return The value of thumbnail. (Nullable)
      */
-    public java.math.BigDecimal getPrice() {
-        return _price;
+    public String getThumbnail() {
+        return _thumbnail;
     }
 
     /**
-     * Set the value of price. <br />
-     * {DECIMAL(15) : NotNull}
+     * Set the value of thumbnail. <br />
+     * {VARCHAR(64)}
      * 
-     * @param price The value of price. (Nullable)
+     * @param thumbnail The value of thumbnail. (Nullable)
      */
-    public void setPrice(java.math.BigDecimal price) {
-        _modifiedProperties.addPropertyName("price");
-        this._price = price;
+    public void setThumbnail(String thumbnail) {
+        _modifiedProperties.addPropertyName("thumbnail");
+        this._thumbnail = thumbnail;
     }
 
+    /** Column Annotation for S2Dao. INTEGER */
+    public static final String stock_COLUMN = "STOCK";
+
+    /**
+     * Get the value of stock. <br />
+     * {INTEGER}
+     * 
+     * @return The value of stock. (Nullable)
+     */
+    public java.math.BigDecimal getStock() {
+        return _stock;
+    }
+
+    /**
+     * Set the value of stock. <br />
+     * {INTEGER}
+     * 
+     * @param stock The value of stock. (Nullable)
+     */
+    public void setStock(java.math.BigDecimal stock) {
+        _modifiedProperties.addPropertyName("stock");
+        this._stock = stock;
+    }
+
+    /** Column Annotation for S2Dao. INTEGER : NotNull : Default=[0] */
+    public static final String ordered_COLUMN = "ORDERED";
+
+    /**
+     * Get the value of ordered. <br />
+     * {INTEGER : NotNull : Default=[0]}
+     * 
+     * @return The value of ordered. (Nullable)
+     */
+    public java.math.BigDecimal getOrdered() {
+        return _ordered;
+    }
+
+    /**
+     * Set the value of ordered. <br />
+     * {INTEGER : NotNull : Default=[0]}
+     * 
+     * @param ordered The value of ordered. (Nullable)
+     */
+    public void setOrdered(java.math.BigDecimal ordered) {
+        _modifiedProperties.addPropertyName("ordered");
+        this._ordered = ordered;
+    }
+
+    /** Column Annotation for S2Dao. INTEGER : NotNull */
+    public static final String status_COLUMN = "STATUS";
+
+    /**
+     * Get the value of status. <br />
+     * {INTEGER : NotNull}
+     * 
+     * @return The value of status. (Nullable)
+     */
+    public java.math.BigDecimal getStatus() {
+        return _status;
+    }
+
+    /**
+     * Set the value of status. <br />
+     * {INTEGER : NotNull}
+     * 
+     * @param status The value of status. (Nullable)
+     */
+    public void setStatus(java.math.BigDecimal status) {
+        _modifiedProperties.addPropertyName("status");
+        this._status = status;
+    }
+
     /** Column Annotation for S2Dao. TIMESTAMP : NotNull */
     public static final String dateAdded_COLUMN = "DATE_ADDED";
 
@@ -380,54 +479,6 @@
         this._dateAvailable = dateAvailable;
     }
 
-    /** Column Annotation for S2Dao. DECIMAL(5) : NotNull */
-    public static final String weight_COLUMN = "WEIGHT";
-
-    /**
-     * Get the value of weight. <br />
-     * {DECIMAL(5) : NotNull}
-     * 
-     * @return The value of weight. (Nullable)
-     */
-    public java.math.BigDecimal getWeight() {
-        return _weight;
-    }
-
-    /**
-     * Set the value of weight. <br />
-     * {DECIMAL(5) : NotNull}
-     * 
-     * @param weight The value of weight. (Nullable)
-     */
-    public void setWeight(java.math.BigDecimal weight) {
-        _modifiedProperties.addPropertyName("weight");
-        this._weight = weight;
-    }
-
-    /** Column Annotation for S2Dao. INTEGER : NotNull */
-    public static final String status_COLUMN = "STATUS";
-
-    /**
-     * Get the value of status. <br />
-     * {INTEGER : NotNull}
-     * 
-     * @return The value of status. (Nullable)
-     */
-    public java.math.BigDecimal getStatus() {
-        return _status;
-    }
-
-    /**
-     * Set the value of status. <br />
-     * {INTEGER : NotNull}
-     * 
-     * @param status The value of status. (Nullable)
-     */
-    public void setStatus(java.math.BigDecimal status) {
-        _modifiedProperties.addPropertyName("status");
-        this._status = status;
-    }
-
     /** Column Annotation for S2Dao. INTEGER : FK to TAX_CLASS */
     public static final String taxClassId_COLUMN = "TAX_CLASS_ID";
 
@@ -476,44 +527,20 @@
         this._manufacturerId = manufacturerId;
     }
 
-    /** Column Annotation for S2Dao. INTEGER : NotNull : Default=[0] */
-    public static final String ordered_COLUMN = "ORDERED";
 
-    /**
-     * Get the value of ordered. <br />
-     * {INTEGER : NotNull : Default=[0]}
-     * 
-     * @return The value of ordered. (Nullable)
-     */
-    public java.math.BigDecimal getOrdered() {
-        return _ordered;
-    }
-
-    /**
-     * Set the value of ordered. <br />
-     * {INTEGER : NotNull : Default=[0]}
-     * 
-     * @param ordered The value of ordered. (Nullable)
-     */
-    public void setOrdered(java.math.BigDecimal ordered) {
-        _modifiedProperties.addPropertyName("ordered");
-        this._ordered = ordered;
-    }
-
-
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                            
+                              
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                            
+                              
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                            
+                              
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -1040,19 +1067,20 @@
         final StringBuffer sb = new StringBuffer();
 
         sb.append(delimiter).append(getProductId());
+        sb.append(delimiter).append(getModel());
         sb.append(delimiter).append(getQuantity());
-        sb.append(delimiter).append(getModel());
+        sb.append(delimiter).append(getPrice());
+        sb.append(delimiter).append(getWeight());
+        sb.append(delimiter).append(getImage());
         sb.append(delimiter).append(getThumbnail());
-        sb.append(delimiter).append(getImage());
-        sb.append(delimiter).append(getPrice());
+        sb.append(delimiter).append(getStock());
+        sb.append(delimiter).append(getOrdered());
+        sb.append(delimiter).append(getStatus());
         sb.append(delimiter).append(getDateAdded());
         sb.append(delimiter).append(getLastModified());
         sb.append(delimiter).append(getDateAvailable());
-        sb.append(delimiter).append(getWeight());
-        sb.append(delimiter).append(getStatus());
         sb.append(delimiter).append(getTaxClassId());
         sb.append(delimiter).append(getManufacturerId());
-        sb.append(delimiter).append(getOrdered());
 
         sb.delete(0, delimiter.length());
         sb.insert(0, "{").append("}");

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReviewDescription.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReviewDescription.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReviewDescription.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,7 +14,7 @@
  *     REVIEW_ID, LANGUAGE_ID
  * 
  * [column-property]
- *     REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT
+ *     REVIEW_ID, LANGUAGE_ID, COMMENT
  * 
  * [foreign-property]
  *     language, review
@@ -60,8 +60,8 @@
     /** The value of languageId. PK : INTEGER : NotNull : FK to LANGUAGE */
     protected java.math.BigDecimal _languageId;
 
-    /** The value of reviewText. LONG VARCHAR(32700) : NotNull */
-    protected String _reviewText;
+    /** The value of comment. LONG VARCHAR(32700) : NotNull */
+    protected String _comment;
 
     // ===================================================================================
     //                                                                         Constructor
@@ -177,27 +177,27 @@
     }
 
     /** Column Annotation for S2Dao. LONG VARCHAR(32700) : NotNull */
-    public static final String reviewText_COLUMN = "REVIEW_TEXT";
+    public static final String comment_COLUMN = "COMMENT";
 
     /**
-     * Get the value of reviewText. <br />
+     * Get the value of comment. <br />
      * {LONG VARCHAR(32700) : NotNull}
      * 
-     * @return The value of reviewText. (Nullable)
+     * @return The value of comment. (Nullable)
      */
-    public String getReviewText() {
-        return _reviewText;
+    public String getComment() {
+        return _comment;
     }
 
     /**
-     * Set the value of reviewText. <br />
+     * Set the value of comment. <br />
      * {LONG VARCHAR(32700) : NotNull}
      * 
-     * @param reviewText The value of reviewText. (Nullable)
+     * @param comment The value of comment. (Nullable)
      */
-    public void setReviewText(String reviewText) {
-        _modifiedProperties.addPropertyName("reviewText");
-        this._reviewText = reviewText;
+    public void setComment(String comment) {
+        _modifiedProperties.addPropertyName("comment");
+        this._comment = comment;
     }
 
 
@@ -431,7 +431,7 @@
 
         sb.append(delimiter).append(getReviewId());
         sb.append(delimiter).append(getLanguageId());
-        sb.append(delimiter).append(getReviewText());
+        sb.append(delimiter).append(getComment());
 
         sb.delete(0, delimiter.length());
         sb.insert(0, "{").append("}");

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -101,7 +101,7 @@
     public static final String DB_NAME_URL = "URL";
     /** Db-name of SHORT_DESCRIPTION. VARCHAR(100) */
     public static final String DB_NAME_SHORT_DESCRIPTION = "SHORT_DESCRIPTION";
-    /** Db-name of LONG_DESCRIPTION. VARCHAR(1000) */
+    /** Db-name of LONG_DESCRIPTION. LONG VARCHAR(32700) */
     public static final String DB_NAME_LONG_DESCRIPTION = "LONG_DESCRIPTION";
 
     /** @deprecated Deprecated! So use DB_NAME_ManufacturerId. */
@@ -126,7 +126,7 @@
     public static final String PROPERTY_NAME_url = "url";
     /** Prop-name(JavaBeansRule) of shortDescription. VARCHAR(100) */
     public static final String PROPERTY_NAME_shortDescription = "shortDescription";
-    /** Prop-name(JavaBeansRule) of longDescription. VARCHAR(1000) */
+    /** Prop-name(JavaBeansRule) of longDescription. LONG VARCHAR(32700) */
     public static final String PROPERTY_NAME_longDescription = "longDescription";
 
     // -----------------------------------------------------
@@ -140,7 +140,7 @@
     public static final String CAP_PROP_NAME_Url = "Url";
     /** Cap-prop-name of shortDescription. VARCHAR(100) */
     public static final String CAP_PROP_NAME_ShortDescription = "ShortDescription";
-    /** Cap-prop-name of longDescription. VARCHAR(1000) */
+    /** Cap-prop-name of longDescription. LONG VARCHAR(32700) */
     public static final String CAP_PROP_NAME_LongDescription = "LongDescription";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_ManufacturerId. */
@@ -165,7 +165,7 @@
     public static final String UNCAP_PROP_NAME_url = "url";
     /** Uncap-prop-name of shortDescription. VARCHAR(100) */
     public static final String UNCAP_PROP_NAME_shortDescription = "shortDescription";
-    /** Uncap-prop-name of longDescription. VARCHAR(1000) */
+    /** Uncap-prop-name of longDescription. LONG VARCHAR(32700) */
     public static final String UNCAP_PROP_NAME_longDescription = "longDescription";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ManufacturerId. */

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -16,7 +16,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, TITLE, TEXT
+ *     ORDER_FORM_ID, TITLE, COMMENT
  * 
  * [foreign-property]
  *     orderForm
@@ -97,15 +97,15 @@
     public static final String DB_NAME_ORDER_FORM_ID = "ORDER_FORM_ID";
     /** Db-name of TITLE. VARCHAR(255) : NotNull */
     public static final String DB_NAME_TITLE = "TITLE";
-    /** Db-name of TEXT. LONG VARCHAR(32700) : NotNull */
-    public static final String DB_NAME_TEXT = "TEXT";
+    /** Db-name of COMMENT. LONG VARCHAR(32700) : NotNull */
+    public static final String DB_NAME_COMMENT = "COMMENT";
 
     /** @deprecated Deprecated! So use DB_NAME_OrderFormId. */
     public static final String COLUMN_DB_NAME_OF_OrderFormId = "ORDER_FORM_ID";
     /** @deprecated Deprecated! So use DB_NAME_Title. */
     public static final String COLUMN_DB_NAME_OF_Title = "TITLE";
-    /** @deprecated Deprecated! So use DB_NAME_Text. */
-    public static final String COLUMN_DB_NAME_OF_Text = "TEXT";
+    /** @deprecated Deprecated! So use DB_NAME_Comment. */
+    public static final String COLUMN_DB_NAME_OF_Comment = "COMMENT";
 
     // -----------------------------------------------------
     //                       Column Prop-Name(JavaBeansRule)
@@ -114,8 +114,8 @@
     public static final String PROPERTY_NAME_orderFormId = "orderFormId";
     /** Prop-name(JavaBeansRule) of title. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_title = "title";
-    /** Prop-name(JavaBeansRule) of text. LONG VARCHAR(32700) : NotNull */
-    public static final String PROPERTY_NAME_text = "text";
+    /** Prop-name(JavaBeansRule) of comment. LONG VARCHAR(32700) : NotNull */
+    public static final String PROPERTY_NAME_comment = "comment";
 
     // -----------------------------------------------------
     //                                  Column Cap-Prop-Name
@@ -124,15 +124,15 @@
     public static final String CAP_PROP_NAME_OrderFormId = "OrderFormId";
     /** Cap-prop-name of title. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_Title = "Title";
-    /** Cap-prop-name of text. LONG VARCHAR(32700) : NotNull */
-    public static final String CAP_PROP_NAME_Text = "Text";
+    /** Cap-prop-name of comment. LONG VARCHAR(32700) : NotNull */
+    public static final String CAP_PROP_NAME_Comment = "Comment";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderFormId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_OrderFormId = "OrderFormId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Title. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Title = "Title";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Text. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Text = "Text";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Comment. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Comment = "Comment";
 
     // -----------------------------------------------------
     //                                Column Uncap-Prop-Name
@@ -141,15 +141,15 @@
     public static final String UNCAP_PROP_NAME_orderFormId = "orderFormId";
     /** Uncap-prop-name of title. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_title = "title";
-    /** Uncap-prop-name of text. LONG VARCHAR(32700) : NotNull */
-    public static final String UNCAP_PROP_NAME_text = "text";
+    /** Uncap-prop-name of comment. LONG VARCHAR(32700) : NotNull */
+    public static final String UNCAP_PROP_NAME_comment = "comment";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderFormId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderFormId = "orderFormId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Title. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Title = "title";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Text. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Text = "text";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Comment. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Comment = "comment";
 
     // -----------------------------------------------------
     //                                          Foreign Name
@@ -178,7 +178,7 @@
 
         map.put(DB_NAME_ORDER_FORM_ID.toLowerCase(), PROPERTY_NAME_orderFormId);
         map.put(DB_NAME_TITLE.toLowerCase(), PROPERTY_NAME_title);
-        map.put(DB_NAME_TEXT.toLowerCase(), PROPERTY_NAME_text);
+        map.put(DB_NAME_COMMENT.toLowerCase(), PROPERTY_NAME_comment);
 
         _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _dbNamePropertyNameKeyToLowerMap;
@@ -195,7 +195,7 @@
 
         map.put(PROPERTY_NAME_orderFormId.toLowerCase(), DB_NAME_ORDER_FORM_ID);
         map.put(PROPERTY_NAME_title.toLowerCase(), DB_NAME_TITLE);
-        map.put(PROPERTY_NAME_text.toLowerCase(), DB_NAME_TEXT);
+        map.put(PROPERTY_NAME_comment.toLowerCase(), DB_NAME_COMMENT);
 
         _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _propertyNameDbNameKeyToLowerMap;
@@ -214,7 +214,7 @@
 
         map.put(DB_NAME_ORDER_FORM_ID, CAP_PROP_NAME_OrderFormId);
         map.put(DB_NAME_TITLE, CAP_PROP_NAME_Title);
-        map.put(DB_NAME_TEXT, CAP_PROP_NAME_Text);
+        map.put(DB_NAME_COMMENT, CAP_PROP_NAME_Comment);
 
         _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameCapPropNameMap;
@@ -233,7 +233,7 @@
 
         map.put(DB_NAME_ORDER_FORM_ID, UNCAP_PROP_NAME_orderFormId);
         map.put(DB_NAME_TITLE, UNCAP_PROP_NAME_title);
-        map.put(DB_NAME_TEXT, UNCAP_PROP_NAME_text);
+        map.put(DB_NAME_COMMENT, UNCAP_PROP_NAME_comment);
 
         _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameUncapPropNameMap;
@@ -252,7 +252,7 @@
 
         map.put(CAP_PROP_NAME_OrderFormId, DB_NAME_ORDER_FORM_ID);
         map.put(CAP_PROP_NAME_Title, DB_NAME_TITLE);
-        map.put(CAP_PROP_NAME_Text, DB_NAME_TEXT);
+        map.put(CAP_PROP_NAME_Comment, DB_NAME_COMMENT);
 
         _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameDbNameMap;
@@ -271,7 +271,7 @@
 
         map.put(CAP_PROP_NAME_OrderFormId, UNCAP_PROP_NAME_orderFormId);
         map.put(CAP_PROP_NAME_Title, UNCAP_PROP_NAME_title);
-        map.put(CAP_PROP_NAME_Text, UNCAP_PROP_NAME_text);
+        map.put(CAP_PROP_NAME_Comment, UNCAP_PROP_NAME_comment);
 
         _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameUncapPropNameMap;
@@ -290,7 +290,7 @@
 
         map.put(UNCAP_PROP_NAME_orderFormId, DB_NAME_ORDER_FORM_ID);
         map.put(UNCAP_PROP_NAME_title, DB_NAME_TITLE);
-        map.put(UNCAP_PROP_NAME_text, DB_NAME_TEXT);
+        map.put(UNCAP_PROP_NAME_comment, DB_NAME_COMMENT);
 
         _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameDbNameMap;
@@ -309,7 +309,7 @@
 
         map.put(UNCAP_PROP_NAME_orderFormId, CAP_PROP_NAME_OrderFormId);
         map.put(UNCAP_PROP_NAME_title, CAP_PROP_NAME_Title);
-        map.put(UNCAP_PROP_NAME_text, CAP_PROP_NAME_Text);
+        map.put(UNCAP_PROP_NAME_comment, CAP_PROP_NAME_Comment);
 
         _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameCapPropNameMap;
@@ -520,7 +520,7 @@
         final java.util.List<ColumnInfo> columnInfoList = new java.util.ArrayList<ColumnInfo>();
         columnInfoList.add(columnOrderFormId());
         columnInfoList.add(columnTitle());
-        columnInfoList.add(columnText());
+        columnInfoList.add(columnComment());
         return columnInfoList;
     }
 
@@ -576,7 +576,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ORDER_FORM_ID, TITLE, TEXT";
+        return "ORDER_FORM_ID, TITLE, COMMENT";
     }
 
     /**
@@ -592,10 +592,10 @@
         return new ColumnInfo(this, "TITLE", "title", String.class, false);
     }
     /**
-     * @return Column information of text. (NotNull)
+     * @return Column information of comment. (NotNull)
      */
-    public ColumnInfo columnText() {
-        return new ColumnInfo(this, "TEXT", "text", String.class, false);
+    public ColumnInfo columnComment() {
+        return new ColumnInfo(this, "COMMENT", "comment", String.class, false);
     }
 
     // ===================================================================================
@@ -718,7 +718,7 @@
 
         public RelationTrace columnOrderFormId() { return fixTrace(_relationList, OrderCommentDbm.getInstance().columnOrderFormId()); }
         public RelationTrace columnTitle() { return fixTrace(_relationList, OrderCommentDbm.getInstance().columnTitle()); }
-        public RelationTrace columnText() { return fixTrace(_relationList, OrderCommentDbm.getInstance().columnText()); }
+        public RelationTrace columnComment() { return fixTrace(_relationList, OrderCommentDbm.getInstance().columnComment()); }
     }
 
     // ===================================================================================
@@ -791,7 +791,7 @@
 
         if (analyzer.init("ORDER_FORM_ID", "orderFormId", "orderFormId")) { myEntity.setOrderFormId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("TITLE", "title", "title")) { myEntity.setTitle(analyzer.analyzeString(String.class)); };
-        if (analyzer.init("TEXT", "text", "text")) { myEntity.setText(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("COMMENT", "comment", "comment")) { myEntity.setComment(analyzer.analyzeString(String.class)); };
 
     }
 
@@ -866,7 +866,7 @@
         final StringBuffer sb = new StringBuffer();
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_FORM_ID", myEntity.getOrderFormId());
         helpAppendingColumnValueString(sb, delimiter, equal, "TITLE", myEntity.getTitle());
-        helpAppendingColumnValueString(sb, delimiter, equal, "TEXT", myEntity.getText());
+        helpAppendingColumnValueString(sb, delimiter, equal, "COMMENT", myEntity.getComment());
 
         sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
         return sb.toString();
@@ -923,7 +923,7 @@
         final java.util.Map<String, Object> valueMap = new java.util.LinkedHashMap<String, Object>();
         valueMap.put("ORDER_FORM_ID", myEntity.getOrderFormId());
         valueMap.put("TITLE", myEntity.getTitle());
-        valueMap.put("TEXT", myEntity.getText());
+        valueMap.put("COMMENT", myEntity.getComment());
         return valueMap;
     }
 
@@ -948,7 +948,7 @@
         final java.util.Map<String, String> valueMap = new java.util.LinkedHashMap<String, String>();
         valueMap.put("ORDER_FORM_ID", helpGettingColumnStringValue(myEntity.getOrderFormId()));
         valueMap.put("TITLE", helpGettingColumnStringValue(myEntity.getTitle()));
-        valueMap.put("TEXT", helpGettingColumnStringValue(myEntity.getText()));
+        valueMap.put("COMMENT", helpGettingColumnStringValue(myEntity.getComment()));
         return valueMap;
     }
 
@@ -973,9 +973,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "ORDER_COMMENT(ORDER_FORM_ID, TITLE, TEXT) values(? , ? , ? )";
+            return "insert into " + tablePrefix + "ORDER_COMMENT(ORDER_FORM_ID, TITLE, COMMENT) values(? , ? , ? )";
         }
-        return "insert into ORDER_COMMENT(ORDER_FORM_ID, TITLE, TEXT) values(? , ? , ? )";
+        return "insert into ORDER_COMMENT(ORDER_FORM_ID, TITLE, COMMENT) values(? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -16,7 +16,7 @@
  *     ORDER_STATUS_HISTORY_ID
  * 
  * [column-property]
- *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS
+ *     ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT
  * 
  * [foreign-property]
  *     orderForm, orderStatus
@@ -103,8 +103,8 @@
     public static final String DB_NAME_DATE_ADDED = "DATE_ADDED";
     /** Db-name of CUSTOMER_NOTIFIED. INTEGER : Default=[0] */
     public static final String DB_NAME_CUSTOMER_NOTIFIED = "CUSTOMER_NOTIFIED";
-    /** Db-name of COMMENTS. LONG VARCHAR(32700) */
-    public static final String DB_NAME_COMMENTS = "COMMENTS";
+    /** Db-name of COMMENT. LONG VARCHAR(32700) */
+    public static final String DB_NAME_COMMENT = "COMMENT";
 
     /** @deprecated Deprecated! So use DB_NAME_OrderStatusHistoryId. */
     public static final String COLUMN_DB_NAME_OF_OrderStatusHistoryId = "ORDER_STATUS_HISTORY_ID";
@@ -116,8 +116,8 @@
     public static final String COLUMN_DB_NAME_OF_DateAdded = "DATE_ADDED";
     /** @deprecated Deprecated! So use DB_NAME_CustomerNotified. */
     public static final String COLUMN_DB_NAME_OF_CustomerNotified = "CUSTOMER_NOTIFIED";
-    /** @deprecated Deprecated! So use DB_NAME_Comments. */
-    public static final String COLUMN_DB_NAME_OF_Comments = "COMMENTS";
+    /** @deprecated Deprecated! So use DB_NAME_Comment. */
+    public static final String COLUMN_DB_NAME_OF_Comment = "COMMENT";
 
     // -----------------------------------------------------
     //                       Column Prop-Name(JavaBeansRule)
@@ -132,8 +132,8 @@
     public static final String PROPERTY_NAME_dateAdded = "dateAdded";
     /** Prop-name(JavaBeansRule) of customerNotified. INTEGER : Default=[0] */
     public static final String PROPERTY_NAME_customerNotified = "customerNotified";
-    /** Prop-name(JavaBeansRule) of comments. LONG VARCHAR(32700) */
-    public static final String PROPERTY_NAME_comments = "comments";
+    /** Prop-name(JavaBeansRule) of comment. LONG VARCHAR(32700) */
+    public static final String PROPERTY_NAME_comment = "comment";
 
     // -----------------------------------------------------
     //                                  Column Cap-Prop-Name
@@ -148,8 +148,8 @@
     public static final String CAP_PROP_NAME_DateAdded = "DateAdded";
     /** Cap-prop-name of customerNotified. INTEGER : Default=[0] */
     public static final String CAP_PROP_NAME_CustomerNotified = "CustomerNotified";
-    /** Cap-prop-name of comments. LONG VARCHAR(32700) */
-    public static final String CAP_PROP_NAME_Comments = "Comments";
+    /** Cap-prop-name of comment. LONG VARCHAR(32700) */
+    public static final String CAP_PROP_NAME_Comment = "Comment";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderStatusHistoryId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_OrderStatusHistoryId = "OrderStatusHistoryId";
@@ -161,8 +161,8 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_DateAdded = "DateAdded";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerNotified. */
     public static final String COLUMN_CAP_PROP_NAME_OF_CustomerNotified = "CustomerNotified";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Comments. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Comments = "Comments";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Comment. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Comment = "Comment";
 
     // -----------------------------------------------------
     //                                Column Uncap-Prop-Name
@@ -177,8 +177,8 @@
     public static final String UNCAP_PROP_NAME_dateAdded = "dateAdded";
     /** Uncap-prop-name of customerNotified. INTEGER : Default=[0] */
     public static final String UNCAP_PROP_NAME_customerNotified = "customerNotified";
-    /** Uncap-prop-name of comments. LONG VARCHAR(32700) */
-    public static final String UNCAP_PROP_NAME_comments = "comments";
+    /** Uncap-prop-name of comment. LONG VARCHAR(32700) */
+    public static final String UNCAP_PROP_NAME_comment = "comment";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderStatusHistoryId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderStatusHistoryId = "orderStatusHistoryId";
@@ -190,8 +190,8 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DateAdded = "dateAdded";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerNotified. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerNotified = "customerNotified";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Comments. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Comments = "comments";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Comment. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Comment = "comment";
 
     // -----------------------------------------------------
     //                                          Foreign Name
@@ -229,7 +229,7 @@
         map.put(DB_NAME_ORDER_STATUS_ID.toLowerCase(), PROPERTY_NAME_orderStatusId);
         map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded);
         map.put(DB_NAME_CUSTOMER_NOTIFIED.toLowerCase(), PROPERTY_NAME_customerNotified);
-        map.put(DB_NAME_COMMENTS.toLowerCase(), PROPERTY_NAME_comments);
+        map.put(DB_NAME_COMMENT.toLowerCase(), PROPERTY_NAME_comment);
 
         _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _dbNamePropertyNameKeyToLowerMap;
@@ -249,7 +249,7 @@
         map.put(PROPERTY_NAME_orderStatusId.toLowerCase(), DB_NAME_ORDER_STATUS_ID);
         map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED);
         map.put(PROPERTY_NAME_customerNotified.toLowerCase(), DB_NAME_CUSTOMER_NOTIFIED);
-        map.put(PROPERTY_NAME_comments.toLowerCase(), DB_NAME_COMMENTS);
+        map.put(PROPERTY_NAME_comment.toLowerCase(), DB_NAME_COMMENT);
 
         _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _propertyNameDbNameKeyToLowerMap;
@@ -271,7 +271,7 @@
         map.put(DB_NAME_ORDER_STATUS_ID, CAP_PROP_NAME_OrderStatusId);
         map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded);
         map.put(DB_NAME_CUSTOMER_NOTIFIED, CAP_PROP_NAME_CustomerNotified);
-        map.put(DB_NAME_COMMENTS, CAP_PROP_NAME_Comments);
+        map.put(DB_NAME_COMMENT, CAP_PROP_NAME_Comment);
 
         _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameCapPropNameMap;
@@ -293,7 +293,7 @@
         map.put(DB_NAME_ORDER_STATUS_ID, UNCAP_PROP_NAME_orderStatusId);
         map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded);
         map.put(DB_NAME_CUSTOMER_NOTIFIED, UNCAP_PROP_NAME_customerNotified);
-        map.put(DB_NAME_COMMENTS, UNCAP_PROP_NAME_comments);
+        map.put(DB_NAME_COMMENT, UNCAP_PROP_NAME_comment);
 
         _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameUncapPropNameMap;
@@ -315,7 +315,7 @@
         map.put(CAP_PROP_NAME_OrderStatusId, DB_NAME_ORDER_STATUS_ID);
         map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED);
         map.put(CAP_PROP_NAME_CustomerNotified, DB_NAME_CUSTOMER_NOTIFIED);
-        map.put(CAP_PROP_NAME_Comments, DB_NAME_COMMENTS);
+        map.put(CAP_PROP_NAME_Comment, DB_NAME_COMMENT);
 
         _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameDbNameMap;
@@ -337,7 +337,7 @@
         map.put(CAP_PROP_NAME_OrderStatusId, UNCAP_PROP_NAME_orderStatusId);
         map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded);
         map.put(CAP_PROP_NAME_CustomerNotified, UNCAP_PROP_NAME_customerNotified);
-        map.put(CAP_PROP_NAME_Comments, UNCAP_PROP_NAME_comments);
+        map.put(CAP_PROP_NAME_Comment, UNCAP_PROP_NAME_comment);
 
         _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameUncapPropNameMap;
@@ -359,7 +359,7 @@
         map.put(UNCAP_PROP_NAME_orderStatusId, DB_NAME_ORDER_STATUS_ID);
         map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED);
         map.put(UNCAP_PROP_NAME_customerNotified, DB_NAME_CUSTOMER_NOTIFIED);
-        map.put(UNCAP_PROP_NAME_comments, DB_NAME_COMMENTS);
+        map.put(UNCAP_PROP_NAME_comment, DB_NAME_COMMENT);
 
         _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameDbNameMap;
@@ -381,7 +381,7 @@
         map.put(UNCAP_PROP_NAME_orderStatusId, CAP_PROP_NAME_OrderStatusId);
         map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded);
         map.put(UNCAP_PROP_NAME_customerNotified, CAP_PROP_NAME_CustomerNotified);
-        map.put(UNCAP_PROP_NAME_comments, CAP_PROP_NAME_Comments);
+        map.put(UNCAP_PROP_NAME_comment, CAP_PROP_NAME_Comment);
 
         _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameCapPropNameMap;
@@ -595,7 +595,7 @@
         columnInfoList.add(columnOrderStatusId());
         columnInfoList.add(columnDateAdded());
         columnInfoList.add(columnCustomerNotified());
-        columnInfoList.add(columnComments());
+        columnInfoList.add(columnComment());
         return columnInfoList;
     }
 
@@ -651,7 +651,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS";
+        return "ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT";
     }
 
     /**
@@ -685,10 +685,10 @@
         return new ColumnInfo(this, "CUSTOMER_NOTIFIED", "customerNotified", java.math.BigDecimal.class, false);
     }
     /**
-     * @return Column information of comments. (NotNull)
+     * @return Column information of comment. (NotNull)
      */
-    public ColumnInfo columnComments() {
-        return new ColumnInfo(this, "COMMENTS", "comments", String.class, false);
+    public ColumnInfo columnComment() {
+        return new ColumnInfo(this, "COMMENT", "comment", String.class, false);
     }
 
     // ===================================================================================
@@ -835,7 +835,7 @@
         public RelationTrace columnOrderStatusId() { return fixTrace(_relationList, OrderStatusHistoryDbm.getInstance().columnOrderStatusId()); }
         public RelationTrace columnDateAdded() { return fixTrace(_relationList, OrderStatusHistoryDbm.getInstance().columnDateAdded()); }
         public RelationTrace columnCustomerNotified() { return fixTrace(_relationList, OrderStatusHistoryDbm.getInstance().columnCustomerNotified()); }
-        public RelationTrace columnComments() { return fixTrace(_relationList, OrderStatusHistoryDbm.getInstance().columnComments()); }
+        public RelationTrace columnComment() { return fixTrace(_relationList, OrderStatusHistoryDbm.getInstance().columnComment()); }
     }
 
     // ===================================================================================
@@ -911,7 +911,7 @@
         if (analyzer.init("ORDER_STATUS_ID", "orderStatusId", "orderStatusId")) { myEntity.setOrderStatusId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); };
         if (analyzer.init("CUSTOMER_NOTIFIED", "customerNotified", "customerNotified")) { myEntity.setCustomerNotified(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("COMMENTS", "comments", "comments")) { myEntity.setComments(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("COMMENT", "comment", "comment")) { myEntity.setComment(analyzer.analyzeString(String.class)); };
 
     }
 
@@ -989,7 +989,7 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_STATUS_ID", myEntity.getOrderStatusId());
         helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_NOTIFIED", myEntity.getCustomerNotified());
-        helpAppendingColumnValueString(sb, delimiter, equal, "COMMENTS", myEntity.getComments());
+        helpAppendingColumnValueString(sb, delimiter, equal, "COMMENT", myEntity.getComment());
 
         sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
         return sb.toString();
@@ -1049,7 +1049,7 @@
         valueMap.put("ORDER_STATUS_ID", myEntity.getOrderStatusId());
         valueMap.put("DATE_ADDED", myEntity.getDateAdded());
         valueMap.put("CUSTOMER_NOTIFIED", myEntity.getCustomerNotified());
-        valueMap.put("COMMENTS", myEntity.getComments());
+        valueMap.put("COMMENT", myEntity.getComment());
         return valueMap;
     }
 
@@ -1077,7 +1077,7 @@
         valueMap.put("ORDER_STATUS_ID", helpGettingColumnStringValue(myEntity.getOrderStatusId()));
         valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded()));
         valueMap.put("CUSTOMER_NOTIFIED", helpGettingColumnStringValue(myEntity.getCustomerNotified()));
-        valueMap.put("COMMENTS", helpGettingColumnStringValue(myEntity.getComments()));
+        valueMap.put("COMMENT", helpGettingColumnStringValue(myEntity.getComment()));
         return valueMap;
     }
 
@@ -1102,9 +1102,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "ORDER_STATUS_HISTORY(ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS) values(? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "ORDER_STATUS_HISTORY(ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT) values(? , ? , ? , ? , ? , ? )";
         }
-        return "insert into ORDER_STATUS_HISTORY(ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENTS) values(? , ? , ? , ? , ? , ? )";
+        return "insert into ORDER_STATUS_HISTORY(ORDER_STATUS_HISTORY_ID, ORDER_FORM_ID, ORDER_STATUS_ID, DATE_ADDED, CUSTOMER_NOTIFIED, COMMENT) values(? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -16,7 +16,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -95,215 +95,229 @@
     //                                        --------------
     /** Db-name of PRODUCT_ID. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String DB_NAME_PRODUCT_ID = "PRODUCT_ID";
+    /** Db-name of MODEL. VARCHAR(32) */
+    public static final String DB_NAME_MODEL = "MODEL";
     /** Db-name of QUANTITY. INTEGER : NotNull */
     public static final String DB_NAME_QUANTITY = "QUANTITY";
-    /** Db-name of MODEL. VARCHAR(32) */
-    public static final String DB_NAME_MODEL = "MODEL";
+    /** Db-name of PRICE. DECIMAL(15) : NotNull */
+    public static final String DB_NAME_PRICE = "PRICE";
+    /** Db-name of WEIGHT. DECIMAL(5) */
+    public static final String DB_NAME_WEIGHT = "WEIGHT";
+    /** Db-name of IMAGE. VARCHAR(64) */
+    public static final String DB_NAME_IMAGE = "IMAGE";
     /** Db-name of THUMBNAIL. VARCHAR(64) */
     public static final String DB_NAME_THUMBNAIL = "THUMBNAIL";
-    /** Db-name of IMAGE. VARCHAR(64) */
-    public static final String DB_NAME_IMAGE = "IMAGE";
-    /** Db-name of PRICE. DECIMAL(15) : NotNull */
-    public static final String DB_NAME_PRICE = "PRICE";
+    /** Db-name of STOCK. INTEGER */
+    public static final String DB_NAME_STOCK = "STOCK";
+    /** Db-name of ORDERED. INTEGER : NotNull : Default=[0] */
+    public static final String DB_NAME_ORDERED = "ORDERED";
+    /** Db-name of STATUS. INTEGER : NotNull */
+    public static final String DB_NAME_STATUS = "STATUS";
     /** Db-name of DATE_ADDED. TIMESTAMP : NotNull */
     public static final String DB_NAME_DATE_ADDED = "DATE_ADDED";
     /** Db-name of LAST_MODIFIED. TIMESTAMP */
     public static final String DB_NAME_LAST_MODIFIED = "LAST_MODIFIED";
     /** Db-name of DATE_AVAILABLE. TIMESTAMP */
     public static final String DB_NAME_DATE_AVAILABLE = "DATE_AVAILABLE";
-    /** Db-name of WEIGHT. DECIMAL(5) : NotNull */
-    public static final String DB_NAME_WEIGHT = "WEIGHT";
-    /** Db-name of STATUS. INTEGER : NotNull */
-    public static final String DB_NAME_STATUS = "STATUS";
     /** Db-name of TAX_CLASS_ID. INTEGER : FK to TAX_CLASS */
     public static final String DB_NAME_TAX_CLASS_ID = "TAX_CLASS_ID";
     /** Db-name of MANUFACTURER_ID. INTEGER : FK to MANUFACTURER */
     public static final String DB_NAME_MANUFACTURER_ID = "MANUFACTURER_ID";
-    /** Db-name of ORDERED. INTEGER : NotNull : Default=[0] */
-    public static final String DB_NAME_ORDERED = "ORDERED";
 
     /** @deprecated Deprecated! So use DB_NAME_ProductId. */
     public static final String COLUMN_DB_NAME_OF_ProductId = "PRODUCT_ID";
+    /** @deprecated Deprecated! So use DB_NAME_Model. */
+    public static final String COLUMN_DB_NAME_OF_Model = "MODEL";
     /** @deprecated Deprecated! So use DB_NAME_Quantity. */
     public static final String COLUMN_DB_NAME_OF_Quantity = "QUANTITY";
-    /** @deprecated Deprecated! So use DB_NAME_Model. */
-    public static final String COLUMN_DB_NAME_OF_Model = "MODEL";
+    /** @deprecated Deprecated! So use DB_NAME_Price. */
+    public static final String COLUMN_DB_NAME_OF_Price = "PRICE";
+    /** @deprecated Deprecated! So use DB_NAME_Weight. */
+    public static final String COLUMN_DB_NAME_OF_Weight = "WEIGHT";
+    /** @deprecated Deprecated! So use DB_NAME_Image. */
+    public static final String COLUMN_DB_NAME_OF_Image = "IMAGE";
     /** @deprecated Deprecated! So use DB_NAME_Thumbnail. */
     public static final String COLUMN_DB_NAME_OF_Thumbnail = "THUMBNAIL";
-    /** @deprecated Deprecated! So use DB_NAME_Image. */
-    public static final String COLUMN_DB_NAME_OF_Image = "IMAGE";
-    /** @deprecated Deprecated! So use DB_NAME_Price. */
-    public static final String COLUMN_DB_NAME_OF_Price = "PRICE";
+    /** @deprecated Deprecated! So use DB_NAME_Stock. */
+    public static final String COLUMN_DB_NAME_OF_Stock = "STOCK";
+    /** @deprecated Deprecated! So use DB_NAME_Ordered. */
+    public static final String COLUMN_DB_NAME_OF_Ordered = "ORDERED";
+    /** @deprecated Deprecated! So use DB_NAME_Status. */
+    public static final String COLUMN_DB_NAME_OF_Status = "STATUS";
     /** @deprecated Deprecated! So use DB_NAME_DateAdded. */
     public static final String COLUMN_DB_NAME_OF_DateAdded = "DATE_ADDED";
     /** @deprecated Deprecated! So use DB_NAME_LastModified. */
     public static final String COLUMN_DB_NAME_OF_LastModified = "LAST_MODIFIED";
     /** @deprecated Deprecated! So use DB_NAME_DateAvailable. */
     public static final String COLUMN_DB_NAME_OF_DateAvailable = "DATE_AVAILABLE";
-    /** @deprecated Deprecated! So use DB_NAME_Weight. */
-    public static final String COLUMN_DB_NAME_OF_Weight = "WEIGHT";
-    /** @deprecated Deprecated! So use DB_NAME_Status. */
-    public static final String COLUMN_DB_NAME_OF_Status = "STATUS";
     /** @deprecated Deprecated! So use DB_NAME_TaxClassId. */
     public static final String COLUMN_DB_NAME_OF_TaxClassId = "TAX_CLASS_ID";
     /** @deprecated Deprecated! So use DB_NAME_ManufacturerId. */
     public static final String COLUMN_DB_NAME_OF_ManufacturerId = "MANUFACTURER_ID";
-    /** @deprecated Deprecated! So use DB_NAME_Ordered. */
-    public static final String COLUMN_DB_NAME_OF_Ordered = "ORDERED";
 
     // -----------------------------------------------------
     //                       Column Prop-Name(JavaBeansRule)
     //                       -------------------------------
     /** Prop-name(JavaBeansRule) of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String PROPERTY_NAME_productId = "productId";
+    /** Prop-name(JavaBeansRule) of model. VARCHAR(32) */
+    public static final String PROPERTY_NAME_model = "model";
     /** Prop-name(JavaBeansRule) of quantity. INTEGER : NotNull */
     public static final String PROPERTY_NAME_quantity = "quantity";
-    /** Prop-name(JavaBeansRule) of model. VARCHAR(32) */
-    public static final String PROPERTY_NAME_model = "model";
+    /** Prop-name(JavaBeansRule) of price. DECIMAL(15) : NotNull */
+    public static final String PROPERTY_NAME_price = "price";
+    /** Prop-name(JavaBeansRule) of weight. DECIMAL(5) */
+    public static final String PROPERTY_NAME_weight = "weight";
+    /** Prop-name(JavaBeansRule) of image. VARCHAR(64) */
+    public static final String PROPERTY_NAME_image = "image";
     /** Prop-name(JavaBeansRule) of thumbnail. VARCHAR(64) */
     public static final String PROPERTY_NAME_thumbnail = "thumbnail";
-    /** Prop-name(JavaBeansRule) of image. VARCHAR(64) */
-    public static final String PROPERTY_NAME_image = "image";
-    /** Prop-name(JavaBeansRule) of price. DECIMAL(15) : NotNull */
-    public static final String PROPERTY_NAME_price = "price";
+    /** Prop-name(JavaBeansRule) of stock. INTEGER */
+    public static final String PROPERTY_NAME_stock = "stock";
+    /** Prop-name(JavaBeansRule) of ordered. INTEGER : NotNull : Default=[0] */
+    public static final String PROPERTY_NAME_ordered = "ordered";
+    /** Prop-name(JavaBeansRule) of status. INTEGER : NotNull */
+    public static final String PROPERTY_NAME_status = "status";
     /** Prop-name(JavaBeansRule) of dateAdded. TIMESTAMP : NotNull */
     public static final String PROPERTY_NAME_dateAdded = "dateAdded";
     /** Prop-name(JavaBeansRule) of lastModified. TIMESTAMP */
     public static final String PROPERTY_NAME_lastModified = "lastModified";
     /** Prop-name(JavaBeansRule) of dateAvailable. TIMESTAMP */
     public static final String PROPERTY_NAME_dateAvailable = "dateAvailable";
-    /** Prop-name(JavaBeansRule) of weight. DECIMAL(5) : NotNull */
-    public static final String PROPERTY_NAME_weight = "weight";
-    /** Prop-name(JavaBeansRule) of status. INTEGER : NotNull */
-    public static final String PROPERTY_NAME_status = "status";
     /** Prop-name(JavaBeansRule) of taxClassId. INTEGER : FK to TAX_CLASS */
     public static final String PROPERTY_NAME_taxClassId = "taxClassId";
     /** Prop-name(JavaBeansRule) of manufacturerId. INTEGER : FK to MANUFACTURER */
     public static final String PROPERTY_NAME_manufacturerId = "manufacturerId";
-    /** Prop-name(JavaBeansRule) of ordered. INTEGER : NotNull : Default=[0] */
-    public static final String PROPERTY_NAME_ordered = "ordered";
 
     // -----------------------------------------------------
     //                                  Column Cap-Prop-Name
     //                                  --------------------
     /** Cap-prop-name of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String CAP_PROP_NAME_ProductId = "ProductId";
+    /** Cap-prop-name of model. VARCHAR(32) */
+    public static final String CAP_PROP_NAME_Model = "Model";
     /** Cap-prop-name of quantity. INTEGER : NotNull */
     public static final String CAP_PROP_NAME_Quantity = "Quantity";
-    /** Cap-prop-name of model. VARCHAR(32) */
-    public static final String CAP_PROP_NAME_Model = "Model";
+    /** Cap-prop-name of price. DECIMAL(15) : NotNull */
+    public static final String CAP_PROP_NAME_Price = "Price";
+    /** Cap-prop-name of weight. DECIMAL(5) */
+    public static final String CAP_PROP_NAME_Weight = "Weight";
+    /** Cap-prop-name of image. VARCHAR(64) */
+    public static final String CAP_PROP_NAME_Image = "Image";
     /** Cap-prop-name of thumbnail. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Thumbnail = "Thumbnail";
-    /** Cap-prop-name of image. VARCHAR(64) */
-    public static final String CAP_PROP_NAME_Image = "Image";
-    /** Cap-prop-name of price. DECIMAL(15) : NotNull */
-    public static final String CAP_PROP_NAME_Price = "Price";
+    /** Cap-prop-name of stock. INTEGER */
+    public static final String CAP_PROP_NAME_Stock = "Stock";
+    /** Cap-prop-name of ordered. INTEGER : NotNull : Default=[0] */
+    public static final String CAP_PROP_NAME_Ordered = "Ordered";
+    /** Cap-prop-name of status. INTEGER : NotNull */
+    public static final String CAP_PROP_NAME_Status = "Status";
     /** Cap-prop-name of dateAdded. TIMESTAMP : NotNull */
     public static final String CAP_PROP_NAME_DateAdded = "DateAdded";
     /** Cap-prop-name of lastModified. TIMESTAMP */
     public static final String CAP_PROP_NAME_LastModified = "LastModified";
     /** Cap-prop-name of dateAvailable. TIMESTAMP */
     public static final String CAP_PROP_NAME_DateAvailable = "DateAvailable";
-    /** Cap-prop-name of weight. DECIMAL(5) : NotNull */
-    public static final String CAP_PROP_NAME_Weight = "Weight";
-    /** Cap-prop-name of status. INTEGER : NotNull */
-    public static final String CAP_PROP_NAME_Status = "Status";
     /** Cap-prop-name of taxClassId. INTEGER : FK to TAX_CLASS */
     public static final String CAP_PROP_NAME_TaxClassId = "TaxClassId";
     /** Cap-prop-name of manufacturerId. INTEGER : FK to MANUFACTURER */
     public static final String CAP_PROP_NAME_ManufacturerId = "ManufacturerId";
-    /** Cap-prop-name of ordered. INTEGER : NotNull : Default=[0] */
-    public static final String CAP_PROP_NAME_Ordered = "Ordered";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_ProductId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_ProductId = "ProductId";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Model. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Model = "Model";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Quantity. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Quantity = "Quantity";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Model. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Model = "Model";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Price. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Price = "Price";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Weight. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Weight = "Weight";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Image. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Image = "Image";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Thumbnail. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Thumbnail = "Thumbnail";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Image. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Image = "Image";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Price. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Price = "Price";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Stock. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Stock = "Stock";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Ordered. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Ordered = "Ordered";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Status. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Status = "Status";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DateAdded. */
     public static final String COLUMN_CAP_PROP_NAME_OF_DateAdded = "DateAdded";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_LastModified. */
     public static final String COLUMN_CAP_PROP_NAME_OF_LastModified = "LastModified";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DateAvailable. */
     public static final String COLUMN_CAP_PROP_NAME_OF_DateAvailable = "DateAvailable";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Weight. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Weight = "Weight";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Status. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Status = "Status";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_TaxClassId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_TaxClassId = "TaxClassId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_ManufacturerId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_ManufacturerId = "ManufacturerId";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Ordered. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Ordered = "Ordered";
 
     // -----------------------------------------------------
     //                                Column Uncap-Prop-Name
     //                                ----------------------
     /** Uncap-prop-name of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String UNCAP_PROP_NAME_productId = "productId";
+    /** Uncap-prop-name of model. VARCHAR(32) */
+    public static final String UNCAP_PROP_NAME_model = "model";
     /** Uncap-prop-name of quantity. INTEGER : NotNull */
     public static final String UNCAP_PROP_NAME_quantity = "quantity";
-    /** Uncap-prop-name of model. VARCHAR(32) */
-    public static final String UNCAP_PROP_NAME_model = "model";
+    /** Uncap-prop-name of price. DECIMAL(15) : NotNull */
+    public static final String UNCAP_PROP_NAME_price = "price";
+    /** Uncap-prop-name of weight. DECIMAL(5) */
+    public static final String UNCAP_PROP_NAME_weight = "weight";
+    /** Uncap-prop-name of image. VARCHAR(64) */
+    public static final String UNCAP_PROP_NAME_image = "image";
     /** Uncap-prop-name of thumbnail. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_thumbnail = "thumbnail";
-    /** Uncap-prop-name of image. VARCHAR(64) */
-    public static final String UNCAP_PROP_NAME_image = "image";
-    /** Uncap-prop-name of price. DECIMAL(15) : NotNull */
-    public static final String UNCAP_PROP_NAME_price = "price";
+    /** Uncap-prop-name of stock. INTEGER */
+    public static final String UNCAP_PROP_NAME_stock = "stock";
+    /** Uncap-prop-name of ordered. INTEGER : NotNull : Default=[0] */
+    public static final String UNCAP_PROP_NAME_ordered = "ordered";
+    /** Uncap-prop-name of status. INTEGER : NotNull */
+    public static final String UNCAP_PROP_NAME_status = "status";
     /** Uncap-prop-name of dateAdded. TIMESTAMP : NotNull */
     public static final String UNCAP_PROP_NAME_dateAdded = "dateAdded";
     /** Uncap-prop-name of lastModified. TIMESTAMP */
     public static final String UNCAP_PROP_NAME_lastModified = "lastModified";
     /** Uncap-prop-name of dateAvailable. TIMESTAMP */
     public static final String UNCAP_PROP_NAME_dateAvailable = "dateAvailable";
-    /** Uncap-prop-name of weight. DECIMAL(5) : NotNull */
-    public static final String UNCAP_PROP_NAME_weight = "weight";
-    /** Uncap-prop-name of status. INTEGER : NotNull */
-    public static final String UNCAP_PROP_NAME_status = "status";
     /** Uncap-prop-name of taxClassId. INTEGER : FK to TAX_CLASS */
     public static final String UNCAP_PROP_NAME_taxClassId = "taxClassId";
     /** Uncap-prop-name of manufacturerId. INTEGER : FK to MANUFACTURER */
     public static final String UNCAP_PROP_NAME_manufacturerId = "manufacturerId";
-    /** Uncap-prop-name of ordered. INTEGER : NotNull : Default=[0] */
-    public static final String UNCAP_PROP_NAME_ordered = "ordered";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ProductId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_ProductId = "productId";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Model. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Model = "model";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Quantity. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Quantity = "quantity";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Model. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Model = "model";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Price. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Price = "price";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Weight. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Weight = "weight";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Image. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Image = "image";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Thumbnail. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Thumbnail = "thumbnail";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Image. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Image = "image";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Price. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Price = "price";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Stock. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Stock = "stock";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Ordered. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Ordered = "ordered";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Status. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Status = "status";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DateAdded. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DateAdded = "dateAdded";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastModified. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_LastModified = "lastModified";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DateAvailable. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DateAvailable = "dateAvailable";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Weight. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Weight = "weight";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Status. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Status = "status";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_TaxClassId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_TaxClassId = "taxClassId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ManufacturerId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_ManufacturerId = "manufacturerId";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Ordered. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Ordered = "ordered";
 
     // -----------------------------------------------------
     //                                          Foreign Name
@@ -403,19 +417,20 @@
         map.put(TABLE_DB_NAME.toLowerCase(), TABLE_PROPERTY_NAME);
 
         map.put(DB_NAME_PRODUCT_ID.toLowerCase(), PROPERTY_NAME_productId);
+        map.put(DB_NAME_MODEL.toLowerCase(), PROPERTY_NAME_model);
         map.put(DB_NAME_QUANTITY.toLowerCase(), PROPERTY_NAME_quantity);
-        map.put(DB_NAME_MODEL.toLowerCase(), PROPERTY_NAME_model);
+        map.put(DB_NAME_PRICE.toLowerCase(), PROPERTY_NAME_price);
+        map.put(DB_NAME_WEIGHT.toLowerCase(), PROPERTY_NAME_weight);
+        map.put(DB_NAME_IMAGE.toLowerCase(), PROPERTY_NAME_image);
         map.put(DB_NAME_THUMBNAIL.toLowerCase(), PROPERTY_NAME_thumbnail);
-        map.put(DB_NAME_IMAGE.toLowerCase(), PROPERTY_NAME_image);
-        map.put(DB_NAME_PRICE.toLowerCase(), PROPERTY_NAME_price);
+        map.put(DB_NAME_STOCK.toLowerCase(), PROPERTY_NAME_stock);
+        map.put(DB_NAME_ORDERED.toLowerCase(), PROPERTY_NAME_ordered);
+        map.put(DB_NAME_STATUS.toLowerCase(), PROPERTY_NAME_status);
         map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded);
         map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified);
         map.put(DB_NAME_DATE_AVAILABLE.toLowerCase(), PROPERTY_NAME_dateAvailable);
-        map.put(DB_NAME_WEIGHT.toLowerCase(), PROPERTY_NAME_weight);
-        map.put(DB_NAME_STATUS.toLowerCase(), PROPERTY_NAME_status);
         map.put(DB_NAME_TAX_CLASS_ID.toLowerCase(), PROPERTY_NAME_taxClassId);
         map.put(DB_NAME_MANUFACTURER_ID.toLowerCase(), PROPERTY_NAME_manufacturerId);
-        map.put(DB_NAME_ORDERED.toLowerCase(), PROPERTY_NAME_ordered);
 
         _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _dbNamePropertyNameKeyToLowerMap;
@@ -431,19 +446,20 @@
         map.put(TABLE_PROPERTY_NAME.toLowerCase(), TABLE_DB_NAME);
 
         map.put(PROPERTY_NAME_productId.toLowerCase(), DB_NAME_PRODUCT_ID);
+        map.put(PROPERTY_NAME_model.toLowerCase(), DB_NAME_MODEL);
         map.put(PROPERTY_NAME_quantity.toLowerCase(), DB_NAME_QUANTITY);
-        map.put(PROPERTY_NAME_model.toLowerCase(), DB_NAME_MODEL);
+        map.put(PROPERTY_NAME_price.toLowerCase(), DB_NAME_PRICE);
+        map.put(PROPERTY_NAME_weight.toLowerCase(), DB_NAME_WEIGHT);
+        map.put(PROPERTY_NAME_image.toLowerCase(), DB_NAME_IMAGE);
         map.put(PROPERTY_NAME_thumbnail.toLowerCase(), DB_NAME_THUMBNAIL);
-        map.put(PROPERTY_NAME_image.toLowerCase(), DB_NAME_IMAGE);
-        map.put(PROPERTY_NAME_price.toLowerCase(), DB_NAME_PRICE);
+        map.put(PROPERTY_NAME_stock.toLowerCase(), DB_NAME_STOCK);
+        map.put(PROPERTY_NAME_ordered.toLowerCase(), DB_NAME_ORDERED);
+        map.put(PROPERTY_NAME_status.toLowerCase(), DB_NAME_STATUS);
         map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED);
         map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED);
         map.put(PROPERTY_NAME_dateAvailable.toLowerCase(), DB_NAME_DATE_AVAILABLE);
-        map.put(PROPERTY_NAME_weight.toLowerCase(), DB_NAME_WEIGHT);
-        map.put(PROPERTY_NAME_status.toLowerCase(), DB_NAME_STATUS);
         map.put(PROPERTY_NAME_taxClassId.toLowerCase(), DB_NAME_TAX_CLASS_ID);
         map.put(PROPERTY_NAME_manufacturerId.toLowerCase(), DB_NAME_MANUFACTURER_ID);
-        map.put(PROPERTY_NAME_ordered.toLowerCase(), DB_NAME_ORDERED);
 
         _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _propertyNameDbNameKeyToLowerMap;
@@ -461,19 +477,20 @@
         map.put(TABLE_DB_NAME, TABLE_CAP_PROP_NAME);
 
         map.put(DB_NAME_PRODUCT_ID, CAP_PROP_NAME_ProductId);
+        map.put(DB_NAME_MODEL, CAP_PROP_NAME_Model);
         map.put(DB_NAME_QUANTITY, CAP_PROP_NAME_Quantity);
-        map.put(DB_NAME_MODEL, CAP_PROP_NAME_Model);
+        map.put(DB_NAME_PRICE, CAP_PROP_NAME_Price);
+        map.put(DB_NAME_WEIGHT, CAP_PROP_NAME_Weight);
+        map.put(DB_NAME_IMAGE, CAP_PROP_NAME_Image);
         map.put(DB_NAME_THUMBNAIL, CAP_PROP_NAME_Thumbnail);
-        map.put(DB_NAME_IMAGE, CAP_PROP_NAME_Image);
-        map.put(DB_NAME_PRICE, CAP_PROP_NAME_Price);
+        map.put(DB_NAME_STOCK, CAP_PROP_NAME_Stock);
+        map.put(DB_NAME_ORDERED, CAP_PROP_NAME_Ordered);
+        map.put(DB_NAME_STATUS, CAP_PROP_NAME_Status);
         map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded);
         map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified);
         map.put(DB_NAME_DATE_AVAILABLE, CAP_PROP_NAME_DateAvailable);
-        map.put(DB_NAME_WEIGHT, CAP_PROP_NAME_Weight);
-        map.put(DB_NAME_STATUS, CAP_PROP_NAME_Status);
         map.put(DB_NAME_TAX_CLASS_ID, CAP_PROP_NAME_TaxClassId);
         map.put(DB_NAME_MANUFACTURER_ID, CAP_PROP_NAME_ManufacturerId);
-        map.put(DB_NAME_ORDERED, CAP_PROP_NAME_Ordered);
 
         _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameCapPropNameMap;
@@ -491,19 +508,20 @@
         map.put(TABLE_DB_NAME, TABLE_UNCAP_PROP_NAME);
 
         map.put(DB_NAME_PRODUCT_ID, UNCAP_PROP_NAME_productId);
+        map.put(DB_NAME_MODEL, UNCAP_PROP_NAME_model);
         map.put(DB_NAME_QUANTITY, UNCAP_PROP_NAME_quantity);
-        map.put(DB_NAME_MODEL, UNCAP_PROP_NAME_model);
+        map.put(DB_NAME_PRICE, UNCAP_PROP_NAME_price);
+        map.put(DB_NAME_WEIGHT, UNCAP_PROP_NAME_weight);
+        map.put(DB_NAME_IMAGE, UNCAP_PROP_NAME_image);
         map.put(DB_NAME_THUMBNAIL, UNCAP_PROP_NAME_thumbnail);
-        map.put(DB_NAME_IMAGE, UNCAP_PROP_NAME_image);
-        map.put(DB_NAME_PRICE, UNCAP_PROP_NAME_price);
+        map.put(DB_NAME_STOCK, UNCAP_PROP_NAME_stock);
+        map.put(DB_NAME_ORDERED, UNCAP_PROP_NAME_ordered);
+        map.put(DB_NAME_STATUS, UNCAP_PROP_NAME_status);
         map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded);
         map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified);
         map.put(DB_NAME_DATE_AVAILABLE, UNCAP_PROP_NAME_dateAvailable);
-        map.put(DB_NAME_WEIGHT, UNCAP_PROP_NAME_weight);
-        map.put(DB_NAME_STATUS, UNCAP_PROP_NAME_status);
         map.put(DB_NAME_TAX_CLASS_ID, UNCAP_PROP_NAME_taxClassId);
         map.put(DB_NAME_MANUFACTURER_ID, UNCAP_PROP_NAME_manufacturerId);
-        map.put(DB_NAME_ORDERED, UNCAP_PROP_NAME_ordered);
 
         _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameUncapPropNameMap;
@@ -521,19 +539,20 @@
         map.put(TABLE_CAP_PROP_NAME, TABLE_DB_NAME);
 
         map.put(CAP_PROP_NAME_ProductId, DB_NAME_PRODUCT_ID);
+        map.put(CAP_PROP_NAME_Model, DB_NAME_MODEL);
         map.put(CAP_PROP_NAME_Quantity, DB_NAME_QUANTITY);
-        map.put(CAP_PROP_NAME_Model, DB_NAME_MODEL);
+        map.put(CAP_PROP_NAME_Price, DB_NAME_PRICE);
+        map.put(CAP_PROP_NAME_Weight, DB_NAME_WEIGHT);
+        map.put(CAP_PROP_NAME_Image, DB_NAME_IMAGE);
         map.put(CAP_PROP_NAME_Thumbnail, DB_NAME_THUMBNAIL);
-        map.put(CAP_PROP_NAME_Image, DB_NAME_IMAGE);
-        map.put(CAP_PROP_NAME_Price, DB_NAME_PRICE);
+        map.put(CAP_PROP_NAME_Stock, DB_NAME_STOCK);
+        map.put(CAP_PROP_NAME_Ordered, DB_NAME_ORDERED);
+        map.put(CAP_PROP_NAME_Status, DB_NAME_STATUS);
         map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED);
         map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED);
         map.put(CAP_PROP_NAME_DateAvailable, DB_NAME_DATE_AVAILABLE);
-        map.put(CAP_PROP_NAME_Weight, DB_NAME_WEIGHT);
-        map.put(CAP_PROP_NAME_Status, DB_NAME_STATUS);
         map.put(CAP_PROP_NAME_TaxClassId, DB_NAME_TAX_CLASS_ID);
         map.put(CAP_PROP_NAME_ManufacturerId, DB_NAME_MANUFACTURER_ID);
-        map.put(CAP_PROP_NAME_Ordered, DB_NAME_ORDERED);
 
         _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameDbNameMap;
@@ -551,19 +570,20 @@
         map.put(TABLE_CAP_PROP_NAME, TABLE_UNCAP_PROP_NAME);
 
         map.put(CAP_PROP_NAME_ProductId, UNCAP_PROP_NAME_productId);
+        map.put(CAP_PROP_NAME_Model, UNCAP_PROP_NAME_model);
         map.put(CAP_PROP_NAME_Quantity, UNCAP_PROP_NAME_quantity);
-        map.put(CAP_PROP_NAME_Model, UNCAP_PROP_NAME_model);
+        map.put(CAP_PROP_NAME_Price, UNCAP_PROP_NAME_price);
+        map.put(CAP_PROP_NAME_Weight, UNCAP_PROP_NAME_weight);
+        map.put(CAP_PROP_NAME_Image, UNCAP_PROP_NAME_image);
         map.put(CAP_PROP_NAME_Thumbnail, UNCAP_PROP_NAME_thumbnail);
-        map.put(CAP_PROP_NAME_Image, UNCAP_PROP_NAME_image);
-        map.put(CAP_PROP_NAME_Price, UNCAP_PROP_NAME_price);
+        map.put(CAP_PROP_NAME_Stock, UNCAP_PROP_NAME_stock);
+        map.put(CAP_PROP_NAME_Ordered, UNCAP_PROP_NAME_ordered);
+        map.put(CAP_PROP_NAME_Status, UNCAP_PROP_NAME_status);
         map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded);
         map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified);
         map.put(CAP_PROP_NAME_DateAvailable, UNCAP_PROP_NAME_dateAvailable);
-        map.put(CAP_PROP_NAME_Weight, UNCAP_PROP_NAME_weight);
-        map.put(CAP_PROP_NAME_Status, UNCAP_PROP_NAME_status);
         map.put(CAP_PROP_NAME_TaxClassId, UNCAP_PROP_NAME_taxClassId);
         map.put(CAP_PROP_NAME_ManufacturerId, UNCAP_PROP_NAME_manufacturerId);
-        map.put(CAP_PROP_NAME_Ordered, UNCAP_PROP_NAME_ordered);
 
         _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameUncapPropNameMap;
@@ -581,19 +601,20 @@
         map.put(TABLE_UNCAP_PROP_NAME, TABLE_DB_NAME);
 
         map.put(UNCAP_PROP_NAME_productId, DB_NAME_PRODUCT_ID);
+        map.put(UNCAP_PROP_NAME_model, DB_NAME_MODEL);
         map.put(UNCAP_PROP_NAME_quantity, DB_NAME_QUANTITY);
-        map.put(UNCAP_PROP_NAME_model, DB_NAME_MODEL);
+        map.put(UNCAP_PROP_NAME_price, DB_NAME_PRICE);
+        map.put(UNCAP_PROP_NAME_weight, DB_NAME_WEIGHT);
+        map.put(UNCAP_PROP_NAME_image, DB_NAME_IMAGE);
         map.put(UNCAP_PROP_NAME_thumbnail, DB_NAME_THUMBNAIL);
-        map.put(UNCAP_PROP_NAME_image, DB_NAME_IMAGE);
-        map.put(UNCAP_PROP_NAME_price, DB_NAME_PRICE);
+        map.put(UNCAP_PROP_NAME_stock, DB_NAME_STOCK);
+        map.put(UNCAP_PROP_NAME_ordered, DB_NAME_ORDERED);
+        map.put(UNCAP_PROP_NAME_status, DB_NAME_STATUS);
         map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED);
         map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED);
         map.put(UNCAP_PROP_NAME_dateAvailable, DB_NAME_DATE_AVAILABLE);
-        map.put(UNCAP_PROP_NAME_weight, DB_NAME_WEIGHT);
-        map.put(UNCAP_PROP_NAME_status, DB_NAME_STATUS);
         map.put(UNCAP_PROP_NAME_taxClassId, DB_NAME_TAX_CLASS_ID);
         map.put(UNCAP_PROP_NAME_manufacturerId, DB_NAME_MANUFACTURER_ID);
-        map.put(UNCAP_PROP_NAME_ordered, DB_NAME_ORDERED);
 
         _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameDbNameMap;
@@ -611,19 +632,20 @@
         map.put(TABLE_UNCAP_PROP_NAME, TABLE_CAP_PROP_NAME);
 
         map.put(UNCAP_PROP_NAME_productId, CAP_PROP_NAME_ProductId);
+        map.put(UNCAP_PROP_NAME_model, CAP_PROP_NAME_Model);
         map.put(UNCAP_PROP_NAME_quantity, CAP_PROP_NAME_Quantity);
-        map.put(UNCAP_PROP_NAME_model, CAP_PROP_NAME_Model);
+        map.put(UNCAP_PROP_NAME_price, CAP_PROP_NAME_Price);
+        map.put(UNCAP_PROP_NAME_weight, CAP_PROP_NAME_Weight);
+        map.put(UNCAP_PROP_NAME_image, CAP_PROP_NAME_Image);
         map.put(UNCAP_PROP_NAME_thumbnail, CAP_PROP_NAME_Thumbnail);
-        map.put(UNCAP_PROP_NAME_image, CAP_PROP_NAME_Image);
-        map.put(UNCAP_PROP_NAME_price, CAP_PROP_NAME_Price);
+        map.put(UNCAP_PROP_NAME_stock, CAP_PROP_NAME_Stock);
+        map.put(UNCAP_PROP_NAME_ordered, CAP_PROP_NAME_Ordered);
+        map.put(UNCAP_PROP_NAME_status, CAP_PROP_NAME_Status);
         map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded);
         map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified);
         map.put(UNCAP_PROP_NAME_dateAvailable, CAP_PROP_NAME_DateAvailable);
-        map.put(UNCAP_PROP_NAME_weight, CAP_PROP_NAME_Weight);
-        map.put(UNCAP_PROP_NAME_status, CAP_PROP_NAME_Status);
         map.put(UNCAP_PROP_NAME_taxClassId, CAP_PROP_NAME_TaxClassId);
         map.put(UNCAP_PROP_NAME_manufacturerId, CAP_PROP_NAME_ManufacturerId);
-        map.put(UNCAP_PROP_NAME_ordered, CAP_PROP_NAME_Ordered);
 
         _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameCapPropNameMap;
@@ -833,19 +855,20 @@
     public java.util.List<ColumnInfo> getColumnInfoList() {
         final java.util.List<ColumnInfo> columnInfoList = new java.util.ArrayList<ColumnInfo>();
         columnInfoList.add(columnProductId());
+        columnInfoList.add(columnModel());
         columnInfoList.add(columnQuantity());
-        columnInfoList.add(columnModel());
+        columnInfoList.add(columnPrice());
+        columnInfoList.add(columnWeight());
+        columnInfoList.add(columnImage());
         columnInfoList.add(columnThumbnail());
-        columnInfoList.add(columnImage());
-        columnInfoList.add(columnPrice());
+        columnInfoList.add(columnStock());
+        columnInfoList.add(columnOrdered());
+        columnInfoList.add(columnStatus());
         columnInfoList.add(columnDateAdded());
         columnInfoList.add(columnLastModified());
         columnInfoList.add(columnDateAvailable());
-        columnInfoList.add(columnWeight());
-        columnInfoList.add(columnStatus());
         columnInfoList.add(columnTaxClassId());
         columnInfoList.add(columnManufacturerId());
-        columnInfoList.add(columnOrdered());
         return columnInfoList;
     }
 
@@ -901,7 +924,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED";
+        return "PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID";
     }
 
     /**
@@ -911,22 +934,28 @@
         return new ColumnInfo(this, "PRODUCT_ID", "productId", java.math.BigDecimal.class, true);
     }
     /**
+     * @return Column information of model. (NotNull)
+     */
+    public ColumnInfo columnModel() {
+        return new ColumnInfo(this, "MODEL", "model", String.class, false);
+    }
+    /**
      * @return Column information of quantity. (NotNull)
      */
     public ColumnInfo columnQuantity() {
         return new ColumnInfo(this, "QUANTITY", "quantity", java.math.BigDecimal.class, false);
     }
     /**
-     * @return Column information of model. (NotNull)
+     * @return Column information of price. (NotNull)
      */
-    public ColumnInfo columnModel() {
-        return new ColumnInfo(this, "MODEL", "model", String.class, false);
+    public ColumnInfo columnPrice() {
+        return new ColumnInfo(this, "PRICE", "price", java.math.BigDecimal.class, false);
     }
     /**
-     * @return Column information of thumbnail. (NotNull)
+     * @return Column information of weight. (NotNull)
      */
-    public ColumnInfo columnThumbnail() {
-        return new ColumnInfo(this, "THUMBNAIL", "thumbnail", String.class, false);
+    public ColumnInfo columnWeight() {
+        return new ColumnInfo(this, "WEIGHT", "weight", java.math.BigDecimal.class, false);
     }
     /**
      * @return Column information of image. (NotNull)
@@ -935,12 +964,30 @@
         return new ColumnInfo(this, "IMAGE", "image", String.class, false);
     }
     /**
-     * @return Column information of price. (NotNull)
+     * @return Column information of thumbnail. (NotNull)
      */
-    public ColumnInfo columnPrice() {
-        return new ColumnInfo(this, "PRICE", "price", java.math.BigDecimal.class, false);
+    public ColumnInfo columnThumbnail() {
+        return new ColumnInfo(this, "THUMBNAIL", "thumbnail", String.class, false);
     }
     /**
+     * @return Column information of stock. (NotNull)
+     */
+    public ColumnInfo columnStock() {
+        return new ColumnInfo(this, "STOCK", "stock", java.math.BigDecimal.class, false);
+    }
+    /**
+     * @return Column information of ordered. (NotNull)
+     */
+    public ColumnInfo columnOrdered() {
+        return new ColumnInfo(this, "ORDERED", "ordered", java.math.BigDecimal.class, false);
+    }
+    /**
+     * @return Column information of status. (NotNull)
+     */
+    public ColumnInfo columnStatus() {
+        return new ColumnInfo(this, "STATUS", "status", java.math.BigDecimal.class, false);
+    }
+    /**
      * @return Column information of dateAdded. (NotNull)
      */
     public ColumnInfo columnDateAdded() {
@@ -959,18 +1006,6 @@
         return new ColumnInfo(this, "DATE_AVAILABLE", "dateAvailable", java.sql.Timestamp.class, false);
     }
     /**
-     * @return Column information of weight. (NotNull)
-     */
-    public ColumnInfo columnWeight() {
-        return new ColumnInfo(this, "WEIGHT", "weight", java.math.BigDecimal.class, false);
-    }
-    /**
-     * @return Column information of status. (NotNull)
-     */
-    public ColumnInfo columnStatus() {
-        return new ColumnInfo(this, "STATUS", "status", java.math.BigDecimal.class, false);
-    }
-    /**
      * @return Column information of taxClassId. (NotNull)
      */
     public ColumnInfo columnTaxClassId() {
@@ -982,12 +1017,6 @@
     public ColumnInfo columnManufacturerId() {
         return new ColumnInfo(this, "MANUFACTURER_ID", "manufacturerId", java.math.BigDecimal.class, false);
     }
-    /**
-     * @return Column information of ordered. (NotNull)
-     */
-    public ColumnInfo columnOrdered() {
-        return new ColumnInfo(this, "ORDERED", "ordered", java.math.BigDecimal.class, false);
-    }
 
     // ===================================================================================
     //                                                                         Unique Info
@@ -1360,19 +1389,20 @@
         }
 
         public RelationTrace columnProductId() { return fixTrace(_relationList, ProductDbm.getInstance().columnProductId()); }
+        public RelationTrace columnModel() { return fixTrace(_relationList, ProductDbm.getInstance().columnModel()); }
         public RelationTrace columnQuantity() { return fixTrace(_relationList, ProductDbm.getInstance().columnQuantity()); }
-        public RelationTrace columnModel() { return fixTrace(_relationList, ProductDbm.getInstance().columnModel()); }
+        public RelationTrace columnPrice() { return fixTrace(_relationList, ProductDbm.getInstance().columnPrice()); }
+        public RelationTrace columnWeight() { return fixTrace(_relationList, ProductDbm.getInstance().columnWeight()); }
+        public RelationTrace columnImage() { return fixTrace(_relationList, ProductDbm.getInstance().columnImage()); }
         public RelationTrace columnThumbnail() { return fixTrace(_relationList, ProductDbm.getInstance().columnThumbnail()); }
-        public RelationTrace columnImage() { return fixTrace(_relationList, ProductDbm.getInstance().columnImage()); }
-        public RelationTrace columnPrice() { return fixTrace(_relationList, ProductDbm.getInstance().columnPrice()); }
+        public RelationTrace columnStock() { return fixTrace(_relationList, ProductDbm.getInstance().columnStock()); }
+        public RelationTrace columnOrdered() { return fixTrace(_relationList, ProductDbm.getInstance().columnOrdered()); }
+        public RelationTrace columnStatus() { return fixTrace(_relationList, ProductDbm.getInstance().columnStatus()); }
         public RelationTrace columnDateAdded() { return fixTrace(_relationList, ProductDbm.getInstance().columnDateAdded()); }
         public RelationTrace columnLastModified() { return fixTrace(_relationList, ProductDbm.getInstance().columnLastModified()); }
         public RelationTrace columnDateAvailable() { return fixTrace(_relationList, ProductDbm.getInstance().columnDateAvailable()); }
-        public RelationTrace columnWeight() { return fixTrace(_relationList, ProductDbm.getInstance().columnWeight()); }
-        public RelationTrace columnStatus() { return fixTrace(_relationList, ProductDbm.getInstance().columnStatus()); }
         public RelationTrace columnTaxClassId() { return fixTrace(_relationList, ProductDbm.getInstance().columnTaxClassId()); }
         public RelationTrace columnManufacturerId() { return fixTrace(_relationList, ProductDbm.getInstance().columnManufacturerId()); }
-        public RelationTrace columnOrdered() { return fixTrace(_relationList, ProductDbm.getInstance().columnOrdered()); }
     }
 
     // ===================================================================================
@@ -1444,19 +1474,20 @@
         final MapStringValueAnalyzer analyzer = new MapStringValueAnalyzer(columnValueMap, entity.getModifiedPropertyNames());
 
         if (analyzer.init("PRODUCT_ID", "productId", "productId")) { myEntity.setProductId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("MODEL", "model", "model")) { myEntity.setModel(analyzer.analyzeString(String.class)); };
         if (analyzer.init("QUANTITY", "quantity", "quantity")) { myEntity.setQuantity(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("MODEL", "model", "model")) { myEntity.setModel(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("PRICE", "price", "price")) { myEntity.setPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("WEIGHT", "weight", "weight")) { myEntity.setWeight(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("IMAGE", "image", "image")) { myEntity.setImage(analyzer.analyzeString(String.class)); };
         if (analyzer.init("THUMBNAIL", "thumbnail", "thumbnail")) { myEntity.setThumbnail(analyzer.analyzeString(String.class)); };
-        if (analyzer.init("IMAGE", "image", "image")) { myEntity.setImage(analyzer.analyzeString(String.class)); };
-        if (analyzer.init("PRICE", "price", "price")) { myEntity.setPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("STOCK", "stock", "stock")) { myEntity.setStock(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("ORDERED", "ordered", "ordered")) { myEntity.setOrdered(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("STATUS", "status", "status")) { myEntity.setStatus(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); };
         if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); };
         if (analyzer.init("DATE_AVAILABLE", "dateAvailable", "dateAvailable")) { myEntity.setDateAvailable(analyzer.analyzeDate(java.sql.Timestamp.class)); };
-        if (analyzer.init("WEIGHT", "weight", "weight")) { myEntity.setWeight(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("STATUS", "status", "status")) { myEntity.setStatus(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("TAX_CLASS_ID", "taxClassId", "taxClassId")) { myEntity.setTaxClassId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("MANUFACTURER_ID", "manufacturerId", "manufacturerId")) { myEntity.setManufacturerId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("ORDERED", "ordered", "ordered")) { myEntity.setOrdered(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
 
     }
 
@@ -1530,19 +1561,20 @@
         final String mapMarkAndStartBrace = MAP_STRING_MAP_MARK + startBrace;
         final StringBuffer sb = new StringBuffer();
         helpAppendingColumnValueString(sb, delimiter, equal, "PRODUCT_ID", myEntity.getProductId());
+        helpAppendingColumnValueString(sb, delimiter, equal, "MODEL", myEntity.getModel());
         helpAppendingColumnValueString(sb, delimiter, equal, "QUANTITY", myEntity.getQuantity());
-        helpAppendingColumnValueString(sb, delimiter, equal, "MODEL", myEntity.getModel());
+        helpAppendingColumnValueString(sb, delimiter, equal, "PRICE", myEntity.getPrice());
+        helpAppendingColumnValueString(sb, delimiter, equal, "WEIGHT", myEntity.getWeight());
+        helpAppendingColumnValueString(sb, delimiter, equal, "IMAGE", myEntity.getImage());
         helpAppendingColumnValueString(sb, delimiter, equal, "THUMBNAIL", myEntity.getThumbnail());
-        helpAppendingColumnValueString(sb, delimiter, equal, "IMAGE", myEntity.getImage());
-        helpAppendingColumnValueString(sb, delimiter, equal, "PRICE", myEntity.getPrice());
+        helpAppendingColumnValueString(sb, delimiter, equal, "STOCK", myEntity.getStock());
+        helpAppendingColumnValueString(sb, delimiter, equal, "ORDERED", myEntity.getOrdered());
+        helpAppendingColumnValueString(sb, delimiter, equal, "STATUS", myEntity.getStatus());
         helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded());
         helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified());
         helpAppendingColumnValueString(sb, delimiter, equal, "DATE_AVAILABLE", myEntity.getDateAvailable());
-        helpAppendingColumnValueString(sb, delimiter, equal, "WEIGHT", myEntity.getWeight());
-        helpAppendingColumnValueString(sb, delimiter, equal, "STATUS", myEntity.getStatus());
         helpAppendingColumnValueString(sb, delimiter, equal, "TAX_CLASS_ID", myEntity.getTaxClassId());
         helpAppendingColumnValueString(sb, delimiter, equal, "MANUFACTURER_ID", myEntity.getManufacturerId());
-        helpAppendingColumnValueString(sb, delimiter, equal, "ORDERED", myEntity.getOrdered());
 
         sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
         return sb.toString();
@@ -1598,19 +1630,20 @@
         final Product myEntity = downcast(entity);
         final java.util.Map<String, Object> valueMap = new java.util.LinkedHashMap<String, Object>();
         valueMap.put("PRODUCT_ID", myEntity.getProductId());
+        valueMap.put("MODEL", myEntity.getModel());
         valueMap.put("QUANTITY", myEntity.getQuantity());
-        valueMap.put("MODEL", myEntity.getModel());
+        valueMap.put("PRICE", myEntity.getPrice());
+        valueMap.put("WEIGHT", myEntity.getWeight());
+        valueMap.put("IMAGE", myEntity.getImage());
         valueMap.put("THUMBNAIL", myEntity.getThumbnail());
-        valueMap.put("IMAGE", myEntity.getImage());
-        valueMap.put("PRICE", myEntity.getPrice());
+        valueMap.put("STOCK", myEntity.getStock());
+        valueMap.put("ORDERED", myEntity.getOrdered());
+        valueMap.put("STATUS", myEntity.getStatus());
         valueMap.put("DATE_ADDED", myEntity.getDateAdded());
         valueMap.put("LAST_MODIFIED", myEntity.getLastModified());
         valueMap.put("DATE_AVAILABLE", myEntity.getDateAvailable());
-        valueMap.put("WEIGHT", myEntity.getWeight());
-        valueMap.put("STATUS", myEntity.getStatus());
         valueMap.put("TAX_CLASS_ID", myEntity.getTaxClassId());
         valueMap.put("MANUFACTURER_ID", myEntity.getManufacturerId());
-        valueMap.put("ORDERED", myEntity.getOrdered());
         return valueMap;
     }
 
@@ -1634,19 +1667,20 @@
         final Product myEntity = downcast(entity);
         final java.util.Map<String, String> valueMap = new java.util.LinkedHashMap<String, String>();
         valueMap.put("PRODUCT_ID", helpGettingColumnStringValue(myEntity.getProductId()));
+        valueMap.put("MODEL", helpGettingColumnStringValue(myEntity.getModel()));
         valueMap.put("QUANTITY", helpGettingColumnStringValue(myEntity.getQuantity()));
-        valueMap.put("MODEL", helpGettingColumnStringValue(myEntity.getModel()));
+        valueMap.put("PRICE", helpGettingColumnStringValue(myEntity.getPrice()));
+        valueMap.put("WEIGHT", helpGettingColumnStringValue(myEntity.getWeight()));
+        valueMap.put("IMAGE", helpGettingColumnStringValue(myEntity.getImage()));
         valueMap.put("THUMBNAIL", helpGettingColumnStringValue(myEntity.getThumbnail()));
-        valueMap.put("IMAGE", helpGettingColumnStringValue(myEntity.getImage()));
-        valueMap.put("PRICE", helpGettingColumnStringValue(myEntity.getPrice()));
+        valueMap.put("STOCK", helpGettingColumnStringValue(myEntity.getStock()));
+        valueMap.put("ORDERED", helpGettingColumnStringValue(myEntity.getOrdered()));
+        valueMap.put("STATUS", helpGettingColumnStringValue(myEntity.getStatus()));
         valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded()));
         valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified()));
         valueMap.put("DATE_AVAILABLE", helpGettingColumnStringValue(myEntity.getDateAvailable()));
-        valueMap.put("WEIGHT", helpGettingColumnStringValue(myEntity.getWeight()));
-        valueMap.put("STATUS", helpGettingColumnStringValue(myEntity.getStatus()));
         valueMap.put("TAX_CLASS_ID", helpGettingColumnStringValue(myEntity.getTaxClassId()));
         valueMap.put("MANUFACTURER_ID", helpGettingColumnStringValue(myEntity.getManufacturerId()));
-        valueMap.put("ORDERED", helpGettingColumnStringValue(myEntity.getOrdered()));
         return valueMap;
     }
 
@@ -1671,9 +1705,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "PRODUCT(PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "PRODUCT(PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
         }
-        return "insert into PRODUCT(PRODUCT_ID, QUANTITY, MODEL, THUMBNAIL, IMAGE, PRICE, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, WEIGHT, STATUS, TAX_CLASS_ID, MANUFACTURER_ID, ORDERED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into PRODUCT(PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDescriptionDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDescriptionDbm.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDescriptionDbm.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -16,7 +16,7 @@
  *     REVIEW_ID, LANGUAGE_ID
  * 
  * [column-property]
- *     REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT
+ *     REVIEW_ID, LANGUAGE_ID, COMMENT
  * 
  * [foreign-property]
  *     language, review
@@ -97,15 +97,15 @@
     public static final String DB_NAME_REVIEW_ID = "REVIEW_ID";
     /** Db-name of LANGUAGE_ID. PK : INTEGER : NotNull : FK to LANGUAGE */
     public static final String DB_NAME_LANGUAGE_ID = "LANGUAGE_ID";
-    /** Db-name of REVIEW_TEXT. LONG VARCHAR(32700) : NotNull */
-    public static final String DB_NAME_REVIEW_TEXT = "REVIEW_TEXT";
+    /** Db-name of COMMENT. LONG VARCHAR(32700) : NotNull */
+    public static final String DB_NAME_COMMENT = "COMMENT";
 
     /** @deprecated Deprecated! So use DB_NAME_ReviewId. */
     public static final String COLUMN_DB_NAME_OF_ReviewId = "REVIEW_ID";
     /** @deprecated Deprecated! So use DB_NAME_LanguageId. */
     public static final String COLUMN_DB_NAME_OF_LanguageId = "LANGUAGE_ID";
-    /** @deprecated Deprecated! So use DB_NAME_ReviewText. */
-    public static final String COLUMN_DB_NAME_OF_ReviewText = "REVIEW_TEXT";
+    /** @deprecated Deprecated! So use DB_NAME_Comment. */
+    public static final String COLUMN_DB_NAME_OF_Comment = "COMMENT";
 
     // -----------------------------------------------------
     //                       Column Prop-Name(JavaBeansRule)
@@ -114,8 +114,8 @@
     public static final String PROPERTY_NAME_reviewId = "reviewId";
     /** Prop-name(JavaBeansRule) of languageId. PK : INTEGER : NotNull : FK to LANGUAGE */
     public static final String PROPERTY_NAME_languageId = "languageId";
-    /** Prop-name(JavaBeansRule) of reviewText. LONG VARCHAR(32700) : NotNull */
-    public static final String PROPERTY_NAME_reviewText = "reviewText";
+    /** Prop-name(JavaBeansRule) of comment. LONG VARCHAR(32700) : NotNull */
+    public static final String PROPERTY_NAME_comment = "comment";
 
     // -----------------------------------------------------
     //                                  Column Cap-Prop-Name
@@ -124,15 +124,15 @@
     public static final String CAP_PROP_NAME_ReviewId = "ReviewId";
     /** Cap-prop-name of languageId. PK : INTEGER : NotNull : FK to LANGUAGE */
     public static final String CAP_PROP_NAME_LanguageId = "LanguageId";
-    /** Cap-prop-name of reviewText. LONG VARCHAR(32700) : NotNull */
-    public static final String CAP_PROP_NAME_ReviewText = "ReviewText";
+    /** Cap-prop-name of comment. LONG VARCHAR(32700) : NotNull */
+    public static final String CAP_PROP_NAME_Comment = "Comment";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_ReviewId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_ReviewId = "ReviewId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_LanguageId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_LanguageId = "LanguageId";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_ReviewText. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_ReviewText = "ReviewText";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Comment. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Comment = "Comment";
 
     // -----------------------------------------------------
     //                                Column Uncap-Prop-Name
@@ -141,15 +141,15 @@
     public static final String UNCAP_PROP_NAME_reviewId = "reviewId";
     /** Uncap-prop-name of languageId. PK : INTEGER : NotNull : FK to LANGUAGE */
     public static final String UNCAP_PROP_NAME_languageId = "languageId";
-    /** Uncap-prop-name of reviewText. LONG VARCHAR(32700) : NotNull */
-    public static final String UNCAP_PROP_NAME_reviewText = "reviewText";
+    /** Uncap-prop-name of comment. LONG VARCHAR(32700) : NotNull */
+    public static final String UNCAP_PROP_NAME_comment = "comment";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ReviewId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_ReviewId = "reviewId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LanguageId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_LanguageId = "languageId";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ReviewText. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_ReviewText = "reviewText";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Comment. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Comment = "comment";
 
     // -----------------------------------------------------
     //                                          Foreign Name
@@ -184,7 +184,7 @@
 
         map.put(DB_NAME_REVIEW_ID.toLowerCase(), PROPERTY_NAME_reviewId);
         map.put(DB_NAME_LANGUAGE_ID.toLowerCase(), PROPERTY_NAME_languageId);
-        map.put(DB_NAME_REVIEW_TEXT.toLowerCase(), PROPERTY_NAME_reviewText);
+        map.put(DB_NAME_COMMENT.toLowerCase(), PROPERTY_NAME_comment);
 
         _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _dbNamePropertyNameKeyToLowerMap;
@@ -201,7 +201,7 @@
 
         map.put(PROPERTY_NAME_reviewId.toLowerCase(), DB_NAME_REVIEW_ID);
         map.put(PROPERTY_NAME_languageId.toLowerCase(), DB_NAME_LANGUAGE_ID);
-        map.put(PROPERTY_NAME_reviewText.toLowerCase(), DB_NAME_REVIEW_TEXT);
+        map.put(PROPERTY_NAME_comment.toLowerCase(), DB_NAME_COMMENT);
 
         _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _propertyNameDbNameKeyToLowerMap;
@@ -220,7 +220,7 @@
 
         map.put(DB_NAME_REVIEW_ID, CAP_PROP_NAME_ReviewId);
         map.put(DB_NAME_LANGUAGE_ID, CAP_PROP_NAME_LanguageId);
-        map.put(DB_NAME_REVIEW_TEXT, CAP_PROP_NAME_ReviewText);
+        map.put(DB_NAME_COMMENT, CAP_PROP_NAME_Comment);
 
         _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameCapPropNameMap;
@@ -239,7 +239,7 @@
 
         map.put(DB_NAME_REVIEW_ID, UNCAP_PROP_NAME_reviewId);
         map.put(DB_NAME_LANGUAGE_ID, UNCAP_PROP_NAME_languageId);
-        map.put(DB_NAME_REVIEW_TEXT, UNCAP_PROP_NAME_reviewText);
+        map.put(DB_NAME_COMMENT, UNCAP_PROP_NAME_comment);
 
         _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameUncapPropNameMap;
@@ -258,7 +258,7 @@
 
         map.put(CAP_PROP_NAME_ReviewId, DB_NAME_REVIEW_ID);
         map.put(CAP_PROP_NAME_LanguageId, DB_NAME_LANGUAGE_ID);
-        map.put(CAP_PROP_NAME_ReviewText, DB_NAME_REVIEW_TEXT);
+        map.put(CAP_PROP_NAME_Comment, DB_NAME_COMMENT);
 
         _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameDbNameMap;
@@ -277,7 +277,7 @@
 
         map.put(CAP_PROP_NAME_ReviewId, UNCAP_PROP_NAME_reviewId);
         map.put(CAP_PROP_NAME_LanguageId, UNCAP_PROP_NAME_languageId);
-        map.put(CAP_PROP_NAME_ReviewText, UNCAP_PROP_NAME_reviewText);
+        map.put(CAP_PROP_NAME_Comment, UNCAP_PROP_NAME_comment);
 
         _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameUncapPropNameMap;
@@ -296,7 +296,7 @@
 
         map.put(UNCAP_PROP_NAME_reviewId, DB_NAME_REVIEW_ID);
         map.put(UNCAP_PROP_NAME_languageId, DB_NAME_LANGUAGE_ID);
-        map.put(UNCAP_PROP_NAME_reviewText, DB_NAME_REVIEW_TEXT);
+        map.put(UNCAP_PROP_NAME_comment, DB_NAME_COMMENT);
 
         _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameDbNameMap;
@@ -315,7 +315,7 @@
 
         map.put(UNCAP_PROP_NAME_reviewId, CAP_PROP_NAME_ReviewId);
         map.put(UNCAP_PROP_NAME_languageId, CAP_PROP_NAME_LanguageId);
-        map.put(UNCAP_PROP_NAME_reviewText, CAP_PROP_NAME_ReviewText);
+        map.put(UNCAP_PROP_NAME_comment, CAP_PROP_NAME_Comment);
 
         _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameCapPropNameMap;
@@ -526,7 +526,7 @@
         final java.util.List<ColumnInfo> columnInfoList = new java.util.ArrayList<ColumnInfo>();
         columnInfoList.add(columnReviewId());
         columnInfoList.add(columnLanguageId());
-        columnInfoList.add(columnReviewText());
+        columnInfoList.add(columnComment());
         return columnInfoList;
     }
 
@@ -582,7 +582,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT";
+        return "REVIEW_ID, LANGUAGE_ID, COMMENT";
     }
 
     /**
@@ -598,10 +598,10 @@
         return new ColumnInfo(this, "LANGUAGE_ID", "languageId", java.math.BigDecimal.class, true);
     }
     /**
-     * @return Column information of reviewText. (NotNull)
+     * @return Column information of comment. (NotNull)
      */
-    public ColumnInfo columnReviewText() {
-        return new ColumnInfo(this, "REVIEW_TEXT", "reviewText", String.class, false);
+    public ColumnInfo columnComment() {
+        return new ColumnInfo(this, "COMMENT", "comment", String.class, false);
     }
 
     // ===================================================================================
@@ -746,7 +746,7 @@
 
         public RelationTrace columnReviewId() { return fixTrace(_relationList, ReviewDescriptionDbm.getInstance().columnReviewId()); }
         public RelationTrace columnLanguageId() { return fixTrace(_relationList, ReviewDescriptionDbm.getInstance().columnLanguageId()); }
-        public RelationTrace columnReviewText() { return fixTrace(_relationList, ReviewDescriptionDbm.getInstance().columnReviewText()); }
+        public RelationTrace columnComment() { return fixTrace(_relationList, ReviewDescriptionDbm.getInstance().columnComment()); }
     }
 
     // ===================================================================================
@@ -821,7 +821,7 @@
 
         if (analyzer.init("REVIEW_ID", "reviewId", "reviewId")) { myEntity.setReviewId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("LANGUAGE_ID", "languageId", "languageId")) { myEntity.setLanguageId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("REVIEW_TEXT", "reviewText", "reviewText")) { myEntity.setReviewText(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("COMMENT", "comment", "comment")) { myEntity.setComment(analyzer.analyzeString(String.class)); };
 
     }
 
@@ -897,7 +897,7 @@
         final StringBuffer sb = new StringBuffer();
         helpAppendingColumnValueString(sb, delimiter, equal, "REVIEW_ID", myEntity.getReviewId());
         helpAppendingColumnValueString(sb, delimiter, equal, "LANGUAGE_ID", myEntity.getLanguageId());
-        helpAppendingColumnValueString(sb, delimiter, equal, "REVIEW_TEXT", myEntity.getReviewText());
+        helpAppendingColumnValueString(sb, delimiter, equal, "COMMENT", myEntity.getComment());
 
         sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
         return sb.toString();
@@ -954,7 +954,7 @@
         final java.util.Map<String, Object> valueMap = new java.util.LinkedHashMap<String, Object>();
         valueMap.put("REVIEW_ID", myEntity.getReviewId());
         valueMap.put("LANGUAGE_ID", myEntity.getLanguageId());
-        valueMap.put("REVIEW_TEXT", myEntity.getReviewText());
+        valueMap.put("COMMENT", myEntity.getComment());
         return valueMap;
     }
 
@@ -979,7 +979,7 @@
         final java.util.Map<String, String> valueMap = new java.util.LinkedHashMap<String, String>();
         valueMap.put("REVIEW_ID", helpGettingColumnStringValue(myEntity.getReviewId()));
         valueMap.put("LANGUAGE_ID", helpGettingColumnStringValue(myEntity.getLanguageId()));
-        valueMap.put("REVIEW_TEXT", helpGettingColumnStringValue(myEntity.getReviewText()));
+        valueMap.put("COMMENT", helpGettingColumnStringValue(myEntity.getComment()));
         return valueMap;
     }
 
@@ -1004,9 +1004,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "REVIEW_DESCRIPTION(REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT) values(? , ? , ? )";
+            return "insert into " + tablePrefix + "REVIEW_DESCRIPTION(REVIEW_ID, LANGUAGE_ID, COMMENT) values(? , ? , ? )";
         }
-        return "insert into REVIEW_DESCRIPTION(REVIEW_ID, LANGUAGE_ID, REVIEW_TEXT) values(? , ? , ? )";
+        return "insert into REVIEW_DESCRIPTION(REVIEW_ID, LANGUAGE_ID, COMMENT) values(? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCommentCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCommentCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCommentCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -316,149 +316,149 @@
 
     abstract protected ConditionValue getCValueTitle();
       
-    /** Column db name of text. */
-    protected static final String COL_TEXT = "TEXT";
+    /** Column db name of comment. */
+    protected static final String COL_COMMENT = "COMMENT";
 
-    /** Column java name of text. */
-    protected static final String J_Text = "Text";
+    /** Column java name of comment. */
+    protected static final String J_Comment = "Comment";
 
-    /** Column uncapitalised java name of text. */
-    protected static final String UJ_text = "text";
+    /** Column uncapitalised java name of comment. */
+    protected static final String UJ_comment = "comment";
     
     /**
-     * Set the value of text using equal. { = }
+     * Set the value of comment using equal. { = }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as equal.
+     * @param comment The value of comment as equal.
      */
-    public void setText_Equal(String text) {
-        registerText(ConditionKey.CK_EQUAL, filterRemoveEmptyString(text));
+    public void setComment_Equal(String comment) {
+        registerComment(ConditionKey.CK_EQUAL, filterRemoveEmptyString(comment));
     }
                   
     /**
-     * Set the value of text using notEqual. { != }
+     * Set the value of comment using notEqual. { != }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as notEqual.
+     * @param comment The value of comment as notEqual.
      */
-    public void setText_NotEqual(String text) {
-        registerText(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(text));
+    public void setComment_NotEqual(String comment) {
+        registerComment(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of text using greaterThan. { &gt; }
+     * Set the value of comment using greaterThan. { &gt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as greaterThan.
+     * @param comment The value of comment as greaterThan.
      */
-    public void setText_GreaterThan(String text) {
-        registerText(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(text));
+    public void setComment_GreaterThan(String comment) {
+        registerComment(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of text using lessThan. { &lt; }
+     * Set the value of comment using lessThan. { &lt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as lessThan.
+     * @param comment The value of comment as lessThan.
      */
-    public void setText_LessThan(String text) {
-        registerText(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(text));
+    public void setComment_LessThan(String comment) {
+        registerComment(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of text using greaterEqual. { &gt;= }
+     * Set the value of comment using greaterEqual. { &gt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as greaterEqual.
+     * @param comment The value of comment as greaterEqual.
      */
-    public void setText_GreaterEqual(String text) {
-        registerText(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(text));
+    public void setComment_GreaterEqual(String comment) {
+        registerComment(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of text using lessEqual. { &lt;= }
+     * Set the value of comment using lessEqual. { &lt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as lessEqual.
+     * @param comment The value of comment as lessEqual.
      */
-    public void setText_LessEqual(String text) {
-        registerText(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(text));
+    public void setComment_LessEqual(String comment) {
+        registerComment(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of text using prefixSearch. { like 'xxx%' }
+     * Set the value of comment using prefixSearch. { like 'xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param text The value of text as prefixSearch.
+     * @param comment The value of comment as prefixSearch.
      */
-    public void setText_PrefixSearch(String text) {
-        registerText(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(text));
+    public void setComment_PrefixSearch(String comment) {
+        registerComment(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of text using likeSearch. { like '%xxx%' }
+     * Set the value of comment using likeSearch. { like '%xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * You can invoke this method several times and the conditions are set up.
      * 
-     * @param text The value of text as likeSearch.
+     * @param comment The value of comment as likeSearch.
      * @param likeSearchOption The option of like-search. (NotNull)
      */
-    public void setText_LikeSearch(String text, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
-        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(text), getCValueText(), COL_TEXT, J_Text, UJ_text, likeSearchOption);
+    public void setComment_LikeSearch(String comment, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(comment), getCValueComment(), COL_COMMENT, J_Comment, UJ_comment, likeSearchOption);
     }
             
     /**
-     * Set the value of text using inScope. { in ('a', 'b') }
+     * Set the value of comment using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param textList The value of text as inScope.
+     * @param commentList The value of comment as inScope.
      */
-    public void setText_InScope(java.util.List<String> textList) {
-        registerText(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(textList));
+    public void setComment_InScope(java.util.List<String> commentList) {
+        registerComment(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(commentList));
     }
 
     /**
-     * Set the value of text using inScope. { in ('a', 'b') }
+     * Set the value of comment using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param text The value of text as inScope.
+     * @param comment The value of comment as inScope.
      * @param inScopeOption The option of in-scope. (NotNull)
      */
-    public void setText_InScope(String text, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
-        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(text), getCValueText(), COL_TEXT, J_Text, UJ_text, inScopeOption);
+    public void setComment_InScope(String comment, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(comment), getCValueComment(), COL_COMMENT, J_Comment, UJ_comment, inScopeOption);
     }
             
     /**
-     * Set the value of text using notInScope. { not in ('a', 'b') }
+     * Set the value of comment using notInScope. { not in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param textList The value of text as notInScope.
+     * @param commentList The value of comment as notInScope.
      */
-    public void setText_NotInScope(java.util.List<String> textList) {
-        registerText(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(textList));
+    public void setComment_NotInScope(java.util.List<String> commentList) {
+        registerComment(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(commentList));
     }
                                                     
     /**
-     * Register condition of text.
+     * Register condition of comment.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of text. (Nullable)
+     * @param value The value of comment. (Nullable)
      */
-    protected void registerText(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueText(), COL_TEXT, J_Text, UJ_text);
+    protected void registerComment(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueComment(), COL_COMMENT, J_Comment, UJ_comment);
     }
 
     /**
-     * Register inline condition of text.
+     * Register inline condition of comment.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of text. (Nullable)
+     * @param value The value of comment. (Nullable)
      */
-    protected void registerInlineText(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueText(), COL_TEXT, J_Text, UJ_text);
+    protected void registerInlineComment(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueComment(), COL_COMMENT, J_Comment, UJ_comment);
     }
 
-    abstract protected ConditionValue getCValueText();
+    abstract protected ConditionValue getCValueComment();
   
     // ===================================================================================
     //                                                                      Basic Override

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusHistoryCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusHistoryCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusHistoryCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -614,163 +614,163 @@
 
     abstract protected ConditionValue getCValueCustomerNotified();
       
-    /** Column db name of comments. */
-    protected static final String COL_COMMENTS = "COMMENTS";
+    /** Column db name of comment. */
+    protected static final String COL_COMMENT = "COMMENT";
 
-    /** Column java name of comments. */
-    protected static final String J_Comments = "Comments";
+    /** Column java name of comment. */
+    protected static final String J_Comment = "Comment";
 
-    /** Column uncapitalised java name of comments. */
-    protected static final String UJ_comments = "comments";
+    /** Column uncapitalised java name of comment. */
+    protected static final String UJ_comment = "comment";
     
     /**
-     * Set the value of comments using equal. { = }
+     * Set the value of comment using equal. { = }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as equal.
+     * @param comment The value of comment as equal.
      */
-    public void setComments_Equal(String comments) {
-        registerComments(ConditionKey.CK_EQUAL, filterRemoveEmptyString(comments));
+    public void setComment_Equal(String comment) {
+        registerComment(ConditionKey.CK_EQUAL, filterRemoveEmptyString(comment));
     }
                   
     /**
-     * Set the value of comments using notEqual. { != }
+     * Set the value of comment using notEqual. { != }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as notEqual.
+     * @param comment The value of comment as notEqual.
      */
-    public void setComments_NotEqual(String comments) {
-        registerComments(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(comments));
+    public void setComment_NotEqual(String comment) {
+        registerComment(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of comments using greaterThan. { &gt; }
+     * Set the value of comment using greaterThan. { &gt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as greaterThan.
+     * @param comment The value of comment as greaterThan.
      */
-    public void setComments_GreaterThan(String comments) {
-        registerComments(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(comments));
+    public void setComment_GreaterThan(String comment) {
+        registerComment(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of comments using lessThan. { &lt; }
+     * Set the value of comment using lessThan. { &lt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as lessThan.
+     * @param comment The value of comment as lessThan.
      */
-    public void setComments_LessThan(String comments) {
-        registerComments(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(comments));
+    public void setComment_LessThan(String comment) {
+        registerComment(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of comments using greaterEqual. { &gt;= }
+     * Set the value of comment using greaterEqual. { &gt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as greaterEqual.
+     * @param comment The value of comment as greaterEqual.
      */
-    public void setComments_GreaterEqual(String comments) {
-        registerComments(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(comments));
+    public void setComment_GreaterEqual(String comment) {
+        registerComment(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of comments using lessEqual. { &lt;= }
+     * Set the value of comment using lessEqual. { &lt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as lessEqual.
+     * @param comment The value of comment as lessEqual.
      */
-    public void setComments_LessEqual(String comments) {
-        registerComments(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(comments));
+    public void setComment_LessEqual(String comment) {
+        registerComment(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of comments using prefixSearch. { like 'xxx%' }
+     * Set the value of comment using prefixSearch. { like 'xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param comments The value of comments as prefixSearch.
+     * @param comment The value of comment as prefixSearch.
      */
-    public void setComments_PrefixSearch(String comments) {
-        registerComments(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(comments));
+    public void setComment_PrefixSearch(String comment) {
+        registerComment(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of comments using likeSearch. { like '%xxx%' }
+     * Set the value of comment using likeSearch. { like '%xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * You can invoke this method several times and the conditions are set up.
      * 
-     * @param comments The value of comments as likeSearch.
+     * @param comment The value of comment as likeSearch.
      * @param likeSearchOption The option of like-search. (NotNull)
      */
-    public void setComments_LikeSearch(String comments, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
-        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(comments), getCValueComments(), COL_COMMENTS, J_Comments, UJ_comments, likeSearchOption);
+    public void setComment_LikeSearch(String comment, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(comment), getCValueComment(), COL_COMMENT, J_Comment, UJ_comment, likeSearchOption);
     }
             
     /**
-     * Set the value of comments using inScope. { in ('a', 'b') }
+     * Set the value of comment using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param commentsList The value of comments as inScope.
+     * @param commentList The value of comment as inScope.
      */
-    public void setComments_InScope(java.util.List<String> commentsList) {
-        registerComments(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(commentsList));
+    public void setComment_InScope(java.util.List<String> commentList) {
+        registerComment(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(commentList));
     }
 
     /**
-     * Set the value of comments using inScope. { in ('a', 'b') }
+     * Set the value of comment using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param comments The value of comments as inScope.
+     * @param comment The value of comment as inScope.
      * @param inScopeOption The option of in-scope. (NotNull)
      */
-    public void setComments_InScope(String comments, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
-        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(comments), getCValueComments(), COL_COMMENTS, J_Comments, UJ_comments, inScopeOption);
+    public void setComment_InScope(String comment, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(comment), getCValueComment(), COL_COMMENT, J_Comment, UJ_comment, inScopeOption);
     }
             
     /**
-     * Set the value of comments using notInScope. { not in ('a', 'b') }
+     * Set the value of comment using notInScope. { not in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param commentsList The value of comments as notInScope.
+     * @param commentList The value of comment as notInScope.
      */
-    public void setComments_NotInScope(java.util.List<String> commentsList) {
-        registerComments(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(commentsList));
+    public void setComment_NotInScope(java.util.List<String> commentList) {
+        registerComment(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(commentList));
     }
                                                 
     /**
-     * Set the value of comments using isNull. { is null }
+     * Set the value of comment using isNull. { is null }
      */
-    public void setComments_IsNull() {
-        registerComments(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    public void setComment_IsNull() {
+        registerComment(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
     }
 
     /**
-     * Set the value of comments using isNotNull. { is not null }
+     * Set the value of comment using isNotNull. { is not null }
      */
-    public void setComments_IsNotNull() {
-        registerComments(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    public void setComment_IsNotNull() {
+        registerComment(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
     }
         
     /**
-     * Register condition of comments.
+     * Register condition of comment.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of comments. (Nullable)
+     * @param value The value of comment. (Nullable)
      */
-    protected void registerComments(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueComments(), COL_COMMENTS, J_Comments, UJ_comments);
+    protected void registerComment(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueComment(), COL_COMMENT, J_Comment, UJ_comment);
     }
 
     /**
-     * Register inline condition of comments.
+     * Register inline condition of comment.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of comments. (Nullable)
+     * @param value The value of comment. (Nullable)
      */
-    protected void registerInlineComments(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueComments(), COL_COMMENTS, J_Comments, UJ_comments);
+    protected void registerInlineComment(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueComment(), COL_COMMENT, J_Comment, UJ_comment);
     }
 
-    abstract protected ConditionValue getCValueComments();
+    abstract protected ConditionValue getCValueComment();
   
     // ===================================================================================
     //                                                                      Basic Override

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -529,6 +529,164 @@
 
     abstract protected ConditionValue getCValueProductId();
       
+    /** Column db name of model. */
+    protected static final String COL_MODEL = "MODEL";
+
+    /** Column java name of model. */
+    protected static final String J_Model = "Model";
+
+    /** Column uncapitalised java name of model. */
+    protected static final String UJ_model = "model";
+    
+    /**
+     * Set the value of model using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as equal.
+     */
+    public void setModel_Equal(String model) {
+        registerModel(ConditionKey.CK_EQUAL, filterRemoveEmptyString(model));
+    }
+                  
+    /**
+     * Set the value of model using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as notEqual.
+     */
+    public void setModel_NotEqual(String model) {
+        registerModel(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(model));
+    }
+            
+    /**
+     * Set the value of model using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as greaterThan.
+     */
+    public void setModel_GreaterThan(String model) {
+        registerModel(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(model));
+    }
+            
+    /**
+     * Set the value of model using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as lessThan.
+     */
+    public void setModel_LessThan(String model) {
+        registerModel(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(model));
+    }
+            
+    /**
+     * Set the value of model using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as greaterEqual.
+     */
+    public void setModel_GreaterEqual(String model) {
+        registerModel(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(model));
+    }
+            
+    /**
+     * Set the value of model using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as lessEqual.
+     */
+    public void setModel_LessEqual(String model) {
+        registerModel(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(model));
+    }
+            
+    /**
+     * Set the value of model using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param model The value of model as prefixSearch.
+     */
+    public void setModel_PrefixSearch(String model) {
+        registerModel(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(model));
+    }
+            
+    /**
+     * Set the value of model using likeSearch. { like '%xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * You can invoke this method several times and the conditions are set up.
+     * 
+     * @param model The value of model as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setModel_LikeSearch(String model, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(model), getCValueModel(), COL_MODEL, J_Model, UJ_model, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of model using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param modelList The value of model as inScope.
+     */
+    public void setModel_InScope(java.util.List<String> modelList) {
+        registerModel(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(modelList));
+    }
+
+    /**
+     * Set the value of model using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param model The value of model as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setModel_InScope(String model, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(model), getCValueModel(), COL_MODEL, J_Model, UJ_model, inScopeOption);
+    }
+            
+    /**
+     * Set the value of model using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param modelList The value of model as notInScope.
+     */
+    public void setModel_NotInScope(java.util.List<String> modelList) {
+        registerModel(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(modelList));
+    }
+                                                
+    /**
+     * Set the value of model using isNull. { is null }
+     */
+    public void setModel_IsNull() {
+        registerModel(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of model using isNotNull. { is not null }
+     */
+    public void setModel_IsNotNull() {
+        registerModel(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of model.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of model. (Nullable)
+     */
+    protected void registerModel(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueModel(), COL_MODEL, J_Model, UJ_model);
+    }
+
+    /**
+     * Register inline condition of model.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of model. (Nullable)
+     */
+    protected void registerInlineModel(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueModel(), COL_MODEL, J_Model, UJ_model);
+    }
+
+    abstract protected ConditionValue getCValueModel();
+      
     /** Column db name of quantity. */
     protected static final String COL_QUANTITY = "QUANTITY";
 
@@ -634,163 +792,387 @@
 
     abstract protected ConditionValue getCValueQuantity();
       
-    /** Column db name of model. */
-    protected static final String COL_MODEL = "MODEL";
+    /** Column db name of price. */
+    protected static final String COL_PRICE = "PRICE";
 
-    /** Column java name of model. */
-    protected static final String J_Model = "Model";
+    /** Column java name of price. */
+    protected static final String J_Price = "Price";
 
-    /** Column uncapitalised java name of model. */
-    protected static final String UJ_model = "model";
+    /** Column uncapitalised java name of price. */
+    protected static final String UJ_price = "price";
+            
+    /**
+     * Set the value of price using equal. { = }
+     * 
+     * @param price The value of price as equal.
+     */
+    public void setPrice_Equal(java.math.BigDecimal price) {
+        registerPrice(ConditionKey.CK_EQUAL, price);
+    }
+            
+    /**
+     * Set the value of price using notEqual. { != }
+     * 
+     * @param price The value of price as notEqual.
+     */
+    public void setPrice_NotEqual(java.math.BigDecimal price) {
+        registerPrice(ConditionKey.CK_NOT_EQUAL, price);
+    }
+            
+    /**
+     * Set the value of price using greaterThan. { &gt; }
+     * 
+     * @param price The value of price as greaterThan.
+     */
+    public void setPrice_GreaterThan(java.math.BigDecimal price) {
+        registerPrice(ConditionKey.CK_GREATER_THAN, price);
+    }
+            
+    /**
+     * Set the value of price using lessThan. { &lt; }
+     * 
+     * @param price The value of price as lessThan.
+     */
+    public void setPrice_LessThan(java.math.BigDecimal price) {
+        registerPrice(ConditionKey.CK_LESS_THAN, price);
+    }
+            
+    /**
+     * Set the value of price using greaterEqual. { &gt;= }
+     * 
+     * @param price The value of price as greaterEqual.
+     */
+    public void setPrice_GreaterEqual(java.math.BigDecimal price) {
+        registerPrice(ConditionKey.CK_GREATER_EQUAL, price);
+    }
+            
+    /**
+     * Set the value of price using lessEqual. { &lt;= }
+     * 
+     * @param price The value of price as lessEqual.
+     */
+    public void setPrice_LessEqual(java.math.BigDecimal price) {
+        registerPrice(ConditionKey.CK_LESS_EQUAL, price);
+    }
+                  
+    /**
+     * Set the value of price using inScope. { in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param priceList The value of price as inScope.
+     */
+    public void setPrice_InScope(java.util.List<java.math.BigDecimal> priceList) {
+        registerPrice(ConditionKey.CK_IN_SCOPE, priceList);
+    }
+            
+    /**
+     * Set the value of price using notInScope. { not in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param priceList The value of price as notInScope.
+     */
+    public void setPrice_NotInScope(java.util.List<java.math.BigDecimal> priceList) {
+        registerPrice(ConditionKey.CK_NOT_IN_SCOPE, priceList);
+    }
+                                                
+    /**
+     * Register condition of price.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of price. (Nullable)
+     */
+    protected void registerPrice(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValuePrice(), COL_PRICE, J_Price, UJ_price);
+    }
+
+    /**
+     * Register inline condition of price.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of price. (Nullable)
+     */
+    protected void registerInlinePrice(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValuePrice(), COL_PRICE, J_Price, UJ_price);
+    }
+
+    abstract protected ConditionValue getCValuePrice();
+      
+    /** Column db name of weight. */
+    protected static final String COL_WEIGHT = "WEIGHT";
+
+    /** Column java name of weight. */
+    protected static final String J_Weight = "Weight";
+
+    /** Column uncapitalised java name of weight. */
+    protected static final String UJ_weight = "weight";
+            
+    /**
+     * Set the value of weight using equal. { = }
+     * 
+     * @param weight The value of weight as equal.
+     */
+    public void setWeight_Equal(java.math.BigDecimal weight) {
+        registerWeight(ConditionKey.CK_EQUAL, weight);
+    }
+            
+    /**
+     * Set the value of weight using notEqual. { != }
+     * 
+     * @param weight The value of weight as notEqual.
+     */
+    public void setWeight_NotEqual(java.math.BigDecimal weight) {
+        registerWeight(ConditionKey.CK_NOT_EQUAL, weight);
+    }
+            
+    /**
+     * Set the value of weight using greaterThan. { &gt; }
+     * 
+     * @param weight The value of weight as greaterThan.
+     */
+    public void setWeight_GreaterThan(java.math.BigDecimal weight) {
+        registerWeight(ConditionKey.CK_GREATER_THAN, weight);
+    }
+            
+    /**
+     * Set the value of weight using lessThan. { &lt; }
+     * 
+     * @param weight The value of weight as lessThan.
+     */
+    public void setWeight_LessThan(java.math.BigDecimal weight) {
+        registerWeight(ConditionKey.CK_LESS_THAN, weight);
+    }
+            
+    /**
+     * Set the value of weight using greaterEqual. { &gt;= }
+     * 
+     * @param weight The value of weight as greaterEqual.
+     */
+    public void setWeight_GreaterEqual(java.math.BigDecimal weight) {
+        registerWeight(ConditionKey.CK_GREATER_EQUAL, weight);
+    }
+            
+    /**
+     * Set the value of weight using lessEqual. { &lt;= }
+     * 
+     * @param weight The value of weight as lessEqual.
+     */
+    public void setWeight_LessEqual(java.math.BigDecimal weight) {
+        registerWeight(ConditionKey.CK_LESS_EQUAL, weight);
+    }
+                  
+    /**
+     * Set the value of weight using inScope. { in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param weightList The value of weight as inScope.
+     */
+    public void setWeight_InScope(java.util.List<java.math.BigDecimal> weightList) {
+        registerWeight(ConditionKey.CK_IN_SCOPE, weightList);
+    }
+            
+    /**
+     * Set the value of weight using notInScope. { not in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param weightList The value of weight as notInScope.
+     */
+    public void setWeight_NotInScope(java.util.List<java.math.BigDecimal> weightList) {
+        registerWeight(ConditionKey.CK_NOT_IN_SCOPE, weightList);
+    }
+                                            
+    /**
+     * Set the value of weight using isNull. { is null }
+     */
+    public void setWeight_IsNull() {
+        registerWeight(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of weight using isNotNull. { is not null }
+     */
+    public void setWeight_IsNotNull() {
+        registerWeight(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of weight.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of weight. (Nullable)
+     */
+    protected void registerWeight(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueWeight(), COL_WEIGHT, J_Weight, UJ_weight);
+    }
+
+    /**
+     * Register inline condition of weight.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of weight. (Nullable)
+     */
+    protected void registerInlineWeight(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueWeight(), COL_WEIGHT, J_Weight, UJ_weight);
+    }
+
+    abstract protected ConditionValue getCValueWeight();
+      
+    /** Column db name of image. */
+    protected static final String COL_IMAGE = "IMAGE";
+
+    /** Column java name of image. */
+    protected static final String J_Image = "Image";
+
+    /** Column uncapitalised java name of image. */
+    protected static final String UJ_image = "image";
     
     /**
-     * Set the value of model using equal. { = }
+     * Set the value of image using equal. { = }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as equal.
+     * @param image The value of image as equal.
      */
-    public void setModel_Equal(String model) {
-        registerModel(ConditionKey.CK_EQUAL, filterRemoveEmptyString(model));
+    public void setImage_Equal(String image) {
+        registerImage(ConditionKey.CK_EQUAL, filterRemoveEmptyString(image));
     }
                   
     /**
-     * Set the value of model using notEqual. { != }
+     * Set the value of image using notEqual. { != }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as notEqual.
+     * @param image The value of image as notEqual.
      */
-    public void setModel_NotEqual(String model) {
-        registerModel(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(model));
+    public void setImage_NotEqual(String image) {
+        registerImage(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(image));
     }
             
     /**
-     * Set the value of model using greaterThan. { &gt; }
+     * Set the value of image using greaterThan. { &gt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as greaterThan.
+     * @param image The value of image as greaterThan.
      */
-    public void setModel_GreaterThan(String model) {
-        registerModel(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(model));
+    public void setImage_GreaterThan(String image) {
+        registerImage(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(image));
     }
             
     /**
-     * Set the value of model using lessThan. { &lt; }
+     * Set the value of image using lessThan. { &lt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as lessThan.
+     * @param image The value of image as lessThan.
      */
-    public void setModel_LessThan(String model) {
-        registerModel(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(model));
+    public void setImage_LessThan(String image) {
+        registerImage(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(image));
     }
             
     /**
-     * Set the value of model using greaterEqual. { &gt;= }
+     * Set the value of image using greaterEqual. { &gt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as greaterEqual.
+     * @param image The value of image as greaterEqual.
      */
-    public void setModel_GreaterEqual(String model) {
-        registerModel(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(model));
+    public void setImage_GreaterEqual(String image) {
+        registerImage(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(image));
     }
             
     /**
-     * Set the value of model using lessEqual. { &lt;= }
+     * Set the value of image using lessEqual. { &lt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as lessEqual.
+     * @param image The value of image as lessEqual.
      */
-    public void setModel_LessEqual(String model) {
-        registerModel(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(model));
+    public void setImage_LessEqual(String image) {
+        registerImage(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(image));
     }
             
     /**
-     * Set the value of model using prefixSearch. { like 'xxx%' }
+     * Set the value of image using prefixSearch. { like 'xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param model The value of model as prefixSearch.
+     * @param image The value of image as prefixSearch.
      */
-    public void setModel_PrefixSearch(String model) {
-        registerModel(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(model));
+    public void setImage_PrefixSearch(String image) {
+        registerImage(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(image));
     }
             
     /**
-     * Set the value of model using likeSearch. { like '%xxx%' }
+     * Set the value of image using likeSearch. { like '%xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * You can invoke this method several times and the conditions are set up.
      * 
-     * @param model The value of model as likeSearch.
+     * @param image The value of image as likeSearch.
      * @param likeSearchOption The option of like-search. (NotNull)
      */
-    public void setModel_LikeSearch(String model, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
-        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(model), getCValueModel(), COL_MODEL, J_Model, UJ_model, likeSearchOption);
+    public void setImage_LikeSearch(String image, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(image), getCValueImage(), COL_IMAGE, J_Image, UJ_image, likeSearchOption);
     }
             
     /**
-     * Set the value of model using inScope. { in ('a', 'b') }
+     * Set the value of image using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param modelList The value of model as inScope.
+     * @param imageList The value of image as inScope.
      */
-    public void setModel_InScope(java.util.List<String> modelList) {
-        registerModel(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(modelList));
+    public void setImage_InScope(java.util.List<String> imageList) {
+        registerImage(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(imageList));
     }
 
     /**
-     * Set the value of model using inScope. { in ('a', 'b') }
+     * Set the value of image using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param model The value of model as inScope.
+     * @param image The value of image as inScope.
      * @param inScopeOption The option of in-scope. (NotNull)
      */
-    public void setModel_InScope(String model, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
-        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(model), getCValueModel(), COL_MODEL, J_Model, UJ_model, inScopeOption);
+    public void setImage_InScope(String image, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(image), getCValueImage(), COL_IMAGE, J_Image, UJ_image, inScopeOption);
     }
             
     /**
-     * Set the value of model using notInScope. { not in ('a', 'b') }
+     * Set the value of image using notInScope. { not in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param modelList The value of model as notInScope.
+     * @param imageList The value of image as notInScope.
      */
-    public void setModel_NotInScope(java.util.List<String> modelList) {
-        registerModel(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(modelList));
+    public void setImage_NotInScope(java.util.List<String> imageList) {
+        registerImage(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(imageList));
     }
                                                 
     /**
-     * Set the value of model using isNull. { is null }
+     * Set the value of image using isNull. { is null }
      */
-    public void setModel_IsNull() {
-        registerModel(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    public void setImage_IsNull() {
+        registerImage(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
     }
 
     /**
-     * Set the value of model using isNotNull. { is not null }
+     * Set the value of image using isNotNull. { is not null }
      */
-    public void setModel_IsNotNull() {
-        registerModel(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    public void setImage_IsNotNull() {
+        registerImage(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
     }
         
     /**
-     * Register condition of model.
+     * Register condition of image.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of model. (Nullable)
+     * @param value The value of image. (Nullable)
      */
-    protected void registerModel(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueModel(), COL_MODEL, J_Model, UJ_model);
+    protected void registerImage(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueImage(), COL_IMAGE, J_Image, UJ_image);
     }
 
     /**
-     * Register inline condition of model.
+     * Register inline condition of image.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of model. (Nullable)
+     * @param value The value of image. (Nullable)
      */
-    protected void registerInlineModel(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueModel(), COL_MODEL, J_Model, UJ_model);
+    protected void registerInlineImage(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueImage(), COL_IMAGE, J_Image, UJ_image);
     }
 
-    abstract protected ConditionValue getCValueModel();
+    abstract protected ConditionValue getCValueImage();
       
     /** Column db name of thumbnail. */
     protected static final String COL_THUMBNAIL = "THUMBNAIL";
@@ -950,268 +1332,334 @@
 
     abstract protected ConditionValue getCValueThumbnail();
       
-    /** Column db name of image. */
-    protected static final String COL_IMAGE = "IMAGE";
+    /** Column db name of stock. */
+    protected static final String COL_STOCK = "STOCK";
 
-    /** Column java name of image. */
-    protected static final String J_Image = "Image";
+    /** Column java name of stock. */
+    protected static final String J_Stock = "Stock";
 
-    /** Column uncapitalised java name of image. */
-    protected static final String UJ_image = "image";
-    
+    /** Column uncapitalised java name of stock. */
+    protected static final String UJ_stock = "stock";
+            
     /**
-     * Set the value of image using equal. { = }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using equal. { = }
      * 
-     * @param image The value of image as equal.
+     * @param stock The value of stock as equal.
      */
-    public void setImage_Equal(String image) {
-        registerImage(ConditionKey.CK_EQUAL, filterRemoveEmptyString(image));
+    public void setStock_Equal(java.math.BigDecimal stock) {
+        registerStock(ConditionKey.CK_EQUAL, stock);
     }
-                  
+            
     /**
-     * Set the value of image using notEqual. { != }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using notEqual. { != }
      * 
-     * @param image The value of image as notEqual.
+     * @param stock The value of stock as notEqual.
      */
-    public void setImage_NotEqual(String image) {
-        registerImage(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(image));
+    public void setStock_NotEqual(java.math.BigDecimal stock) {
+        registerStock(ConditionKey.CK_NOT_EQUAL, stock);
     }
             
     /**
-     * Set the value of image using greaterThan. { &gt; }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using greaterThan. { &gt; }
      * 
-     * @param image The value of image as greaterThan.
+     * @param stock The value of stock as greaterThan.
      */
-    public void setImage_GreaterThan(String image) {
-        registerImage(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(image));
+    public void setStock_GreaterThan(java.math.BigDecimal stock) {
+        registerStock(ConditionKey.CK_GREATER_THAN, stock);
     }
             
     /**
-     * Set the value of image using lessThan. { &lt; }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using lessThan. { &lt; }
      * 
-     * @param image The value of image as lessThan.
+     * @param stock The value of stock as lessThan.
      */
-    public void setImage_LessThan(String image) {
-        registerImage(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(image));
+    public void setStock_LessThan(java.math.BigDecimal stock) {
+        registerStock(ConditionKey.CK_LESS_THAN, stock);
     }
             
     /**
-     * Set the value of image using greaterEqual. { &gt;= }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using greaterEqual. { &gt;= }
      * 
-     * @param image The value of image as greaterEqual.
+     * @param stock The value of stock as greaterEqual.
      */
-    public void setImage_GreaterEqual(String image) {
-        registerImage(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(image));
+    public void setStock_GreaterEqual(java.math.BigDecimal stock) {
+        registerStock(ConditionKey.CK_GREATER_EQUAL, stock);
     }
             
     /**
-     * Set the value of image using lessEqual. { &lt;= }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using lessEqual. { &lt;= }
      * 
-     * @param image The value of image as lessEqual.
+     * @param stock The value of stock as lessEqual.
      */
-    public void setImage_LessEqual(String image) {
-        registerImage(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(image));
+    public void setStock_LessEqual(java.math.BigDecimal stock) {
+        registerStock(ConditionKey.CK_LESS_EQUAL, stock);
     }
+                  
+    /**
+     * Set the value of stock using inScope. { in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param stockList The value of stock as inScope.
+     */
+    public void setStock_InScope(java.util.List<java.math.BigDecimal> stockList) {
+        registerStock(ConditionKey.CK_IN_SCOPE, stockList);
+    }
             
     /**
-     * Set the value of image using prefixSearch. { like 'xxx%' }
-     * If the value is null or empty-string, this condition is ignored.
+     * Set the value of stock using notInScope. { not in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param image The value of image as prefixSearch.
+     * @param stockList The value of stock as notInScope.
      */
-    public void setImage_PrefixSearch(String image) {
-        registerImage(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(image));
+    public void setStock_NotInScope(java.util.List<java.math.BigDecimal> stockList) {
+        registerStock(ConditionKey.CK_NOT_IN_SCOPE, stockList);
     }
+                                            
+    /**
+     * Set the value of stock using isNull. { is null }
+     */
+    public void setStock_IsNull() {
+        registerStock(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of stock using isNotNull. { is not null }
+     */
+    public void setStock_IsNotNull() {
+        registerStock(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of stock.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of stock. (Nullable)
+     */
+    protected void registerStock(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueStock(), COL_STOCK, J_Stock, UJ_stock);
+    }
+
+    /**
+     * Register inline condition of stock.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of stock. (Nullable)
+     */
+    protected void registerInlineStock(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueStock(), COL_STOCK, J_Stock, UJ_stock);
+    }
+
+    abstract protected ConditionValue getCValueStock();
+      
+    /** Column db name of ordered. */
+    protected static final String COL_ORDERED = "ORDERED";
+
+    /** Column java name of ordered. */
+    protected static final String J_Ordered = "Ordered";
+
+    /** Column uncapitalised java name of ordered. */
+    protected static final String UJ_ordered = "ordered";
             
     /**
-     * Set the value of image using likeSearch. { like '%xxx%' }
-     * If the value is null or empty-string, this condition is ignored.
-     * You can invoke this method several times and the conditions are set up.
+     * Set the value of ordered using equal. { = }
      * 
-     * @param image The value of image as likeSearch.
-     * @param likeSearchOption The option of like-search. (NotNull)
+     * @param ordered The value of ordered as equal.
      */
-    public void setImage_LikeSearch(String image, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
-        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(image), getCValueImage(), COL_IMAGE, J_Image, UJ_image, likeSearchOption);
+    public void setOrdered_Equal(java.math.BigDecimal ordered) {
+        registerOrdered(ConditionKey.CK_EQUAL, ordered);
     }
             
     /**
-     * Set the value of image using inScope. { in ('a', 'b') }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * Set the value of ordered using notEqual. { != }
      * 
-     * @param imageList The value of image as inScope.
+     * @param ordered The value of ordered as notEqual.
      */
-    public void setImage_InScope(java.util.List<String> imageList) {
-        registerImage(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(imageList));
+    public void setOrdered_NotEqual(java.math.BigDecimal ordered) {
+        registerOrdered(ConditionKey.CK_NOT_EQUAL, ordered);
     }
-
+            
     /**
-     * Set the value of image using inScope. { in ('a', 'b') }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * Set the value of ordered using greaterThan. { &gt; }
      * 
-     * @param image The value of image as inScope.
-     * @param inScopeOption The option of in-scope. (NotNull)
+     * @param ordered The value of ordered as greaterThan.
      */
-    public void setImage_InScope(String image, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
-        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(image), getCValueImage(), COL_IMAGE, J_Image, UJ_image, inScopeOption);
+    public void setOrdered_GreaterThan(java.math.BigDecimal ordered) {
+        registerOrdered(ConditionKey.CK_GREATER_THAN, ordered);
     }
             
     /**
-     * Set the value of image using notInScope. { not in ('a', 'b') }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * Set the value of ordered using lessThan. { &lt; }
      * 
-     * @param imageList The value of image as notInScope.
+     * @param ordered The value of ordered as lessThan.
      */
-    public void setImage_NotInScope(java.util.List<String> imageList) {
-        registerImage(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(imageList));
+    public void setOrdered_LessThan(java.math.BigDecimal ordered) {
+        registerOrdered(ConditionKey.CK_LESS_THAN, ordered);
     }
-                                                
+            
     /**
-     * Set the value of image using isNull. { is null }
+     * Set the value of ordered using greaterEqual. { &gt;= }
+     * 
+     * @param ordered The value of ordered as greaterEqual.
      */
-    public void setImage_IsNull() {
-        registerImage(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    public void setOrdered_GreaterEqual(java.math.BigDecimal ordered) {
+        registerOrdered(ConditionKey.CK_GREATER_EQUAL, ordered);
     }
-
+            
     /**
-     * Set the value of image using isNotNull. { is not null }
+     * Set the value of ordered using lessEqual. { &lt;= }
+     * 
+     * @param ordered The value of ordered as lessEqual.
      */
-    public void setImage_IsNotNull() {
-        registerImage(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    public void setOrdered_LessEqual(java.math.BigDecimal ordered) {
+        registerOrdered(ConditionKey.CK_LESS_EQUAL, ordered);
     }
-        
+                  
     /**
-     * Register condition of image.
+     * Set the value of ordered using inScope. { in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
+     * @param orderedList The value of ordered as inScope.
+     */
+    public void setOrdered_InScope(java.util.List<java.math.BigDecimal> orderedList) {
+        registerOrdered(ConditionKey.CK_IN_SCOPE, orderedList);
+    }
+            
+    /**
+     * Set the value of ordered using notInScope. { not in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param orderedList The value of ordered as notInScope.
+     */
+    public void setOrdered_NotInScope(java.util.List<java.math.BigDecimal> orderedList) {
+        registerOrdered(ConditionKey.CK_NOT_IN_SCOPE, orderedList);
+    }
+                                                
+    /**
+     * Register condition of ordered.
+     * 
      * @param key Condition key. (NotNull)
-     * @param value The value of image. (Nullable)
+     * @param value The value of ordered. (Nullable)
      */
-    protected void registerImage(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueImage(), COL_IMAGE, J_Image, UJ_image);
+    protected void registerOrdered(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueOrdered(), COL_ORDERED, J_Ordered, UJ_ordered);
     }
 
     /**
-     * Register inline condition of image.
+     * Register inline condition of ordered.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of image. (Nullable)
+     * @param value The value of ordered. (Nullable)
      */
-    protected void registerInlineImage(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueImage(), COL_IMAGE, J_Image, UJ_image);
+    protected void registerInlineOrdered(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueOrdered(), COL_ORDERED, J_Ordered, UJ_ordered);
     }
 
-    abstract protected ConditionValue getCValueImage();
+    abstract protected ConditionValue getCValueOrdered();
       
-    /** Column db name of price. */
-    protected static final String COL_PRICE = "PRICE";
+    /** Column db name of status. */
+    protected static final String COL_STATUS = "STATUS";
 
-    /** Column java name of price. */
-    protected static final String J_Price = "Price";
+    /** Column java name of status. */
+    protected static final String J_Status = "Status";
 
-    /** Column uncapitalised java name of price. */
-    protected static final String UJ_price = "price";
+    /** Column uncapitalised java name of status. */
+    protected static final String UJ_status = "status";
             
     /**
-     * Set the value of price using equal. { = }
+     * Set the value of status using equal. { = }
      * 
-     * @param price The value of price as equal.
+     * @param status The value of status as equal.
      */
-    public void setPrice_Equal(java.math.BigDecimal price) {
-        registerPrice(ConditionKey.CK_EQUAL, price);
+    public void setStatus_Equal(java.math.BigDecimal status) {
+        registerStatus(ConditionKey.CK_EQUAL, status);
     }
             
     /**
-     * Set the value of price using notEqual. { != }
+     * Set the value of status using notEqual. { != }
      * 
-     * @param price The value of price as notEqual.
+     * @param status The value of status as notEqual.
      */
-    public void setPrice_NotEqual(java.math.BigDecimal price) {
-        registerPrice(ConditionKey.CK_NOT_EQUAL, price);
+    public void setStatus_NotEqual(java.math.BigDecimal status) {
+        registerStatus(ConditionKey.CK_NOT_EQUAL, status);
     }
             
     /**
-     * Set the value of price using greaterThan. { &gt; }
+     * Set the value of status using greaterThan. { &gt; }
      * 
-     * @param price The value of price as greaterThan.
+     * @param status The value of status as greaterThan.
      */
-    public void setPrice_GreaterThan(java.math.BigDecimal price) {
-        registerPrice(ConditionKey.CK_GREATER_THAN, price);
+    public void setStatus_GreaterThan(java.math.BigDecimal status) {
+        registerStatus(ConditionKey.CK_GREATER_THAN, status);
     }
             
     /**
-     * Set the value of price using lessThan. { &lt; }
+     * Set the value of status using lessThan. { &lt; }
      * 
-     * @param price The value of price as lessThan.
+     * @param status The value of status as lessThan.
      */
-    public void setPrice_LessThan(java.math.BigDecimal price) {
-        registerPrice(ConditionKey.CK_LESS_THAN, price);
+    public void setStatus_LessThan(java.math.BigDecimal status) {
+        registerStatus(ConditionKey.CK_LESS_THAN, status);
     }
             
     /**
-     * Set the value of price using greaterEqual. { &gt;= }
+     * Set the value of status using greaterEqual. { &gt;= }
      * 
-     * @param price The value of price as greaterEqual.
+     * @param status The value of status as greaterEqual.
      */
-    public void setPrice_GreaterEqual(java.math.BigDecimal price) {
-        registerPrice(ConditionKey.CK_GREATER_EQUAL, price);
+    public void setStatus_GreaterEqual(java.math.BigDecimal status) {
+        registerStatus(ConditionKey.CK_GREATER_EQUAL, status);
     }
             
     /**
-     * Set the value of price using lessEqual. { &lt;= }
+     * Set the value of status using lessEqual. { &lt;= }
      * 
-     * @param price The value of price as lessEqual.
+     * @param status The value of status as lessEqual.
      */
-    public void setPrice_LessEqual(java.math.BigDecimal price) {
-        registerPrice(ConditionKey.CK_LESS_EQUAL, price);
+    public void setStatus_LessEqual(java.math.BigDecimal status) {
+        registerStatus(ConditionKey.CK_LESS_EQUAL, status);
     }
                   
     /**
-     * Set the value of price using inScope. { in (a, b) }
+     * Set the value of status using inScope. { in (a, b) }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param priceList The value of price as inScope.
+     * @param statusList The value of status as inScope.
      */
-    public void setPrice_InScope(java.util.List<java.math.BigDecimal> priceList) {
-        registerPrice(ConditionKey.CK_IN_SCOPE, priceList);
+    public void setStatus_InScope(java.util.List<java.math.BigDecimal> statusList) {
+        registerStatus(ConditionKey.CK_IN_SCOPE, statusList);
     }
             
     /**
-     * Set the value of price using notInScope. { not in (a, b) }
+     * Set the value of status using notInScope. { not in (a, b) }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param priceList The value of price as notInScope.
+     * @param statusList The value of status as notInScope.
      */
-    public void setPrice_NotInScope(java.util.List<java.math.BigDecimal> priceList) {
-        registerPrice(ConditionKey.CK_NOT_IN_SCOPE, priceList);
+    public void setStatus_NotInScope(java.util.List<java.math.BigDecimal> statusList) {
+        registerStatus(ConditionKey.CK_NOT_IN_SCOPE, statusList);
     }
                                                 
     /**
-     * Register condition of price.
+     * Register condition of status.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of price. (Nullable)
+     * @param value The value of status. (Nullable)
      */
-    protected void registerPrice(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValuePrice(), COL_PRICE, J_Price, UJ_price);
+    protected void registerStatus(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueStatus(), COL_STATUS, J_Status, UJ_status);
     }
 
     /**
-     * Register inline condition of price.
+     * Register inline condition of status.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of price. (Nullable)
+     * @param value The value of status. (Nullable)
      */
-    protected void registerInlinePrice(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValuePrice(), COL_PRICE, J_Price, UJ_price);
+    protected void registerInlineStatus(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueStatus(), COL_STATUS, J_Status, UJ_status);
     }
 
-    abstract protected ConditionValue getCValuePrice();
+    abstract protected ConditionValue getCValueStatus();
       
     /** Column db name of dateAdded. */
     protected static final String COL_DATE_ADDED = "DATE_ADDED";
@@ -1529,216 +1977,6 @@
 
     abstract protected ConditionValue getCValueDateAvailable();
       
-    /** Column db name of weight. */
-    protected static final String COL_WEIGHT = "WEIGHT";
-
-    /** Column java name of weight. */
-    protected static final String J_Weight = "Weight";
-
-    /** Column uncapitalised java name of weight. */
-    protected static final String UJ_weight = "weight";
-            
-    /**
-     * Set the value of weight using equal. { = }
-     * 
-     * @param weight The value of weight as equal.
-     */
-    public void setWeight_Equal(java.math.BigDecimal weight) {
-        registerWeight(ConditionKey.CK_EQUAL, weight);
-    }
-            
-    /**
-     * Set the value of weight using notEqual. { != }
-     * 
-     * @param weight The value of weight as notEqual.
-     */
-    public void setWeight_NotEqual(java.math.BigDecimal weight) {
-        registerWeight(ConditionKey.CK_NOT_EQUAL, weight);
-    }
-            
-    /**
-     * Set the value of weight using greaterThan. { &gt; }
-     * 
-     * @param weight The value of weight as greaterThan.
-     */
-    public void setWeight_GreaterThan(java.math.BigDecimal weight) {
-        registerWeight(ConditionKey.CK_GREATER_THAN, weight);
-    }
-            
-    /**
-     * Set the value of weight using lessThan. { &lt; }
-     * 
-     * @param weight The value of weight as lessThan.
-     */
-    public void setWeight_LessThan(java.math.BigDecimal weight) {
-        registerWeight(ConditionKey.CK_LESS_THAN, weight);
-    }
-            
-    /**
-     * Set the value of weight using greaterEqual. { &gt;= }
-     * 
-     * @param weight The value of weight as greaterEqual.
-     */
-    public void setWeight_GreaterEqual(java.math.BigDecimal weight) {
-        registerWeight(ConditionKey.CK_GREATER_EQUAL, weight);
-    }
-            
-    /**
-     * Set the value of weight using lessEqual. { &lt;= }
-     * 
-     * @param weight The value of weight as lessEqual.
-     */
-    public void setWeight_LessEqual(java.math.BigDecimal weight) {
-        registerWeight(ConditionKey.CK_LESS_EQUAL, weight);
-    }
-                  
-    /**
-     * Set the value of weight using inScope. { in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param weightList The value of weight as inScope.
-     */
-    public void setWeight_InScope(java.util.List<java.math.BigDecimal> weightList) {
-        registerWeight(ConditionKey.CK_IN_SCOPE, weightList);
-    }
-            
-    /**
-     * Set the value of weight using notInScope. { not in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param weightList The value of weight as notInScope.
-     */
-    public void setWeight_NotInScope(java.util.List<java.math.BigDecimal> weightList) {
-        registerWeight(ConditionKey.CK_NOT_IN_SCOPE, weightList);
-    }
-                                                
-    /**
-     * Register condition of weight.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of weight. (Nullable)
-     */
-    protected void registerWeight(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueWeight(), COL_WEIGHT, J_Weight, UJ_weight);
-    }
-
-    /**
-     * Register inline condition of weight.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of weight. (Nullable)
-     */
-    protected void registerInlineWeight(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueWeight(), COL_WEIGHT, J_Weight, UJ_weight);
-    }
-
-    abstract protected ConditionValue getCValueWeight();
-      
-    /** Column db name of status. */
-    protected static final String COL_STATUS = "STATUS";
-
-    /** Column java name of status. */
-    protected static final String J_Status = "Status";
-
-    /** Column uncapitalised java name of status. */
-    protected static final String UJ_status = "status";
-            
-    /**
-     * Set the value of status using equal. { = }
-     * 
-     * @param status The value of status as equal.
-     */
-    public void setStatus_Equal(java.math.BigDecimal status) {
-        registerStatus(ConditionKey.CK_EQUAL, status);
-    }
-            
-    /**
-     * Set the value of status using notEqual. { != }
-     * 
-     * @param status The value of status as notEqual.
-     */
-    public void setStatus_NotEqual(java.math.BigDecimal status) {
-        registerStatus(ConditionKey.CK_NOT_EQUAL, status);
-    }
-            
-    /**
-     * Set the value of status using greaterThan. { &gt; }
-     * 
-     * @param status The value of status as greaterThan.
-     */
-    public void setStatus_GreaterThan(java.math.BigDecimal status) {
-        registerStatus(ConditionKey.CK_GREATER_THAN, status);
-    }
-            
-    /**
-     * Set the value of status using lessThan. { &lt; }
-     * 
-     * @param status The value of status as lessThan.
-     */
-    public void setStatus_LessThan(java.math.BigDecimal status) {
-        registerStatus(ConditionKey.CK_LESS_THAN, status);
-    }
-            
-    /**
-     * Set the value of status using greaterEqual. { &gt;= }
-     * 
-     * @param status The value of status as greaterEqual.
-     */
-    public void setStatus_GreaterEqual(java.math.BigDecimal status) {
-        registerStatus(ConditionKey.CK_GREATER_EQUAL, status);
-    }
-            
-    /**
-     * Set the value of status using lessEqual. { &lt;= }
-     * 
-     * @param status The value of status as lessEqual.
-     */
-    public void setStatus_LessEqual(java.math.BigDecimal status) {
-        registerStatus(ConditionKey.CK_LESS_EQUAL, status);
-    }
-                  
-    /**
-     * Set the value of status using inScope. { in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param statusList The value of status as inScope.
-     */
-    public void setStatus_InScope(java.util.List<java.math.BigDecimal> statusList) {
-        registerStatus(ConditionKey.CK_IN_SCOPE, statusList);
-    }
-            
-    /**
-     * Set the value of status using notInScope. { not in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param statusList The value of status as notInScope.
-     */
-    public void setStatus_NotInScope(java.util.List<java.math.BigDecimal> statusList) {
-        registerStatus(ConditionKey.CK_NOT_IN_SCOPE, statusList);
-    }
-                                                
-    /**
-     * Register condition of status.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of status. (Nullable)
-     */
-    protected void registerStatus(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueStatus(), COL_STATUS, J_Status, UJ_status);
-    }
-
-    /**
-     * Register inline condition of status.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of status. (Nullable)
-     */
-    protected void registerInlineStatus(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueStatus(), COL_STATUS, J_Status, UJ_status);
-    }
-
-    abstract protected ConditionValue getCValueStatus();
-      
     /** Column db name of taxClassId. */
     protected static final String COL_TAX_CLASS_ID = "TAX_CLASS_ID";
 
@@ -2010,111 +2248,6 @@
     }
 
     abstract protected ConditionValue getCValueManufacturerId();
-      
-    /** Column db name of ordered. */
-    protected static final String COL_ORDERED = "ORDERED";
-
-    /** Column java name of ordered. */
-    protected static final String J_Ordered = "Ordered";
-
-    /** Column uncapitalised java name of ordered. */
-    protected static final String UJ_ordered = "ordered";
-            
-    /**
-     * Set the value of ordered using equal. { = }
-     * 
-     * @param ordered The value of ordered as equal.
-     */
-    public void setOrdered_Equal(java.math.BigDecimal ordered) {
-        registerOrdered(ConditionKey.CK_EQUAL, ordered);
-    }
-            
-    /**
-     * Set the value of ordered using notEqual. { != }
-     * 
-     * @param ordered The value of ordered as notEqual.
-     */
-    public void setOrdered_NotEqual(java.math.BigDecimal ordered) {
-        registerOrdered(ConditionKey.CK_NOT_EQUAL, ordered);
-    }
-            
-    /**
-     * Set the value of ordered using greaterThan. { &gt; }
-     * 
-     * @param ordered The value of ordered as greaterThan.
-     */
-    public void setOrdered_GreaterThan(java.math.BigDecimal ordered) {
-        registerOrdered(ConditionKey.CK_GREATER_THAN, ordered);
-    }
-            
-    /**
-     * Set the value of ordered using lessThan. { &lt; }
-     * 
-     * @param ordered The value of ordered as lessThan.
-     */
-    public void setOrdered_LessThan(java.math.BigDecimal ordered) {
-        registerOrdered(ConditionKey.CK_LESS_THAN, ordered);
-    }
-            
-    /**
-     * Set the value of ordered using greaterEqual. { &gt;= }
-     * 
-     * @param ordered The value of ordered as greaterEqual.
-     */
-    public void setOrdered_GreaterEqual(java.math.BigDecimal ordered) {
-        registerOrdered(ConditionKey.CK_GREATER_EQUAL, ordered);
-    }
-            
-    /**
-     * Set the value of ordered using lessEqual. { &lt;= }
-     * 
-     * @param ordered The value of ordered as lessEqual.
-     */
-    public void setOrdered_LessEqual(java.math.BigDecimal ordered) {
-        registerOrdered(ConditionKey.CK_LESS_EQUAL, ordered);
-    }
-                  
-    /**
-     * Set the value of ordered using inScope. { in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param orderedList The value of ordered as inScope.
-     */
-    public void setOrdered_InScope(java.util.List<java.math.BigDecimal> orderedList) {
-        registerOrdered(ConditionKey.CK_IN_SCOPE, orderedList);
-    }
-            
-    /**
-     * Set the value of ordered using notInScope. { not in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param orderedList The value of ordered as notInScope.
-     */
-    public void setOrdered_NotInScope(java.util.List<java.math.BigDecimal> orderedList) {
-        registerOrdered(ConditionKey.CK_NOT_IN_SCOPE, orderedList);
-    }
-                                                
-    /**
-     * Register condition of ordered.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of ordered. (Nullable)
-     */
-    protected void registerOrdered(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueOrdered(), COL_ORDERED, J_Ordered, UJ_ordered);
-    }
-
-    /**
-     * Register inline condition of ordered.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of ordered. (Nullable)
-     */
-    protected void registerInlineOrdered(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueOrdered(), COL_ORDERED, J_Ordered, UJ_ordered);
-    }
-
-    abstract protected ConditionValue getCValueOrdered();
   
     // ===================================================================================
     //                                                                      Basic Override

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsReviewDescriptionCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsReviewDescriptionCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsReviewDescriptionCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -294,149 +294,149 @@
 
     abstract protected ConditionValue getCValueLanguageId();
       
-    /** Column db name of reviewText. */
-    protected static final String COL_REVIEW_TEXT = "REVIEW_TEXT";
+    /** Column db name of comment. */
+    protected static final String COL_COMMENT = "COMMENT";
 
-    /** Column java name of reviewText. */
-    protected static final String J_ReviewText = "ReviewText";
+    /** Column java name of comment. */
+    protected static final String J_Comment = "Comment";
 
-    /** Column uncapitalised java name of reviewText. */
-    protected static final String UJ_reviewText = "reviewText";
+    /** Column uncapitalised java name of comment. */
+    protected static final String UJ_comment = "comment";
     
     /**
-     * Set the value of reviewText using equal. { = }
+     * Set the value of comment using equal. { = }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as equal.
+     * @param comment The value of comment as equal.
      */
-    public void setReviewText_Equal(String reviewText) {
-        registerReviewText(ConditionKey.CK_EQUAL, filterRemoveEmptyString(reviewText));
+    public void setComment_Equal(String comment) {
+        registerComment(ConditionKey.CK_EQUAL, filterRemoveEmptyString(comment));
     }
                   
     /**
-     * Set the value of reviewText using notEqual. { != }
+     * Set the value of comment using notEqual. { != }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as notEqual.
+     * @param comment The value of comment as notEqual.
      */
-    public void setReviewText_NotEqual(String reviewText) {
-        registerReviewText(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(reviewText));
+    public void setComment_NotEqual(String comment) {
+        registerComment(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of reviewText using greaterThan. { &gt; }
+     * Set the value of comment using greaterThan. { &gt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as greaterThan.
+     * @param comment The value of comment as greaterThan.
      */
-    public void setReviewText_GreaterThan(String reviewText) {
-        registerReviewText(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(reviewText));
+    public void setComment_GreaterThan(String comment) {
+        registerComment(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of reviewText using lessThan. { &lt; }
+     * Set the value of comment using lessThan. { &lt; }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as lessThan.
+     * @param comment The value of comment as lessThan.
      */
-    public void setReviewText_LessThan(String reviewText) {
-        registerReviewText(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(reviewText));
+    public void setComment_LessThan(String comment) {
+        registerComment(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of reviewText using greaterEqual. { &gt;= }
+     * Set the value of comment using greaterEqual. { &gt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as greaterEqual.
+     * @param comment The value of comment as greaterEqual.
      */
-    public void setReviewText_GreaterEqual(String reviewText) {
-        registerReviewText(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(reviewText));
+    public void setComment_GreaterEqual(String comment) {
+        registerComment(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of reviewText using lessEqual. { &lt;= }
+     * Set the value of comment using lessEqual. { &lt;= }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as lessEqual.
+     * @param comment The value of comment as lessEqual.
      */
-    public void setReviewText_LessEqual(String reviewText) {
-        registerReviewText(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(reviewText));
+    public void setComment_LessEqual(String comment) {
+        registerComment(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of reviewText using prefixSearch. { like 'xxx%' }
+     * Set the value of comment using prefixSearch. { like 'xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * 
-     * @param reviewText The value of reviewText as prefixSearch.
+     * @param comment The value of comment as prefixSearch.
      */
-    public void setReviewText_PrefixSearch(String reviewText) {
-        registerReviewText(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(reviewText));
+    public void setComment_PrefixSearch(String comment) {
+        registerComment(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(comment));
     }
             
     /**
-     * Set the value of reviewText using likeSearch. { like '%xxx%' }
+     * Set the value of comment using likeSearch. { like '%xxx%' }
      * If the value is null or empty-string, this condition is ignored.
      * You can invoke this method several times and the conditions are set up.
      * 
-     * @param reviewText The value of reviewText as likeSearch.
+     * @param comment The value of comment as likeSearch.
      * @param likeSearchOption The option of like-search. (NotNull)
      */
-    public void setReviewText_LikeSearch(String reviewText, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
-        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(reviewText), getCValueReviewText(), COL_REVIEW_TEXT, J_ReviewText, UJ_reviewText, likeSearchOption);
+    public void setComment_LikeSearch(String comment, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(comment), getCValueComment(), COL_COMMENT, J_Comment, UJ_comment, likeSearchOption);
     }
             
     /**
-     * Set the value of reviewText using inScope. { in ('a', 'b') }
+     * Set the value of comment using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param reviewTextList The value of reviewText as inScope.
+     * @param commentList The value of comment as inScope.
      */
-    public void setReviewText_InScope(java.util.List<String> reviewTextList) {
-        registerReviewText(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(reviewTextList));
+    public void setComment_InScope(java.util.List<String> commentList) {
+        registerComment(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(commentList));
     }
 
     /**
-     * Set the value of reviewText using inScope. { in ('a', 'b') }
+     * Set the value of comment using inScope. { in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param reviewText The value of reviewText as inScope.
+     * @param comment The value of comment as inScope.
      * @param inScopeOption The option of in-scope. (NotNull)
      */
-    public void setReviewText_InScope(String reviewText, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
-        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(reviewText), getCValueReviewText(), COL_REVIEW_TEXT, J_ReviewText, UJ_reviewText, inScopeOption);
+    public void setComment_InScope(String comment, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(comment), getCValueComment(), COL_COMMENT, J_Comment, UJ_comment, inScopeOption);
     }
             
     /**
-     * Set the value of reviewText using notInScope. { not in ('a', 'b') }
+     * Set the value of comment using notInScope. { not in ('a', 'b') }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param reviewTextList The value of reviewText as notInScope.
+     * @param commentList The value of comment as notInScope.
      */
-    public void setReviewText_NotInScope(java.util.List<String> reviewTextList) {
-        registerReviewText(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(reviewTextList));
+    public void setComment_NotInScope(java.util.List<String> commentList) {
+        registerComment(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(commentList));
     }
                                                     
     /**
-     * Register condition of reviewText.
+     * Register condition of comment.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of reviewText. (Nullable)
+     * @param value The value of comment. (Nullable)
      */
-    protected void registerReviewText(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueReviewText(), COL_REVIEW_TEXT, J_ReviewText, UJ_reviewText);
+    protected void registerComment(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueComment(), COL_COMMENT, J_Comment, UJ_comment);
     }
 
     /**
-     * Register inline condition of reviewText.
+     * Register inline condition of comment.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of reviewText. (Nullable)
+     * @param value The value of comment. (Nullable)
      */
-    protected void registerInlineReviewText(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueReviewText(), COL_REVIEW_TEXT, J_ReviewText, UJ_reviewText);
+    protected void registerInlineComment(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueComment(), COL_COMMENT, J_Comment, UJ_comment);
     }
 
-    abstract protected ConditionValue getCValueReviewText();
+    abstract protected ConditionValue getCValueComment();
   
     // ===================================================================================
     //                                                                      Basic Override

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCommentCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCommentCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCommentCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -91,21 +91,21 @@
     }
   
     /**
-     * Include select-column of text as mine.
+     * Include select-column of comment as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Text() {
-        registerIncludedSelectColumn("Text", getRealColumnName("TEXT"));
+    public void includeAsMine_Comment() {
+        registerIncludedSelectColumn("Comment", getRealColumnName("COMMENT"));
     }
 
     /**
-     * Include select-column of text as mine.
+     * Include select-column of comment as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Text(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("TEXT"));
+    public void includeAsMine_Comment(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("COMMENT"));
     }
   
     // ===================================================================================
@@ -216,45 +216,45 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [TEXT]
+    //   Column = [COMMENT]
     // - - - - - - - - -/
 
-    /** The attribute of text. */
-    protected ConditionValue _text;
+    /** The attribute of comment. */
+    protected ConditionValue _comment;
 
     /**
-     * Get the value of text.
+     * Get the value of comment.
      * 
-     * @return The value of text.
+     * @return The value of comment.
      */
-    public ConditionValue getText() {
-        if (_text == null) {
-            _text = new ConditionValue();
+    public ConditionValue getComment() {
+        if (_comment == null) {
+            _comment = new ConditionValue();
         }
-        return _text;
+        return _comment;
     }
 
-    protected ConditionValue getCValueText() {
-        return getText();
+    protected ConditionValue getCValueComment() {
+        return getComment();
     }
 
                                                   
     /**
-     * Add order-by of text as ASC.
+     * Add order-by of comment as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsOrderCommentCQ addOrderBy_Text_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_TEXT), null, true);return this;
+    public BsOrderCommentCQ addOrderBy_Comment_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENT), null, true);return this;
     }
 
     /**
-     * Add order-by of text as DESC.
+     * Add order-by of comment as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsOrderCommentCQ addOrderBy_Text_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_TEXT), null, false);return this;
+    public BsOrderCommentCQ addOrderBy_Comment_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENT), null, false);return this;
     }
       
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusHistoryCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusHistoryCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusHistoryCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -145,21 +145,21 @@
     }
   
     /**
-     * Include select-column of comments as mine.
+     * Include select-column of comment as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Comments() {
-        registerIncludedSelectColumn("Comments", getRealColumnName("COMMENTS"));
+    public void includeAsMine_Comment() {
+        registerIncludedSelectColumn("Comment", getRealColumnName("COMMENT"));
     }
 
     /**
-     * Include select-column of comments as mine.
+     * Include select-column of comment as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Comments(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("COMMENTS"));
+    public void includeAsMine_Comment(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("COMMENT"));
     }
   
     // ===================================================================================
@@ -412,45 +412,45 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [COMMENTS]
+    //   Column = [COMMENT]
     // - - - - - - - - -/
 
-    /** The attribute of comments. */
-    protected ConditionValue _comments;
+    /** The attribute of comment. */
+    protected ConditionValue _comment;
 
     /**
-     * Get the value of comments.
+     * Get the value of comment.
      * 
-     * @return The value of comments.
+     * @return The value of comment.
      */
-    public ConditionValue getComments() {
-        if (_comments == null) {
-            _comments = new ConditionValue();
+    public ConditionValue getComment() {
+        if (_comment == null) {
+            _comment = new ConditionValue();
         }
-        return _comments;
+        return _comment;
     }
 
-    protected ConditionValue getCValueComments() {
-        return getComments();
+    protected ConditionValue getCValueComment() {
+        return getComment();
     }
 
                                                       
     /**
-     * Add order-by of comments as ASC.
+     * Add order-by of comment as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsOrderStatusHistoryCQ addOrderBy_Comments_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENTS), null, true);return this;
+    public BsOrderStatusHistoryCQ addOrderBy_Comment_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENT), null, true);return this;
     }
 
     /**
-     * Add order-by of comments as DESC.
+     * Add order-by of comment as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsOrderStatusHistoryCQ addOrderBy_Comments_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENTS), null, false);return this;
+    public BsOrderStatusHistoryCQ addOrderBy_Comment_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENT), null, false);return this;
     }
       
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -73,6 +73,24 @@
     }
   
     /**
+     * Include select-column of model as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_Model() {
+        registerIncludedSelectColumn("Model", getRealColumnName("MODEL"));
+    }
+
+    /**
+     * Include select-column of model as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_Model(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("MODEL"));
+    }
+  
+    /**
      * Include select-column of quantity as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -91,39 +109,39 @@
     }
   
     /**
-     * Include select-column of model as mine.
+     * Include select-column of price as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Model() {
-        registerIncludedSelectColumn("Model", getRealColumnName("MODEL"));
+    public void includeAsMine_Price() {
+        registerIncludedSelectColumn("Price", getRealColumnName("PRICE"));
     }
 
     /**
-     * Include select-column of model as mine.
+     * Include select-column of price as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Model(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("MODEL"));
+    public void includeAsMine_Price(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("PRICE"));
     }
   
     /**
-     * Include select-column of thumbnail as mine.
+     * Include select-column of weight as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Thumbnail() {
-        registerIncludedSelectColumn("Thumbnail", getRealColumnName("THUMBNAIL"));
+    public void includeAsMine_Weight() {
+        registerIncludedSelectColumn("Weight", getRealColumnName("WEIGHT"));
     }
 
     /**
-     * Include select-column of thumbnail as mine.
+     * Include select-column of weight as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Thumbnail(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("THUMBNAIL"));
+    public void includeAsMine_Weight(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("WEIGHT"));
     }
   
     /**
@@ -145,114 +163,132 @@
     }
   
     /**
-     * Include select-column of price as mine.
+     * Include select-column of thumbnail as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Price() {
-        registerIncludedSelectColumn("Price", getRealColumnName("PRICE"));
+    public void includeAsMine_Thumbnail() {
+        registerIncludedSelectColumn("Thumbnail", getRealColumnName("THUMBNAIL"));
     }
 
     /**
-     * Include select-column of price as mine.
+     * Include select-column of thumbnail as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Price(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("PRICE"));
+    public void includeAsMine_Thumbnail(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("THUMBNAIL"));
     }
   
     /**
-     * Include select-column of dateAdded as mine.
+     * Include select-column of stock as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_DateAdded() {
-        registerIncludedSelectColumn("DateAdded", getRealColumnName("DATE_ADDED"));
+    public void includeAsMine_Stock() {
+        registerIncludedSelectColumn("Stock", getRealColumnName("STOCK"));
     }
 
     /**
-     * Include select-column of dateAdded as mine.
+     * Include select-column of stock as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_DateAdded(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("DATE_ADDED"));
+    public void includeAsMine_Stock(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("STOCK"));
     }
   
     /**
-     * Include select-column of lastModified as mine.
+     * Include select-column of ordered as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_LastModified() {
-        registerIncludedSelectColumn("LastModified", getRealColumnName("LAST_MODIFIED"));
+    public void includeAsMine_Ordered() {
+        registerIncludedSelectColumn("Ordered", getRealColumnName("ORDERED"));
     }
 
     /**
-     * Include select-column of lastModified as mine.
+     * Include select-column of ordered as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_LastModified(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("LAST_MODIFIED"));
+    public void includeAsMine_Ordered(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("ORDERED"));
     }
   
     /**
-     * Include select-column of dateAvailable as mine.
+     * Include select-column of status as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_DateAvailable() {
-        registerIncludedSelectColumn("DateAvailable", getRealColumnName("DATE_AVAILABLE"));
+    public void includeAsMine_Status() {
+        registerIncludedSelectColumn("Status", getRealColumnName("STATUS"));
     }
 
     /**
-     * Include select-column of dateAvailable as mine.
+     * Include select-column of status as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_DateAvailable(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("DATE_AVAILABLE"));
+    public void includeAsMine_Status(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("STATUS"));
     }
   
     /**
-     * Include select-column of weight as mine.
+     * Include select-column of dateAdded as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Weight() {
-        registerIncludedSelectColumn("Weight", getRealColumnName("WEIGHT"));
+    public void includeAsMine_DateAdded() {
+        registerIncludedSelectColumn("DateAdded", getRealColumnName("DATE_ADDED"));
     }
 
     /**
-     * Include select-column of weight as mine.
+     * Include select-column of dateAdded as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Weight(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("WEIGHT"));
+    public void includeAsMine_DateAdded(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("DATE_ADDED"));
     }
   
     /**
-     * Include select-column of status as mine.
+     * Include select-column of lastModified as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_Status() {
-        registerIncludedSelectColumn("Status", getRealColumnName("STATUS"));
+    public void includeAsMine_LastModified() {
+        registerIncludedSelectColumn("LastModified", getRealColumnName("LAST_MODIFIED"));
     }
 
     /**
-     * Include select-column of status as mine.
+     * Include select-column of lastModified as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_Status(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("STATUS"));
+    public void includeAsMine_LastModified(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("LAST_MODIFIED"));
     }
   
     /**
+     * Include select-column of dateAvailable as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_DateAvailable() {
+        registerIncludedSelectColumn("DateAvailable", getRealColumnName("DATE_AVAILABLE"));
+    }
+
+    /**
+     * Include select-column of dateAvailable as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_DateAvailable(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("DATE_AVAILABLE"));
+    }
+  
+    /**
      * Include select-column of taxClassId as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -288,24 +324,6 @@
         registerIncludedSelectColumn(aliasName, getRealColumnName("MANUFACTURER_ID"));
     }
   
-    /**
-     * Include select-column of ordered as mine.
-     * Alias name is java-name of this column.
-     * Be careful to whether your table have the same column.
-     */
-    public void includeAsMine_Ordered() {
-        registerIncludedSelectColumn("Ordered", getRealColumnName("ORDERED"));
-    }
-
-    /**
-     * Include select-column of ordered as mine.
-     * 
-     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
-     */
-    public void includeAsMine_Ordered(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("ORDERED"));
-    }
-  
     // ===================================================================================
     //                                                                               Query
     //                                                                               =====
@@ -708,6 +726,48 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [MODEL]
+    // - - - - - - - - -/
+
+    /** The attribute of model. */
+    protected ConditionValue _model;
+
+    /**
+     * Get the value of model.
+     * 
+     * @return The value of model.
+     */
+    public ConditionValue getModel() {
+        if (_model == null) {
+            _model = new ConditionValue();
+        }
+        return _model;
+    }
+
+    protected ConditionValue getCValueModel() {
+        return getModel();
+    }
+
+                                                      
+    /**
+     * Add order-by of model as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Model_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_MODEL), null, true);return this;
+    }
+
+    /**
+     * Add order-by of model as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Model_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_MODEL), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [QUANTITY]
     // - - - - - - - - -/
 
@@ -750,48 +810,132 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [MODEL]
+    //   Column = [PRICE]
     // - - - - - - - - -/
 
-    /** The attribute of model. */
-    protected ConditionValue _model;
+    /** The attribute of price. */
+    protected ConditionValue _price;
 
     /**
-     * Get the value of model.
+     * Get the value of price.
      * 
-     * @return The value of model.
+     * @return The value of price.
      */
-    public ConditionValue getModel() {
-        if (_model == null) {
-            _model = new ConditionValue();
+    public ConditionValue getPrice() {
+        if (_price == null) {
+            _price = new ConditionValue();
         }
-        return _model;
+        return _price;
     }
 
-    protected ConditionValue getCValueModel() {
-        return getModel();
+    protected ConditionValue getCValuePrice() {
+        return getPrice();
     }
 
+                                                  
+    /**
+     * Add order-by of price as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Price_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_PRICE), null, true);return this;
+    }
+
+    /**
+     * Add order-by of price as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Price_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_PRICE), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [WEIGHT]
+    // - - - - - - - - -/
+
+    /** The attribute of weight. */
+    protected ConditionValue _weight;
+
+    /**
+     * Get the value of weight.
+     * 
+     * @return The value of weight.
+     */
+    public ConditionValue getWeight() {
+        if (_weight == null) {
+            _weight = new ConditionValue();
+        }
+        return _weight;
+    }
+
+    protected ConditionValue getCValueWeight() {
+        return getWeight();
+    }
+
                                                       
     /**
-     * Add order-by of model as ASC.
+     * Add order-by of weight as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsProductCQ addOrderBy_Model_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_MODEL), null, true);return this;
+    public BsProductCQ addOrderBy_Weight_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_WEIGHT), null, true);return this;
     }
 
     /**
-     * Add order-by of model as DESC.
+     * Add order-by of weight as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsProductCQ addOrderBy_Model_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_MODEL), null, false);return this;
+    public BsProductCQ addOrderBy_Weight_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_WEIGHT), null, false);return this;
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [IMAGE]
+    // - - - - - - - - -/
+
+    /** The attribute of image. */
+    protected ConditionValue _image;
+
+    /**
+     * Get the value of image.
+     * 
+     * @return The value of image.
+     */
+    public ConditionValue getImage() {
+        if (_image == null) {
+            _image = new ConditionValue();
+        }
+        return _image;
+    }
+
+    protected ConditionValue getCValueImage() {
+        return getImage();
+    }
+
+                                                      
+    /**
+     * Add order-by of image as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Image_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_IMAGE), null, true);return this;
+    }
+
+    /**
+     * Add order-by of image as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Image_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_IMAGE), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [THUMBNAIL]
     // - - - - - - - - -/
 
@@ -834,90 +978,132 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [IMAGE]
+    //   Column = [STOCK]
     // - - - - - - - - -/
 
-    /** The attribute of image. */
-    protected ConditionValue _image;
+    /** The attribute of stock. */
+    protected ConditionValue _stock;
 
     /**
-     * Get the value of image.
+     * Get the value of stock.
      * 
-     * @return The value of image.
+     * @return The value of stock.
      */
-    public ConditionValue getImage() {
-        if (_image == null) {
-            _image = new ConditionValue();
+    public ConditionValue getStock() {
+        if (_stock == null) {
+            _stock = new ConditionValue();
         }
-        return _image;
+        return _stock;
     }
 
-    protected ConditionValue getCValueImage() {
-        return getImage();
+    protected ConditionValue getCValueStock() {
+        return getStock();
     }
 
                                                       
     /**
-     * Add order-by of image as ASC.
+     * Add order-by of stock as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsProductCQ addOrderBy_Image_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_IMAGE), null, true);return this;
+    public BsProductCQ addOrderBy_Stock_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_STOCK), null, true);return this;
     }
 
     /**
-     * Add order-by of image as DESC.
+     * Add order-by of stock as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsProductCQ addOrderBy_Image_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_IMAGE), null, false);return this;
+    public BsProductCQ addOrderBy_Stock_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_STOCK), null, false);return this;
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [PRICE]
+    //   Column = [ORDERED]
     // - - - - - - - - -/
 
-    /** The attribute of price. */
-    protected ConditionValue _price;
+    /** The attribute of ordered. */
+    protected ConditionValue _ordered;
 
     /**
-     * Get the value of price.
+     * Get the value of ordered.
      * 
-     * @return The value of price.
+     * @return The value of ordered.
      */
-    public ConditionValue getPrice() {
-        if (_price == null) {
-            _price = new ConditionValue();
+    public ConditionValue getOrdered() {
+        if (_ordered == null) {
+            _ordered = new ConditionValue();
         }
-        return _price;
+        return _ordered;
     }
 
-    protected ConditionValue getCValuePrice() {
-        return getPrice();
+    protected ConditionValue getCValueOrdered() {
+        return getOrdered();
     }
 
                                                   
     /**
-     * Add order-by of price as ASC.
+     * Add order-by of ordered as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsProductCQ addOrderBy_Price_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_PRICE), null, true);return this;
+    public BsProductCQ addOrderBy_Ordered_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_ORDERED), null, true);return this;
     }
 
     /**
-     * Add order-by of price as DESC.
+     * Add order-by of ordered as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsProductCQ addOrderBy_Price_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_PRICE), null, false);return this;
+    public BsProductCQ addOrderBy_Ordered_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_ORDERED), null, false);return this;
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [STATUS]
+    // - - - - - - - - -/
+
+    /** The attribute of status. */
+    protected ConditionValue _status;
+
+    /**
+     * Get the value of status.
+     * 
+     * @return The value of status.
+     */
+    public ConditionValue getStatus() {
+        if (_status == null) {
+            _status = new ConditionValue();
+        }
+        return _status;
+    }
+
+    protected ConditionValue getCValueStatus() {
+        return getStatus();
+    }
+
+                                                  
+    /**
+     * Add order-by of status as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Status_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_STATUS), null, true);return this;
+    }
+
+    /**
+     * Add order-by of status as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsProductCQ addOrderBy_Status_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_STATUS), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [DATE_ADDED]
     // - - - - - - - - -/
 
@@ -1044,90 +1230,6 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [WEIGHT]
-    // - - - - - - - - -/
-
-    /** The attribute of weight. */
-    protected ConditionValue _weight;
-
-    /**
-     * Get the value of weight.
-     * 
-     * @return The value of weight.
-     */
-    public ConditionValue getWeight() {
-        if (_weight == null) {
-            _weight = new ConditionValue();
-        }
-        return _weight;
-    }
-
-    protected ConditionValue getCValueWeight() {
-        return getWeight();
-    }
-
-                                                  
-    /**
-     * Add order-by of weight as ASC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Weight_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_WEIGHT), null, true);return this;
-    }
-
-    /**
-     * Add order-by of weight as DESC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Weight_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_WEIGHT), null, false);return this;
-    }
-      
-    // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [STATUS]
-    // - - - - - - - - -/
-
-    /** The attribute of status. */
-    protected ConditionValue _status;
-
-    /**
-     * Get the value of status.
-     * 
-     * @return The value of status.
-     */
-    public ConditionValue getStatus() {
-        if (_status == null) {
-            _status = new ConditionValue();
-        }
-        return _status;
-    }
-
-    protected ConditionValue getCValueStatus() {
-        return getStatus();
-    }
-
-                                                  
-    /**
-     * Add order-by of status as ASC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Status_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_STATUS), null, true);return this;
-    }
-
-    /**
-     * Add order-by of status as DESC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Status_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_STATUS), null, false);return this;
-    }
-      
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [TAX_CLASS_ID]
     // - - - - - - - - -/
 
@@ -1243,48 +1345,6 @@
         getSqlClause().registerOrderBy(getRealColumnName(COL_MANUFACTURER_ID), null, false);return this;
     }
       
-    // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [ORDERED]
-    // - - - - - - - - -/
-
-    /** The attribute of ordered. */
-    protected ConditionValue _ordered;
-
-    /**
-     * Get the value of ordered.
-     * 
-     * @return The value of ordered.
-     */
-    public ConditionValue getOrdered() {
-        if (_ordered == null) {
-            _ordered = new ConditionValue();
-        }
-        return _ordered;
-    }
-
-    protected ConditionValue getCValueOrdered() {
-        return getOrdered();
-    }
-
-                                                  
-    /**
-     * Add order-by of ordered as ASC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Ordered_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_ORDERED), null, true);return this;
-    }
-
-    /**
-     * Add order-by of ordered as DESC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Ordered_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_ORDERED), null, false);return this;
-    }
-      
     // ===================================================================================
     //                                                                         Union Query
     //                                                                         ===========

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsReviewDescriptionCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsReviewDescriptionCQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsReviewDescriptionCQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -91,21 +91,21 @@
     }
   
     /**
-     * Include select-column of reviewText as mine.
+     * Include select-column of comment as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_ReviewText() {
-        registerIncludedSelectColumn("ReviewText", getRealColumnName("REVIEW_TEXT"));
+    public void includeAsMine_Comment() {
+        registerIncludedSelectColumn("Comment", getRealColumnName("COMMENT"));
     }
 
     /**
-     * Include select-column of reviewText as mine.
+     * Include select-column of comment as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_ReviewText(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("REVIEW_TEXT"));
+    public void includeAsMine_Comment(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("COMMENT"));
     }
   
     // ===================================================================================
@@ -232,45 +232,45 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [REVIEW_TEXT]
+    //   Column = [COMMENT]
     // - - - - - - - - -/
 
-    /** The attribute of reviewText. */
-    protected ConditionValue _reviewText;
+    /** The attribute of comment. */
+    protected ConditionValue _comment;
 
     /**
-     * Get the value of reviewText.
+     * Get the value of comment.
      * 
-     * @return The value of reviewText.
+     * @return The value of comment.
      */
-    public ConditionValue getReviewText() {
-        if (_reviewText == null) {
-            _reviewText = new ConditionValue();
+    public ConditionValue getComment() {
+        if (_comment == null) {
+            _comment = new ConditionValue();
         }
-        return _reviewText;
+        return _comment;
     }
 
-    protected ConditionValue getCValueReviewText() {
-        return getReviewText();
+    protected ConditionValue getCValueComment() {
+        return getComment();
     }
 
                                                   
     /**
-     * Add order-by of reviewText as ASC.
+     * Add order-by of comment as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsReviewDescriptionCQ addOrderBy_ReviewText_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_REVIEW_TEXT), null, true);return this;
+    public BsReviewDescriptionCQ addOrderBy_Comment_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENT), null, true);return this;
     }
 
     /**
-     * Add order-by of reviewText as DESC.
+     * Add order-by of comment as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsReviewDescriptionCQ addOrderBy_ReviewText_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_REVIEW_TEXT), null, false);return this;
+    public BsReviewDescriptionCQ addOrderBy_Comment_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_COMMENT), null, false);return this;
     }
       
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCommentCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCommentCIQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCommentCIQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -97,10 +97,10 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [TEXT]
+    //   Column = [COMMENT]
     // - - - - - - - - -/
-    protected ConditionValue getCValueText() {
-        return _myCQ.getText();
+    protected ConditionValue getCValueComment() {
+        return _myCQ.getComment();
     }
 
                                                         

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusHistoryCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusHistoryCIQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusHistoryCIQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -125,10 +125,10 @@
 
                                                             
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [COMMENTS]
+    //   Column = [COMMENT]
     // - - - - - - - - -/
-    protected ConditionValue getCValueComments() {
-        return _myCQ.getComments();
+    protected ConditionValue getCValueComment() {
+        return _myCQ.getComment();
     }
 
                                                             

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -184,6 +184,14 @@
     }
                                                       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [MODEL]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueModel() {
+        return _myCQ.getModel();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [QUANTITY]
     // - - - - - - - - -/
     protected ConditionValue getCValueQuantity() {
@@ -192,14 +200,30 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [MODEL]
+    //   Column = [PRICE]
     // - - - - - - - - -/
-    protected ConditionValue getCValueModel() {
-        return _myCQ.getModel();
+    protected ConditionValue getCValuePrice() {
+        return _myCQ.getPrice();
     }
 
+                                                        
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [WEIGHT]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueWeight() {
+        return _myCQ.getWeight();
+    }
+
                                                             
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [IMAGE]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueImage() {
+        return _myCQ.getImage();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [THUMBNAIL]
     // - - - - - - - - -/
     protected ConditionValue getCValueThumbnail() {
@@ -208,22 +232,30 @@
 
                                                             
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [IMAGE]
+    //   Column = [STOCK]
     // - - - - - - - - -/
-    protected ConditionValue getCValueImage() {
-        return _myCQ.getImage();
+    protected ConditionValue getCValueStock() {
+        return _myCQ.getStock();
     }
 
                                                             
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [PRICE]
+    //   Column = [ORDERED]
     // - - - - - - - - -/
-    protected ConditionValue getCValuePrice() {
-        return _myCQ.getPrice();
+    protected ConditionValue getCValueOrdered() {
+        return _myCQ.getOrdered();
     }
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [STATUS]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueStatus() {
+        return _myCQ.getStatus();
+    }
+
+                                                        
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [DATE_ADDED]
     // - - - - - - - - -/
     protected ConditionValue getCValueDateAdded() {
@@ -248,22 +280,6 @@
 
                                           
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [WEIGHT]
-    // - - - - - - - - -/
-    protected ConditionValue getCValueWeight() {
-        return _myCQ.getWeight();
-    }
-
-                                                        
-    // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [STATUS]
-    // - - - - - - - - -/
-    protected ConditionValue getCValueStatus() {
-        return _myCQ.getStatus();
-    }
-
-                                                        
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [TAX_CLASS_ID]
     // - - - - - - - - -/
     protected ConditionValue getCValueTaxClassId() {
@@ -287,12 +303,4 @@
         _myCQ.keepManufacturerId_InScopeSubQuery_Manufacturer(subQuery);
     }
                                                     
-    // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [ORDERED]
-    // - - - - - - - - -/
-    protected ConditionValue getCValueOrdered() {
-        return _myCQ.getOrdered();
-    }
-
-                                                        
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ReviewDescriptionCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ReviewDescriptionCIQ.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ReviewDescriptionCIQ.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -101,10 +101,10 @@
     }
                                                 
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [REVIEW_TEXT]
+    //   Column = [COMMENT]
     // - - - - - - - - -/
-    protected ConditionValue getCValueReviewText() {
-        return _myCQ.getReviewText();
+    protected ConditionValue getCValueComment() {
+        return _myCQ.getComment();
     }
 
                                                         

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
+import jp.sf.pal.pompei.exentity.Category;
 import jp.sf.pal.pompei.exentity.CategoryDescription;
 import jp.sf.pal.pompei.web.admin.product.CategoryEditPage;
 
@@ -11,9 +12,8 @@
 
 public interface CategoryDxo extends Serializable {
 
-    @ConversionRule("sortOrder : category.sortOrder"
-            + ",categoryName : categoryName" + ",categoryId : categoryId"
-            + ",categoryImage : category.categoryImage")
+    @ConversionRule("sortOrder : category.sortOrder" + ",name : name"
+            + ",categoryId : categoryId" + ",image : category.image")
     public void convert(List<CategoryDescription> category,
             List<Map<String, Object>> list);
 
@@ -21,4 +21,8 @@
 
     public void convert(CategoryEditPage page, CategoryDescription entity);
 
+    public void convert(CategoryDescription entity, CategoryEditPage page);
+
+    public void convert(Category entity, CategoryEditPage page);
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -11,20 +11,21 @@
 import org.seasar.extension.dxo.annotation.ConversionRule;
 
 public interface DeliveryMethodDxo extends Serializable {
-    @ConversionRule("sortOrder : deliveryMethod.sortOrder"
-            + ",deliveryMethodName : deliveryMethodName"
+    @ConversionRule("sortOrder : deliveryMethod.sortOrder" + ",name : name"
             + ",deliveryMethodId : deliveryMethodId"
-            + ",deliveryClass : deliveryMethod.deliveryClass"
-            + ",deliveryStatus : deliveryMethod.deliveryStatus")
-    public void convert(List<DeliveryMethodDescription> deliveryMethod,
+            + ",code : deliveryMethod.code" + ",status : deliveryMethod.status")
+    public void convert(
+            List<DeliveryMethodDescription> deliveryMethodDescriptionList,
             List<Map<String, Object>> list);
 
-    @ConversionRule("label : deliveryMethodName" + ", value : deliveryMethodId")
+    @ConversionRule("label : name" + ", value : deliveryMethodId")
     public List<Map<String, String>> convert(List<DeliveryMethodDescription> dmd);
 
     public void convert(DeliveryMethodDescription dmd,
             DeliveryMethodEditPage page);
 
+    public void convert(DeliveryMethod dm, DeliveryMethodEditPage page);
+
     public void convert(DeliveryMethodEditPage page, DeliveryMethod dm);
 
     public void convert(DeliveryMethodEditPage page,

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -12,18 +12,16 @@
 
 public interface ManufacturerDxo extends Serializable {
 
-    @ConversionRule("manufacturersId : manufacturersId"
-            + ",manufacturersName : manufacturers.manufacturersName"
-            + ",manufacturersDesc : manufacturersShortDesc")
-    void convert(List<ManufacturerDescription> manufacturers,
+    @ConversionRule("manufacturerId : manufacturerId"
+            + ",name : manufacturer.name"
+            + ",shortDescription : shortDescription")
+    void convert(List<ManufacturerDescription> manufacturerDescriptionList,
             List<Map<String, Object>> list);
 
-    @ConversionRule("manufacturersId : manufacturersId"
-            + ",manufacturersName : manufacturers.manufacturersName"
-            + ",manufacturersImage : manufacturers.manufacturersImage"
-            + ",manufacturersUrl : manufacturersUrl"
-            + ",manufacturersShortDesc : manufacturersShortDesc"
-            + ",manufacturersLongDesc : manufacturersLongDesc")
+    @ConversionRule("manufacturerId : manufacturerId"
+            + ",name : manufacturer.name" + ",image : manufacturer.image"
+            + ",url : url" + ",shortDescription : shortDescription"
+            + ",longDescription : longDescription")
     void convert(ManufacturerDescription info, ManufacturerEditPage page);
 
     void convert(ManufacturerEditPage manufacturerEditPage,
@@ -31,8 +29,8 @@
 
     void convert(ManufacturerEditPage manufacturerEditPage, Manufacturer entity);
 
-    @ConversionRule("value : manufacturersId" + ",label : manufacturersName")
-    void convertCombo(List<Manufacturer> manufacturers,
+    @ConversionRule("value : manufacturerId" + ",label : name")
+    void convertCombo(List<Manufacturer> manufacturer,
             List<Map<String, String>> list);
 
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -17,14 +17,13 @@
 
     Product convertProduct(ProductEditPage productEditPage);
 
-    @ConversionRule("productsId : productsId"
-            + ",productsModel : productsModel"
-            + ",productsImage : productsImage"
-            + ",productsPrice : productsPrice"
-            + ",productsStatus : productsStatus"
-            + ",productsDescriptionList : productsDescriptionList"
-            + ",manufacturersName : manufacturers.manufacturersName"
-            + ",productsDateAdded : productsDateAdded")
+    @ConversionRule("productId : productId"
+            + ",model : model"
+            + ",price : price"
+            + ",status : status"
+            + ",productDescriptionList : productDescriptionList"
+            + ",manufacturerName : manufacturer.name"
+            + ",dateAdded : dateAdded")
     void convert(List<Product> list, List<Map<String, Object>> list2);
 
     //    @ConversionRule("productsId : productsId"

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ManufacturerService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ManufacturerService.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ManufacturerService.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,22 +14,22 @@
  */
 public interface ManufacturerService extends Serializable {
 
-    public void addManufacturesInfo(ManufacturerDescription info);
+    public void addManufactureDescription(ManufacturerDescription info);
 
     public void deleteManufacture(BigDecimal id);
 
-    public ManufacturerDescription getManufacturesInfo(BigDecimal id);
+    public ManufacturerDescription getManufactureDescription(BigDecimal id);
 
-    public ManufacturerDescription getManufacturesInfo(BigDecimal id,
+    public ManufacturerDescription getManufactureDescription(BigDecimal id,
             BigDecimal languageId);
 
-    public List<ManufacturerDescription> getManufacturesInfoList();
+    public List<ManufacturerDescription> getManufactureDescriptionList();
 
-    public List<ManufacturerDescription> getManufacturesInfoList(
+    public List<ManufacturerDescription> getManufactureDescriptionList(
             BigDecimal languagesId);
 
-    public List<Manufacturer> getManufactureList();
+    public List<Manufacturer> getManufacturerList();
 
-    public void updateManufacturesInfo(ManufacturerDescription info);
+    public void updateManufactureDescription(ManufacturerDescription info);
 
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/TaxService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/TaxService.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/TaxService.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -2,11 +2,15 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
+import jp.sf.pal.pompei.exentity.TaxClass;
 import jp.sf.pal.pompei.exentity.TaxRate;
 
 public interface TaxService extends Serializable {
 
     public abstract TaxRate getTaxRateByZoneId(BigDecimal zoneId);
 
+    public abstract List<TaxClass> getTaxClassList();
+
 }
\ No newline at end of file

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ManufacturerServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ManufacturerServiceImpl.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ManufacturerServiceImpl.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -47,7 +47,7 @@
         this.languageService = languageService;
     }
 
-    public void addManufacturesInfo(ManufacturerDescription info) {
+    public void addManufactureDescription(ManufacturerDescription info) {
         Manufacturer manufacturers = info.getManufacturer();
         manufacturers.setDateAdded(new Timestamp(new Date().getTime()));
         manufacturers.setLastModified(new Timestamp(new Date().getTime()));
@@ -74,12 +74,12 @@
         manufacturerBhv.delete(manufacturers);
     }
 
-    public ManufacturerDescription getManufacturesInfo(BigDecimal id) {
-        return getManufacturesInfo(id, getLanguageService()
+    public ManufacturerDescription getManufactureDescription(BigDecimal id) {
+        return getManufactureDescription(id, getLanguageService()
                 .getCurrentLanguage().getLanguageId());
     }
 
-    public ManufacturerDescription getManufacturesInfo(BigDecimal id,
+    public ManufacturerDescription getManufactureDescription(BigDecimal id,
             BigDecimal languagesId) {
         ManufacturerDescriptionCB cb = new ManufacturerDescriptionCB();
         cb.setupSelect_Manufacturer();
@@ -88,12 +88,12 @@
         return manufacturerDescriptionBhv.selectEntity(cb);
     }
 
-    public List<ManufacturerDescription> getManufacturesInfoList() {
-        return getManufacturesInfoList(getLanguageService()
+    public List<ManufacturerDescription> getManufactureDescriptionList() {
+        return getManufactureDescriptionList(getLanguageService()
                 .getCurrentLanguage().getLanguageId());
     }
 
-    public List<ManufacturerDescription> getManufacturesInfoList(
+    public List<ManufacturerDescription> getManufactureDescriptionList(
             BigDecimal languagesId) {
         ManufacturerDescriptionCB cb = new ManufacturerDescriptionCB();
         cb.addOrderBy_PK_Asc();
@@ -102,7 +102,7 @@
         return manufacturerDescriptionBhv.selectList(cb);
     }
 
-    public List<Manufacturer> getManufactureList() {
+    public List<Manufacturer> getManufacturerList() {
         ManufacturerCB cb = new ManufacturerCB();
         List<Manufacturer> list = manufacturerBhv.selectList(cb);
         //		List<String> nameList = new ArrayList<String>();
@@ -112,7 +112,7 @@
         return list;
     }
 
-    public void updateManufacturesInfo(ManufacturerDescription info) {
+    public void updateManufactureDescription(ManufacturerDescription info) {
         manufacturerDescriptionBhv.update(info);
 
         Manufacturer manufacturers = info.getManufacturer();

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -167,7 +167,6 @@
 
     public List<Product> getProductList(BigDecimal categoriesId) {
         ProductToCategoryCB cb = new ProductToCategoryCB();
-        cb.setupSelect_Product();
         cb.setupSelect_Product().withManufacturer();
         cb.query().setCategoryId_Equal(categoriesId);
         List<ProductToCategory> list = productToCategoryBhv.selectList(cb);
@@ -176,7 +175,7 @@
         for (ProductToCategory categories : list) {
             productsList.add(categories.getProduct());
         }
-        //TODO there is better method..
+        //TODO there may be better method..
         productBhv.loadProductDescriptionList(productsList);
 
         return productsList;

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/TaxServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/TaxServiceImpl.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/TaxServiceImpl.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -1,10 +1,13 @@
 package jp.sf.pal.pompei.service.impl;
 
 import java.math.BigDecimal;
+import java.util.List;
 
+import jp.sf.pal.pompei.cbean.TaxClassCB;
 import jp.sf.pal.pompei.cbean.TaxRateCB;
 import jp.sf.pal.pompei.exbhv.TaxClassBhv;
 import jp.sf.pal.pompei.exbhv.TaxRateBhv;
+import jp.sf.pal.pompei.exentity.TaxClass;
 import jp.sf.pal.pompei.exentity.TaxRate;
 import jp.sf.pal.pompei.service.TaxService;
 
@@ -29,6 +32,11 @@
         return getTaxRateBhv().selectEntity(cb);
     }
 
+    public List<TaxClass> getTaxClassList() {
+        TaxClassCB cb = new TaxClassCB();
+        return getTaxClassBhv().selectList(cb);
+    }
+
     /**
      * @return taxClassBhv
      */
@@ -56,4 +64,5 @@
     public void setTaxRateBhv(TaxRateBhv taxRatesBhv) {
         this.taxRateBhv = taxRatesBhv;
     }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -53,6 +53,8 @@
                 return DeliveryMethodListPage.class;
             }
             getDeliveryMethodDxo().convert(dmd, getDeliveryMethodEditPage());
+            getDeliveryMethodDxo().convert(dmd.getDeliveryMethod(),
+                    getDeliveryMethodEditPage());
         } else {
             return DeliveryMethodListPage.class;
         }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,50 +14,55 @@
     private static final long serialVersionUID = -4656929386006745305L;
 
     @Required
-    private String deliveryClass;
+    private String objectName;
 
     @Required
-    private String deliveryStatus;
+    private Integer status;
 
     @Required
-    private String deliveryMethodName;
+    private String code;
 
     private String mode;
 
+    @Required
     private Integer sortOrder;
 
     private BigDecimal targetId;
 
+    private String name;
+
+    private String description;
+
     private LabelHelper labelHelper;
 
-    public String getDeliveryClass() {
-        return deliveryClass;
+    public String getObjectName() {
+        return objectName;
     }
 
-    public void setDeliveryClass(String deliveryClass) {
-        this.deliveryClass = deliveryClass;
+    public void setObjectName(String deliveryClass) {
+        this.objectName = deliveryClass;
     }
 
     /**
      * @return deliveryStatus
      */
-    public String getDeliveryStatus() {
-        return deliveryStatus;
+    public Integer getStatus() {
+        return status;
     }
 
     /**
      * @param deliveryStatus 設定する deliveryStatus
      */
-    public void setDeliveryStatus(String deliveryStatus) {
-        this.deliveryStatus = deliveryStatus;
+    public void setStatus(Integer deliveryStatus) {
+        this.status = deliveryStatus;
     }
 
-    public String getDeliveryMethodName() {
-        return deliveryMethodName;
+    public String getCode() {
+        return code;
     }
 
-    public void setDeliveryMethodName(String deliveryMethodName) {
-        this.deliveryMethodName = deliveryMethodName;
+    public void setCode(String deliveryMethodName) {
+        this.code = deliveryMethodName;
     }
 
     public String getMode() {
@@ -68,14 +73,6 @@
         this.mode = mode;
     }
 
-    public Integer getSortOrder() {
-        return sortOrder;
-    }
-
-    public void setSortOrder(Integer sortOrder) {
-        this.sortOrder = sortOrder;
-    }
-
     public BigDecimal getTargetId() {
         return targetId;
     }
@@ -116,4 +113,46 @@
         return getLabelHelper().getLabelValue(getMode());
     }
 
+    /**
+     * @return name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name 設定する name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description 設定する description
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * @return sortOrder
+     */
+    public Integer getSortOrder() {
+        return sortOrder;
+    }
+
+    /**
+     * @param sortOrder 設定する sortOrder
+     */
+    public void setSortOrder(Integer sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -12,7 +12,7 @@
      */
     private static final long serialVersionUID = -2437233534751079761L;
 
-    private String deliveryClass;
+    private String code;
 
     private BigDecimal deliveryMethodId;
 
@@ -20,7 +20,7 @@
 
     private List<Map<String, Object>> deliveryMethodItems;
 
-    private String deliveryMethodName;
+    private String name;
 
     private String mode;
 
@@ -28,12 +28,12 @@
 
     private BigDecimal targetId;
 
-    public String getDeliveryClass() {
-        return deliveryClass;
+    public String getCode() {
+        return code;
     }
 
-    public void setDeliveryClass(String deliveryClass) {
-        this.deliveryClass = deliveryClass;
+    public void setCode(String deliveryClass) {
+        this.code = deliveryClass;
     }
 
     public BigDecimal getDeliveryMethodId() {
@@ -61,12 +61,12 @@
         this.deliveryMethodItems = deliveryMethodItems;
     }
 
-    public String getDeliveryMethodName() {
-        return deliveryMethodName;
+    public String getName() {
+        return name;
     }
 
-    public void setDeliveryMethodName(String deliveryMethodName) {
-        this.deliveryMethodName = deliveryMethodName;
+    public void setName(String deliveryMethodName) {
+        this.name = deliveryMethodName;
     }
 
     public String getMode() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -26,7 +26,7 @@
     /**
      * dxo
      */
-    private CategoryDxo categoriesDxo;
+    private CategoryDxo categoryDxo;
 
     /**
      * カテゴリ編集ページ
@@ -70,19 +70,19 @@
     public Class<?> prerender() {
         if (categoryEditPage.getMode().equals(PompeiConstants.UPDATE_MODE)) {
             // update
-            CategoryDescription d = categoryService
-                    .getCategoryDescription(categoryEditPage.getTargetId());
-            Category c = d.getCategory();
+            CategoryDescription cd = categoryService.getCategoryDescription(
+                    categoryEditPage.getTargetId(), getLanguageService()
+                            .getDefaultLanguage().getLanguageId());
+            Category c = cd.getCategory();
 
-            categoryEditPage.setCategoriesName(d.getName());
-            categoryEditPage.setCategoriesImage(c.getImage());
-            categoryEditPage.setSortOrder(c.getSortOrder());
+            getCategoryDxo().convert(cd, getCategoryEditPage());
+            getCategoryDxo().convert(cd.getCategory(), getCategoryEditPage());
 
         } else {
             // insert
             //TODO needs to use TakeOver on 
-            categoryEditPage.setCategoriesName("");
-            categoryEditPage.setCategoriesImage("");
+            categoryEditPage.setName("");
+            categoryEditPage.setImage("");
             categoryEditPage.setSortOrder(null);
         }
 
@@ -97,16 +97,16 @@
         int index = list.size() - 1;
 
         Map<String, Object> m = list.get(index);
-        BigDecimal parentId = (BigDecimal) m.get(PompeiConstants.CATEGORIES_ID);
+        BigDecimal parentId = (BigDecimal) m.get(PompeiConstants.CATEGORY_ID);
 
         if (categoryEditPage.getMode().equals(PompeiConstants.INSERT_MODE)) {
             // insert
             CategoryDescription d = new CategoryDescription();
-            categoriesDxo.convert(getCategoryEditPage(), d);
+            categoryDxo.convert(getCategoryEditPage(), d);
             Category c = new Category();
             // TODO dxo
             c.setCategoryId(categoryEditPage.getTargetId());
-            c.setImage(categoryEditPage.getCategoriesImage());
+            c.setImage(categoryEditPage.getImage());
             c.setSortOrder(categoryEditPage.getSortOrder());
             d.setCategory(c);
             c.setParentId(parentId);
@@ -118,11 +118,11 @@
                             categoryEditPage.getTargetId(),
                             getLanguageService().getDefaultLanguage()
                                     .getLanguageId());
-            categoriesDxo.convert(getCategoryEditPage(), d);
+            categoryDxo.convert(getCategoryEditPage(), d);
             Category c = d.getCategory();
             // TODO dxo
             c.setCategoryId(categoryEditPage.getTargetId());
-            c.setImage(categoryEditPage.getCategoriesImage());
+            c.setImage(categoryEditPage.getImage());
             c.setSortOrder(categoryEditPage.getSortOrder());
             c.setLastModified(new Timestamp(new Date().getTime()));
             c.setParentId(parentId);
@@ -143,12 +143,12 @@
         this.categoryService = categoryListService;
     }
 
-    public CategoryDxo getCategoriesDxo() {
-        return categoriesDxo;
+    public CategoryDxo getCategoryDxo() {
+        return categoryDxo;
     }
 
-    public void setCategoriesDxo(CategoryDxo dxo) {
-        this.categoriesDxo = dxo;
+    public void setCategoryDxo(CategoryDxo dxo) {
+        this.categoryDxo = dxo;
     }
 
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
+import org.seasar.teeda.extension.annotation.validator.Required;
 import org.seasar.teeda.extension.util.LabelHelper;
 
 public class CategoryEditPage implements Serializable {
@@ -34,10 +35,13 @@
     @SubapplicationScope
     private List<Map<String, Object>> breadcrumbItems;
 
-    private String categoriesImage;
+    private String image;
 
-    private String categoriesName;
+    @Required
+    private String name;
 
+    private String description;
+
     private BigDecimal parentId;
 
     private BigDecimal sortOrder;
@@ -51,20 +55,20 @@
 
     private LabelHelper labelHelper;
 
-    public String getCategoriesImage() {
-        return categoriesImage;
+    public String getImage() {
+        return image;
     }
 
-    public void setCategoriesImage(String categoriesImage) {
-        this.categoriesImage = categoriesImage;
+    public void setImage(String categoriesImage) {
+        this.image = categoriesImage;
     }
 
-    public String getCategoriesName() {
-        return categoriesName;
+    public String getName() {
+        return name;
     }
 
-    public void setCategoriesName(String categoriesName) {
-        this.categoriesName = categoriesName;
+    public void setName(String categoriesName) {
+        this.name = categoriesName;
     }
 
     public String getBreadcrumb() {
@@ -132,4 +136,18 @@
     public String getDoUpdateValue() {
         return getLabelHelper().getLabelValue(getMode());
     }
+
+    /**
+     * @return description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description 設定する description
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -59,24 +59,26 @@
     public Class<?> prerender() {
 
         if (categoryListPage.getParentId() == null) {
-            categoryListPage.setParentId(new BigDecimal("0"));
+            categoryListPage.setParentId(PompeiConstants.ROOT_CATEGORY_ID);
         }
 
         if (categoryListPage.getBreadcrumbItems() == null) {
 
-            categoryListPage.setCategoriesId(new BigDecimal("0"));
+            categoryListPage.setCategoryId(PompeiConstants.ROOT_CATEGORY_ID);
 
             List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
             Map<String, Object> m = new HashMap<String, Object>();
-            m.put(PompeiConstants.CATEGORIES_ID, new BigDecimal("0"));
-            m.put(PompeiConstants.BREADCRUMB, "TOP");
+            m
+                    .put(PompeiConstants.CATEGORY_ID,
+                            PompeiConstants.ROOT_CATEGORY_ID);
+            m.put(PompeiConstants.BREADCRUMB, getCategoryListPage()
+                    .getLabelHelper().getLabelValue("top"));
             list.add(m);
             categoryListPage.setBreadcrumbItems(list);
 
         } else {
-            if (categoryListPage.getCategoriesId() != null) {
-                categoryListPage
-                        .setParentId(categoryListPage.getCategoriesId());
+            if (categoryListPage.getCategoryId() != null) {
+                categoryListPage.setParentId(categoryListPage.getCategoryId());
             }
 
             //パンくずリストを再セット
@@ -120,7 +122,7 @@
         // TODO redirect wrong page??
 
         //TODO put message
-        return null;
+        return CategoryListPage.class;
     }
 
     /**
@@ -149,17 +151,22 @@
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
         for (Map<String, Object> m : breadcrumbItems) {
             list.add(m);
-            if (((BigDecimal) m.get(PompeiConstants.CATEGORIES_ID)).equals(id)) {
+            if (((BigDecimal) m.get(PompeiConstants.CATEGORY_ID)).equals(id)) {
                 return list;
             }
         }
 
-        CategoryDescription d = categoryService
-                .getCategoryDescription(categoryListPage.getCategoriesId());
+        CategoryDescription cd = categoryService.getCategoryDescription(
+                categoryListPage.getCategoryId(), getLanguageService()
+                        .getDefaultLanguage().getLanguageId());
 
+        if (cd == null) {
+            return list;
+        }
+
         Map<String, Object> m = new HashMap<String, Object>();
-        m.put(PompeiConstants.CATEGORIES_ID, id);
-        m.put(PompeiConstants.BREADCRUMB, d.getName());
+        m.put(PompeiConstants.CATEGORY_ID, id);
+        m.put(PompeiConstants.BREADCRUMB, cd.getName());
         list.add(m);
         return list;
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
+import org.seasar.teeda.extension.util.LabelHelper;
 
 public class CategoryListPage implements Serializable {
     /**
@@ -25,16 +26,14 @@
 
     private int categoryIndex;
 
-    private BigDecimal categoriesId;
+    private BigDecimal categoryId;
 
-    private String categoriesImage;
+    private String image;
 
-    private String categoriesName;
+    private String name;
 
     private BigDecimal sortOrder;
 
-    private String title;
-
     private String breadcrumb;
 
     private BigDecimal targetId;
@@ -53,20 +52,22 @@
     @SubapplicationScope
     private List<Map<String, Object>> categoryItems;
 
-    public String getCategoriesImage() {
-        return categoriesImage;
+    private LabelHelper labelHelper;
+
+    public String getImage() {
+        return image;
     }
 
-    public void setCategoriesImage(String categoriesImage) {
-        this.categoriesImage = categoriesImage;
+    public void setImage(String categoriesImage) {
+        this.image = categoriesImage;
     }
 
-    public String getCategoriesName() {
-        return categoriesName;
+    public String getName() {
+        return name;
     }
 
-    public void setCategoriesName(String categoriesName) {
-        this.categoriesName = categoriesName;
+    public void setName(String categoriesName) {
+        this.name = categoriesName;
     }
 
     public BigDecimal getSortOrder() {
@@ -77,18 +78,6 @@
         this.sortOrder = sortOrder;
     }
 
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    //	public Class prerender() {
-    //		return null;
-    //	}
-
     public List<Map<String, Object>> getCategoryItems() {
         return categoryItems;
     }
@@ -97,12 +86,12 @@
         this.categoryItems = categoryList;
     }
 
-    public BigDecimal getCategoriesId() {
-        return categoriesId;
+    public BigDecimal getCategoryId() {
+        return categoryId;
     }
 
-    public void setCategoriesId(BigDecimal categoriesId) {
-        this.categoriesId = categoriesId;
+    public void setCategoryId(BigDecimal categoriesId) {
+        this.categoryId = categoriesId;
     }
 
     public List<Map<String, Object>> getBreadcrumbItems() {
@@ -168,4 +157,18 @@
     public void setCategoryIndex(int categoryIndex) {
         this.categoryIndex = categoryIndex;
     }
+
+    /**
+     * @return labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper 設定する labelHelper
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -3,6 +3,9 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.dxo.ManufacturerDxo;
 import jp.sf.pal.pompei.exentity.Manufacturer;
@@ -41,9 +44,9 @@
 
     public Class<?> prerender() {
         if (isUpdate()) {
-            BigDecimal id = manufacturerEditPage.getManufacturersId();
+            BigDecimal id = manufacturerEditPage.getManufacturerId();
             ManufacturerDescription info = manufacturerService
-                    .getManufacturesInfo(id, getLanguageService()
+                    .getManufactureDescription(id, getLanguageService()
                             .getDefaultLanguage().getLanguageId());
             if (info != null) {
                 manufacturersDxo.convert(info, manufacturerEditPage);
@@ -56,12 +59,13 @@
         return null;
     }
 
+    @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,targetId")
     public Class<?> doUpdate() {
         if (isUpdate()) {
             // update
-            BigDecimal id = getManufacturerEditPage().getManufacturersId();
+            BigDecimal id = getManufacturerEditPage().getManufacturerId();
             ManufacturerDescription info = getManufacturerService()
-                    .getManufacturesInfo(
+                    .getManufactureDescription(
                             id,
                             getLanguageService().getDefaultLanguage()
                                     .getLanguageId());
@@ -69,10 +73,9 @@
             Manufacturer manufacturers = info.getManufacturer();
             getManufacturersDxo().convert(getManufacturerEditPage(),
                     manufacturers);
-            manufacturers.setName(manufacturerEditPage.getManufacturersName());
-            manufacturers
-                    .setImage(manufacturerEditPage.getManufacturersImage());
-            manufacturerService.updateManufacturesInfo(info);
+            manufacturers.setName(manufacturerEditPage.getName());
+            manufacturers.setImage(manufacturerEditPage.getImage());
+            manufacturerService.updateManufactureDescription(info);
             // TODO put message
             return ManufacturerEditPage.class;
         } else {
@@ -85,7 +88,7 @@
             getManufacturersDxo().convert(getManufacturerEditPage(),
                     manufacturers);
             info.setManufacturer(manufacturers);
-            manufacturerService.addManufacturesInfo(info);
+            getManufacturerService().addManufactureDescription(info);
             // TODO put message
             return ManufacturerListPage.class;
         }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -16,20 +16,18 @@
 
     public static final String manufacturersUrl_TRequiredValidator = null;
 
-    private BigDecimal manufacturersId;
+    private BigDecimal manufacturerId;
 
-    private String manufacturersImage;
+    private String image;
 
-    private String manufacturersLongDesc;
+    private String longDescription;
 
-    private String manufacturersName;
+    private String name;
 
-    private String manufacturersShortDesc;
+    private String shortDescription;
 
-    private String manufacturersUrl;
+    private String url;
 
-    private String title;
-
     private BigDecimal targetId;
 
     /**
@@ -53,62 +51,54 @@
         this.targetId = targetId;
     }
 
-    public String getManufacturersImage() {
-        return manufacturersImage;
+    public String getImage() {
+        return image;
     }
 
-    public void setManufacturersImage(String manufacturersImage) {
-        this.manufacturersImage = manufacturersImage;
+    public void setImage(String manufacturersImage) {
+        this.image = manufacturersImage;
     }
 
-    public String getManufacturersLongDesc() {
-        return manufacturersLongDesc;
+    public String getLongDescription() {
+        return longDescription;
     }
 
-    public void setManufacturersLongDesc(String manufacturersLongDesc) {
-        this.manufacturersLongDesc = manufacturersLongDesc;
+    public void setLongDescription(String manufacturersLongDesc) {
+        this.longDescription = manufacturersLongDesc;
     }
 
-    public String getManufacturersName() {
-        return manufacturersName;
+    public String getName() {
+        return name;
     }
 
-    public void setManufacturersName(String manufacturersName) {
-        this.manufacturersName = manufacturersName;
+    public void setName(String manufacturersName) {
+        this.name = manufacturersName;
     }
 
-    public String getManufacturersShortDesc() {
-        return manufacturersShortDesc;
+    public String getShortDescription() {
+        return shortDescription;
     }
 
-    public void setManufacturersShortDesc(String manufacturersShortDesc) {
-        this.manufacturersShortDesc = manufacturersShortDesc;
+    public void setShortDescription(String manufacturersShortDesc) {
+        this.shortDescription = manufacturersShortDesc;
     }
 
-    public String getManufacturersUrl() {
-        return manufacturersUrl;
+    public String getUrl() {
+        return url;
     }
 
-    public void setManufacturersUrl(String manufacturersUrl) {
-        this.manufacturersUrl = manufacturersUrl;
+    public void setUrl(String manufacturersUrl) {
+        this.url = manufacturersUrl;
     }
 
-    public String getTitle() {
-        return title;
+    public BigDecimal getManufacturerId() {
+        return manufacturerId;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public void setManufacturerId(BigDecimal manufacturersId) {
+        this.manufacturerId = manufacturersId;
     }
 
-    public BigDecimal getManufacturersId() {
-        return manufacturersId;
-    }
-
-    public void setManufacturersId(BigDecimal manufacturersId) {
-        this.manufacturersId = manufacturersId;
-    }
-
     public String getMode() {
         return mode;
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -8,6 +8,7 @@
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.dxo.ManufacturerDxo;
 import jp.sf.pal.pompei.exentity.ManufacturerDescription;
+import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.service.ManufacturerService;
 
 public class ManufacturerListAction implements Serializable {
@@ -20,32 +21,19 @@
     /**
      *
      */
-    private ManufacturerListPage manufacuturerListPage;
+    private ManufacturerListPage manufacturerListPage;
 
     /**
      *
      */
     private ManufacturerService manufacturerService;
 
+    private LanguageService languageService;
+
     private ManufacturerDxo manufacturersDxo;
 
-    /**
-     * @return manufacuturerListPage
-     */
-    public ManufacturerListPage getManufacuturerListPage() {
-        return manufacuturerListPage;
-    }
-
-    /**
-     * @param manufacuturerListPage 設定する manufacuturerListPage
-     */
-    public void setManufacuturerListPage(
-            ManufacturerListPage manufacuturerListPage) {
-        this.manufacuturerListPage = manufacuturerListPage;
-    }
-
     public Class<?> doDelete() {
-        manufacturerService.deleteManufacture(getManufacuturerListPage()
+        manufacturerService.deleteManufacture(getManufacturerListPage()
                 .getTargetId());
 
         //TODO put message
@@ -53,25 +41,15 @@
     }
 
     public Class<?> doUpdate() {
-        getManufacturerListPage().setManufacturersId(
+        getManufacturerListPage().setManufacturerId(
                 getManufacturerListPage().getTargetId());
         return ManufacturerEditPage.class;
     }
 
-    /**
-     * @return makerListPage
-     */
-    public ManufacturerListPage getManufacturerListPage() {
-        return manufacuturerListPage;
+    public Class<?> doAdd() {
+        return ManufacturerEditPage.class;
     }
 
-    /**
-     * @param listPage 設定する makerListPage
-     */
-    public void setManufacturerListPage(ManufacturerListPage listPage) {
-        this.manufacuturerListPage = listPage;
-    }
-
     public Class<?> initialize() {
         return null;
     }
@@ -80,10 +58,11 @@
         //		List list = getMockList();
         //		makerListPage.setManufacturerItems(list);
         List<ManufacturerDescription> list = manufacturerService
-                .getManufacturesInfoList();
+                .getManufactureDescriptionList(getLanguageService()
+                        .getDefaultLanguage().getLanguageId());
         List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
         manufacturersDxo.convert(list, mapList);
-        getManufacuturerListPage().setManufacturerItems(mapList);
+        getManufacturerListPage().setManufacturerItems(mapList);
 
         // redner FacesMessage
         FacesMessageUtil.renderMessages();
@@ -124,4 +103,34 @@
         this.manufacturersDxo = dxo;
     }
 
+    /**
+     * @return languageService
+     */
+    public LanguageService getLanguageService() {
+        return languageService;
+    }
+
+    /**
+     * @param languageService 設定する languageService
+     */
+    public void setLanguageService(LanguageService languageService) {
+        this.languageService = languageService;
+    }
+
+    /**
+     * @return manufacuturerListPage
+     */
+    public ManufacturerListPage getManufacturerListPage() {
+
+        return manufacturerListPage;
+    }
+
+    /**
+     * @param manufacuturerListPage 設定する manufacuturerListPage
+     */
+    public void setManufacturerListPage(
+            ManufacturerListPage manufacuturerListPage) {
+        this.manufacturerListPage = manufacuturerListPage;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -14,29 +14,27 @@
      */
     private static final long serialVersionUID = 1619134135122729994L;
 
-    private String manufacturersDesc;
+    private String shortDescription;
 
     private int manufacturerIndex = 1;
 
     @SubapplicationScope
     private List<Map<String, Object>> manufacturerItems;
 
-    private String manufacturersName;
+    private String name;
 
     private String mode;
 
     private BigDecimal targetId;
 
-    private BigDecimal manufacturersId;
+    private BigDecimal manufacturerId;
 
-    private String title;
-
-    public String getManufacturersDesc() {
-        return manufacturersDesc;
+    public String getShortDescription() {
+        return shortDescription;
     }
 
-    public void setManufacturersDesc(String manufacturerDesc) {
-        this.manufacturersDesc = manufacturerDesc;
+    public void setShortDescription(String manufacturerDesc) {
+        this.shortDescription = manufacturerDesc;
     }
 
     public int getManufacturerIndex() {
@@ -55,12 +53,12 @@
         this.manufacturerItems = manufacturerItems;
     }
 
-    public String getManufacturersName() {
-        return manufacturersName;
+    public String getName() {
+        return name;
     }
 
-    public void setManufacturersName(String manufacturerName) {
-        this.manufacturersName = manufacturerName;
+    public void setName(String manufacturerName) {
+        this.name = manufacturerName;
     }
 
     public String getMode() {
@@ -85,20 +83,12 @@
         this.targetId = targetId;
     }
 
-    public String getTitle() {
-        return title;
+    public BigDecimal getManufacturerId() {
+        return manufacturerId;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public void setManufacturerId(BigDecimal manufacturersId) {
+        this.manufacturerId = manufacturersId;
     }
 
-    public BigDecimal getManufacturersId() {
-        return manufacturersId;
-    }
-
-    public void setManufacturersId(BigDecimal manufacturersId) {
-        this.manufacturersId = manufacturersId;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -11,11 +11,14 @@
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.dxo.ManufacturerDxo;
 import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.dxo.TaxDxo;
 import jp.sf.pal.pompei.exentity.Manufacturer;
 import jp.sf.pal.pompei.exentity.Product;
 import jp.sf.pal.pompei.exentity.ProductDescription;
+import jp.sf.pal.pompei.exentity.TaxClass;
 import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.service.ManufacturerService;
+import jp.sf.pal.pompei.service.TaxService;
 import jp.sf.pal.pompei.service.impl.ProductServiceImpl;
 
 public class ProductEditAction implements Serializable {
@@ -36,11 +39,15 @@
     /**	 */
     private ProductDxo productDxo;
 
+    private TaxDxo taxDxo;
+
     /**	 */
     private ManufacturerService manufacturerService;
 
+    private TaxService taxService;
+
     /**	 */
-    private ManufacturerDxo manufacturersDxo;
+    private ManufacturerDxo manufacturerDxo;
 
     public ProductDxo getProductDxo() {
         return productDxo;
@@ -52,38 +59,47 @@
 
     public Class<?> initialize() {
 
-        List<Map<String, String>> mList = getManufacturerList();
-        productEditPage.setManufacturersIdItems(mList);
-        //TODO tax
+        List<Map<String, String>> mList = getManufacturerIdList();
+        productEditPage.setManufacturerIdItems(mList);
+        // tax
+        List<Map<String, String>> tcList = getTaxClassIdList();
+        productEditPage.setTaxClassIdItems(tcList);
 
         return null;
     }
 
-    private List<Map<String, String>> getManufacturerList() {
-        List<Manufacturer> mList = manufacturerService.getManufactureList();
+    private List<Map<String, String>> getManufacturerIdList() {
+        List<Manufacturer> mList = manufacturerService.getManufacturerList();
         List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-        manufacturersDxo.convertCombo(mList, list);
+        manufacturerDxo.convertCombo(mList, list);
         return list;
     }
 
+    private List<Map<String, String>> getTaxClassIdList() {
+        List<TaxClass> mList = getTaxService().getTaxClassList();
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        getTaxDxo().convert(mList, list);
+        return list;
+    }
+
     public Class<?> prerender() {
         if (isUpdate()) {
             // update
             ProductDescription description = productService
-                    .getProdcutsDescription(productEditPage.getProductsId());
+                    .getProdcutsDescription(productEditPage.getProductId());
             productDxo.convert(description, productEditPage);
         } else {
             //insert
             // TODO needs to use TakeOver
             productEditPage.setMode(PompeiConstants.INSERT_MODE);
-            productEditPage.setProductsName("");
-            productEditPage.setProductsModel("");
-            productEditPage.setProductsImage("");
+            productEditPage.setName("");
+            productEditPage.setModel("");
+            productEditPage.setImage("");
             BigDecimal zero = new BigDecimal("0");
-            productEditPage.setProductsPrice(zero);
-            productEditPage.setProductsQuantity(zero);
-            productEditPage.setProductsStatus(zero);
-            productEditPage.setProductsWeight(zero);
+            productEditPage.setPrice(zero);
+            productEditPage.setQuantity(zero);
+            productEditPage.setStatus(zero);
+            productEditPage.setWeight(zero);
         }
 
         // render faces messages
@@ -101,7 +117,7 @@
             description.setProduct(products);
             description.setLanguageId(getLanguageService().getDefaultLanguage()
                     .getLanguageId());
-            description.setImageFile(productEditPage.getProductsImageFile());
+            description.setImageFile(productEditPage.getImageFile());
 
             try {
                 productService.addProductDescription(description,
@@ -113,7 +129,7 @@
 
         } else if (isUpdate()) {
             ProductDescription description = productService
-                    .getProdcutsDescription(productEditPage.getProductsId(),
+                    .getProdcutsDescription(productEditPage.getProductId(),
                             getLanguageService().getDefaultLanguage()
                                     .getLanguageId());
             productDxo.convertPageToDescription(productEditPage, description);
@@ -121,7 +137,7 @@
             Product products = description.getProduct();
             productDxo.convertPageToProduct(productEditPage, products);
 
-            description.setImageFile(productEditPage.getProductsImageFile());
+            description.setImageFile(productEditPage.getImageFile());
             try {
                 productService.updateProductDescription(description);
                 //TODO put message
@@ -182,12 +198,12 @@
         this.languageService = languageService;
     }
 
-    public ManufacturerDxo getManufacturersDxo() {
-        return manufacturersDxo;
+    public ManufacturerDxo getManufacturerDxo() {
+        return manufacturerDxo;
     }
 
-    public void setManufacturersDxo(ManufacturerDxo manufacturersDxo) {
-        this.manufacturersDxo = manufacturersDxo;
+    public void setManufacturerDxo(ManufacturerDxo manufacturersDxo) {
+        this.manufacturerDxo = manufacturersDxo;
     }
 
     public ManufacturerService getManufacturerService() {
@@ -198,4 +214,32 @@
         this.manufacturerService = manufacturerService;
     }
 
+    /**
+     * @return taxService
+     */
+    public TaxService getTaxService() {
+        return taxService;
+    }
+
+    /**
+     * @param taxService 設定する taxService
+     */
+    public void setTaxService(TaxService taxService) {
+        this.taxService = taxService;
+    }
+
+    /**
+     * @return taxDxo
+     */
+    public TaxDxo getTaxDxo() {
+        return taxDxo;
+    }
+
+    /**
+     * @param taxDxo 設定する taxDxo
+     */
+    public void setTaxDxo(TaxDxo taxDxo) {
+        this.taxDxo = taxDxo;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -8,6 +8,7 @@
 import jp.sf.pal.jsf.custom.fileupload.UploadedFile;
 
 import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
+import org.seasar.teeda.extension.annotation.validator.Required;
 
 public class ProductEditPage implements Serializable {
 
@@ -18,8 +19,6 @@
 
     public static final String productsName_TRequiredValidator = null;
 
-    public static final String manufacturersId_TRequiredValidator = null;
-
     public static final String productsModel_TRequiredValidator = null;
 
     private String breadcrumb;
@@ -29,39 +28,47 @@
     @SubapplicationScope
     private List<Map<String, Object>> breadcrumbItems;
 
-    @SubapplicationScope
-    private List<Map<String, String>> manufacturersIdItems;
+    private List<Map<String, String>> manufacturerIdItems;
 
-    private BigDecimal manufacturersId;
+    @Required
+    private BigDecimal manufacturerId;
 
     private String mode;
 
     private BigDecimal parentId;
 
-    private BigDecimal productsId;
+    private BigDecimal productId;
 
-    private String productsImage;
+    private String image;
 
-    private UploadedFile productsImageFile;
+    private UploadedFile imageFile;
 
-    private String productsModel;
+    private String thumbnail;
 
-    private String productsName;
+    private UploadedFile thumbnailFile;
 
-    private BigDecimal productsPrice;
+    private String model;
 
-    private BigDecimal productsQuantity;
+    @Required
+    private String name;
 
-    private BigDecimal productsStatus;
+    @Required
+    private BigDecimal price;
 
-    private BigDecimal productsTaxClassId;
+    @Required
+    private BigDecimal quantity;
 
-    private BigDecimal productsWeight;
+    private BigDecimal status;
 
+    private List<Map<String, String>> taxClassIdItems;
+
+    @Required
+    private BigDecimal taxClassId;
+
+    private BigDecimal weight;
+
     private BigDecimal targetId;
 
-    private String title;
-
     public String getBreadcrumb() {
         return breadcrumb;
     }
@@ -86,13 +93,13 @@
         this.breadcrumbItems = breadcrumbItems;
     }
 
-    public List<Map<String, String>> getManufacturersIdItems() {
-        return manufacturersIdItems;
+    public List<Map<String, String>> getManufacturerIdItems() {
+        return manufacturerIdItems;
     }
 
-    public void setManufacturersIdItems(
+    public void setManufacturerIdItems(
             List<Map<String, String>> manufacturerItems) {
-        this.manufacturersIdItems = manufacturerItems;
+        this.manufacturerIdItems = manufacturerItems;
     }
 
     public String getMode() {
@@ -111,82 +118,82 @@
         this.parentId = parentId;
     }
 
-    public String getProductsImage() {
-        return productsImage;
+    public String getImage() {
+        return image;
     }
 
-    public void setProductsImage(String productsImage) {
-        this.productsImage = productsImage;
+    public void setImage(String productsImage) {
+        this.image = productsImage;
     }
 
     /**
      * @return productsImageFile
      */
-    public UploadedFile getProductsImageFile() {
-        return productsImageFile;
+    public UploadedFile getImageFile() {
+        return imageFile;
     }
 
     /**
      * @param productsImageFile 設定する productsImageFile
      */
-    public void setProductsImageFile(UploadedFile productsImageFile) {
-        this.productsImageFile = productsImageFile;
+    public void setImageFile(UploadedFile productsImageFile) {
+        this.imageFile = productsImageFile;
     }
 
-    public String getProductsModel() {
-        return productsModel;
+    public String getModel() {
+        return model;
     }
 
-    public void setProductsModel(String productsModel) {
-        this.productsModel = productsModel;
+    public void setModel(String productsModel) {
+        this.model = productsModel;
     }
 
-    public String getProductsName() {
-        return productsName;
+    public String getName() {
+        return name;
     }
 
-    public void setProductsName(String productsName) {
-        this.productsName = productsName;
+    public void setName(String productsName) {
+        this.name = productsName;
     }
 
-    public BigDecimal getProductsPrice() {
-        return productsPrice;
+    public BigDecimal getPrice() {
+        return price;
     }
 
-    public void setProductsPrice(BigDecimal productsPrice) {
-        this.productsPrice = productsPrice;
+    public void setPrice(BigDecimal productsPrice) {
+        this.price = productsPrice;
     }
 
-    public BigDecimal getProductsQuantity() {
-        return productsQuantity;
+    public BigDecimal getQuantity() {
+        return quantity;
     }
 
-    public void setProductsQuantity(BigDecimal productsQuantity) {
-        this.productsQuantity = productsQuantity;
+    public void setQuantity(BigDecimal productsQuantity) {
+        this.quantity = productsQuantity;
     }
 
-    public BigDecimal getProductsStatus() {
-        return productsStatus;
+    public BigDecimal getStatus() {
+        return status;
     }
 
-    public void setProductsStatus(BigDecimal productsStatus) {
-        this.productsStatus = productsStatus;
+    public void setStatus(BigDecimal productsStatus) {
+        this.status = productsStatus;
     }
 
-    public BigDecimal getProductsTaxClassId() {
-        return productsTaxClassId;
+    public BigDecimal getTaxClassId() {
+        return taxClassId;
     }
 
-    public void setProductsTaxClassId(BigDecimal productsTaxClassId) {
-        this.productsTaxClassId = productsTaxClassId;
+    public void setTaxClassId(BigDecimal productsTaxClassId) {
+        this.taxClassId = productsTaxClassId;
     }
 
-    public BigDecimal getProductsWeight() {
-        return productsWeight;
+    public BigDecimal getWeight() {
+        return weight;
     }
 
-    public void setProductsWeight(BigDecimal productsWeight) {
-        this.productsWeight = productsWeight;
+    public void setWeight(BigDecimal productsWeight) {
+        this.weight = productsWeight;
     }
 
     public BigDecimal getTargetId() {
@@ -197,28 +204,62 @@
         this.targetId = targetId;
     }
 
-    public String getTitle() {
-        return title;
+    public BigDecimal getManufacturerId() {
+        return manufacturerId;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public void setManufacturerId(BigDecimal manufacturersId) {
+        this.manufacturerId = manufacturersId;
     }
 
-    public BigDecimal getManufacturersId() {
-        return manufacturersId;
+    public BigDecimal getProductId() {
+        return productId;
     }
 
-    public void setManufacturersId(BigDecimal manufacturersId) {
-        this.manufacturersId = manufacturersId;
+    public void setProductId(BigDecimal productsId) {
+        this.productId = productsId;
     }
 
-    public BigDecimal getProductsId() {
-        return productsId;
+    /**
+     * @return thumbnail
+     */
+    public String getThumbnail() {
+        return thumbnail;
     }
 
-    public void setProductsId(BigDecimal productsId) {
-        this.productsId = productsId;
+    /**
+     * @param thumbnail 設定する thumbnail
+     */
+    public void setThumbnail(String thumbnail) {
+        this.thumbnail = thumbnail;
     }
 
+    /**
+     * @return thumbnailFile
+     */
+    public UploadedFile getThumbnailFile() {
+        return thumbnailFile;
+    }
+
+    /**
+     * @param thumbnailFile 設定する thumbnailFile
+     */
+    public void setThumbnailFile(UploadedFile thumbnailFile) {
+        this.thumbnailFile = thumbnailFile;
+    }
+
+    /**
+     * @return taxClassIdItems
+     */
+    public List<Map<String, String>> getTaxClassIdItems() {
+        return taxClassIdItems;
+    }
+
+    /**
+     * @param taxClassIdItems 設定する taxClassIdItems
+     */
+    public void setTaxClassIdItems(List<Map<String, String>> taxClassIdItems) {
+        this.taxClassIdItems = taxClassIdItems;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -45,7 +45,7 @@
     }
 
     public Class<?> doDelete() {
-        productService.deleteProduct(productListPage.getProductsId());
+        productService.deleteProduct(productListPage.getProductId());
         //TODO put message
         return null;
     }
@@ -64,15 +64,17 @@
         }
 
         if (productListPage.getParentId() == null) {
-            productListPage.setParentId(new BigDecimal("0"));
+            productListPage.setParentId(PompeiConstants.ROOT_CATEGORY_ID);
         }
 
         if (productListPage.getBreadcrumbItems() == null) {
-            productListPage.setCategoriesId(new BigDecimal("0"));
+            productListPage.setCategoryId(PompeiConstants.ROOT_CATEGORY_ID);
 
             List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
             Map<String, Object> m = new HashMap<String, Object>();
-            m.put(PompeiConstants.CATEGORIES_ID, new BigDecimal("0"));
+            m
+                    .put(PompeiConstants.CATEGORY_ID,
+                            PompeiConstants.ROOT_CATEGORY_ID);
             m.put(PompeiConstants.BREADCRUMB, getProductListPage()
                     .getLabelHelper().getLabelValue(
                             PompeiConstants.TOP_CATEGORY));
@@ -80,8 +82,8 @@
             productListPage.setBreadcrumbItems(list);
 
         } else {
-            if (productListPage.getCategoriesId() != null) {
-                productListPage.setParentId(productListPage.getCategoriesId());
+            if (productListPage.getCategoryId() != null) {
+                productListPage.setParentId(productListPage.getCategoryId());
             }
 
             //パンくずリストを再セット
@@ -99,7 +101,7 @@
                 .getParentId());
         List<Map<String, Object>> sList = new ArrayList<Map<String, Object>>();
         productDxo.convert(list, sList);
-        productListPage.setProductsItems(sList);
+        productListPage.setProductItems(sList);
 
         // render faces messages
         FacesMessageUtil.renderMessages();
@@ -185,16 +187,20 @@
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
         for (Map<String, Object> m : breadcrumbItems) {
             list.add(m);
-            if (((BigDecimal) m.get(PompeiConstants.CATEGORIES_ID)).equals(id)) {
+            if (((BigDecimal) m.get(PompeiConstants.CATEGORY_ID)).equals(id)) {
                 return list;
             }
         }
         CategoryDescription d = categoryService.getCategoryDescription(
-                productListPage.getCategoriesId(), getLanguageService()
+                productListPage.getCategoryId(), getLanguageService()
                         .getDefaultLanguage().getLanguageId());
 
+        if (d == null) {
+            return list;
+        }
+
         Map<String, Object> m = new HashMap<String, Object>();
-        m.put(PompeiConstants.CATEGORIES_ID, id);
+        m.put(PompeiConstants.CATEGORY_ID, id);
         m.put(PompeiConstants.BREADCRUMB, d.getName());
         list.add(m);
         return list;

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -9,6 +9,7 @@
 import jp.sf.pal.pompei.exentity.ProductDescription;
 import jp.sf.pal.pompei.service.LanguageService;
 
+import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
 import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
 import org.seasar.teeda.extension.util.LabelHelper;
 
@@ -21,8 +22,6 @@
 
     private String mode;
 
-    private int rowIndex;
-
     private BigDecimal targetId;
 
     @SubapplicationScope
@@ -37,33 +36,31 @@
 
     private int categoryIndex;
 
-    private BigDecimal categoriesId;
+    private BigDecimal categoryId;
 
     @SubapplicationScope
     private List<Map<String, Object>> categoryItems;
 
-    private String categoriesName;
+    private String name;
 
-    private String manufacturersName;
+    private String manufacturerName;
 
-    private String productsDateAdded;
+    // TODO date format
+    @DateTimeConverter(pattern = "yyyy/MM/dd")
+    private String dateAdded;
 
-    private String productsImage;
+    private int productIndex;
 
-    private int productsIndex;
+    private List<Map<String, Object>> productItems;
 
-    private List<Map<String, Object>> productsItems;
+    private BigDecimal productId;
 
-    private BigDecimal productsId;
+    private String model;
 
-    private String productsModel;
+    private BigDecimal price;
 
-    private String productsName;
+    private BigDecimal status;
 
-    private BigDecimal productsPrice;
-
-    private BigDecimal productsStatus;
-
     private String sortOrder;
 
     private String title;
@@ -126,78 +123,62 @@
         this.categoryItems = categoryItems;
     }
 
-    public String getManufacturersName() {
-        return manufacturersName;
+    public String getManufacturerName() {
+        return manufacturerName;
     }
 
-    public void setManufacturersName(String manufacturersName) {
-        this.manufacturersName = manufacturersName;
+    public void setManufacturerName(String manufacturersName) {
+        this.manufacturerName = manufacturersName;
     }
 
-    public String getProductsDateAdded() {
-        return productsDateAdded;
+    public String getDateAdded() {
+        return dateAdded;
     }
 
-    public void setProductsDateAdded(String productsDateAdded) {
-        this.productsDateAdded = productsDateAdded;
+    public void setDateAdded(String productsDateAdded) {
+        this.dateAdded = productsDateAdded;
     }
 
-    public String getProductsImage() {
-        return productsImage;
+    public int getProductIndex() {
+        return productIndex;
     }
 
-    public void setProductsImage(String productsImage) {
-        this.productsImage = productsImage;
+    public void setProductIndex(int productsIndex) {
+        this.productIndex = productsIndex;
     }
 
-    public int getProductsIndex() {
-        return productsIndex;
+    public List<Map<String, Object>> getProductItems() {
+        return productItems;
     }
 
-    public void setProductsIndex(int productsIndex) {
-        this.productsIndex = productsIndex;
+    public void setProductItems(List<Map<String, Object>> productsItems) {
+        this.productItems = productsItems;
     }
 
-    public List<Map<String, Object>> getProductsItems() {
-        return productsItems;
+    public String getModel() {
+        return model;
     }
 
-    public void setProductsItems(List<Map<String, Object>> productsItems) {
-        this.productsItems = productsItems;
+    public void setModel(String productsModel) {
+        this.model = productsModel;
     }
 
-    public String getProductsModel() {
-        return productsModel;
+    public BigDecimal getPrice() {
+        return price;
     }
 
-    public void setProductsModel(String productsModel) {
-        this.productsModel = productsModel;
+    public void setPrice(BigDecimal productsPrice) {
+        this.price = productsPrice;
     }
 
-    public String getProductsName() {
-        return productsName;
+    public BigDecimal getStatus() {
+        return status;
     }
 
-    public void setProductsName(String productsName) {
-        this.productsName = productsName;
+    public void setStatus(BigDecimal productsStatus) {
+        this.status = productsStatus;
     }
 
-    public BigDecimal getProductsPrice() {
-        return productsPrice;
-    }
-
-    public void setProductsPrice(BigDecimal productsPrice) {
-        this.productsPrice = productsPrice;
-    }
-
-    public BigDecimal getProductsStatus() {
-        return productsStatus;
-    }
-
-    public void setProductsStatus(BigDecimal productsStatus) {
-        this.productsStatus = productsStatus;
-    }
-
     public String getSortOrder() {
         return sortOrder;
     }
@@ -222,14 +203,6 @@
         this.parentId = parentId;
     }
 
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    public void setRowIndex(int rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-
     public BigDecimal getTargetId() {
         return targetId;
     }
@@ -238,20 +211,20 @@
         this.targetId = targetId;
     }
 
-    public BigDecimal getCategoriesId() {
-        return categoriesId;
+    public BigDecimal getCategoryId() {
+        return categoryId;
     }
 
-    public void setCategoriesId(BigDecimal categoriesId) {
-        this.categoriesId = categoriesId;
+    public void setCategoryId(BigDecimal categoriesId) {
+        this.categoryId = categoriesId;
     }
 
-    public String getCategoriesName() {
-        return categoriesName;
+    public String getName() {
+        return name;
     }
 
-    public void setCategoriesName(String categoriesName) {
-        this.categoriesName = categoriesName;
+    public void setName(String categoriesName) {
+        this.name = categoriesName;
     }
 
     //    public List getDescriptionList() {
@@ -267,12 +240,12 @@
     //        }
     //    }
 
-    public BigDecimal getProductsId() {
-        return productsId;
+    public BigDecimal getProductId() {
+        return productId;
     }
 
-    public void setProductsId(BigDecimal productsId) {
-        this.productsId = productsId;
+    public void setProductId(BigDecimal productsId) {
+        this.productId = productsId;
     }
 
     /**
@@ -303,12 +276,12 @@
         this.languageService = languageService;
     }
 
-    public String getProductsDefaultName() {
+    public String getDefaultName() {
         //TODO remove?
-        if (productsItems != null && productsIndex < productsItems.size()) {
-            List<ProductDescription> list = (List<ProductDescription>) productsItems
-                    .get(productsIndex).get(
-                            PompeiConstants.PRODUCTS_DESCRIPTION_LIST);
+        if (productItems != null && productIndex < productItems.size()) {
+            List<ProductDescription> list = (List<ProductDescription>) productItems
+                    .get(productIndex).get(
+                            PompeiConstants.PRODUCT_DESCRIPTION_LIST);
             if (list != null) {
                 for (ProductDescription pd : list) {
                     BigDecimal languagesId = getLanguageService()

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -160,7 +160,7 @@
             ProductDescription pd = getProductService().getProdcutsDescription(
                     basket.getProductId());
             ManufacturerDescription mi = getManufacturerService()
-                    .getManufacturesInfo(
+                    .getManufactureDescription(
                             basket.getProduct().getManufacturerId());
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("customersBasketId", basket.getCustomerBasketId());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -108,7 +108,7 @@
             ProductDescription pd = getProductService().getProdcutsDescription(
                     basket.getProductId());
             ManufacturerDescription mi = getManufacturerService()
-                    .getManufacturesInfo(
+                    .getManufactureDescription(
                             basket.getProduct().getManufacturerId());
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("customersBasketId", basket.getCustomerBasketId());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -71,7 +71,7 @@
 
             List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
             Map<String, Object> m = new HashMap<String, Object>();
-            m.put(PompeiConstants.CATEGORIES_ID, new BigDecimal("0"));
+            m.put(PompeiConstants.CATEGORY_ID, new BigDecimal("0"));
             m.put(PompeiConstants.BREADCRUMB, getLabelHelper().getLabelValue(
                     PompeiConstants.TOP_CATEGORY));
             list.add(m);
@@ -113,7 +113,7 @@
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
         for (Map<String, Object> m : breadcrumbItems) {
             list.add(m);
-            if (((BigDecimal) m.get(PompeiConstants.CATEGORIES_ID)).equals(id)) {
+            if (((BigDecimal) m.get(PompeiConstants.CATEGORY_ID)).equals(id)) {
                 return list;
             }
         }
@@ -121,7 +121,7 @@
                 .getCategoryDescription(productListPage.getCategoriesId());
 
         Map<String, Object> m = new HashMap<String, Object>();
-        m.put(PompeiConstants.CATEGORIES_ID, id);
+        m.put(PompeiConstants.CATEGORY_ID, id);
         m.put(PompeiConstants.BREADCRUMB, d.getName());
         list.add(m);
         return list;

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java	2007-09-20 09:05:57 UTC (rev 573)
@@ -199,7 +199,7 @@
         if (productItems != null && productIndex < productItems.size()) {
             List<ProductDescription> list = (List<ProductDescription>) productItems
                     .get(productIndex).get(
-                            PompeiConstants.PRODUCTS_DESCRIPTION_LIST);
+                            PompeiConstants.PRODUCT_DESCRIPTION_LIST);
             for (ProductDescription pd : list) {
                 BigDecimal languagesId = getLanguageService()
                         .getCurrentLanguage().getLanguageId();

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -15,18 +15,34 @@
       <table>
         <tr style="dummy" height="20px">
           <th>
+            <label>コード名</label>
+          </th>
+          <td>
+            <input type="text" id="code" />
+          </td>
+        </tr>
+        <tr style="dummy" height="20px">
+          <th>
+            <label>オブジェクト名</label>
+          </th>
+          <td>
+            <input type="text" id="objectName" />
+          </td>
+        </tr>
+        <tr style="dummy" height="20px">
+          <th>
             <label>配送方法名</label>
           </th>
           <td>
-            <input type="text" id="deliveryMethodName" />
+            <input type="text" id="name" />
           </td>
         </tr>
         <tr style="dummy" height="20px">
           <th>
-            <label>配送方法タイプ</label>
+            <label>説明</label>
           </th>
           <td>
-            <input type="text" id="deliveryClass" />
+            <input type="text" id="description" />
           </td>
         </tr>
         <tr style="dummy" height="20px">
@@ -35,7 +51,7 @@
           </th>
           <td>
             <!-- TODO pull-down -->
-            <input type="text" id="deliveryStatus" />
+            <input type="text" id="status" />
           </td>
         </tr>
         <tr style="dummy" height="20px">
@@ -43,7 +59,7 @@
             <label>表示順</label>
           </th>
           <td>
-            <input type="text" size="2" maxlength="3" id="sortOrder" />
+            <input type="text" id="sortOrder" />
           </td>
         </tr>
       </table>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -25,7 +25,7 @@
           <tr style="dummy">
             <th height="20px">表示順</th>
             <th>配送方法名</th>
-            <th>クラス名</th>
+            <th>コード名</th>
             <th>&nbsp;</th>
           </tr>
         </thead>
@@ -35,10 +35,10 @@
               <span id="sortOrder">2</span>
             </td>
             <td>
-              <span id="deliveryMethodName">配送方法</span>
+              <span id="name">配送方法</span>
             </td>
             <td>
-              <span id="deliveryClass">クラス</span>
+              <span id="code">コード</span>
             </td>
             <td>
               <input type="submit" id="doUpdate" value="編集" onclick="setMode(this.form,'update');setTargetId(this.form,this.nextSibling.value);" /><input type="hidden" id="deliveryMethodId" /><input type="button" id="doDelete" value="削除" onclick="if(confirm('削除します。よろしいですか?')){setMode(this.form,'delete');setTargetId(this.form,this.previousSibling.value)}else{return false}" />

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -16,13 +16,16 @@
 <input type="hidden" id="targetId" />
 <input type="hidden" id="parentId" />
 <table>
+	<tr style="dummy" height="20px">
+		<th><label>カテゴリ名</label></th><td><input type="text" id="name" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th><label>説明</label></th><td><input type="text" id="description" /></td>
+	</tr>
 	<tr style="dummy" height="20px">
-		<th><label>カテゴリ名</label></th><td><input type="text" id="categoriesName" /></td>
+		<th><label>イメージ</label></th><td><input type="file" id="image" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th><label>イメージ</label></th><td><input type="file" id="categoriesImage" /></td>
-	</tr>
-	<tr style="dummy" height="20px">
 		<th><label>表示順</label></th><td><input type="text" size="2" maxlength="3" id="sortOrder" /></td>
 	</tr>
 </table>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -19,7 +19,7 @@
  -->
 </script>
 <div id="breadcrumbItems">
-	&gt;&nbsp;<a id="goSubCategory" href="categoryList.html?categoriesId=0"><span id="breadcrumb"></span></a>
+	&gt;&nbsp;<a id="goSubCategory" href="categoryList.html?categoryId=0"><span id="breadcrumb"></span></a>
 </div>
 <hr/>
 <form id="categoryListForm" method="post"><input type="hidden" id="mode" /><input type="hidden" id="targetId" />
@@ -36,10 +36,10 @@
    <tbody id="categoryItems">
 		<tr style="dummy">
 			<td align="center"><span id="sortOrder">2</span><input type="hidden" id="categoryIndex"/></td>
-			<td><a id="goCategoryList" href="categoryList.html?categoriesId=1"><span id="categoriesName">カテゴリ</span></a></td>
-			<td><span id="categoriesImage"></span>&nbsp;</td>
+			<td><a id="goCategoryList" href="categoryList.html?categoryId=1"><span id="name">カテゴリ</span></a></td>
+			<td><span id="image"></span>&nbsp;</td>
 			<td>
-              <input type="submit" id="doUpdate" value="編集" onclick="setMode(this.form,'update');setTargetId(this.form,this.nextSibling.value);" /><input type="hidden" id="categoriesId" /><input type="button" id="doDelete" value="削除" onclick="if(confirm('削除します。よろしいですか?')){setMode(this.form,'delete');setTargetId(this.form,this.previousSibling.value)}else{return false}" />
+              <input type="submit" id="doUpdate" value="編集" onclick="setMode(this.form,'update');setTargetId(this.form,this.nextSibling.value);" /><input type="hidden" id="categoryId" /><input type="button" id="doDelete" value="削除" onclick="if(confirm('削除します。よろしいですか?')){setMode(this.form,'delete');setTargetId(this.form,this.previousSibling.value)}else{return false}" />
 			</td>
 		</tr>
 	</tbody>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -7,28 +7,28 @@
 </head>
 <body>
 <form id="form" method="post">
-<input type="hidden" id="manufacturersId"/>
+<input type="hidden" id="manufacturerId"/>
 <div><span id="allMessages"></span></div>
 <table border="1">
 	<tr style="dummy" height="20px">
 		<th><label>メーカー名</label></th>
-		<td><input type="text" id="manufacturersName"/></td>
+		<td><input type="text" id="name"/></td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th><label>説明(略)</label></th>
-		<td><input type="text" id="manufacturersShortDesc"/></td>
+		<td><input type="text" id="shortDescription"/></td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th><label>説明(詳細)</label></th>
-		<td><textarea cols="20" rows="4" id="manufacturersLongDesc"></textarea></td>
+		<td><textarea cols="20" rows="4" id="longDescription"></textarea></td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th><label>URL</label></th>
-		<td><input type="text" id="manufacturersUrl"/></td>
+		<td><input type="text" id="url"/></td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th><label>ロゴ</label></th>
-		<td><input type="file" id="manufacturersImage"/></td>
+		<td><input type="file" id="image"/></td>
 	</tr>
 </table>
 <br/>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -32,16 +32,16 @@
 	<tbody id="manufacturerItems">
 		<tr style="dummy">
 			<td><span id="manufacturerIndex">1</span></td>
-			<td><span id="manufacturersName">アディダス</span>&amp;nbsp;</td>
-			<td><span id="manufacturersDesc">ドイツのスポーツメーカー</span>&amp;nbsp;</td>
+			<td><span id="name">アディダス</span>&amp;nbsp;</td>
+			<td><span id="shortDescription">ドイツのスポーツメーカー</span>&amp;nbsp;</td>
 			<td>
-              <input type="submit" id="doUpdate" value="編集" onclick="setMode(this.form,'update');setTargetId(this.form,this.nextSibling.value);" /><input type="hidden" id="manufacturersId" /><input type="button" id="doDelete" value="削除" onclick="if(confirm('削除します。よろしいですか?')){setMode(this.form,'delete');setTargetId(this.form,this.previousSibling.value)}else{return false}" />
+              <input type="submit" id="doUpdate" value="編集" onclick="setMode(this.form,'update');setTargetId(this.form,this.nextSibling.value);" /><input type="hidden" id="manufacturerId" /><input type="button" id="doDelete" value="削除" onclick="if(confirm('削除します。よろしいですか?')){setMode(this.form,'delete');setTargetId(this.form,this.previousSibling.value)}else{return false}" />
 			</td>
 		</tr>
 	</tbody>
 	<tfoot></tfoot>
 </table>
 <br/>
-<input type="submit" id="goManufacturerEdit-add" value="メーカーを追加する" onClick="setMode(this.form,'insert')"/>
+<input type="submit" id="doAdd" value="メーカーを追加する" onclick="setMode(this.form,'insert')"/>
 </form>
 </body></html>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -15,41 +15,48 @@
 <input type="hidden" id="mode" />
 <input type="hidden" id="targetId" />
 <input type="hidden" id="parentId" />
-<input type="hidden" id="productsId" />
+<input type="hidden" id="productId" />
 <table border="1">
 	<tr style="dummy" height="20px">
-		<th>商品名</th><td><input id="productsName" /></td>
+		<th>商品名</th><td><input id="name" /></td>
 	</tr>
+	<tr style="dummy" height="20px">
+		<th>イメージ</th><td><input id="image" type="hidden"/>
+		<pal:inputFileUpload id="imageFile" value="#{admin_product_productEditPage.imageFile}"></pal:inputFileUpload></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th>サムネイル</th><td><input id="thumbnail" type="hidden"/>
+		<pal:inputFileUpload id="thumbnailFile" value="#{admin_product_productEditPage.thumbnailFile}"></pal:inputFileUpload></td>
+	</tr>
 	<tr style="dummy" height="20px">
-		<th>イメージ</th><td><input id="productsImage" type="hidden"/>
-		<pal:inputFileUpload id="productsImageFile" value="#{admin_product_productEditPage.productsImageFile}"></pal:inputFileUpload></td>
+		<th>型番</th><td><input id="model" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>型番</th><td><input id="productsModel" /></td>
+		<th>数量</th><td><input id="quantity" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>数量</th><td><input id="productsQuantity" /></td>
+		<th>価格</th><td><input id="price" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>価格</th><td><input id="productsPrice" /></td>
+		<th>重量</th><td><input id="weight" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>重量</th><td><input id="productsWeight" /></td>
+		<th>ステータス</th><td><input id="status" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>ステータス</th><td><input id="productsStatus" /></td>
-	</tr>
-	<tr style="dummy" height="20px">
 		<th>メーカー</th>
 		<td>
-			<select id="manufacturersId">
+			<select id="manufacturerId">
 				<option value="0"></option>
 			</select>
 		</td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th>税種別ID</th>
-		<td><input id="productsTaxClassId" /></td>
+		<td><select id="taxClassId">
+				<option value="0"></option>
+			</select>
+		</td>
 	</tr>
 </table>
 <input type="submit" id="doUpdate" value="登録する" />

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html	2007-09-20 09:04:47 UTC (rev 572)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html	2007-09-20 09:05:57 UTC (rev 573)
@@ -13,12 +13,12 @@
     <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
 </div>
 <div id="breadcrumbItems">
-	&gt;&nbsp;<a id="goSubCategory-a" href="./productList.html?categoriesId=0"><span id="breadcrumb"></span></a>
+	&gt;&nbsp;<a id="goSubCategory-a" href="./productList.html?categoryId=0"><span id="breadcrumb"></span></a>
 </div>
 <br/>
 <br/>
 <div id="categoryItems">
-<a id="goSubCategory-b" href="./productList.html?categoriesId=1"><span id="categoriesName">スニーカー</span></a>&amp;nbsp;&amp;nbsp;
+<a id="goSubCategory-b" href="./productList.html?categoryId=1"><span id="name">スニーカー</span></a>&amp;nbsp;&amp;nbsp;
 </div>
 <hr/>
 <table border="1">
@@ -27,7 +27,6 @@
 			<!--<th><label>NO</label></th>-->
 			<th><label>商品ID</label></th>
 			<th><label>商品名</label></th>
-			<th><label>イメージ</label></th>
 			<th><label>型番</label></th>
 			<th><label>価格</label></th>
 			<th><label>ステータス</label></th>
@@ -36,20 +35,19 @@
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
-	<tbody id="productsItems">
+	<tbody id="productItems">
 		<tr style="dummy">
 			<!--<td><span id="productsIndex">1</span></td>-->
-			<td><span id="productsId">0</span></td>
-			<td><span id="productsDefaultName">表示できず</span></td>
-			<td><span id="productsImage">画像</span></td>
-			<td><span id="productsModel">MX-XXX</span></td>
-			<td><span id="productsPrice">30,000</span></td>
-			<td><span id="productsStatus">取扱中</span></td>
-			<td><span id="manufacturersName">アディダス</span></td>
-			<td><span id="productsDateAdded">2007/07/12</span></td>
+			<td><span id="productId">0</span></td>
+			<td><span id="defaultName">表示できず</span></td>
+			<td><span id="model">MX-XXX</span></td>
+			<td><span id="price">30,000</span></td>
+			<td><span id="status">取扱中</span></td>
+			<td><span id="manufacturerName">アディダス</span></td>
+			<td><span id="dateAdded">2007/07/12</span></td>
 			<td>
-				<a id="goProductEdit" href="./productEdit.html?parentId=0&productsId=0&fixed_mode=update">編集</a>
-				<a id="goProductDelete" href="./productList.html?parentId=0&productsId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか?')){return true;}else{return false;}">削除</a>
+				<a id="goProductEdit" href="./productEdit.html?parentId=0&productId=0&fixed_mode=update">編集</a>
+				<a id="goProductDelete" href="./productList.html?parentId=0&productId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか?')){return true;}else{return false;}">削除</a>
 			</td>
 		</tr>
 	</tbody>


pal-cvs メーリングリストの案内