[880] replaced with pompei-db. (pal-cvs 3144) - Portal Application Laboratory

Revision: 880
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=880
Author:   shinsuke
Date:     2008-04-08 14:03:44 +0900 (Tue, 08 Apr 2008)

Log Message:
-----------
replaced with pompei-db.

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/.classpath
    pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs
    pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs
    pompei/portlets/pompei-core/trunk/pom.xml
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.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/entity/notification/order/Product.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.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/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/cart/ProductListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.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/checkout/CheckoutConfirmPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.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/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties
    pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties
    pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.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/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
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html

Added Paths:
-----------
    pompei/portlets/pompei-core/trunk/src/main/config/sql/
    pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql
    pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_data.sql
    pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_sample_data.sql
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_over.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_down.png
    pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_over.png

Removed Paths:
-------------
    pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/converter/
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.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/OrderFormDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/
    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/DeliveryMethodListAction.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/resources/dbflute.dicon
    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


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/.classpath
===================================================================

--- pompei/portlets/pompei-core/trunk/.classpath	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/.classpath	2008-04-08 05:03:44 UTC (rev 880)
@@ -8,49 +8,48 @@
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 
   <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao/1.0.46/s2-dao-1.0.46.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.17/s2-extension-2.4.17.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.24/s2-extension-2.4.24.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.13-rc6/teeda-tiger-1.0.13-rc6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.24/s2-tiger-2.4.24.jar"/>
   <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.65/h2-1.0.65.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.12-SNAPSHOT/teeda-extension-1.0.12-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-extension/1.0.12-SNAPSHOT/teeda-extension-1.0.12-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.12-SNAPSHOT/teeda-core-1.0.12-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.12-SNAPSHOT/teeda-core-1.0.12-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-portletfilter/1.0.3/portals-bridges-portletfilter-1.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jp/sf/pal/pompei-db-h2/0.1.0-SNAPSHOT/pompei-db-h2-0.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/pompei-db-h2/0.1.0-SNAPSHOT/pompei-db-h2-0.1.0-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.1.3_pal-1.0.3/jetspeed-api-2.1.3_pal-1.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.17/s2-framework-2.4.17.jar"/>
   <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.5/velocity-1.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.11/teeda-tiger-1.0.11.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.11/teeda-tiger-1.0.11-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.15/log4j-1.2.15.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.1.2_pal-1.0-beta6/jetspeed-api-2.1.2_pal-1.0-beta6.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao-tiger/1.0.47/s2-dao-tiger-1.0.47.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.13-rc6/teeda-extension-1.0.13-rc6.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.17/s2-tiger-2.4.17.jar"/>
-  <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.0/xmlunit-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-locator/2.1.3_pal-1.0.3/jetspeed-locator-2.1.3_pal-1.0.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.13-rc6/teeda-ajax-1.0.13-rc6.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.12-SNAPSHOT/teeda-ajax-1.0.12-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.12-SNAPSHOT/teeda-ajax-1.0.12-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jp/sf/pal/pompei-db/0.1.0-SNAPSHOT/pompei-db-0.1.0-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/pompei-db/0.1.0-SNAPSHOT/pompei-db-0.1.0-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.24/s2-framework-2.4.24.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao/1.0.47/s2-dao-1.0.47.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-locator/2.1.2_pal-1.0-beta6/jetspeed-locator-2.1.2_pal-1.0-beta6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.0/geronimo-jsp_2.0_spec-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070624/ognl-2.6.9-patch-20070624.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao-tiger/1.0.46/s2-dao-tiger-1.0.46.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070908/ognl-2.6.9-patch-20070908.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.13-rc6/teeda-core-1.0.13-rc6.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7/s2-portlet-1.0.7.jar" sourcepath="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7/s2-portlet-1.0.7-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jp/sf/pal/jsf4portlet/0.2-SNAPSHOT/jsf4portlet-0.2-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/jsf4portlet/0.2-SNAPSHOT/jsf4portlet-0.2-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/common-utils/0.4-SNAPSHOT/common-utils-0.4-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/common-utils/0.4-SNAPSHOT/common-utils-0.4-SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-xmlunit/0.1.0/teeda-xmlunit-0.1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
 </classpath>

Modified: pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,6 +1,6 @@
-#Tue Jul 24 13:39:37 JST 2007
+#Thu Oct 11 09:30:41 JST 2007
 eclipse.preferences.version=1
 formatter_profile=_Seasar
 formatter_settings_version=11
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="getter \u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="setter \u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} \u8A2D\u5B9A\u3059\u308B ${bare_field_name}\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F Java \u30D5\u30A1\u30A4\u30EB\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F\u306E\u578B\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u306A\u3044\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="\u59D4\u8B72\u30E1\u30BD\u30C3\u30C9\u306E\u30B3\u30E1\u30F3\u30C8" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="\u65B0\u898F\u4F5C\u6210\u30D5\u30A1\u30A4\u30EB" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="\u65B0\u898F class \u578B\u306E\u672C\u6587\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="\u65B0\u898F interface \u578B\u306E\u672C\u6587\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="\u65B0\u898F enum \u578B\u306E\u672C\u6587\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="\u65B0\u898F annotation \u578B\u306E\u672C\u6587\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="\u65B0\u898F catch \u30D6\u30ED\u30C3\u30AF\u4E2D\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} \u81EA\u52D5\u751F\u6210\u3055\u308C\u305F catch \u30D6\u30ED\u30C3\u30AF\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F\u30E1\u30BD\u30C3\u30C9\u30FB\u30B9\u30BF\u30D6\u4E2D\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} \u81EA\u52D5\u751F\u6210\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u30FB\u30B9\u30BF\u30D6\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u30FB\u30B9\u30BF\u30D6\u4E2D\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} \u81EA\u52D5\u751F\u6210\u3055\u308C\u305F\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC\u30FB\u30B9\u30BF\u30D6</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F getter \u4E2D\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="\u4F5C\u6210\u6E08\u307F setter \u4E2D\u306E\u30B3\u30FC\u30C9" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>

Modified: pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs
===================================================================
--- pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,4 +1,4 @@
-#Sun Aug 26 07:25:31 JST 2007
+#Mon Nov 12 14:26:07 JST 2007
 DaoType=S2Dao
 DefaultResourcePath=/pompei-core/src/main/resources
 DefaultRootPackage=jp.sf.pal.pompei

Modified: pompei/portlets/pompei-core/trunk/pom.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/pom.xml	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/pom.xml	2008-04-08 05:03:44 UTC (rev 880)
@@ -5,7 +5,7 @@
   <artifactId>pompei-core</artifactId>
   <packaging>war</packaging>
   <name>Pompei</name>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>0.1.0-SNAPSHOT</version>
   <description>Portalet for constructing EC site</description>
   <url>http://pal.sourceforge.jp/</url>
   <inceptionYear>2005</inceptionYear>
@@ -22,8 +22,6 @@
     <developer>
       <id>takeharu</id>
       <name>Takeharu Yamaguchi</name>
-      <email>TBD</email>
-      <url>TBD</url>
       <organization/>
       <organizationUrl/>
       <timezone>+9</timezone>
@@ -72,9 +70,9 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <dependencies>
           <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.2.2.0</version>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.0.65</version>
           </dependency>
         </dependencies>
         <executions>
@@ -83,11 +81,10 @@
             <phase>clean</phase>
             <configuration>
               <tasks>
-                <delete dir="${basedir}/src/main/webapp/WEB-INF/db/pompei"/>
-                <!--mkdir dir="${basedir}/src/main/webapp/WEB-INF/db/pompei"/-->
-                <sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:directory:${basedir}/src/main/webapp/WEB-INF/db/pompei;create=true" userid="" password="" src="${basedir}/src/main/webapp/WEB-INF/db/create_table.sql" onerror="continue"/>
-                <sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:directory:${basedir}/src/main/webapp/WEB-INF/db/pompei;create=true" userid="" password="" src="${basedir}/src/main/webapp/WEB-INF/db/insert_data.sql" onerror="continue"/>
-                <sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:directory:${basedir}/src/main/webapp/WEB-INF/db/pompei;create=true" userid="" password="" src="${basedir}/src/main/webapp/WEB-INF/db/insert_sample_data.sql" onerror="continue"/>
+                <delete dir="${basedir}/src/main/webapp/WEB-INF/db/"/>
+                <mkdir dir="${basedir}/src/main/webapp/WEB-INF/db/"/>
+                <sql driver="org.h2.Driver" url="jdbc:h2:file:${basedir}/src/main/webapp/WEB-INF/db/pompei" userid="sa" password="" src="${basedir}/src/main/config/sql/create_table.sql" onerror="continue"/>
+                <sql driver="org.h2.Driver" url="jdbc:h2:file:${basedir}/src/main/webapp/WEB-INF/db/pompei" userid="sa" password="" src="${basedir}/src/main/config/sql/insert_data.sql" onerror="continue"/>
               </tasks>
             </configuration>
             <goals>
@@ -112,6 +109,12 @@
       <url>http://maven.seasar.org/maven2</url>
     </repository>
     <repository>
+      <id>maven.marevol.com</id>
+      <name>Maven2 Repository on marevol.com</name>
+      <url>http://maven.marevol.com/</url>
+      <layout>legacy</layout>
+    </repository>
+    <repository>
       <id>maven2.marevol.com</id>
       <name>Maven2 Repository on marevol.com</name>
       <url>http://maven2.marevol.com/</url>
@@ -130,7 +133,7 @@
       <version>1.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
+<!--     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.15</version>
@@ -149,6 +152,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+ -->
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
@@ -194,12 +198,12 @@
     <dependency>
       <groupId>org.seasar.container</groupId>
       <artifactId>s2-framework</artifactId>
-      <version>2.4.17</version>
+      <version>2.4.24</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.container</groupId>
       <artifactId>s2-extension</artifactId>
-      <version>2.4.17</version>
+      <version>2.4.24</version>
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
@@ -210,7 +214,7 @@
     <dependency>
       <groupId>org.seasar.container</groupId>
       <artifactId>s2-tiger</artifactId>
-      <version>2.4.17</version>
+      <version>2.4.24</version>
       <exclusions>
         <exclusion>
           <groupId>org.easymock</groupId>
@@ -221,9 +225,9 @@
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-extension</artifactId>
-      <version>1.0.12-SNAPSHOT</version>
+      <version>1.0.13-rc6</version>
     </dependency>
-    <!--
+<!--
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-ajax</artifactId>
@@ -233,45 +237,41 @@
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-tiger</artifactId>
-      <version>1.0.11</version>
+      <version>1.0.13-rc6</version>
     </dependency>
+<!--
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-xmlunit</artifactId>
       <version>0.1.0</version>
       <scope>test</scope>
     </dependency>
+-->
     <dependency>
       <groupId>org.seasar.dao</groupId>
       <artifactId>s2-dao</artifactId>
-      <version>1.0.46</version>
+      <version>1.0.47</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.dao</groupId>
       <artifactId>s2-dao-tiger</artifactId>
-      <version>1.0.46</version>
+      <version>1.0.47</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.2.2.0</version>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.0.65</version>
+      <scope>provided</scope>
     </dependency>
-    <!--
+<!--
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>5.0.4</version>
     </dependency>
 -->
-    <!--
+<!-- SERVLET DEV: BEGIN @@@
     <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.0.20070304</version>
-    </dependency>
--->
-    <!-- SERVLET DEV: BEGIN @@@
-    <dependency>
       <groupId>jp.sf.pal</groupId>
       <artifactId>faces-dev-filter</artifactId>
       <version>0.2-SNAPSHOT</version>
@@ -320,13 +320,13 @@
     </dependency>
     <dependency>
       <groupId>jp.sf.pal</groupId>
-      <artifactId>faces-response-filter</artifactId>
-      <version>0.2</version>
+      <artifactId>common-utils</artifactId>
+      <version>0.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>jp.sf.pal</groupId>
-      <artifactId>common-utils</artifactId>
-      <version>0.4-SNAPSHOT</version>
+      <artifactId>faces-response-filter</artifactId>
+      <version>0.2</version>
     </dependency>
     <dependency>
       <groupId>jp.sf.pal</groupId>
@@ -335,10 +335,15 @@
     </dependency>
     <dependency>
       <groupId>jp.sf.pal</groupId>
-      <artifactId>jsf4portlet</artifactId>
-      <version>0.2-SNAPSHOT</version>
+      <artifactId>pompei-db-h2</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>jp.sf.pal</groupId>
+      <artifactId>pompei-db</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
       <version>1.1.1</version>
@@ -363,19 +368,19 @@
       <artifactId>activation</artifactId>
       <version>1.1</version>
     </dependency>
-    <!-- Jetspeed2 -->
+<!-- Jetspeed2 -->
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-api</artifactId>
-      <version>2.1.2_pal-1.0-beta6</version>
-      <!-- PORTLET DEV: BEGIN -->
+      <version>2.1.3_pal-1.0.3</version>
+<!-- PORTLET DEV: BEGIN -->
       <scope>provided</scope>
-      <!-- PORTLET DEV: END -->
+<!-- PORTLET DEV: END -->
     </dependency>
     <dependency>
       <groupId>org.apache.portals.jetspeed-2</groupId>
       <artifactId>jetspeed-locator</artifactId>
-      <version>2.1.2_pal-1.0-beta6</version>
+      <version>2.1.3_pal-1.0.3</version>
     </dependency>
   </dependencies>
 </project>

Deleted: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,4481 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<clay-model clay-version="1.4.0">
-<database-model alias="" author="" begin-script="" end-script="" name="pompei" remarks="" sql-dialect-id="jp.azzurri.clay.dialect.MySQL_4_0_Dialect" uid="1350e24:11525502e7d:-8000" version="1.0">
-<database-model-description></database-model-description>
-<schema-list>
-<schema alias="" name="APP" remarks="" uid="1350e24:11525502e7d:-7fff">
-<schema-description></schema-description>
-<domain-list/>
-<table-list>
-<table alias="" name="ADDRESS_BOOK" remarks="" uid="1350e24:11525502e7d:-7ffe">
-<table-description></table-description>
-<table-figure-bounds height="369" width="289" x="2226" y="364"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ADDRESS_BOOK_ID" remarks="" uid="1350e24:11525502e7d:-7ffc">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7ffb">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="COMPANY" remarks="" uid="1350e24:11525502e7d:-7ffa">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="DEPARTMENT" remarks="" uid="1350e24:11525502e7d:-7ff9">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7ff8">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="LASTNAME" remarks="" uid="1350e24:11525502e7d:-7ff7">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc9">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc8">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7ff6">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="SUBURB" remarks="" uid="1350e24:11525502e7d:-7ff5">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="CITY" remarks="" uid="1350e24:11525502e7d:-7ff4">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="STATE" remarks="" uid="1350e24:11525502e7d:-7ff3">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="POSTCODE" remarks="" uid="1350e24:11525502e7d:-7ff2">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="TELEPHONE" remarks="" uid="1350e24:11525502e7d:-7ff1">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="FAX" remarks="" uid="1350e24:11525502e7d:-7ff0">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CELLPHONE" remarks="" uid="1350e24:11525502e7d:-7fef">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="DEFAULT_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7fee">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7fed">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="COUNTRY_ID" remarks="" uid="1350e24:11525502e7d:-7fec">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="ZONE_ID" remarks="" uid="1350e24:11525502e7d:-7feb">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021754660" remarks="" uid="1350e24:11525502e7d:-7ffd">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ADDRESS_BOOK_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ADDRESS_BOOK_2" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e40">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ZONE_ID" referenced-key-column-name="ZONE_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ADDRESS_BOOK_3" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e3f">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="COUNTRY_ID" referenced-key-column-name="COUNTRY_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ADDRESS_BOOK_4" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e3e">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ADDRESS_BOOKS_4" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e3d">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021754660" remarks="" uid="1350e24:11525502e7d:-7fea" unique="true">
-<index-description></index-description>
-<index-column name="ADDRESS_BOOK_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756570" remarks="" uid="1350e24:11525502e7d:-7fe9" unique="false">
-<index-description></index-description>
-<index-column name="CUSTOMER_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="CATEGORY" remarks="" uid="1350e24:11525502e7d:-7fe8">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="982" y="3229"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CATEGORY_ID" remarks="" uid="1350e24:11525502e7d:-7fe6">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" remarks="" uid="1350e24:11525502e7d:-7fe5">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="PARENT_ID" remarks="" uid="1350e24:11525502e7d:-7fe4">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7fe3">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7fe2">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7fe1">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021754850" remarks="" uid="1350e24:11525502e7d:-7fe7">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CATEGORY_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_CATEGORIES_1" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e3c">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PARENT_ID" referenced-key-column-name="CATEGORY_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021754850" remarks="" uid="1350e24:11525502e7d:-7fe0" unique="true">
-<index-description></index-description>
-<index-column name="CATEGORY_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="CATEGORY_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7fdf">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1125" y="2941"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="CATEGORY_ID" remarks="" uid="1350e24:11525502e7d:-7fdd">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="1" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7fdc">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7fdb">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7fda">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021754880" remarks="" uid="1350e24:11525502e7d:-7fde">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CATEGORY_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021756620" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e3b">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CATEGORY_ID" referenced-key-column-name="CATEGORY_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CATEGORIES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e3a">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021754880" remarks="" uid="1350e24:11525502e7d:-7fd9" unique="true">
-<index-description></index-description>
-<index-column name="CATEGORY_ID" sort="ASC"/>
-<index-column name="LANGUAGE_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756620" remarks="" uid="1350e24:11525502e7d:-7fd8" unique="false">
-<index-description></index-description>
-<index-column name="CATEGORY_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="COUNTRY" remarks="" uid="1350e24:11525502e7d:-7fd7">
-<table-description></table-description>
-<table-figure-bounds height="112" width="207" x="2336" y="184"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="COUNTRY_ID" remarks="" uid="1350e24:11525502e7d:-7fd5">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7fd4">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="2" decimal-digits="0" default-value="" mandatory="true" name="ISO_CODE_2" remarks="" uid="1350e24:11525502e7d:-7fd3">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="3" decimal-digits="0" default-value="" mandatory="true" name="ISO_CODE_3" remarks="" uid="1350e24:11525502e7d:-7fd2">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755010" remarks="" uid="1350e24:11525502e7d:-7fd6">
-<primary-key-description></primary-key-description>
-<primary-key-column name="COUNTRY_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021755010" remarks="" uid="1350e24:11525502e7d:-7fd1" unique="true">
-<index-description></index-description>
-<index-column name="COUNTRY_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="CUSTOMER" remarks="" uid="1350e24:11525502e7d:-7fd0">
-<table-description></table-description>
-<table-figure-bounds height="237" width="288" x="2328" y="787"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="PORTAL_ID" remarks="" uid="1350e24:11525502e7d:-7fcd">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="GENDER" remarks="" uid="1350e24:11525502e7d:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="2000" precision-min="1" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7fcb">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="LASTNAME" remarks="" uid="1350e24:11525502e7d:-7fca">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fcd">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="NICKNAME" remarks="" uid="1350e24:11525502e7d:-7fc9">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="'0000-00-00 00:00:00'" mandatory="true" name="DAY_OF_BIRTH" remarks="" uid="1350e24:11525502e7d:-7fc8">
-<column-description></column-description>
-<data-type jdbc-type="91" literal-prefix="'" literal-suffix="'" name="DATE" selected-variant-pattern="DATE">
-<variant type-name-pattern="DATE"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="true" name="EMAIL_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7fc7">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="554210:1153a1d1f91:-7fcd">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="554210:1153a1d1f91:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755080" remarks="" uid="1350e24:11525502e7d:-7fcf">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CUSTOMER_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021755080" remarks="" uid="1350e24:11525502e7d:-7fc6" unique="true">
-<index-description></index-description>
-<index-column name="CUSTOMER_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="CUSTOMER_BASKET" remarks="" uid="1350e24:11525502e7d:-7fc4">
-<table-description></table-description>
-<table-figure-bounds height="129" width="282" x="2857" y="2150"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_BASKET_ID" remarks="" uid="1350e24:11525502e7d:-7fc2">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7fc1">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7fc0">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="QUANTITY" remarks="" uid="1350e24:11525502e7d:-7fbf">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="false" name="FINAL_PRICE" remarks="" uid="1350e24:11525502e7d:-7fbe">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p,%s)">
-<variant precision-max="38" precision-min="1" precision-variable="%p" scale-max="127" scale-min="-84" scale-variable="%s" type-name-pattern="DECIMAL(%p,%s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="38" precision-min="1" precision-variable="%p" type-name-pattern="DECIMAL(%p)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7fbd">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755120" remarks="" uid="1350e24:11525502e7d:-7fc3">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CUSTOMER_BASKET_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_1" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e39">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e38">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755120" remarks="" uid="1350e24:11525502e7d:-7fbc" unique="true">
-<index-description></index-description>
-<index-column name="CUSTOMER_BASKET_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="CUSTOMER_BASKET_ATTRIBUTE" remarks="" uid="1350e24:11525502e7d:-7fbb">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="2942" y="2517"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMERS_BASKET_ATTRIBUTE_ID" remarks="" uid="1350e24:11525502e7d:-7fb9">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7fb8">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7fb7">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCTS_OPTION_ID" remarks="" uid="1350e24:11525502e7d:-7fb6">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCTS_OPTION_VALUE_ID" remarks="" uid="1350e24:11525502e7d:-7fb5">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7fb4">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755170" remarks="" uid="1350e24:11525502e7d:-7fba">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CUSTOMERS_BASKET_ATTRIBUTE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_1" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e37">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e36">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_4" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e35">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCTS_OPTION_VALUE_ID" referenced-key-column-name="PRODUCT_OPTION_VALUE_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CUSTOMERS_BASKET_ATTRIBUTES_5" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e34">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCTS_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755170" remarks="" uid="1350e24:11525502e7d:-7fb3" unique="true">
-<index-description></index-description>
-<index-column name="CUSTOMERS_BASKET_ATTRIBUTE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="DELIVERY_METHOD" remarks="" uid="1350e24:11525502e7d:-7fb2">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="335" y="694"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7fb0">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="CODE" remarks="" uid="1350e24:11525502e7d:-7faf">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="true" name="OBJECT_NAME" remarks="" uid="1350e24:11525502e7d:-7fae">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="STATUS" remarks="" uid="1350e24:11525502e7d:-7fad">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7fac">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7fab">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7faa">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756200" remarks="" uid="1350e24:11525502e7d:-7fb1">
-<primary-key-description></primary-key-description>
-<primary-key-column name="DELIVERY_METHOD_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021756200" remarks="" uid="1350e24:11525502e7d:-7fa9" unique="true">
-<index-description></index-description>
-<index-column name="DELIVERY_METHOD_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="DELIVERY_METHOD_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7fa8">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1473" y="758"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="0" mandatory="true" name="DELIVERY_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7fa6">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="1" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7fa5">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7fa4">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7fa3">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756230" remarks="" uid="1350e24:11525502e7d:-7fa7">
-<primary-key-description></primary-key-description>
-<primary-key-column name="DELIVERY_METHOD_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021756940" on-delete="" on-update="" referenced-key="SQL070831021756200" referenced-table="DELIVERY_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e33">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="DELIVERY_METHOD_ID" referenced-key-column-name="DELIVERY_METHOD_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_DELIVERY_METHOD_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e32">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756230" remarks="" uid="1350e24:11525502e7d:-7fa2" unique="true">
-<index-description></index-description>
-<index-column name="DELIVERY_METHOD_ID" sort="ASC"/>
-<index-column name="LANGUAGE_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756940" remarks="" uid="1350e24:11525502e7d:-7fa1" unique="false">
-<index-description></index-description>
-<index-column name="DELIVERY_METHOD_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="GEO_ZONE" remarks="" uid="1350e24:11525502e7d:-7fa0">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1804" y="54"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="GEO_ZONE_ID" remarks="" uid="1350e24:11525502e7d:-7f9e">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7f9d">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7f9c">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7f9b">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7f9a">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756450" remarks="" uid="1350e24:11525502e7d:-7f9f">
-<primary-key-description></primary-key-description>
-<primary-key-column name="GEO_ZONE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021756450" remarks="" uid="1350e24:11525502e7d:-7f99" unique="true">
-<index-description></index-description>
-<index-column name="GEO_ZONE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="LANGUAGE" remarks="" uid="1350e24:11525502e7d:-7f98">
-<table-description></table-description>
-<table-figure-bounds height="135" width="228" x="1607" y="1745"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7f96">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7f95">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="LOCALE_NAME" remarks="" uid="1350e24:11525502e7d:-7f94">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" remarks="" uid="1350e24:11525502e7d:-7f93">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DIRECTORY_NAME" remarks="" uid="1350e24:11525502e7d:-7f92">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="false" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7f91">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755250" remarks="" uid="1350e24:11525502e7d:-7f97">
-<primary-key-description></primary-key-description>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021755250" remarks="" uid="1350e24:11525502e7d:-7f90" unique="true">
-<index-description></index-description>
-<index-column name="LANGUAGE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="MANUFACTURER" remarks="" uid="1350e24:11525502e7d:-7f8f">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1592" y="3028"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="MANUFACTURER_ID" remarks="" uid="1350e24:11525502e7d:-7f8d">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7f8c">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" remarks="" uid="1350e24:11525502e7d:-7f8b">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7f8a">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7f89">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755280" remarks="" uid="1350e24:11525502e7d:-7f8e">
-<primary-key-description></primary-key-description>
-<primary-key-column name="MANUFACTURER_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021755280" remarks="" uid="1350e24:11525502e7d:-7f88" unique="true">
-<index-description></index-description>
-<index-column name="MANUFACTURER_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="MANUFACTURER_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7f87">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="564" y="3026"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="MANUFACTURER_ID" remarks="" uid="1350e24:11525502e7d:-7f85">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7f84">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="URL" remarks="" uid="1350e24:11525502e7d:-7f83">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="100" decimal-digits="0" default-value="" mandatory="false" name="SHORT_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7f82">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="LONG_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7f81">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755310" remarks="" uid="1350e24:11525502e7d:-7f86">
-<primary-key-description></primary-key-description>
-<primary-key-column name="LANGUAGE_ID"/>
-<primary-key-column name="MANUFACTURER_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021756730" on-delete="" on-update="" referenced-key="SQL070831021755280" referenced-table="MANUFACTURER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e31">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="MANUFACTURER_ID" referenced-key-column-name="MANUFACTURER_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_MANUFACTURERS_INFO_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e30">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755310" remarks="" uid="1350e24:11525502e7d:-7f80" unique="true">
-<index-description></index-description>
-<index-column name="MANUFACTURER_ID" sort="ASC"/>
-<index-column name="LANGUAGE_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756730" remarks="" uid="1350e24:11525502e7d:-7f7f" unique="false">
-<index-description></index-description>
-<index-column name="MANUFACTURER_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_FORM" remarks="" uid="1350e24:11525502e7d:-7f7e">
-<table-description></table-description>
-<table-figure-bounds height="1128" width="378" x="27" y="910"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f7c">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_NUMBER" remarks="" uid="ec1f9e:115310155b0:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7f7b">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_GENDER" remarks="" uid="1350e24:11525502e7d:-7f7a">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f79">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f78">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc5">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc4">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_DAY_OF_BIRTH" remarks="" uid="1350e24:11525502e7d:-7f77">
-<column-description></column-description>
-<data-type jdbc-type="91" literal-prefix="'" literal-suffix="'" name="DATE" selected-variant-pattern="DATE">
-<variant type-name-pattern="DATE"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_EMAIL_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7f76">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_COMPANY" remarks="" uid="1350e24:11525502e7d:-7f75">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_DEPARTMENT" remarks="" uid="1350e24:11525502e7d:-7f74">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7f73">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_SUBURB" remarks="" uid="1350e24:11525502e7d:-7f72">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_CITY" remarks="" uid="1350e24:11525502e7d:-7f71">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_STATE" remarks="" uid="1350e24:11525502e7d:-7f70">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_POSTCODE" remarks="" uid="1350e24:11525502e7d:-7f6f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_COUNTRY_NAME" remarks="" uid="1350e24:11525502e7d:-7f6e">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_TELEPHONE" remarks="" uid="1350e24:11525502e7d:-7f6d">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_LOCALE_NAME" remarks="" uid="1350e24:11525502e7d:-7f6c">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_COMPANY" remarks="" uid="1350e24:11525502e7d:-7f6b">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_DEPARTMENT" remarks="" uid="1350e24:11525502e7d:-7f6a">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f69">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f68">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc3">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc2">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7f67">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_SUBURB" remarks="" uid="1350e24:11525502e7d:-7f66">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_CITY" remarks="" uid="1350e24:11525502e7d:-7f65">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_STATE" remarks="" uid="1350e24:11525502e7d:-7f64">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_POSTCODE" remarks="" uid="1350e24:11525502e7d:-7f63">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_COUNTRY_NAME" remarks="" uid="1350e24:11525502e7d:-7f62">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_TELEPHONE" remarks="" uid="1350e24:11525502e7d:-7f61">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LOCALE_NAME" remarks="" uid="1350e24:11525502e7d:-7f60">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="BILLING_COMPANY" remarks="" uid="1350e24:11525502e7d:-7f5f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="BILLING_DEPARTMENT" remarks="" uid="1350e24:11525502e7d:-7f5e">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="BILLING_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f5d">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f5c">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="BILLING_FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc1">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="false" name="BILLING_LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc0">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="BILLING_STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7f5b">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_SUBURB" remarks="" uid="1350e24:11525502e7d:-7f5a">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="BILLING_CITY" remarks="" uid="1350e24:11525502e7d:-7f59">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_STATE" remarks="" uid="1350e24:11525502e7d:-7f58">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="BILLING_POSTCODE" remarks="" uid="1350e24:11525502e7d:-7f57">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_COUNTRY_NAME" remarks="" uid="1350e24:11525502e7d:-7f56">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="BILLING_TELEPHONE" remarks="" uid="1350e24:11525502e7d:-7f55">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LOCALE_NAME" remarks="" uid="1350e24:11525502e7d:-7f54">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="PAYMENT_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7f53">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_CODE" remarks="" uid="1350e24:11525502e7d:-7f52">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="ORDER_CARD_INFO_ID" remarks="" uid="1350e24:11525502e7d:-7f51">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7f50">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_METHOD_CODE" remarks="" uid="1350e24:11525502e7d:-7f4f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_NUMBER" remarks="" uid="cb9718:1159b6c07dd:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7f4e">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_ID" remarks="" uid="1350e24:11525502e7d:-7f4d">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="PURCHASED_DATE" remarks="" uid="1350e24:11525502e7d:-7f4c">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="FINISHED_DATE" remarks="" uid="1350e24:11525502e7d:-7f4b">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="CURRENCY_ID" remarks="" uid="1350e24:11525502e7d:-7f4a">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="3" decimal-digits="0" default-value="" mandatory="true" name="CURRENCY_CODE" remarks="" uid="1350e24:11525502e7d:-7f49">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="SUB_TOTAL_PRICE" remarks="" uid="148ab5c:1152d143877:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="TAX" remarks="" uid="1350e24:11525502e7d:-7f46">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="DELIVERY_PRICE" remarks="" uid="1350e24:11525502e7d:-7f48">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="PAYMENT_FEE" remarks="" uid="bf544c:1159961299e:-7fc5">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="TOTAL_PRICE" remarks="" uid="1350e24:11525502e7d:-7f47">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755840" remarks="" uid="1350e24:11525502e7d:-7f7d">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_FORM_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021756810" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e2f">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
-</foreign-key>
-<foreign-key alias="" name="SQL070831021756860" on-delete="" on-update="" referenced-key="SQL070831021756000" referenced-table="ORDER_STATUS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e2e">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_3" on-delete="" on-update="" referenced-key="PK_PAYMENT_METHOD" referenced-table="PAYMENT_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e2d">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PAYMENT_METHOD_ID" referenced-key-column-name="PAYMENT_METHOD_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_4" on-delete="" on-update="" referenced-key="SQL070831021756200" referenced-table="DELIVERY_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e2c">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="DELIVERY_METHOD_ID" referenced-key-column-name="DELIVERY_METHOD_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_6" on-delete="" on-update="" referenced-key="PK_CURRENCY" referenced-table="CURRENCY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e2b">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CURRENCY_ID" referenced-key-column-name="CURRENCY_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755840" remarks="" uid="1350e24:11525502e7d:-7f45" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_FORM_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756810" remarks="" uid="1350e24:11525502e7d:-7f44" unique="false">
-<index-description></index-description>
-<index-column name="CUSTOMER_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756860" remarks="" uid="1350e24:11525502e7d:-7f43" unique="false">
-<index-description></index-description>
-<index-column name="ORDER_STATUS_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_PRODUCT" remarks="" uid="1350e24:11525502e7d:-7f42">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="475" y="1915"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7f40">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f3f">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7f3e">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CODE" remarks="" uid="1f530d8:115531622f1:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="" uid="1350e24:11525502e7d:-7f3d">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="PRICE" remarks="" uid="1350e24:11525502e7d:-7f3b">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="FINAL_PRICE" remarks="" uid="1350e24:11525502e7d:-7f3a">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p,%s)">
-<variant precision-max="38" precision-min="1" precision-variable="%p" scale-max="127" scale-min="-84" scale-variable="%s" type-name-pattern="DECIMAL(%p,%s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="38" precision-min="1" precision-variable="%p" type-name-pattern="DECIMAL(%p)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="7" decimal-digits="4" default-value="" mandatory="true" name="TAX" remarks="" uid="1350e24:11525502e7d:-7f39">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="QUANTITY" remarks="" uid="1350e24:11525502e7d:-7f38">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755890" remarks="" uid="1350e24:11525502e7d:-7f41">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_PRODUCT_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021755891" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e29">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
-</foreign-key>
-<foreign-key alias="" name="SQL070831021755892" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e28">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755890" remarks="" uid="1350e24:11525502e7d:-7f37" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_PRODUCT_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021755891" remarks="" uid="1350e24:11525502e7d:-7f36" unique="false">
-<index-description></index-description>
-<index-column name="ORDER_FORM_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021755892" remarks="" uid="1350e24:11525502e7d:-7f35" unique="false">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_PRODUCT_ATTRIBUTE" remarks="" uid="1350e24:11525502e7d:-7f34">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="687" y="1640"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_ATTRIBUTE_ID" remarks="" uid="1350e24:11525502e7d:-7f32">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f31">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7f30">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="PRODUCTS_OPTIONS" remarks="" uid="1350e24:11525502e7d:-7f2f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_VALUE" remarks="" uid="1350e24:11525502e7d:-7f2e">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="OPTIONS_VALUES_PRICE" remarks="" uid="1350e24:11525502e7d:-7f2d">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p,%s)">
-<variant precision-max="38" precision-min="1" precision-variable="%p" scale-max="127" scale-min="-84" scale-variable="%s" type-name-pattern="DECIMAL(%p,%s)"/>
-<variant type-name-pattern="DECIMAL"/>
-<variant precision-max="38" precision-min="1" precision-variable="%p" type-name-pattern="DECIMAL(%p)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="PRICE_PREFIX" remarks="" uid="1350e24:11525502e7d:-7f2c">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="2000" precision-min="1" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756080" remarks="" uid="1350e24:11525502e7d:-7f33">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_PRODUCT_ATTRIBUTE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_ATTRIBUTES_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e27">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e26">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756080" remarks="" uid="1350e24:11525502e7d:-7f2b" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_PRODUCT_ATTRIBUTE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_PRODUCT_DOWNLOAD" remarks="" uid="1350e24:11525502e7d:-7f2a">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="823" y="1389"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_DOWNLOAD_ID" remarks="" uid="1350e24:11525502e7d:-7f28">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f27">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7f26">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="''" mandatory="true" name="FILENAME" remarks="" uid="1350e24:11525502e7d:-7f25">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="MAXDAYS" remarks="" uid="1350e24:11525502e7d:-7f24">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="COUNT" remarks="" uid="1350e24:11525502e7d:-7f23">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756110" remarks="" uid="1350e24:11525502e7d:-7f29">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_PRODUCT_DOWNLOAD_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_DOWNLOAD_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e25">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_PRODUCTS_DOWNLOAD_2" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e24">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756110" remarks="" uid="1350e24:11525502e7d:-7f22" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_PRODUCT_DOWNLOAD_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_STATUS" remarks="" uid="1350e24:11525502e7d:-7f21">
-<table-description></table-description>
-<table-figure-bounds height="113" width="242" x="808" y="1059"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_ID" remarks="" uid="1350e24:11525502e7d:-7f1f">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="TYPE" remarks="" uid="86558:115828b463c:-7f9e">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7f1e">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7f1d">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7f1c">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756000" remarks="" uid="1350e24:11525502e7d:-7f20">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_STATUS_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021756000" remarks="" uid="1350e24:11525502e7d:-7f1b" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_STATUS_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_STATUS_HISTORY" remarks="" uid="1350e24:11525502e7d:-7f1a">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="715" y="905"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_HISTORY_ID" remarks="" uid="1350e24:11525502e7d:-7f18">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f17">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_ID" remarks="" uid="1350e24:11525502e7d:-7f16">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7f15">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="0" mandatory="false" name="CUSTOMER_NOTIFIED" remarks="" uid="1350e24:11525502e7d:-7f14">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="COMMENT" remarks="" uid="1350e24:11525502e7d:-7f13">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756030" remarks="" uid="1350e24:11525502e7d:-7f19">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_STATUS_HISTORY_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021756900" on-delete="" on-update="" referenced-key="SQL070831021756000" referenced-table="ORDER_STATUS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e23">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_STATUS_HISTORY_2" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e22">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756030" remarks="" uid="1350e24:11525502e7d:-7f12" unique="true">
-<index-description></index-description>
-<index-column name="ORDER_STATUS_HISTORY_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756900" remarks="" uid="1350e24:11525502e7d:-7f11" unique="false">
-<index-description></index-description>
-<index-column name="ORDER_STATUS_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_COMMENT" remarks="" uid="1350e24:11525502e7d:-7f10">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="30" y="2092"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f0e">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="TITLE" remarks="" uid="1350e24:11525502e7d:-7f0d">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="COMMENT" remarks="" uid="1350e24:11525502e7d:-7f0c">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756170" remarks="" uid="1350e24:11525502e7d:-7f0f">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_FORM_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_TOTAL_1" on-delete="" on-update="" referenced-key="SQL070831021755840" referenced-table="ORDER_FORM" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e21">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_FORM_ID" referenced-key-column-name="ORDER_FORM_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="PRODUCT" remarks="" uid="1350e24:11525502e7d:-7f0a">
-<table-description></table-description>
-<table-figure-bounds height="314" width="249" x="2246" y="2372"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7f08">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CODE" remarks="" uid="c0fc8e:11548c89038:-7fbe">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="" uid="1350e24:11525502e7d:-7f07">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="QUANTITY" remarks="" uid="1350e24:11525502e7d:-7f06">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="PRICE" remarks="" uid="1350e24:11525502e7d:-7f05">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="5" decimal-digits="2" default-value="" mandatory="false" name="WEIGHT" remarks="" uid="1350e24:11525502e7d:-7f04">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="SIZE" remarks="" uid="1350e24:11525502e7d:-7f03">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="ORDERED" remarks="" uid="1350e24:11525502e7d:-7f00">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="REVIEWED" remarks="" uid="c0fc8e:11548c89038:-7fc5">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="RATING" remarks="" uid="c0fc8e:11548c89038:-7fc4">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="STATUS" remarks="" uid="1350e24:11525502e7d:-7eff">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7efe">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7efd">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="DATE_AVAILABLE" remarks="" uid="1350e24:11525502e7d:-7efc">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="TAX_CLASS_ID" remarks="" uid="1350e24:11525502e7d:-7efb">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="MANUFACTURER_ID" remarks="" uid="1350e24:11525502e7d:-7efa">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755390" remarks="" uid="1350e24:11525502e7d:-7f09">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021755391" on-delete="" on-update="" referenced-key="SQL070831021755280" referenced-table="MANUFACTURER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e20">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="MANUFACTURER_ID" referenced-key-column-name="MANUFACTURER_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_2" on-delete="" on-update="" referenced-key="SQL070831021756390" referenced-table="TAX_CLASS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e1f">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="TAX_CLASS_ID" referenced-key-column-name="TAX_CLASS_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755390" remarks="" uid="1350e24:11525502e7d:-7ef9" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021755391" remarks="" uid="1350e24:11525502e7d:-7ef8" unique="false">
-<index-description></index-description>
-<index-column name="MANUFACTURER_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_ATTRIBUTE" remarks="" uid="1350e24:11525502e7d:-7ef7">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="3984" y="1800"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ATTRIBUTE_ID" remarks="" uid="1350e24:11525502e7d:-7ef5">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7ef4">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_ID" remarks="" uid="1350e24:11525502e7d:-7ef3">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_VALUE_ID" remarks="" uid="1350e24:11525502e7d:-7ef2">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="OPTION_VALUE_PRICE" remarks="" uid="1350e24:11525502e7d:-7ef1">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="PRICE_PREFIX" remarks="" uid="1350e24:11525502e7d:-7ef0">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="2000" precision-min="1" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755500" remarks="" uid="1350e24:11525502e7d:-7ef6">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_ATTRIBUTE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021756760" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e1e">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_2" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e1d">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_3" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e1c">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_OPTION_VALUE_ID" referenced-key-column-name="PRODUCT_OPTION_VALUE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755500" remarks="" uid="1350e24:11525502e7d:-7eef" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ATTRIBUTE_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021756760" remarks="" uid="1350e24:11525502e7d:-7eee" unique="false">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_ATTRIBUTE_DOWNLOAD" remarks="" uid="1350e24:11525502e7d:-7eed">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="3921" y="1645"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ATTRIBUTE_ID" remarks="" uid="1350e24:11525502e7d:-7eeb">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="''" mandatory="true" name="FILENAME" remarks="" uid="1350e24:11525502e7d:-7eea">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="MAXDAYS" remarks="" uid="1350e24:11525502e7d:-7ee9">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="MAXCOUNT" remarks="" uid="1350e24:11525502e7d:-7ee8">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755560" remarks="" uid="1350e24:11525502e7d:-7eec">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_ATTRIBUTE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_ATTRIBUTES_DOWNLOAD_1" on-delete="" on-update="" referenced-key="SQL070831021755500" referenced-table="PRODUCT_ATTRIBUTE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e1b">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ATTRIBUTE_ID" referenced-key-column-name="PRODUCT_ATTRIBUTE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755560" remarks="" uid="1350e24:11525502e7d:-7ee7" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ATTRIBUTE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7ee6">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="1907" y="3113"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7ee4">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="1" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7ee3">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="''" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7ee2">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="TITLE" remarks="" uid="c0fc8e:11548c89038:-7fc1">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7ee1">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="URL" remarks="" uid="1350e24:11525502e7d:-7ee0">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="false" name="VIEWED" remarks="" uid="1350e24:11525502e7d:-7edf">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755590" remarks="" uid="1350e24:11525502e7d:-7ee5">
-<primary-key-description></primary-key-description>
-<primary-key-column name="LANGUAGE_ID"/>
-<primary-key-column name="PRODUCT_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021755591" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e1a">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e19">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755590" remarks="" uid="1350e24:11525502e7d:-7ede" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-<index-column name="LANGUAGE_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021755591" remarks="" uid="1350e24:11525502e7d:-7edd" unique="false">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_NOTIFICATION" remarks="" uid="1350e24:11525502e7d:-7edc">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="2174" y="2017"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7eda">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7ed9">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7ed8">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755670" remarks="" uid="1350e24:11525502e7d:-7edb">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CUSTOMER_ID"/>
-<primary-key-column name="PRODUCT_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_NOTIFICATIONS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e18">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_NOTIFICATIONS_2" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e17">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755670" remarks="" uid="1350e24:11525502e7d:-7ed7" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-<index-column name="CUSTOMER_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_OPTION" remarks="" uid="1350e24:11525502e7d:-7ed6">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="3353" y="2013"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_ID" remarks="" uid="1350e24:11525502e7d:-7ed4">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755700" remarks="" uid="1350e24:11525502e7d:-7ed5">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_OPTION_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021755700" remarks="" uid="1350e24:11525502e7d:-7ed3" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_OPTION_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_OPTION_VALUE" remarks="" uid="1350e24:11525502e7d:-7ed2">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="4038" y="2421"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_VALUE_ID" remarks="" uid="1350e24:11525502e7d:-7ed0">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755720" remarks="" uid="1350e24:11525502e7d:-7ed1">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_OPTION_VALUE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021755720" remarks="" uid="1350e24:11525502e7d:-7ecf" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_OPTION_VALUE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION" remarks="" uid="1350e24:11525502e7d:-7ece">
-<table-description></table-description>
-<table-figure-bounds height="78" width="304" x="4601" y="1997"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ASSOCIATION_ID" remarks="" uid="1350e24:11525502e7d:-7ecc">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_ID" remarks="" uid="1350e24:11525502e7d:-7ecb">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_VALUE_ID" remarks="" uid="1350e24:11525502e7d:-7eca">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755750" remarks="" uid="1350e24:11525502e7d:-7ecd">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ASSOCIATION_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_1" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e16">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_TO_PRODUCTS_OPTIONS_2" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e15">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_OPTION_VALUE_ID" referenced-key-column-name="PRODUCT_OPTION_VALUE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755750" remarks="" uid="1350e24:11525502e7d:-7ec9" unique="true">
-<index-description></index-description>
-<index-column name="ASSOCIATION_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="PRODUCT_TO_CATEGORY" remarks="" uid="1350e24:11525502e7d:-7ec8">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="2269" y="3269"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7ec6">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CATEGORY_ID" remarks="" uid="1350e24:11525502e7d:-7ec5">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="COMMENT" remarks="" uid="1350e24:11525502e7d:-7ec4">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021755770" remarks="" uid="1350e24:11525502e7d:-7ec7">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CATEGORY_ID"/>
-<primary-key-column name="PRODUCT_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="SQL070831021755780" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e14">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_TO_CATEGORIES_2" on-delete="" on-update="" referenced-key="SQL070831021754850" referenced-table="CATEGORY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e13">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CATEGORY_ID" referenced-key-column-name="CATEGORY_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021755770" remarks="" uid="1350e24:11525502e7d:-7ec3" unique="true">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-<index-column name="CATEGORY_ID" sort="ASC"/>
-</index>
-<index alias="" name="SQL070831021755780" remarks="" uid="1350e24:11525502e7d:-7ec2" unique="false">
-<index-description></index-description>
-<index-column name="PRODUCT_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="REVIEW" remarks="" uid="1350e24:11525502e7d:-7ec1">
-<table-description></table-description>
-<table-figure-bounds height="159" width="267" x="2479" y="2122"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="REVIEW_ID" remarks="" uid="1350e24:11525502e7d:-7ebf">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7ebe">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7ebd">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_NICKNAME" remarks="" uid="1350e24:11525502e7d:-7ebc">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="RATING" remarks="" uid="1350e24:11525502e7d:-7ebb">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7eba">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7eb9">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756260" remarks="" uid="1350e24:11525502e7d:-7ec0">
-<primary-key-description></primary-key-description>
-<primary-key-column name="REVIEW_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_REVIEWS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e12">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_REVIEWS_2" on-delete="" on-update="" referenced-key="SQL070831021755080" referenced-table="CUSTOMER" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e11">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CUSTOMER_ID" referenced-key-column-name="CUSTOMER_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756260" remarks="" uid="1350e24:11525502e7d:-7eb8" unique="true">
-<index-description></index-description>
-<index-column name="REVIEW_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="REVIEW_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7eb7">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="2029" y="1607"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="REVIEW_ID" remarks="" uid="1350e24:11525502e7d:-7eb5">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7eb4">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="COMMENT" remarks="" uid="1350e24:11525502e7d:-7eb3">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756290" remarks="" uid="1350e24:11525502e7d:-7eb6">
-<primary-key-description></primary-key-description>
-<primary-key-column name="LANGUAGE_ID"/>
-<primary-key-column name="REVIEW_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_REVIEWS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021756260" referenced-table="REVIEW" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e10">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="REVIEW_ID" referenced-key-column-name="REVIEW_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_REVIEWS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e0f">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756290" remarks="" uid="1350e24:11525502e7d:-7eb2" unique="true">
-<index-description></index-description>
-<index-column name="REVIEW_ID" sort="ASC"/>
-<index-column name="LANGUAGE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="BARGAIN" remarks="" uid="1350e24:11525502e7d:-7eb1">
-<table-description></table-description>
-<table-figure-bounds height="163" width="308" x="2751" y="3207"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="BARGAIN_ID" remarks="" uid="1350e24:11525502e7d:-7eaf">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7eae">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="BARGAIN_PRICE" remarks="" uid="1350e24:11525502e7d:-7ead">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7eac">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7eab">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="START_DATE" remarks="" uid="1350e24:11525502e7d:-7eaa">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="EXPIRE_DATE" remarks="" uid="1350e24:11525502e7d:-7ea9">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="1" mandatory="true" name="STATUS" remarks="" uid="1350e24:11525502e7d:-7ea8">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756360" remarks="" uid="1350e24:11525502e7d:-7eb0">
-<primary-key-description></primary-key-description>
-<primary-key-column name="BARGAIN_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_SPECIALS_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e0e">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756360" remarks="" uid="1350e24:11525502e7d:-7ea7" unique="true">
-<index-description></index-description>
-<index-column name="BARGAIN_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="TAX_CLASS" remarks="" uid="1350e24:11525502e7d:-7ea6">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="3047" y="825"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="TAX_CLASS_ID" remarks="" uid="1350e24:11525502e7d:-7ea4">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7ea3">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7ea2">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7ea1">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7ea0">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756390" remarks="" uid="1350e24:11525502e7d:-7ea5">
-<primary-key-description></primary-key-description>
-<primary-key-column name="TAX_CLASS_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list>
-<index alias="" name="SQL070831021756390" remarks="" uid="1350e24:11525502e7d:-7e9f" unique="true">
-<index-description></index-description>
-<index-column name="TAX_CLASS_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="TAX_RATE" remarks="" uid="1350e24:11525502e7d:-7e9e">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="3079" y="489"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="TAX_RATES_ID" remarks="" uid="1350e24:11525502e7d:-7e9c">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ZONE_ID" remarks="" uid="1350e24:11525502e7d:-7e9b">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="true" name="TAX_CLASS_ID" remarks="" uid="1350e24:11525502e7d:-7e9a">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="1" mandatory="false" name="PRIORITY" remarks="" uid="1350e24:11525502e7d:-7e99">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="7" decimal-digits="4" default-value="" mandatory="true" name="RATE" remarks="" uid="1350e24:11525502e7d:-7e98">
-<column-description></column-description>
-<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
-<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e97">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7e96">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7e95">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756420" remarks="" uid="1350e24:11525502e7d:-7e9d">
-<primary-key-description></primary-key-description>
-<primary-key-column name="TAX_RATES_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_TAX_RATES_1" on-delete="" on-update="" referenced-key="SQL070831021756390" referenced-table="TAX_CLASS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e0d">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="TAX_CLASS_ID" referenced-key-column-name="TAX_CLASS_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_TAX_RATES_2" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e0c">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ZONE_ID" referenced-key-column-name="ZONE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756420" remarks="" uid="1350e24:11525502e7d:-7e94" unique="true">
-<index-description></index-description>
-<index-column name="TAX_RATES_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ZONE" remarks="" uid="1350e24:11525502e7d:-7e93">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="2878" y="229"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ZONE_ID" remarks="" uid="1350e24:11525502e7d:-7e91">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="COUNTRY_ID" remarks="" uid="1350e24:11525502e7d:-7e90">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="ZONE_CODE" remarks="" uid="1350e24:11525502e7d:-7e8f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e8e">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756500" remarks="" uid="1350e24:11525502e7d:-7e92">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ZONE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ZONES_1" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e0b">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="COUNTRY_ID" referenced-key-column-name="COUNTRY_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756500" remarks="" uid="1350e24:11525502e7d:-7e8d" unique="true">
-<index-description></index-description>
-<index-column name="ZONE_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ZONE_TO_GEO_ZONE" remarks="" uid="1350e24:11525502e7d:-7e8c">
-<table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="2747" y="32"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ASSOCIATION_ID" remarks="" uid="1350e24:11525502e7d:-7e8a">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="COUNTRY_ID" remarks="" uid="1350e24:11525502e7d:-7e89">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="false" name="ZONE_ID" remarks="" uid="1350e24:11525502e7d:-7e88">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="false" name="GEO_ZONE_ID" remarks="" uid="1350e24:11525502e7d:-7e87">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7e86">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7e85">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%p)">
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-<variant type-name-pattern="TIMESTAMP WITH TIME ZONE"/>
-<variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p) WITH TIME ZONE"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="SQL070831021756530" remarks="" uid="1350e24:11525502e7d:-7e8b">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ASSOCIATION_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_1" on-delete="" on-update="" referenced-key="SQL070831021756500" referenced-table="ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e0a">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ZONE_ID" referenced-key-column-name="ZONE_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_2" on-delete="" on-update="" referenced-key="SQL070831021756450" referenced-table="GEO_ZONE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e09">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="GEO_ZONE_ID" referenced-key-column-name="GEO_ZONE_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ZONES_TO_GEO_ZONES_3" on-delete="" on-update="" referenced-key="SQL070831021755010" referenced-table="COUNTRY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e08">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="COUNTRY_ID" referenced-key-column-name="COUNTRY_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list>
-<index alias="" name="SQL070831021756530" remarks="" uid="1350e24:11525502e7d:-7e84" unique="true">
-<index-description></index-description>
-<index-column name="ASSOCIATION_ID" sort="ASC"/>
-</index>
-</index-list>
-</table>
-<table alias="" name="ORDER_STATUS_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e83">
-<table-description></table-description>
-<table-figure-bounds height="109" width="273" x="1094" y="1242"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_ID" remarks="" uid="1350e24:11525502e7d:-7e81">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7e80">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e7f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e7e">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_ORDER_STATUS_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e82">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_STATUS_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ORDERS_STATUS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021756000" referenced-table="ORDER_STATUS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e07">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_ORDERS_STATUS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e06">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="PRODUCT_OPTION_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e7d">
-<table-description></table-description>
-<table-figure-bounds height="104" width="308" x="3318" y="1700"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_ID" remarks="" uid="1350e24:11525502e7d:-7e7b">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7e7a">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e79">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e78">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_PRODUCT_OPTION_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e7c">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_OPTION_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021755700" referenced-table="PRODUCT_OPTION" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e05">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_OPTION_ID" referenced-key-column-name="PRODUCT_OPTION_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e04">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="PRODUCT_OPTION_VALUE_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e77">
-<table-description></table-description>
-<table-figure-bounds height="109" width="318" x="3471" y="2097"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_OPTION_VALUE_ID" remarks="" uid="1350e24:11525502e7d:-7e75">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7e74">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e73">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e72">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_PRODUCT_OPTION_VALUE_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e76">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_OPTION_VALUE_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="SQL070831021755720" referenced-table="PRODUCT_OPTION_VALUE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e03">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_OPTION_VALUE_ID" referenced-key-column-name="PRODUCT_OPTION_VALUE_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PRODUCTS_OPTIONS_VALUES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e02">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="CURRENCY" remarks="" uid="1350e24:11525502e7d:-7e71">
-<table-description></table-description>
-<table-figure-bounds height="153" width="260" x="503" y="158"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CURRENCY_ID" remarks="" uid="1350e24:11525502e7d:-7e6f">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="3" decimal-digits="0" default-value="" mandatory="true" name="CODE" remarks="" uid="1350e24:11525502e7d:-7e6e">
-<column-description></column-description>
-<data-type jdbc-type="1" literal-prefix="'" literal-suffix="'" name="CHAR" selected-variant-pattern="CHAR(%n)">
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n)"/>
-<variant type-name-pattern="CHAR"/>
-<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="12" decimal-digits="0" default-value="" mandatory="false" name="SYMBOL_LEFT" remarks="" uid="1350e24:11525502e7d:-7e6d">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="12" decimal-digits="0" default-value="" mandatory="false" name="SYMBOL_RIGHT" remarks="" uid="1350e24:11525502e7d:-7e6c">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CURRENCY_FORMAT" remarks="" uid="1350e24:11525502e7d:-7e6b">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7e6a">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7e69">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_CURRENCY" remarks="" uid="1350e24:11525502e7d:-7e70">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CURRENCY_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list/>
-</table>
-<table alias="" name="CURRENCY_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e68">
-<table-description></table-description>
-<table-figure-bounds height="113" width="266" x="1187" y="207"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CURRENCY_ID" remarks="" uid="1350e24:11525502e7d:-7e66">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7e65">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e64">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e63">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_CURRENCY_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e67">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CURRENCY_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_CURRENCIES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_CURRENCY" referenced-table="CURRENCY" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e01">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CURRENCY_ID" referenced-key-column-name="CURRENCY_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CURRENCIES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7e00">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="PAYMENT_METHOD" remarks="" uid="1350e24:11525502e7d:-7e62">
-<table-description></table-description>
-<table-figure-bounds height="131" width="276" x="645" y="462"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7e60">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="16" decimal-digits="0" default-value="" mandatory="true" name="CODE" remarks="" uid="1350e24:11525502e7d:-7e5f">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="true" name="OBJECT_NAME" remarks="" uid="bf544c:1159961299e:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="STATUS" remarks="" uid="1b80e60:115a7dda236:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7e5e">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7e5d">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7e5c">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_PAYMENT_METHOD" remarks="" uid="1350e24:11525502e7d:-7e61">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PAYMENT_METHOD_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list/>
-</table>
-<table alias="" name="PAYMENT_METHOD_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e5b">
-<table-description></table-description>
-<table-figure-bounds height="98" width="330" x="1715" y="583"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7e59">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7e58">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e57">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e56">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_PAYMENT_METHOD_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e5a">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PAYMENT_METHOD_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PAYMENT_METHODS_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_PAYMENT_METHOD" referenced-table="PAYMENT_METHOD" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7dff">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PAYMENT_METHOD_ID" referenced-key-column-name="PAYMENT_METHOD_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_PAYMENT_METHODS_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7dfe">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="CARD_TYPE" remarks="" uid="1350e24:11525502e7d:-7e55">
-<table-description></table-description>
-<table-figure-bounds height="119" width="292" x="218" y="341"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CARD_TYPE_ID" remarks="" uid="1350e24:11525502e7d:-7e53">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CODE" remarks="" uid="1350e24:11525502e7d:-7e52">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7e51">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="DATE_ADDED" remarks="" uid="1350e24:11525502e7d:-7e50">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7e4f">
-<column-description></column-description>
-<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
-<variant precision-max="14" precision-min="0" precision-variable="%n" type-name-pattern="TIMESTAMP(%n)"/>
-<variant type-name-pattern="TIMESTAMP"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_CARD_TYPE" remarks="" uid="1350e24:11525502e7d:-7e54">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CARD_TYPE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list/>
-</table>
-<table alias="" name="CARD_TYPE_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e4e">
-<table-description></table-description>
-<table-figure-bounds height="115" width="269" x="1504" y="408"/>
-<column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CARD_TYPE_ID" remarks="" uid="1350e24:11525502e7d:-7e4c">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="LANGUAGE_ID" remarks="" uid="1350e24:11525502e7d:-7e4b">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7e4a">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e49">
-<column-description></column-description>
-<data-type jdbc-type="-1" literal-prefix="'" literal-suffix="'" name="TEXT" selected-variant-pattern="TEXT">
-<variant type-name-pattern="TEXT"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_CARD_TYPE_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e4d">
-<primary-key-description></primary-key-description>
-<primary-key-column name="CARD_TYPE_ID"/>
-<primary-key-column name="LANGUAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_CARD_TYPES_DESCRIPTION_1" on-delete="" on-update="" referenced-key="PK_CARD_TYPE" referenced-table="CARD_TYPE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7dfd">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="CARD_TYPE_ID" referenced-key-column-name="CARD_TYPE_ID"/>
-</foreign-key>
-<foreign-key alias="" name="FK_CARD_TYPES_DESCRIPTION_2" on-delete="" on-update="" referenced-key="SQL070831021755250" referenced-table="LANGUAGE" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="1350e24:11525502e7d:-7dfc">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="LANGUAGE_ID" referenced-key-column-name="LANGUAGE_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="ORDER_CARD_INFO" remarks="" uid="1350e24:11525502e7d:-7e48">
-<table-description></table-description>
-<table-figure-bounds height="132" width="265" x="36" y="574"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_CARD_INFO_ID" remarks="" uid="1350e24:11525502e7d:-7e46">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CARD_CODE" remarks="" uid="1350e24:11525502e7d:-7e44">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="CARD_OWNER" remarks="" uid="1350e24:11525502e7d:-7e43">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="CARD_NUMBER" remarks="" uid="1350e24:11525502e7d:-7e42">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="CARD_EXPIRES" remarks="" uid="1350e24:11525502e7d:-7e41">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CARD_PAYMENT_TYPE" remarks="" uid="8c07e:1156f63c279:-7fce">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_ORDER_CARD_INFO" remarks="" uid="1350e24:11525502e7d:-7e47">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_CARD_INFO_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list/>
-<index-list/>
-</table>
-<table alias="" name="ORDER_NOTIFICATION" remarks="" uid="f09ee3:11546f31335:-7fd0">
-<table-description></table-description>
-<table-figure-bounds height="109" width="290" x="1088" y="634"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_NOTIFICATION_ID" remarks="" uid="f09ee3:11546f31335:-7fcc">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_ID" remarks="" uid="f09ee3:11546f31335:-7fcb">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="128" decimal-digits="0" default-value="" mandatory="false" name="EMAIL_ADDRESS" remarks="" uid="f09ee3:11546f31335:-7fca">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="TEMPLATE_NAME" remarks="" uid="f09ee3:11546f31335:-7fc9">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="STATUS" remarks="" uid="f09ee3:11546f31335:-7f9f">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_ORDER_NOTIFICATION" remarks="" uid="f09ee3:11546f31335:-7fcf">
-<primary-key-description></primary-key-description>
-<primary-key-column name="ORDER_NOTIFICATION_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_ORDER_NOTIFICATION_1" on-delete="" on-update="" referenced-key="SQL070831021756000" referenced-table="ORDER_STATUS" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="f09ee3:11546f31335:-7fb3">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_STATUS_ID" referenced-key-column-name="ORDER_STATUS_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-<table alias="" name="PRODUCT_IMAGE" remarks="" uid="c0fc8e:11548c89038:-7fbd">
-<table-description></table-description>
-<table-figure-bounds height="102" width="270" x="2682" y="2747"/>
-<column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_IMAGE_ID" remarks="" uid="c0fc8e:11548c89038:-7fb9">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PRODUCT_ID" remarks="" uid="c0fc8e:11548c89038:-7fb8">
-<column-description></column-description>
-<data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
-<variant type-name-pattern="BIGINT"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n) ZEROFILL"/>
-<variant type-name-pattern="BIGINT UNSIGNED"/>
-<variant type-name-pattern="BIGINT UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="BIGINT ZEROFILL"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="IMAGE_NAME" remarks="" uid="c0fc8e:11548c89038:-7fb7">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="TYPE" remarks="" uid="c0fc8e:11548c89038:-7fb6">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
-</column-list>
-<primary-key alias="" name="PK_PRODUCT_IMAGE" remarks="" uid="c0fc8e:11548c89038:-7fbc">
-<primary-key-description></primary-key-description>
-<primary-key-column name="PRODUCT_IMAGE_ID"/>
-</primary-key>
-<unique-key-list/>
-<foreign-key-list>
-<foreign-key alias="" name="FK_PRODUCT_IMAGE_1" on-delete="" on-update="" referenced-key="SQL070831021755390" referenced-table="PRODUCT" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="" uid="c0fc8e:11548c89038:-7f8b">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="PRODUCT_ID" referenced-key-column-name="PRODUCT_ID"/>
-</foreign-key>
-</foreign-key-list>
-<index-list/>
-</table>
-</table-list>
-</schema>
-</schema-list>
-</database-model>
-</clay-model>

Copied: pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql (from rev 867, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql)
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql	                        (rev 0)
+++ pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql	2008-04-08 05:03:44 UTC (rev 880)
@@ -0,0 +1,1117 @@
+DROP TABLE IF EXISTS ADDRESS_BOOK;
+DROP TABLE IF EXISTS MANUFACTURER_INFO;
+DROP TABLE IF EXISTS PRODUCT_INFO;
+DROP TABLE IF EXISTS DELIVERY_ZONE_DESCRIPTION;
+DROP TABLE IF EXISTS TAX_TYPE_DESCRIPTION;
+DROP TABLE IF EXISTS COUNTRY_DESCRIPTION;
+DROP TABLE IF EXISTS DELIVERY_TYPE_DESCRIPTION;
+DROP TABLE IF EXISTS PAYMENT_STATUS_DESCRIPTION;
+DROP TABLE IF EXISTS DELIVERY_STATUS_DESCRIPTION;
+DROP TABLE IF EXISTS PRODUCT_ATTRIBUTE;
+DROP TABLE IF EXISTS ORDER_PRODUCT_OPTION;
+DROP TABLE IF EXISTS FAVORITE_PRODUCT;
+DROP TABLE IF EXISTS PRODUCT_STATS;
+DROP TABLE IF EXISTS BASKET_PRODUCT_OPTION;
+DROP TABLE IF EXISTS PRODUCT_OPTION_VALUE_DESCRIPTION;
+DROP TABLE IF EXISTS PRODUCT_OPTION_DESCRIPTION;
+DROP TABLE IF EXISTS CATEGORY_INFO;
+DROP TABLE IF EXISTS IMAGE_DATA;
+DROP TABLE IF EXISTS FILE_TAG_TO_FILE_DATA;
+DROP TABLE IF EXISTS ORDER_PAYMENT;
+DROP TABLE IF EXISTS ORDER_DELIVERY;
+DROP TABLE IF EXISTS PRODUCT_CONTENT;
+DROP TABLE IF EXISTS PRODUCT_PAGE_INFO;
+DROP TABLE IF EXISTS CATEGORY_CONTENT;
+DROP TABLE IF EXISTS CATEGORY_PAGE_INFO;
+DROP TABLE IF EXISTS MANUFACTURER_DESCRIPTION;
+DROP TABLE IF EXISTS ORDER_NOTIFICATION;
+DROP TABLE IF EXISTS ORDER_CARD_INFO;
+DROP TABLE IF EXISTS CARD_TYPE_DESCRIPTION;
+DROP TABLE IF EXISTS PAYMENT_METHOD_DESCRIPTION;
+DROP TABLE IF EXISTS ORDER_STATUS_DESCRIPTION;
+DROP TABLE IF EXISTS BARGAIN;
+DROP TABLE IF EXISTS REVIEW_DESCRIPTION;
+DROP TABLE IF EXISTS PRODUCT_TO_CATEGORY;
+DROP TABLE IF EXISTS PRODUCT_NOTIFICATION;
+DROP TABLE IF EXISTS PRODUCT_DESCRIPTION;
+DROP TABLE IF EXISTS ORDER_COMMENT;
+DROP TABLE IF EXISTS ORDER_STATUS_HISTORY;
+DROP TABLE IF EXISTS DELIVERY_METHOD_DESCRIPTION;
+DROP TABLE IF EXISTS PRODUCT_OPTION_VALUE;
+DROP TABLE IF EXISTS ORDER_PRODUCT;
+DROP TABLE IF EXISTS PRODUCT_OPTION;
+DROP TABLE IF EXISTS REVIEW;
+DROP TABLE IF EXISTS BASKET;
+DROP TABLE IF EXISTS PRODUCT;
+DROP TABLE IF EXISTS ORDER_FORM;
+DROP TABLE IF EXISTS MANUFACTURER;
+DROP TABLE IF EXISTS CATEGORY;
+DROP TABLE IF EXISTS CUSTOMER;
+DROP TABLE IF EXISTS DELIVERY_ZONE;
+DROP TABLE IF EXISTS COUNTRY;
+DROP TABLE IF EXISTS DELIVERY_TYPE;
+DROP TABLE IF EXISTS FILE_TAG;
+DROP TABLE IF EXISTS DELIVERY_STATUS;
+DROP TABLE IF EXISTS PAYMENT_STATUS;
+DROP TABLE IF EXISTS FILE_DATA;
+DROP TABLE IF EXISTS CARD_TYPE;
+DROP TABLE IF EXISTS PAYMENT_METHOD;
+DROP TABLE IF EXISTS TAX_TYPE;
+DROP TABLE IF EXISTS ORDER_STATUS;
+DROP TABLE IF EXISTS DELIVERY_METHOD;
+
+CREATE TABLE DELIVERY_METHOD (
+       DELIVERY_METHOD_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , OBJECT_NAME VARCHAR(128) NOT NULL
+     , STATUS INTEGER NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (DELIVERY_METHOD_ID)
+);
+
+CREATE TABLE ORDER_STATUS (
+       ORDER_STATUS_ID INTEGER NOT NULL AUTO_INCREMENT
+     , TYPE INTEGER NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (ORDER_STATUS_ID)
+);
+
+CREATE TABLE TAX_TYPE (
+       TAX_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , RATE DECIMAL(7, 4) NOT NULL
+     , SORT_ORDER INTEGER
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (TAX_TYPE_ID)
+);
+
+CREATE TABLE PAYMENT_METHOD (
+       PAYMENT_METHOD_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , OBJECT_NAME VARCHAR(128) NOT NULL
+     , STATUS INTEGER NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (PAYMENT_METHOD_ID)
+);
+
+CREATE TABLE CARD_TYPE (
+       CARD_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (CARD_TYPE_ID)
+);
+
+CREATE TABLE FILE_DATA (
+       FILE_DATA_ID BIGINT NOT NULL AUTO_INCREMENT
+     , NAME VARCHAR(100) NOT NULL
+     , FILE_TYPE VARCHAR(10) NOT NULL
+     , STATUS INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (FILE_DATA_ID)
+);
+
+CREATE TABLE PAYMENT_STATUS (
+       PAYMENT_STATUS_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , SORT_ORDER INTEGER
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (PAYMENT_STATUS_ID)
+);
+
+CREATE TABLE DELIVERY_STATUS (
+       DELIVERY_STATUS_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , SORT_ORDER INTEGER
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (DELIVERY_STATUS_ID)
+);
+
+CREATE TABLE FILE_TAG (
+       FILE_TAG_ID BIGINT NOT NULL AUTO_INCREMENT
+     , NAME VARCHAR(100) NOT NULL
+     , PRIMARY KEY (FILE_TAG_ID)
+);
+
+CREATE TABLE DELIVERY_TYPE (
+       DELIVERY_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (DELIVERY_TYPE_ID)
+);
+
+CREATE TABLE COUNTRY (
+       COUNTRY_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (COUNTRY_ID)
+);
+
+CREATE TABLE DELIVERY_ZONE (
+       DELIVERY_ZONE_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CODE VARCHAR(40) NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (DELIVERY_ZONE_ID)
+);
+
+CREATE TABLE CUSTOMER (
+       CUSTOMER_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PORTAL_ID VARCHAR(255) NOT NULL
+     , GENDER CHAR(1) NOT NULL
+     , FIRSTNAME VARCHAR(40) NOT NULL
+     , LASTNAME VARCHAR(40) NOT NULL
+     , FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , LASTNAME_DESCRIPTION VARCHAR(40)
+     , NICKNAME VARCHAR(64)
+     , DAY_OF_BIRTH DATE NOT NULL DEFAULT '0000-00-00 00:00:00'
+     , EMAIL_ADDRESS VARCHAR(128) NOT NULL
+     , CREATED_DATE TIMESTAMP NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (CUSTOMER_ID)
+);
+
+CREATE TABLE CATEGORY (
+       CATEGORY_ID INTEGER NOT NULL AUTO_INCREMENT
+     , PARENT_CATEGORY_ID INTEGER NOT NULL DEFAULT 0
+     , FILE_DATA_ID BIGINT
+     , NUM_OF_PRODUCT INTEGER
+     , STATUS INTEGER NOT NULL
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (CATEGORY_ID)
+);
+
+CREATE TABLE MANUFACTURER (
+       MANUFACTURER_ID INTEGER NOT NULL AUTO_INCREMENT
+     , FILE_DATA_ID BIGINT
+     , SORT_ORDER INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (MANUFACTURER_ID)
+);
+
+CREATE TABLE ORDER_FORM (
+       ORDER_FORM_ID BIGINT NOT NULL AUTO_INCREMENT
+     , ORDER_FORM_NUMBER VARCHAR(40) NOT NULL
+     , CUSTOMER_ID BIGINT
+     , CUSTOMER_GENDER CHAR(1) NOT NULL
+     , CUSTOMER_FIRSTNAME VARCHAR(40) NOT NULL
+     , CUSTOMER_LASTNAME VARCHAR(40) NOT NULL
+     , CUSTOMER_FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , CUSTOMER_LASTNAME_DESCRIPTION VARCHAR(40)
+     , CUSTOMER_DAY_OF_BIRTH DATE NOT NULL
+     , CUSTOMER_EMAIL_ADDRESS VARCHAR(200) NOT NULL
+     , CUSTOMER_COMPANY VARCHAR(120)
+     , CUSTOMER_DEPARTMENT VARCHAR(100)
+     , CUSTOMER_STREET_ADDRESS VARCHAR(240) NOT NULL
+     , CUSTOMER_SUBURB VARCHAR(40)
+     , CUSTOMER_CITY VARCHAR(80) NOT NULL
+     , CUSTOMER_STATE VARCHAR(40)
+     , CUSTOMER_POSTCODE VARCHAR(10) NOT NULL
+     , CUSTOMER_TELEPHONE VARCHAR(40)
+     , CUSTOMER_COUNTRY_CODE VARCHAR(40) NOT NULL
+     , CUSTOMER_LANGUAGE VARCHAR(20) NOT NULL
+     , BILLING_COMPANY VARCHAR(120)
+     , BILLING_DEPARTMENT VARCHAR(100)
+     , BILLING_FIRSTNAME VARCHAR(40) NOT NULL
+     , BILLING_LASTNAME VARCHAR(40) NOT NULL
+     , BILLING_FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , BILLING_LASTNAME_DESCRIPTION VARCHAR(40)
+     , BILLING_STREET_ADDRESS VARCHAR(240) NOT NULL
+     , BILLING_SUBURB VARCHAR(40)
+     , BILLING_CITY VARCHAR(80) NOT NULL
+     , BILLING_STATE VARCHAR(40)
+     , BILLING_POSTCODE VARCHAR(10) NOT NULL
+     , BILLING_TELEPHONE VARCHAR(40)
+     , BILLING_COUNTRY_CODE VARCHAR(40) NOT NULL
+     , BILLING_LANGUAGE VARCHAR(20) NOT NULL
+     , ORDER_STATUS_ID INTEGER NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PURCHASED_DATE TIMESTAMP NOT NULL
+     , FINISHED_DATE TIMESTAMP
+     , PRIMARY KEY (ORDER_FORM_ID)
+);
+
+CREATE TABLE PRODUCT (
+       PRODUCT_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_MODE INTEGER NOT NULL
+     , CODE VARCHAR(40) NOT NULL
+     , MODEL VARCHAR(80)
+     , STOCK INTEGER
+     , CATALOG_PRICE DECIMAL(15, 4)
+     , PRICE DECIMAL(15, 4) NOT NULL
+     , WEIGHT DECIMAL(5, 2)
+     , SIZE VARCHAR(40)
+     , STATUS INTEGER NOT NULL
+     , LIMIT_PURCHASE INTEGER
+     , RELEASE_DATE TIMESTAMP
+     , START_DATE TIMESTAMP
+     , END_DATE TIMESTAMP
+     , FILE_DATA_ID BIGINT
+     , MANUFACTURER_ID INTEGER
+     , TAX_TYPE_ID INTEGER NOT NULL
+     , DELIVERY_TYPE_ID INTEGER NOT NULL
+     , CREATED_DATE TIMESTAMP NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (PRODUCT_ID)
+);
+
+CREATE TABLE BASKET (
+       BASKET_ID BIGINT NOT NULL AUTO_INCREMENT
+     , CUSTOMER_ID BIGINT NOT NULL
+     , PRODUCT_ID BIGINT NOT NULL
+     , QUANTITY INTEGER NOT NULL
+     , FINAL_PRICE DECIMAL(15, 4)
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (BASKET_ID)
+);
+
+CREATE TABLE REVIEW (
+       REVIEW_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , CUSTOMER_ID BIGINT
+     , CUSTOMER_NICKNAME VARCHAR(80) NOT NULL
+     , RATING INTEGER
+     , CREATED_DATE TIMESTAMP NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (REVIEW_ID)
+);
+
+CREATE TABLE PRODUCT_OPTION (
+       PRODUCT_OPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , CODE VARCHAR(40) NOT NULL
+     , PRIMARY KEY (PRODUCT_OPTION_ID)
+);
+
+CREATE TABLE ORDER_PRODUCT (
+       ORDER_PRODUCT_ID BIGINT NOT NULL AUTO_INCREMENT
+     , ORDER_FORM_ID BIGINT NOT NULL
+     , PRODUCT_ID BIGINT NOT NULL
+     , MODEL VARCHAR(80)
+     , CODE VARCHAR(40) NOT NULL
+     , PRICE DECIMAL(15, 4) NOT NULL
+     , FINAL_PRICE DECIMAL(15, 4) NOT NULL
+     , TAX DECIMAL(7, 4) NOT NULL
+     , QUANTITY INTEGER NOT NULL
+     , PRODUCT_NAME VARCHAR(150)
+     , DISPLAY_PRODUCT_NAME VARCHAR(150)
+     , MANUFACTURER_NAME VARCHAR(80)
+     , DISPLAY_MANUFACTURER_NAME VARCHAR(80)
+     , PRIMARY KEY (ORDER_PRODUCT_ID)
+);
+
+CREATE TABLE PRODUCT_OPTION_VALUE (
+       PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_OPTION_ID BIGINT NOT NULL
+     , CODE VARCHAR(40) NOT NULL
+     , STOCK INTEGER
+     , PRIMARY KEY (PRODUCT_OPTION_VALUE_ID)
+);
+
+CREATE TABLE DELIVERY_METHOD_DESCRIPTION (
+       DELIVERY_METHOD_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , DELIVERY_METHOD_ID INTEGER NOT NULL DEFAULT 0
+     , NAME VARCHAR(80) NOT NULL
+     , DESCRIPTION TEXT
+     , LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1'
+     , PRIMARY KEY (DELIVERY_METHOD_DESCRIPTION_ID)
+);
+
+CREATE TABLE ORDER_STATUS_HISTORY (
+       ORDER_STATUS_HISTORY_ID INTEGER NOT NULL AUTO_INCREMENT
+     , ORDER_FORM_ID BIGINT NOT NULL
+     , ORDER_STATUS_ID INTEGER NOT NULL
+     , CUSTOMER_NOTIFIED INTEGER DEFAULT 0
+     , REMARK VARCHAR(200)
+     , CREATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (ORDER_STATUS_HISTORY_ID)
+);
+
+CREATE TABLE ORDER_COMMENT (
+       ORDER_COMMENT_ID BIGINT NOT NULL AUTO_INCREMENT
+     , ORDER_FORM_ID BIGINT NOT NULL
+     , TYPE INTEGER NOT NULL
+     , COMMENT TEXT
+     , PRIMARY KEY (ORDER_COMMENT_ID)
+);
+
+CREATE TABLE PRODUCT_DESCRIPTION (
+       PRODUCT_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , DESCRIPTION TEXT
+     , LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1'
+     , PRIMARY KEY (PRODUCT_DESCRIPTION_ID)
+);
+
+CREATE TABLE PRODUCT_NOTIFICATION (
+       PRODUCT_ID BIGINT NOT NULL
+     , CUSTOMER_ID BIGINT NOT NULL
+     , CREATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (CUSTOMER_ID, PRODUCT_ID)
+);
+
+CREATE TABLE PRODUCT_TO_CATEGORY (
+       PRODUCT_ID BIGINT NOT NULL
+     , CATEGORY_ID INTEGER NOT NULL
+     , PRIMARY KEY (CATEGORY_ID, PRODUCT_ID)
+);
+
+CREATE TABLE REVIEW_DESCRIPTION (
+       REVIEW_ID BIGINT NOT NULL
+     , COMMENT TEXT NOT NULL
+     , PRIMARY KEY (REVIEW_ID)
+);
+
+CREATE TABLE BARGAIN (
+       BARGAIN_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , BARGAIN_PRICE DECIMAL(15, 4) NOT NULL
+     , BARGAIN_CODE VARCHAR(40)
+     , START_DATE TIMESTAMP
+     , END_DATE TIMESTAMP
+     , STATUS INTEGER NOT NULL DEFAULT 1
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (BARGAIN_ID)
+);
+
+CREATE TABLE ORDER_STATUS_DESCRIPTION (
+       ORDER_STATUS_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , ORDER_STATUS_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , DESCRIPTION VARCHAR(255)
+     , LANGUAGE VARCHAR(20)
+     , PRIMARY KEY (ORDER_STATUS_DESCRIPTION_ID)
+);
+
+CREATE TABLE PAYMENT_METHOD_DESCRIPTION (
+       PAYMENT_METHOD_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , PAYMENT_METHOD_ID INTEGER NOT NULL
+     , NAME VARCHAR(80) NOT NULL
+     , DESCRIPTION TEXT
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (PAYMENT_METHOD_DESCRIPTION_ID)
+);
+
+CREATE TABLE CARD_TYPE_DESCRIPTION (
+       CARD_TYPE_DESCRIPTION_ID INTEGER NOT NULL
+     , CARD_TYPE_ID INTEGER NOT NULL
+     , NAME VARCHAR(80) NOT NULL
+     , DESCRIPTION TEXT
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (CARD_TYPE_DESCRIPTION_ID)
+);
+
+CREATE TABLE ORDER_CARD_INFO (
+       ORDER_FORM_ID BIGINT NOT NULL AUTO_INCREMENT
+     , CARD_TYPE_ID INTEGER
+     , CARD_TYPE_CODE VARCHAR(40) NOT NULL
+     , CARD_OWNER VARCHAR(255) NOT NULL
+     , CARD_NUMBER VARCHAR(255) NOT NULL
+     , CARD_EXPIRES VARCHAR(255) NOT NULL
+     , CARD_PAYMENT_TYPE VARCHAR(80)
+     , PRIMARY KEY (ORDER_FORM_ID)
+);
+
+CREATE TABLE ORDER_NOTIFICATION (
+       ORDER_NOTIFICATION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , ORDER_STATUS_ID INTEGER NOT NULL
+     , EMAIL_ADDRESS VARCHAR(200)
+     , TEMPLATE_NAME VARCHAR(40) NOT NULL
+     , STATUS INTEGER NOT NULL
+     , PRIMARY KEY (ORDER_NOTIFICATION_ID)
+);
+
+CREATE TABLE MANUFACTURER_DESCRIPTION (
+       MANUFACTURER_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , MANUFACTURER_ID INTEGER NOT NULL
+     , DESCRIPTION TEXT
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (MANUFACTURER_DESCRIPTION_ID)
+);
+
+CREATE TABLE CATEGORY_PAGE_INFO (
+       CATEGORY_ID INTEGER NOT NULL
+     , PAGE_ID VARCHAR(80) NOT NULL
+     , TEMPLATE_NAME VARCHAR(80) NOT NULL
+     , KEYWORD VARCHAR(160)
+     , DESCRIPTION VARCHAR(160)
+     , PRIMARY KEY (CATEGORY_ID)
+);
+
+CREATE TABLE CATEGORY_CONTENT (
+       CATEGORY_CONTENT_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CATEGORY_ID INTEGER NOT NULL
+     , CONTENT TEXT
+     , SORT_ORDER INTEGER NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (CATEGORY_CONTENT_ID)
+);
+
+CREATE TABLE PRODUCT_PAGE_INFO (
+       PRODUCT_ID BIGINT NOT NULL
+     , PAGE_ID VARCHAR(80) NOT NULL
+     , TEMPLATE_NAME VARCHAR(80) NOT NULL
+     , KEYWORD VARCHAR(160)
+     , DESCRIPTION VARCHAR(160)
+     , PRIMARY KEY (PRODUCT_ID)
+);
+
+CREATE TABLE PRODUCT_CONTENT (
+       PRODUCT_CONTENT_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , CONTENT TEXT
+     , SORT_ORDER INTEGER NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (PRODUCT_CONTENT_ID)
+);
+
+CREATE TABLE ORDER_DELIVERY (
+       ORDER_FORM_ID BIGINT NOT NULL
+     , DELIVERY_COMPANY VARCHAR(120)
+     , DELIVERY_DEPARTMENT VARCHAR(100)
+     , DELIVERY_FIRSTNAME VARCHAR(40) NOT NULL
+     , DELIVERY_LASTNAME VARCHAR(40) NOT NULL
+     , DELIVERY_FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , DELIVERY_LASTNAME_DESCRIPTION VARCHAR(40)
+     , DELIVERY_STREET_ADDRESS VARCHAR(240) NOT NULL
+     , DELIVERY_SUBURB VARCHAR(40)
+     , DELIVERY_CITY VARCHAR(80) NOT NULL
+     , DELIVERY_STATE VARCHAR(40)
+     , DELIVERY_POSTCODE VARCHAR(10) NOT NULL
+     , DELIVERY_TELEPHONE VARCHAR(40)
+     , DELIVERY_STATUS_ID INTEGER
+     , DELIVERY_METHOD_ID INTEGER
+     , DELIVERY_METHOD_CODE VARCHAR(40) NOT NULL
+     , DELIVERY_COUNTRY_CODE VARCHAR(40) NOT NULL
+     , DELIVERY_LANGUAGE VARCHAR(20) NOT NULL
+     , DELIVERY_COUNTRY_ID INTEGER NOT NULL
+     , DELIVERY_ZONE_ID INTEGER NOT NULL
+     , REQUESTED_DATE TIMESTAMP
+     , SENT_DATE TIMESTAMP
+     , RECEIVED_DATE TIMESTAMP
+     , SLIP_NUMBER VARCHAR(40)
+     , GIFT_WRAP INTEGER
+     , GIFT_MESSAGE VARCHAR(200)
+     , ENVELOPE_LABEL VARCHAR(100)
+     , PRIMARY KEY (ORDER_FORM_ID)
+);
+
+CREATE TABLE ORDER_PAYMENT (
+       ORDER_FORM_ID BIGINT NOT NULL
+     , PAYMENT_METHOD_ID INTEGER
+     , PAYMENT_METHOD_CODE VARCHAR(40) NOT NULL
+     , ORDER_CARD_INFO_ID BIGINT
+     , PAYMENT_STATUS_ID INTEGER
+     , SUB_TOTAL_PRICE DECIMAL(14, 6)
+     , TAX DECIMAL(14, 6)
+     , DELIVERY_PRICE DECIMAL(14, 6)
+     , PAYMENT_FEE DECIMAL(14, 6)
+     , TOTAL_PRICE DECIMAL(14, 6) NOT NULL
+     , PRIMARY KEY (ORDER_FORM_ID)
+);
+
+CREATE TABLE FILE_TAG_TO_FILE_DATA (
+       FILE_TAG_ID BIGINT NOT NULL
+     , FILE_DATA_ID BIGINT NOT NULL
+     , PRIMARY KEY (FILE_DATA_ID, FILE_TAG_ID)
+);
+
+CREATE TABLE IMAGE_DATA (
+       FILE_DATA_ID BIGINT NOT NULL AUTO_INCREMENT
+     , SIZE INTEGER
+     , HEIGHT INTEGER
+     , WIDTH INTEGER
+     , PRIMARY KEY (FILE_DATA_ID)
+);
+
+CREATE TABLE CATEGORY_INFO (
+       CATEGORY_INFO_ID INTEGER NOT NULL AUTO_INCREMENT
+     , CATEGORY_ID INTEGER NOT NULL
+     , NAME VARCHAR(80) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (CATEGORY_INFO_ID)
+);
+
+CREATE TABLE PRODUCT_OPTION_DESCRIPTION (
+       PRODUCT_OPTION_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_OPTION_ID BIGINT NOT NULL
+     , NAME VARCHAR(80) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (PRODUCT_OPTION_DESCRIPTION_ID)
+);
+
+CREATE TABLE PRODUCT_OPTION_VALUE_DESCRIPTION (
+       PRODUCT_OPTION_VALUE_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL
+     , NAME VARCHAR(80) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (PRODUCT_OPTION_VALUE_DESCRIPTION_ID)
+);
+
+CREATE TABLE BASKET_PRODUCT_OPTION (
+       BASKET_PRODUCT_OPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+     , BASKET_ID BIGINT NOT NULL
+     , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL
+     , PRIMARY KEY (BASKET_PRODUCT_OPTION_ID)
+);
+
+CREATE TABLE PRODUCT_STATS (
+       PRODUCT_ID BIGINT NOT NULL
+     , ORDERED INTEGER
+     , REVIEWED INTEGER
+     , RATING INTEGER
+     , FAVORITE INTEGER
+     , NOTIFICATION INTEGER
+     , PRIMARY KEY (PRODUCT_ID)
+);
+
+CREATE TABLE FAVORITE_PRODUCT (
+       PRODUCT_ID BIGINT NOT NULL
+     , CUSTOMER_ID BIGINT NOT NULL
+     , UPDATED_DATE TIMESTAMP NOT NULL
+     , PRIMARY KEY (CUSTOMER_ID, PRODUCT_ID)
+);
+
+CREATE TABLE ORDER_PRODUCT_OPTION (
+       ORDER_PRODUCT_OPTION_ID BIGINT NOT NULL AUTO_INCREMENT
+     , ORDER_PRODUCT_ID BIGINT NOT NULL
+     , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL
+     , PRODUCT_OPTION_CODE VARCHAR(40) NOT NULL
+     , PRODUCT_OPTION_VALUE_CODE VARCHAR(40) NOT NULL
+     , PRODUCT_OPTION_NAME VARCHAR(80)
+     , DISPLAY_PRODUCT_OPTION_NAME VARCHAR(80)
+     , PRODUCT_OPTION_VALUE_NAME VARCHAR(80)
+     , DISPLAY_PRODUCT_OPTION_VALUE_NAME VARCHAR(80)
+     , PRIMARY KEY (ORDER_PRODUCT_OPTION_ID)
+);
+
+CREATE TABLE PRODUCT_ATTRIBUTE (
+       PRODUCT_ATTRIBUTE_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , NAME VARCHAR(100) NOT NULL
+     , VALUE VARCHAR(100)
+     , PRIMARY KEY (PRODUCT_ATTRIBUTE_ID)
+);
+
+CREATE TABLE DELIVERY_STATUS_DESCRIPTION (
+       DELIVERY_STATUS_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , DELIVERY_STATUS_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (DELIVERY_STATUS_DESCRIPTION_ID)
+);
+
+CREATE TABLE PAYMENT_STATUS_DESCRIPTION (
+       PAYMENT_STATUS_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , PAYMENT_STATUS_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (PAYMENT_STATUS_DESCRIPTION_ID)
+);
+
+CREATE TABLE DELIVERY_TYPE_DESCRIPTION (
+       DELIVERY_TYPE_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , DELIVERY_TYPE_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (DELIVERY_TYPE_DESCRIPTION_ID)
+);
+
+CREATE TABLE COUNTRY_DESCRIPTION (
+       COUNTRY_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , COUNTRY_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (COUNTRY_DESCRIPTION_ID)
+);
+
+CREATE TABLE TAX_TYPE_DESCRIPTION (
+       TAX_TYPE_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , TAX_TYPE_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , DESCRIPTION VARCHAR(200)
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (TAX_TYPE_DESCRIPTION_ID)
+);
+
+CREATE TABLE DELIVERY_ZONE_DESCRIPTION (
+       DELIVERY_ZONE_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT
+     , DELIVERY_ZONE_ID INTEGER NOT NULL
+     , NAME VARCHAR(40) NOT NULL
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (DELIVERY_ZONE_DESCRIPTION_ID)
+);
+
+CREATE TABLE PRODUCT_INFO (
+       PRODUCT_INFO_ID BIGINT NOT NULL AUTO_INCREMENT
+     , PRODUCT_ID BIGINT NOT NULL
+     , NAME VARCHAR(150) NOT NULL DEFAULT ''
+     , TITLE VARCHAR(80)
+     , URL VARCHAR(255)
+     , LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1'
+     , PRIMARY KEY (PRODUCT_INFO_ID)
+);
+
+CREATE TABLE MANUFACTURER_INFO (
+       MANUFACTURER_INFO_ID INTEGER NOT NULL AUTO_INCREMENT
+     , MANUFACTURER_ID INTEGER NOT NULL
+     , NAME VARCHAR(80) NOT NULL
+     , URL VARCHAR(255)
+     , LANGUAGE VARCHAR(20) NOT NULL
+     , PRIMARY KEY (MANUFACTURER_INFO_ID)
+);
+
+CREATE TABLE ADDRESS_BOOK (
+       ADDRESS_BOOK_ID BIGINT NOT NULL AUTO_INCREMENT
+     , CUSTOMER_ID BIGINT NOT NULL
+     , COMPANY VARCHAR(128)
+     , DEPARTMENT VARCHAR(64)
+     , FIRSTNAME VARCHAR(40) NOT NULL
+     , LASTNAME VARCHAR(40) NOT NULL
+     , FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , LASTNAME_DESCRIPTION VARCHAR(40)
+     , STREET_ADDRESS VARCHAR(255) NOT NULL
+     , SUBURB VARCHAR(32)
+     , CITY VARCHAR(64) NOT NULL
+     , STATE VARCHAR(32)
+     , POSTCODE VARCHAR(10) NOT NULL
+     , TELEPHONE VARCHAR(32)
+     , FAX VARCHAR(32)
+     , CELLPHONE VARCHAR(32)
+     , DEFAULT_ADDRESS INTEGER NOT NULL
+     , COUNTRY_ID INTEGER NOT NULL DEFAULT 0
+     , DELIVERY_ZONE_ID INTEGER NOT NULL
+     , PRIMARY KEY (ADDRESS_BOOK_ID)
+);
+
+ALTER TABLE CATEGORY
+  ADD CONSTRAINT FK_FROM_CATEGORY_TO_CATEGORY
+      FOREIGN KEY (PARENT_CATEGORY_ID)
+      REFERENCES CATEGORY (CATEGORY_ID)
+   ON DELETE SET DEFAULT;
+
+ALTER TABLE CATEGORY
+  ADD CONSTRAINT FK_FROM_CATEGORY_TO_FILE_DATA
+      FOREIGN KEY (FILE_DATA_ID)
+      REFERENCES FILE_DATA (FILE_DATA_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE MANUFACTURER
+  ADD CONSTRAINT FK_FROM_MANUFACTURER_TO_FILE_DATA
+      FOREIGN KEY (FILE_DATA_ID)
+      REFERENCES FILE_DATA (FILE_DATA_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_FORM
+  ADD CONSTRAINT FK_FROM_CUSTOMER_TO_ORDER_FORM
+      FOREIGN KEY (CUSTOMER_ID)
+      REFERENCES CUSTOMER (CUSTOMER_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_FORM
+  ADD CONSTRAINT FK_FROM_ORDER_FORM_TO_ORDER_STATUS
+      FOREIGN KEY (ORDER_STATUS_ID)
+      REFERENCES ORDER_STATUS (ORDER_STATUS_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE PRODUCT
+  ADD CONSTRAINT FK_FROM_PRODUCT_TO_MANUFACTURER
+      FOREIGN KEY (MANUFACTURER_ID)
+      REFERENCES MANUFACTURER (MANUFACTURER_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE PRODUCT
+  ADD CONSTRAINT FK_FROM_PRODUCT_TO_TAX_TYPE
+      FOREIGN KEY (TAX_TYPE_ID)
+      REFERENCES TAX_TYPE (TAX_TYPE_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE PRODUCT
+  ADD CONSTRAINT FK_FROM_PRODUCT_TO_DELIVERY_TYPE
+      FOREIGN KEY (DELIVERY_TYPE_ID)
+      REFERENCES DELIVERY_TYPE (DELIVERY_TYPE_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE PRODUCT
+  ADD CONSTRAINT FK_FROM_PRODUCT_TO_FILE_DATA
+      FOREIGN KEY (FILE_DATA_ID)
+      REFERENCES FILE_DATA (FILE_DATA_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE BASKET
+  ADD CONSTRAINT FK_FROM_BASKET_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE BASKET
+  ADD CONSTRAINT FK_FROM_BASKET_TO_CUSTOMER
+      FOREIGN KEY (CUSTOMER_ID)
+      REFERENCES CUSTOMER (CUSTOMER_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE REVIEW
+  ADD CONSTRAINT FK_FROM_REVIEW_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE REVIEW
+  ADD CONSTRAINT FK_FROM_REVIEW_TO_CUSTOMER
+      FOREIGN KEY (CUSTOMER_ID)
+      REFERENCES CUSTOMER (CUSTOMER_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE PRODUCT_OPTION
+  ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_PRODUCT
+  ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_PRODUCT
+  ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_TO_ORDER_FORM
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_OPTION_VALUE
+  ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION
+      FOREIGN KEY (PRODUCT_OPTION_ID)
+      REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE DELIVERY_METHOD_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_DELIVERY_METHOD_DESCRIPTION_TO_DELIVERY_METHOD
+      FOREIGN KEY (DELIVERY_METHOD_ID)
+      REFERENCES DELIVERY_METHOD (DELIVERY_METHOD_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_STATUS_HISTORY
+  ADD CONSTRAINT FK_FROM_ORDERS_STATUS_HISTORY_TO_ORDER_FORM
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_STATUS_HISTORY
+  ADD CONSTRAINT FK_FROM_ORDER_STATUS_HISTORY_TO_ORDER_FORM
+      FOREIGN KEY (ORDER_STATUS_ID)
+      REFERENCES ORDER_STATUS (ORDER_STATUS_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_COMMENT
+  ADD CONSTRAINT FK_FROM_ORDER_COMMENT_TO_ORDER_FORM
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_PRODUCT_DESCRIPTION_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_NOTIFICATION
+  ADD CONSTRAINT FK_FROM_PRODUCT_NOTIFICATION_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_NOTIFICATION
+  ADD CONSTRAINT FK_FROM_PRODUCT_NOTIFICATION_TO_CUSTOMER
+      FOREIGN KEY (CUSTOMER_ID)
+      REFERENCES CUSTOMER (CUSTOMER_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_TO_CATEGORY
+  ADD CONSTRAINT FK_FROM_PRODUCT_TO_CATEGORY_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_TO_CATEGORY
+  ADD CONSTRAINT FK_FROM_PRODUCT_TO_CATEGORY_TO_CATEGORY
+      FOREIGN KEY (CATEGORY_ID)
+      REFERENCES CATEGORY (CATEGORY_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE REVIEW_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_REVIEW_DESCRIPTION_TO_REVIEW
+      FOREIGN KEY (REVIEW_ID)
+      REFERENCES REVIEW (REVIEW_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE BARGAIN
+  ADD CONSTRAINT FK_FROM_BARGAIN_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_STATUS_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_ORDER_STATUS_DESCRIPTION_TO_ORDER_STATUS
+      FOREIGN KEY (ORDER_STATUS_ID)
+      REFERENCES ORDER_STATUS (ORDER_STATUS_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PAYMENT_METHOD_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_PAYMENT_METHOD_DESCRIPTION_TO_PAYMENT_METHOD
+      FOREIGN KEY (PAYMENT_METHOD_ID)
+      REFERENCES PAYMENT_METHOD (PAYMENT_METHOD_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE CARD_TYPE_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_CARD_TYPES_DESCRIPTION_TO_CARD_TYPE
+      FOREIGN KEY (CARD_TYPE_ID)
+      REFERENCES CARD_TYPE (CARD_TYPE_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_CARD_INFO
+  ADD CONSTRAINT FK_FROM_ORDER_CARD_INFO_TO_CARD_TYPE
+      FOREIGN KEY (CARD_TYPE_ID)
+      REFERENCES CARD_TYPE (CARD_TYPE_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_NOTIFICATION
+  ADD CONSTRAINT FK_FROM_ORDER_NOTIFICATION_TO_ORDER_STATUS
+      FOREIGN KEY (ORDER_STATUS_ID)
+      REFERENCES ORDER_STATUS (ORDER_STATUS_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE MANUFACTURER_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_MANUFACTURER_DESCRIPTION_TO_MANUFACTURER
+      FOREIGN KEY (MANUFACTURER_ID)
+      REFERENCES MANUFACTURER (MANUFACTURER_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE CATEGORY_PAGE_INFO
+  ADD CONSTRAINT FK_FROM_CATEGORY_PAGE_INFO_TO_CATEGORY
+      FOREIGN KEY (CATEGORY_ID)
+      REFERENCES CATEGORY (CATEGORY_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE CATEGORY_CONTENT
+  ADD CONSTRAINT FK_FROM_CATEGORY_CONTENT_TO_CATEGORY
+      FOREIGN KEY (CATEGORY_ID)
+      REFERENCES CATEGORY (CATEGORY_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_PAGE_INFO
+  ADD CONSTRAINT FK_FROM_PRODUCT_PAGE_INFO_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_CONTENT
+  ADD CONSTRAINT FK_FROM_PRODUCT_CONTENT_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_DELIVERY
+  ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_DELIVERY_ZONE
+      FOREIGN KEY (DELIVERY_ZONE_ID)
+      REFERENCES DELIVERY_ZONE (DELIVERY_ZONE_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_DELIVERY
+  ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_COUNTRY
+      FOREIGN KEY (DELIVERY_COUNTRY_ID)
+      REFERENCES COUNTRY (COUNTRY_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_DELIVERY
+  ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_DELIVERY_METHOD
+      FOREIGN KEY (DELIVERY_METHOD_ID)
+      REFERENCES DELIVERY_METHOD (DELIVERY_METHOD_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_DELIVERY
+  ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_DELIVERY_STATUS
+      FOREIGN KEY (DELIVERY_STATUS_ID)
+      REFERENCES DELIVERY_STATUS (DELIVERY_STATUS_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_DELIVERY
+  ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_ORDER_FORM
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_PAYMENT
+  ADD CONSTRAINT FK_FROM_ORDER_PAYMENT_TO_ORDER_FORM
+      FOREIGN KEY (ORDER_FORM_ID)
+      REFERENCES ORDER_FORM (ORDER_FORM_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_PAYMENT
+  ADD CONSTRAINT FK_FROM_ORDER_PAYMENT_TO_PAYMENT_STATUS
+      FOREIGN KEY (PAYMENT_STATUS_ID)
+      REFERENCES PAYMENT_STATUS (PAYMENT_STATUS_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ORDER_PAYMENT
+  ADD CONSTRAINT FK_FROM_ORDER_PAYMENT_TO_PAYMENT_METHOD
+      FOREIGN KEY (PAYMENT_METHOD_ID)
+      REFERENCES PAYMENT_METHOD (PAYMENT_METHOD_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE FILE_TAG_TO_FILE_DATA
+  ADD CONSTRAINT FK_FROM_FILE_TAG_TO_FILE_DATA_TO_FILE_DATA
+      FOREIGN KEY (FILE_DATA_ID)
+      REFERENCES FILE_DATA (FILE_DATA_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE FILE_TAG_TO_FILE_DATA
+  ADD CONSTRAINT FK_FROM_FILE_TAG_TO_FILE_DATA_TO_FILE_TAG
+      FOREIGN KEY (FILE_TAG_ID)
+      REFERENCES FILE_TAG (FILE_TAG_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE IMAGE_DATA
+  ADD CONSTRAINT FK_FROM_IMAGE_DATA_TO_FILE_DATA
+      FOREIGN KEY (FILE_DATA_ID)
+      REFERENCES FILE_DATA (FILE_DATA_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE CATEGORY_INFO
+  ADD CONSTRAINT FK_FROM_CATEGORY_INFO_TO_CATEGORY
+      FOREIGN KEY (CATEGORY_ID)
+      REFERENCES CATEGORY (CATEGORY_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_OPTION_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_DESCRIPTION_TO_PRODUCT_OPTION
+      FOREIGN KEY (PRODUCT_OPTION_ID)
+      REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_OPTION_VALUE_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_VALUE_DESCRIPTION_TO_PRODUCT_OPTION_VALUE
+      FOREIGN KEY (PRODUCT_OPTION_VALUE_ID)
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE BASKET_PRODUCT_OPTION
+  ADD CONSTRAINT FK_FROM_BASKET_PRODUCT_OPTION_TO_BASKET
+      FOREIGN KEY (BASKET_ID)
+      REFERENCES BASKET (BASKET_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE BASKET_PRODUCT_OPTION
+  ADD CONSTRAINT FK_FROM_BASKET_PRODUCT_OPTION_TO_PRODUCT_OPTION_VALUE
+      FOREIGN KEY (PRODUCT_OPTION_VALUE_ID)
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_STATS
+  ADD CONSTRAINT FK_FROM_PRODUCT_STATS_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE FAVORITE_PRODUCT
+  ADD CONSTRAINT FK_FROM_FAVORITE_PRODUCT_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE FAVORITE_PRODUCT
+  ADD CONSTRAINT FK_FROM_FAVORITE_PRODUCT_TO_CUSTOMER
+      FOREIGN KEY (CUSTOMER_ID)
+      REFERENCES CUSTOMER (CUSTOMER_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_PRODUCT_OPTION
+  ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_OPTION_TO_ORDER_PRODUCT
+      FOREIGN KEY (ORDER_PRODUCT_ID)
+      REFERENCES ORDER_PRODUCT (ORDER_PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ORDER_PRODUCT_OPTION
+  ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_OPTION_TO_PRODUCT_OPTION_VALUE
+      FOREIGN KEY (PRODUCT_OPTION_VALUE_ID)
+      REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE PRODUCT_ATTRIBUTE
+  ADD CONSTRAINT FK_FROM_PRODUCT_ATTRIBUTE_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE DELIVERY_STATUS_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_DELIVERY_STATUS_DESCRIPTION_TO_DELIVERY_STATUS
+      FOREIGN KEY (DELIVERY_STATUS_ID)
+      REFERENCES DELIVERY_STATUS (DELIVERY_STATUS_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PAYMENT_STATUS_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_PAYMENT_STATUS_DESCRIPTION_PAYMENT_STATUS
+      FOREIGN KEY (PAYMENT_STATUS_ID)
+      REFERENCES PAYMENT_STATUS (PAYMENT_STATUS_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE DELIVERY_TYPE_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_DELIVERY_TYPE_DESCRIPTION_TO_DELIVERY_TYPE
+      FOREIGN KEY (DELIVERY_TYPE_ID)
+      REFERENCES DELIVERY_TYPE (DELIVERY_TYPE_ID);
+
+ALTER TABLE COUNTRY_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_COUNTRY_DESCRIPTION_TO_COUNTRY
+      FOREIGN KEY (COUNTRY_ID)
+      REFERENCES COUNTRY (COUNTRY_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE TAX_TYPE_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_TAX_TYPE_DESCRIPTION_TO_TAX_TYPE
+      FOREIGN KEY (TAX_TYPE_ID)
+      REFERENCES TAX_TYPE (TAX_TYPE_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE DELIVERY_ZONE_DESCRIPTION
+  ADD CONSTRAINT FK_FROM_DELIVERY_ZONE_DESCRIPTION_TO_DELIVERY_ZONE
+      FOREIGN KEY (DELIVERY_ZONE_ID)
+      REFERENCES DELIVERY_ZONE (DELIVERY_ZONE_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE PRODUCT_INFO
+  ADD CONSTRAINT FK_FROM_PRODUCT_INFO_TO_PRODUCT
+      FOREIGN KEY (PRODUCT_ID)
+      REFERENCES PRODUCT (PRODUCT_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE MANUFACTURER_INFO
+  ADD CONSTRAINT FK_FROM_MANUFACTURER_INFO_TO_MANUFACTURER
+      FOREIGN KEY (MANUFACTURER_ID)
+      REFERENCES MANUFACTURER (MANUFACTURER_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ADDRESS_BOOK
+  ADD CONSTRAINT FK_FROM_ADDRESS_BOOK_TO_CUSTOMER
+      FOREIGN KEY (CUSTOMER_ID)
+      REFERENCES CUSTOMER (CUSTOMER_ID)
+   ON DELETE CASCADE;
+
+ALTER TABLE ADDRESS_BOOK
+  ADD CONSTRAINT FK_FROM_ADDRESS_BOOK_TO_COUNTRY
+      FOREIGN KEY (COUNTRY_ID)
+      REFERENCES COUNTRY (COUNTRY_ID)
+   ON DELETE SET NULL;
+
+ALTER TABLE ADDRESS_BOOK
+  ADD CONSTRAINT FK_FROM_ADDRESS_BOOK_TO_DELIVERY_ZONE
+      FOREIGN KEY (DELIVERY_ZONE_ID)
+      REFERENCES DELIVERY_ZONE (DELIVERY_ZONE_ID)
+   ON DELETE SET NULL;
+

Copied: pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_data.sql (from rev 867, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql)
===================================================================

Copied: pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_sample_data.sql (from rev 867, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_sample_data.sql)
===================================================================

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java	                        (rev 0)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -0,0 +1,93 @@
+package jp.sf.pal.pompei;
+
+/**
+ * @author shinsuke
+ * 
+ */
+public class PompeiException extends Exception {
+
+    /**
+     * Serial Version UID
+     */
+    private static final long serialVersionUID = -2222811573245110791L;
+
+    private String messageId;
+
+    private Object[] args;
+
+    /**
+     * @return Returns the messageId.
+     */
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * @param messageId
+     *            The messageId to set.
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * @return Returns the args.
+     */
+    public Object[] getArgs() {
+        return args;
+    }
+
+    /**
+     * @param args
+     *            The args to set.
+     */
+    public void setArgs(Object[] args) {
+        this.args = args;
+    }
+
+    public PompeiException(String messageId) {
+        super(messageId);
+        this.messageId = messageId;
+    }
+
+    public PompeiException(String messageId, Object[] args) {
+        super(messageId);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+    public PompeiException(String messageId, String message, Throwable cause) {
+        super(message, cause);
+        this.messageId = messageId;
+    }
+
+    public PompeiException(String messageId, Object[] args, String message,
+            Throwable cause) {
+        super(message, cause);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+    public PompeiException(String messageId, String message) {
+        super(message);
+        this.messageId = messageId;
+    }
+
+    public PompeiException(String messageId, Object[] args, String message) {
+        super(message);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+    public PompeiException(String messageId, Throwable cause) {
+        super(cause);
+        this.messageId = messageId;
+    }
+
+    public PompeiException(String messageId, Object[] args, Throwable cause) {
+        super(cause);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,15 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.exentity.CardTypeDescription;
-
-import org.seasar.extension.dxo.annotation.ConversionRule;
-
-public interface CardTypeDxo extends Serializable {
-
-    @ConversionRule("label : name" + ", value : cardType.code")
-    public List<Map<String, String>> convert(List<CardTypeDescription> ctd);
-}

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,34 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-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;
-
-import org.seasar.extension.dxo.annotation.ConversionRule;
-
-public interface CategoryDxo extends Serializable {
-
-    @ConversionRule("sortOrder : category.sortOrder" + ",name : name"
-            + ",description : description" + ",categoryId : categoryId"
-            + ",parentId : category.parentId" + ",image : category.image")
-    public void convert(List<CategoryDescription> category,
-            List<Map<String, Object>> list);
-
-    @ConversionRule("sortOrder : category.sortOrder" + ",name : name"
-            + ",description : description" + ",categoryId : categoryId"
-            + ",parentId : category.parentId" + ",image : category.image")
-    public List<Map<String, Object>> convert(List<CategoryDescription> category);
-
-    CategoryDescription convert(CategoryEditPage page);
-
-    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/CustomerDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -7,36 +7,47 @@
 import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.web.admin.customer.AbstractCustomerEditPage;
+import jp.sf.pal.pompei.web.admin.customer.CustomerConfirmPage;
 import jp.sf.pal.pompei.web.user.checkout.CheckoutConfirmPage;
 import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage;
 import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage;
-import jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage;
+import jp.sf.pal.pompei.web.user.signup.SignupConfirmPage;
 
 public interface CustomerDxo extends Serializable {
+    public void convertFromCustomerToMap(List<Customer> customerList,
+            List<Map<String, Object>> list);
 
-    public void convert(AbstractCustomerEditPage page, AddressBook book);
+    public void convertFromCustomerToPage(Customer customer,
+            AbstractCustomerEditPage page);
 
-    public void convert(AbstractCustomerEditPage page, Customer customer);
+    public void convertFromAddressBookToMap(List<AddressBook> addressBookList,
+            List<Map<String, Object>> list);
 
-    public void convert(AbstractUsersignupPage page, AddressBook book);
+    public void convertFromPageToCustomer(SignupConfirmPage page,
+            Customer customer);
 
-    public void convert(AbstractUsersignupPage page, Customer customer);
+    public void convertFromPageToAddressBook(SignupConfirmPage page,
+            AddressBook addressBook);
 
-    public void convert(Customer customer, AbstractCustomerEditPage page);
+    public void convertFromCustomerToPage(Customer customer,
+            UserInfoEditPage page);
 
-    public void convert(AddressBook addressBook, AbstractCustomerEditPage page);
+    public void convertFromAddressBookToPage(AddressBook addressBook,
+            UserInfoEditPage page);
 
-    public List<Map<String, Object>> convert(List<Customer> list);
+    public void convertFromPageToCustomer(UserInfoEditPage page,
+            Customer customer);
 
-    public void convert(Customer customer, UserInfoEditPage page);
+    public void convertFromPageToAddressBook(UserInfoEditPage page,
+            AddressBook addressBook);
 
-    public void convert(AddressBook addressBook, UserInfoEditPage page);
+    public void convertFromPageToAddressBook(UserAddressSelectPage page,
+            AddressBook addressBook);
 
-    public void convert(UserInfoEditPage page, Customer customer);
+    public void convertFromAddressBookToPage(AddressBook addressBook,
+            CheckoutConfirmPage page);
 
-    public void convert(UserInfoEditPage page, AddressBook addressBook);
+    public void convertFromPageToCustomer(CustomerConfirmPage page,
+            Customer customer);
 
-    public void convert(UserAddressSelectPage page, AddressBook addressBook);
-
-    public void convert(AddressBook addressBook, CheckoutConfirmPage page);
 }

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,33 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.exentity.DeliveryMethod;
-import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
-import jp.sf.pal.pompei.web.admin.order.DeliveryMethodEditPage;
-
-import org.seasar.extension.dxo.annotation.ConversionRule;
-
-public interface DeliveryMethodDxo extends Serializable {
-    @ConversionRule("sortOrder : deliveryMethod.sortOrder" + ",name : name"
-            + ",deliveryMethodId : deliveryMethodId"
-            + ",code : deliveryMethod.code" + ",status : deliveryMethod.status")
-    public void convert(
-            List<DeliveryMethodDescription> deliveryMethodDescriptionList,
-            List<Map<String, Object>> list);
-
-    //    @ConversionRule("label : name" + ", value : deliveryMethodId")
-    public List<Map<String, Object>> 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,
-            DeliveryMethodDescription dmd);
-}

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,36 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.exentity.Manufacturer;
-import jp.sf.pal.pompei.exentity.ManufacturerDescription;
-import jp.sf.pal.pompei.web.admin.product.ManufacturerEditPage;
-
-import org.seasar.extension.dxo.annotation.ConversionRule;
-
-public interface ManufacturerDxo extends Serializable {
-
-    @ConversionRule("manufacturerId : manufacturerId"
-            + ",name : manufacturer.name"
-            + ",shortDescription : shortDescription")
-    void convert(List<ManufacturerDescription> manufacturerDescriptionList,
-            List<Map<String, Object>> list);
-
-    @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,
-            ManufacturerDescription entity);
-
-    void convert(ManufacturerEditPage manufacturerEditPage, Manufacturer entity);
-
-    @ConversionRule("value : manufacturerId" + ",label : name")
-    void convertCombo(List<Manufacturer> manufacturer,
-            List<Map<String, String>> list);
-
-}

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java	                        (rev 0)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -0,0 +1,107 @@
+package jp.sf.pal.pompei.dxo;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import jp.sf.pal.pompei.entity.notification.order.Order;
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.exentity.OrderCardInfo;
+import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.OrderStatus;
+import jp.sf.pal.pompei.exentity.Product;
+import jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage;
+
+import org.seasar.extension.dxo.annotation.ConversionRule;
+
+public interface OrderDxo extends Serializable {
+    public void convertFromOrderFormToMap(List<OrderForm> orderFormList,
+            List<Map<String, Object>> list);
+
+    public void convertFromOrderFormToPage(OrderForm orderForm,
+            AbstractOrderEditPage page);
+
+    public void convertFromOrderCardInfoToPage(OrderCardInfo orderCardInfo,
+            AbstractOrderEditPage page);
+
+    public void convertFromOrderProductToMap(
+            List<OrderProduct> orderProductList, List<Map<String, Object>> list);
+
+    @ConversionRule("label : name" + ",value : orderStatusId")
+    public void convertFromOrderStatusToLabel(
+            List<OrderStatus> orderStatusList, List<Map<String, String>> list);
+
+    public void convertFromPageToOrderForm(AbstractOrderEditPage page,
+            OrderForm orderForm);
+
+    public void convertFromPageToOrderCardInfo(AbstractOrderEditPage page,
+            OrderCardInfo orderCardInfo);
+
+    public void convertFromOrderFormToOrder(OrderForm orderForm, Order order);
+
+    public void convertFromProductToNotification(Product product,
+            jp.sf.pal.pompei.entity.notification.order.Product notification);
+
+    public void convertFromOrderProductToNotification(
+            OrderProduct orderProduct,
+            jp.sf.pal.pompei.entity.notification.order.Product notification);
+
+    @ConversionRule("customerId : customerId" + ",customerGender : gender"
+            + ",customerFirstname : firstname" + ",customerLastname : lastname"
+            + ",customerFirstnameDescription : firstnameDescription"
+            + ",customerLastnameDescription : lastnameDescription"
+            + ",customerDayOfBirth : dayOfBirth"
+            + ",customerEmailAddress : emailAddress")
+    public void convertFromCustomerToOrderForm(Customer customer,
+            OrderForm orderForm);
+
+    @ConversionRule("customerCompany : company"
+            + ",customerDepartment : department"
+            + ",customerStreetAddress : streetAddress"
+            + ",customerSuburb : suburb" + ",customerCity : city"
+            + ",customerState : state" + ",customerPostcode : postcode"
+            + ",customerCompany : company"
+            + ",customerCountryName : country.name"
+            + ",customerTelephone : telephone")
+    public void convertFromCustomerAddressBookToOrderForm(
+            AddressBook addressBook, OrderForm orderForm);
+
+    @ConversionRule("deliveryFirstname : firstname"
+            + ",deliveryLastname : lastname"
+            + ",deliveryFirstnameDescription : firstnameDescription"
+            + ",deliveryLastnameDescription : lastnameDescription"
+            + ",deliveryCompany : company" + ",deliveryDepartment : department"
+            + ",deliveryStreetAddress : streetAddress"
+            + ",deliverySuburb : suburb" + ",deliveryCity : city"
+            + ",deliveryState : state" + ",deliveryPostcode : postcode"
+            + ",deliveryCompany : company"
+            + ",deliveryCountryName : country.name"
+            + ",deliveryTelephone : telephone")
+    public void convertFromDeliveryAddressBookToOrderForm(
+            AddressBook addressBook, OrderForm orderForm);
+
+    @ConversionRule("billingFirstname : firstname"
+            + ",billingLastname : lastname"
+            + ",billingFirstnameDescription : firstnameDescription"
+            + ",billingLastnameDescription : lastnameDescription"
+            + ",billingCompany : company" + ",billingDepartment : department"
+            + ",billingStreetAddress : streetAddress"
+            + ",billingSuburb : suburb" + ",billingCity : city"
+            + ",billingState : state" + ",billingPostcode : postcode"
+            + ",billingCompany : company"
+            + ",billingCountryName : country.name"
+            + ",billingTelephone : telephone")
+    public void convertFromBillingAddressBookToOrderForm(
+            AddressBook addressBook, OrderForm orderForm);
+
+    @ConversionRule("productId : productId" + ",model : model" + ",code : code"
+            + ",price : price" + ",productName : name"
+            + ",manufacturerName : manufacturerName")
+    public void convertFromProductToOrderProduct(Product product,
+            OrderProduct orderProduct);
+
+    public void convertFromOrderFormToNotification(OrderForm orderForm,
+            Order order);
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,108 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.seasar.extension.dxo.annotation.ConversionRule;
-import org.seasar.extension.dxo.annotation.ExcludeNull;
-
-import jp.sf.pal.pompei.entity.notification.order.Order;
-import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.OrderCardInfo;
-import jp.sf.pal.pompei.exentity.OrderForm;
-import jp.sf.pal.pompei.exentity.OrderProduct;
-import jp.sf.pal.pompei.exentity.OrderStatusDescription;
-import jp.sf.pal.pompei.exentity.Product;
-import jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage;
-import jp.sf.pal.pompei.web.admin.order.OrderConfirmPage;
-
-public interface OrderFormDxo extends Serializable {
-
-    OrderForm convert(OrderConfirmPage orderConfirmPage);
-
-    void convert(AbstractOrderEditPage orderEditPage, OrderForm orders);
-
-    // TODO above method is really needed?
-
-    public void convertToOrderCardInfo(OrderConfirmPage orderConfirmPage,
-            OrderCardInfo orderCardInfo);
-
-    @ExcludeNull
-    public void convert(OrderConfirmPage orderConfirmPage, OrderForm orderForm);
-
-    public void convert(OrderForm orderForm, AbstractOrderEditPage orderEditPage);
-
-    @ConversionRule("label : name" + ",value : orderStatusId")
-    public List<Map<String, String>> convertToOrderStatusItems(
-            List<OrderStatusDescription> list);
-
-    @ConversionRule("orderProductId : orderProductId"
-            + ",orderFormId : orderFormId" + ",productId : productId"
-            + ",code : code" + ",model : model" + ",price : price"
-            + ",tax : tax" + ",finalPrice : finalPrice"
-            + ",quantity : quantity")
-    public List<Map<String, Object>> convertToOrderProductItems(
-            List<OrderProduct> list);
-
-    public List<Map<String, Object>> convert(List<OrderForm> list);
-
-    @ConversionRule("customerId : customerId" + ",customerGender : gender"
-            + ",customerFirstname : firstname" + ",customerLastname : lastname"
-            + ",customerFirstnameDescription : firstnameDescription"
-            + ",customerLastnameDescription : lastnameDescription"
-            + ",customerDayOfBirth : dayOfBirth"
-            + ",customerEmailAddress : emailAddress")
-    public void convertToCustomer(Customer customer, OrderForm orderForm);
-
-    @ConversionRule("customerCompany : company"
-            + ",customerDepartment : department"
-            + ",customerStreetAddress : streetAddress"
-            + ",customerSuburb : suburb" + ",customerCity : city"
-            + ",customerState : state" + ",customerPostcode : postcode"
-            + ",customerCompany : company"
-            + ",customerCountryName : country.name"
-            + ",customerTelephone : telephone"
-            + ",customerLocaleName : language.localeName")
-    public void convertToCustomerAddressBook(AddressBook addressBook,
-            OrderForm orderForm);
-
-    @ConversionRule("deliveryFirstname : firstname"
-            + ",deliveryLastname : lastname"
-            + ",deliveryFirstnameDescription : firstnameDescription"
-            + ",deliveryLastnameDescription : lastnameDescription"
-            + ",deliveryCompany : company" + ",deliveryDepartment : department"
-            + ",deliveryStreetAddress : streetAddress"
-            + ",deliverySuburb : suburb" + ",deliveryCity : city"
-            + ",deliveryState : state" + ",deliveryPostcode : postcode"
-            + ",deliveryCompany : company"
-            + ",deliveryCountryName : country.name"
-            + ",deliveryTelephone : telephone"
-            + ",deliveryLocaleName : language.localeName")
-    public void convertToDeliveryAddressBook(AddressBook addressBook,
-            OrderForm orderForm);
-
-    @ConversionRule("billingFirstname : firstname"
-            + ",billingLastname : lastname"
-            + ",billingFirstnameDescription : firstnameDescription"
-            + ",billingLastnameDescription : lastnameDescription"
-            + ",billingCompany : company" + ",billingDepartment : department"
-            + ",billingStreetAddress : streetAddress"
-            + ",billingSuburb : suburb" + ",billingCity : city"
-            + ",billingState : state" + ",billingPostcode : postcode"
-            + ",billingCompany : company"
-            + ",billingCountryName : country.name"
-            + ",billingTelephone : telephone"
-            + ",billingLocaleName : language.localeName")
-    public void convertToBillingAddressBook(AddressBook addressBook,
-            OrderForm orderForm);
-
-    public void convert(Product product, OrderProduct orderProduct);
-
-    public void convert(OrderCardInfo orderCardInfo,
-            AbstractOrderEditPage orderEditPage);
-
-    public Order convert(OrderForm orderForm);
-
-}

Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,14 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.pompei.exentity.PaymentMethodDescription;
-
-public interface PaymentMethodDxo extends Serializable {
-
-    //    @ConversionRule("name : displayMessage"
-    //            + ", value : paymentMethodId")
-    public List<Map<String, Object>> convert(List<PaymentMethodDescription> pmd);
-}

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -4,63 +4,74 @@
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.extension.dxo.annotation.ConversionRule;
-import org.seasar.extension.dxo.annotation.ExcludeNull;
-
-import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.Category;
+import jp.sf.pal.pompei.exentity.DeliveryType;
+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.TaxType;
+import jp.sf.pal.pompei.web.admin.product.CategoryEditPage;
+import jp.sf.pal.pompei.web.admin.product.ManufacturerEditPage;
 import jp.sf.pal.pompei.web.admin.product.ProductEditPage;
 import jp.sf.pal.pompei.web.user.product.ProductDetailsPage;
 
+import org.seasar.extension.dxo.annotation.ConversionRule;
+
 public interface ProductDxo extends Serializable {
 
-    ProductDescription convert(ProductEditPage productEditPage);
+    @ConversionRule("sortOrder : sortOrder" + ",name : name"
+            + ",categoryId : categoryId" + ",parentId : parentId"
+            + ",pageId : categoryPageInfoAsOne.pageId"/* + ",image : category.image"*/)
+    public void convertFromCategoryToMap(List<Category> categoryList,
+            List<Map<String, Object>> list);
 
-    Product convertProduct(ProductEditPage productEditPage);
+    public void convertFromCategoryToPage(Category entity, CategoryEditPage page);
 
+    public void convertFromPageToCategory(CategoryEditPage page, Category entity);
+
+    @ConversionRule("manufacturerId : manufacturerId" + ",name : name"
+            + ",url : url")
+    public void convertFromManufacturerToMap(
+            List<Manufacturer> manufacturerList, List<Map<String, Object>> list);
+
+    public void convertFromManufacturerToPage(Manufacturer manufacturer,
+            ManufacturerEditPage page);
+
+    public void convertFromPageToManufacturer(ManufacturerEditPage page,
+            Manufacturer manufacturer);
+
     @ConversionRule("productId : productId" + ",code : code" + ",model : model"
-            + ",price : price" + ",status : status"
-            + ",productDescriptionList : productDescriptionList"
-            + ",manufacturerName : manufacturer.name"
-            + ",dateAdded : dateAdded")
-    void convert(List<Product> list, List<Map<String, Object>> list2);
+            + ",price : price" + ",status : status" + ",pageId : pageId"
+            + ",fileDataId : fileDataId" + ",name : name"
+            + ",updatedDate : updatedDate")
+    public void convertFromProductToMap(List<Product> productList,
+            List<Map<String, Object>> list);
 
-    //    @ConversionRule("productsId : productsId"
-    //            + ",productsModel : products.productsModel"
-    //            + ",productsImage : products.productsImage"
-    //            + ",productsPrice : products.productsPrice"
-    //            + ",productsStatus : products.productsStatus"
-    //            + ",manufacturersId : products.manufacturersId"
-    //            + ",productsName : productsName")
-    void convert(ProductDescription description, ProductEditPage productEditPage);
+    @ConversionRule("value : manufacturerId" + ",label : name")
+    public void convertFromManufacturerToLabel(
+            List<Manufacturer> manufacturerList, List<Map<String, String>> list);
 
-    void convertPageToDescription(ProductEditPage productEditPage,
-            ProductDescription description);
+    @ConversionRule("value : taxTypeId" + ",label : name")
+    public void convertFromTaxTypeToLabel(List<TaxType> taxTypeList,
+            List<Map<String, String>> list);
 
-    void convertPageToProduct(ProductEditPage productEditPage, Product products);
+    @ConversionRule("value : deliveryTypeId" + ",label : name")
+    public void convertFromDeliveryTypeToLabel(
+            List<DeliveryType> deliveryTypeList, List<Map<String, String>> list);
 
-    void convert(ProductDescription description,
-            ProductDetailsPage productDetailsPage);
+    public void convertFromProductToPage(Product product, ProductEditPage page);
 
-    @ConversionRule("productsId : productsId"
-            + ",productsModel : products.productsModel"
-            + ",productsImage : products.productsImage"
-            + ",productsPrice : products.productsPrice"
-            + ",productsStatus : products.productsStatus"
-            + ",manufacturersId : products.manufacturersId"
-            + ",productsName : productsName")
-    void convert(ProductDescription description, Map<String, Object> map);
+    public void covertFromPageToProduct(ProductEditPage page, Product product);
 
-    @ExcludeNull
-    public void convert(ProductDescription productDescription,
-            jp.sf.pal.pompei.entity.notification.order.Product product);
+    public void convertFromProductToPage(Product product,
+            ProductDetailsPage page);
 
-    @ExcludeNull
-    public void convert(Product product,
-            jp.sf.pal.pompei.entity.notification.order.Product p);
+    @ConversionRule("sortOrder : sortOrder" + ",name : name"
+            + ",categoryId : categoryId" + ",parentId : parentId"
+            + ",pageId : categoryPageInfoAsOne.pageId"/* + ",image : category.image"*/)
+    public void convertFromCategoryToBreadcrumb(List<Category> category,
+            List<Map<String, Object>> list);
 
-    @ExcludeNull
-    public void convert(OrderProduct orderProduct,
-            jp.sf.pal.pompei.entity.notification.order.Product product);
+    public void convertFromProductToNotification(Product product,
+            jp.sf.pal.pompei.entity.notification.order.Product notification);
+
 }

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java	                        (rev 0)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -0,0 +1,23 @@
+package jp.sf.pal.pompei.dxo;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import jp.sf.pal.pompei.exentity.CardType;
+import jp.sf.pal.pompei.exentity.DeliveryMethod;
+import jp.sf.pal.pompei.exentity.PaymentMethod;
+
+public interface SystemDxo extends Serializable {
+
+    public void convertFromDeliveryMethodToMap(
+            List<DeliveryMethod> deliveryMethodList,
+            List<Map<String, Object>> list);
+
+    public void convertFromPaymentMethodToMap(
+            List<PaymentMethod> paymentMethodList,
+            List<Map<String, Object>> list);
+
+    public void convertFromCardTypeToMap(List<CardType> cardTypeList,
+            List<Map<String, Object>> list);
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,15 +0,0 @@
-package jp.sf.pal.pompei.dxo;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.seasar.extension.dxo.annotation.ConversionRule;
-
-import jp.sf.pal.pompei.exentity.TaxClass;
-
-public interface TaxDxo extends Serializable {
-    @ConversionRule("value : taxClassId" + ",label : name")
-    public void convert(List<TaxClass> taxClassList,
-            List<Map<String, String>> list);
-}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,6 +1,8 @@
 package jp.sf.pal.pompei.entity.notification.order;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 public class Product implements Serializable {
 
@@ -9,420 +11,855 @@
      */
     private static final long serialVersionUID = 1955114932729040595L;
 
-    protected java.math.BigDecimal languageId;
+    // OrderForm 
+    private BigDecimal orderFormId;
 
-    protected String name;
+    private String orderFormNumber;
 
-    protected String title;
+    private BigDecimal customerId;
 
-    protected String description;
+    private String customerGender;
 
-    protected String url;
+    private String customerFirstname;
 
-    protected java.math.BigDecimal viewed;
+    private String customerLastname;
 
-    protected java.math.BigDecimal weight;
+    private String customerFirstnameDescription;
 
-    protected String size;
+    private String customerLastnameDescription;
 
-    protected java.math.BigDecimal ordered;
+    private java.util.Date customerDayOfBirth;
 
-    protected java.math.BigDecimal reviewed;
+    private String customerEmailAddress;
 
-    protected java.math.BigDecimal rating;
+    private String customerCompany;
 
-    protected java.math.BigDecimal status;
+    private String customerDepartment;
 
-    protected java.sql.Timestamp dateAdded;
+    private String customerStreetAddress;
 
-    protected java.sql.Timestamp lastModified;
+    private String customerSuburb;
 
-    protected java.sql.Timestamp dateAvailable;
+    private String customerCity;
 
-    protected java.math.BigDecimal taxClassId;
+    private String customerState;
 
-    protected java.math.BigDecimal manufacturerId;
+    private String customerPostcode;
 
-    protected java.math.BigDecimal orderProductId;
+    private String customerTelephone;
 
-    protected java.math.BigDecimal orderFormId;
+    private String customerCountryCode;
 
-    protected java.math.BigDecimal productId;
+    private String customerLanguage;
 
-    protected String code;
+    private String billingCompany;
 
-    protected String model;
+    private String billingDepartment;
 
-    protected java.math.BigDecimal price;
+    private String billingFirstname;
 
-    protected java.math.BigDecimal finalPrice;
+    private String billingLastname;
 
-    protected java.math.BigDecimal tax;
+    private String billingFirstnameDescription;
 
-    protected java.math.BigDecimal quantity;
+    private String billingLastnameDescription;
 
-    /**
-     * @return the languageId
-     */
-    public java.math.BigDecimal getLanguageId() {
-        return languageId;
+    private String billingStreetAddress;
+
+    private String billingSuburb;
+
+    private String billingCity;
+
+    private String billingState;
+
+    private String billingPostcode;
+
+    private String billingTelephone;
+
+    private String billingCountryCode;
+
+    private String billingLanguage;
+
+    private BigDecimal orderStatusId;
+
+    private Date updatedDate;
+
+    private Date purchasedDate;
+
+    private Date finishedDate;
+
+    // OrderPayment
+    private BigDecimal paymentMethodId;
+
+    private String paymentMethodCode;
+
+    private BigDecimal orderCardInfoId;
+
+    private BigDecimal paymentStatusId;
+
+    private BigDecimal subTotalPrice;
+
+    private BigDecimal tax;
+
+    private BigDecimal deliveryPrice;
+
+    private BigDecimal paymentFee;
+
+    private BigDecimal totalPrice;
+
+    // OrderDelivery
+    private String deliveryCompany;
+
+    private String deliveryDepartment;
+
+    private String deliveryFirstname;
+
+    private String deliveryLastname;
+
+    private String deliveryFirstnameDescription;
+
+    private String deliveryLastnameDescription;
+
+    private String deliveryStreetAddress;
+
+    private String deliverySuburb;
+
+    private String deliveryCity;
+
+    private String deliveryState;
+
+    private String deliveryPostcode;
+
+    private String deliveryTelephone;
+
+    private BigDecimal deliveryStatusId;
+
+    private BigDecimal deliveryMethodId;
+
+    private String deliveryMethodCode;
+
+    private String deliveryCountryCode;
+
+    private String deliveryLanguage;
+
+    private BigDecimal deliveryCountryId;
+
+    private BigDecimal deliveryZoneId;
+
+    private Date requestedDate;
+
+    private Date sentDate;
+
+    private Date receivedDate;
+
+    private String slipNumber;
+
+    private BigDecimal giftWrap;
+
+    private String giftMessage;
+
+    private String envelopeLabel;
+
+    // OrderProduct
+    private BigDecimal orderProductId;
+
+    private BigDecimal productId;
+
+    private String model;
+
+    private String code;
+
+    private BigDecimal price;
+
+    private BigDecimal finalPrice;
+
+    //    private BigDecimal tax;
+
+    private BigDecimal quantity;
+
+    private String productName;
+
+    private String displayProductName;
+
+    private String manufacturerName;
+
+    private String displayManufacturerName;
+
+    public BigDecimal getOrderFormId() {
+        return orderFormId;
     }
 
-    /**
-     * @param languageId the languageId to set
-     */
-    public void setLanguageId(java.math.BigDecimal languageId) {
-        this.languageId = languageId;
+    public void setOrderFormId(BigDecimal orderFormId) {
+        this.orderFormId = orderFormId;
     }
 
-    /**
-     * @return the name
-     */
-    public String getName() {
-        return name;
+    public String getOrderFormNumber() {
+        return orderFormNumber;
     }
 
-    /**
-     * @param name the name to set
-     */
-    public void setName(String name) {
-        this.name = name;
+    public void setOrderFormNumber(String orderFormNumber) {
+        this.orderFormNumber = orderFormNumber;
     }
 
-    /**
-     * @return the title
-     */
-    public String getTitle() {
-        return title;
+    public BigDecimal getCustomerId() {
+        return customerId;
     }
 
-    /**
-     * @param title the title to set
-     */
-    public void setTitle(String title) {
-        this.title = title;
+    public void setCustomerId(BigDecimal customerId) {
+        this.customerId = customerId;
     }
 
-    /**
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
+    public String getCustomerGender() {
+        return customerGender;
     }
 
-    /**
-     * @param description the description to set
-     */
-    public void setDescription(String description) {
-        this.description = description;
+    public void setCustomerGender(String customerGender) {
+        this.customerGender = customerGender;
     }
 
-    /**
-     * @return the url
-     */
-    public String getUrl() {
-        return url;
+    public String getCustomerFirstname() {
+        return customerFirstname;
     }
 
-    /**
-     * @param url the url to set
-     */
-    public void setUrl(String url) {
-        this.url = url;
+    public void setCustomerFirstname(String customerFirstname) {
+        this.customerFirstname = customerFirstname;
     }
 
-    /**
-     * @return the viewed
-     */
-    public java.math.BigDecimal getViewed() {
-        return viewed;
+    public String getCustomerLastname() {
+        return customerLastname;
     }
 
-    /**
-     * @param viewed the viewed to set
-     */
-    public void setViewed(java.math.BigDecimal viewed) {
-        this.viewed = viewed;
+    public void setCustomerLastname(String customerLastname) {
+        this.customerLastname = customerLastname;
     }
 
-    /**
-     * @return the weight
-     */
-    public java.math.BigDecimal getWeight() {
-        return weight;
+    public String getCustomerFirstnameDescription() {
+        return customerFirstnameDescription;
     }
 
-    /**
-     * @param weight the weight to set
-     */
-    public void setWeight(java.math.BigDecimal weight) {
-        this.weight = weight;
+    public void setCustomerFirstnameDescription(
+            String customerFirstnameDescription) {
+        this.customerFirstnameDescription = customerFirstnameDescription;
     }
 
-    /**
-     * @return the size
-     */
-    public String getSize() {
-        return size;
+    public String getCustomerLastnameDescription() {
+        return customerLastnameDescription;
     }
 
-    /**
-     * @param size the size to set
-     */
-    public void setSize(String size) {
-        this.size = size;
+    public void setCustomerLastnameDescription(
+            String customerLastnameDescription) {
+        this.customerLastnameDescription = customerLastnameDescription;
     }
 
-    /**
-     * @return the ordered
-     */
-    public java.math.BigDecimal getOrdered() {
-        return ordered;
+    public java.util.Date getCustomerDayOfBirth() {
+        return customerDayOfBirth;
     }
 
-    /**
-     * @param ordered the ordered to set
-     */
-    public void setOrdered(java.math.BigDecimal ordered) {
-        this.ordered = ordered;
+    public void setCustomerDayOfBirth(java.util.Date customerDayOfBirth) {
+        this.customerDayOfBirth = customerDayOfBirth;
     }
 
-    /**
-     * @return the reviewed
-     */
-    public java.math.BigDecimal getReviewed() {
-        return reviewed;
+    public String getCustomerEmailAddress() {
+        return customerEmailAddress;
     }
 
-    /**
-     * @param reviewed the reviewed to set
-     */
-    public void setReviewed(java.math.BigDecimal reviewed) {
-        this.reviewed = reviewed;
+    public void setCustomerEmailAddress(String customerEmailAddress) {
+        this.customerEmailAddress = customerEmailAddress;
     }
 
-    /**
-     * @return the rating
-     */
-    public java.math.BigDecimal getRating() {
-        return rating;
+    public String getCustomerCompany() {
+        return customerCompany;
     }
 
-    /**
-     * @param rating the rating to set
-     */
-    public void setRating(java.math.BigDecimal rating) {
-        this.rating = rating;
+    public void setCustomerCompany(String customerCompany) {
+        this.customerCompany = customerCompany;
     }
 
-    /**
-     * @return the status
-     */
-    public java.math.BigDecimal getStatus() {
-        return status;
+    public String getCustomerDepartment() {
+        return customerDepartment;
     }
 
-    /**
-     * @param status the status to set
-     */
-    public void setStatus(java.math.BigDecimal status) {
-        this.status = status;
+    public void setCustomerDepartment(String customerDepartment) {
+        this.customerDepartment = customerDepartment;
     }
 
-    /**
-     * @return the dateAdded
-     */
-    public java.sql.Timestamp getDateAdded() {
-        return dateAdded;
+    public String getCustomerStreetAddress() {
+        return customerStreetAddress;
     }
 
-    /**
-     * @param dateAdded the dateAdded to set
-     */
-    public void setDateAdded(java.sql.Timestamp dateAdded) {
-        this.dateAdded = dateAdded;
+    public void setCustomerStreetAddress(String customerStreetAddress) {
+        this.customerStreetAddress = customerStreetAddress;
     }
 
-    /**
-     * @return the lastModified
-     */
-    public java.sql.Timestamp getLastModified() {
-        return lastModified;
+    public String getCustomerSuburb() {
+        return customerSuburb;
     }
 
-    /**
-     * @param lastModified the lastModified to set
-     */
-    public void setLastModified(java.sql.Timestamp lastModified) {
-        this.lastModified = lastModified;
+    public void setCustomerSuburb(String customerSuburb) {
+        this.customerSuburb = customerSuburb;
     }
 
-    /**
-     * @return the dateAvailable
-     */
-    public java.sql.Timestamp getDateAvailable() {
-        return dateAvailable;
+    public String getCustomerCity() {
+        return customerCity;
     }
 
-    /**
-     * @param dateAvailable the dateAvailable to set
-     */
-    public void setDateAvailable(java.sql.Timestamp dateAvailable) {
-        this.dateAvailable = dateAvailable;
+    public void setCustomerCity(String customerCity) {
+        this.customerCity = customerCity;
     }
 
-    /**
-     * @return the taxClassId
-     */
-    public java.math.BigDecimal getTaxClassId() {
-        return taxClassId;
+    public String getCustomerState() {
+        return customerState;
     }
 
-    /**
-     * @param taxClassId the taxClassId to set
-     */
-    public void setTaxClassId(java.math.BigDecimal taxClassId) {
-        this.taxClassId = taxClassId;
+    public void setCustomerState(String customerState) {
+        this.customerState = customerState;
     }
 
-    /**
-     * @return the manufacturerId
-     */
-    public java.math.BigDecimal getManufacturerId() {
-        return manufacturerId;
+    public String getCustomerPostcode() {
+        return customerPostcode;
     }
 
-    /**
-     * @param manufacturerId the manufacturerId to set
-     */
-    public void setManufacturerId(java.math.BigDecimal manufacturerId) {
-        this.manufacturerId = manufacturerId;
+    public void setCustomerPostcode(String customerPostcode) {
+        this.customerPostcode = customerPostcode;
     }
 
-    /**
-     * @return the orderProductId
-     */
-    public java.math.BigDecimal getOrderProductId() {
-        return orderProductId;
+    public String getCustomerTelephone() {
+        return customerTelephone;
     }
 
-    /**
-     * @param orderProductId the orderProductId to set
-     */
-    public void setOrderProductId(java.math.BigDecimal orderProductId) {
-        this.orderProductId = orderProductId;
+    public void setCustomerTelephone(String customerTelephone) {
+        this.customerTelephone = customerTelephone;
     }
 
-    /**
-     * @return the orderFormId
-     */
-    public java.math.BigDecimal getOrderFormId() {
-        return orderFormId;
+    public String getCustomerCountryCode() {
+        return customerCountryCode;
     }
 
-    /**
-     * @param orderFormId the orderFormId to set
-     */
-    public void setOrderFormId(java.math.BigDecimal orderFormId) {
-        this.orderFormId = orderFormId;
+    public void setCustomerCountryCode(String customerCountryCode) {
+        this.customerCountryCode = customerCountryCode;
     }
 
-    /**
-     * @return the productId
-     */
-    public java.math.BigDecimal getProductId() {
-        return productId;
+    public String getCustomerLanguage() {
+        return customerLanguage;
     }
 
-    /**
-     * @param productId the productId to set
-     */
-    public void setProductId(java.math.BigDecimal productId) {
-        this.productId = productId;
+    public void setCustomerLanguage(String customerLanguage) {
+        this.customerLanguage = customerLanguage;
     }
 
-    /**
-     * @return the code
-     */
-    public String getCode() {
-        return code;
+    public String getBillingCompany() {
+        return billingCompany;
     }
 
-    /**
-     * @param code the code to set
-     */
-    public void setCode(String code) {
-        this.code = code;
+    public void setBillingCompany(String billingCompany) {
+        this.billingCompany = billingCompany;
     }
 
-    /**
-     * @return the model
-     */
+    public String getBillingDepartment() {
+        return billingDepartment;
+    }
+
+    public void setBillingDepartment(String billingDepartment) {
+        this.billingDepartment = billingDepartment;
+    }
+
+    public String getBillingFirstname() {
+        return billingFirstname;
+    }
+
+    public void setBillingFirstname(String billingFirstname) {
+        this.billingFirstname = billingFirstname;
+    }
+
+    public String getBillingLastname() {
+        return billingLastname;
+    }
+
+    public void setBillingLastname(String billingLastname) {
+        this.billingLastname = billingLastname;
+    }
+
+    public String getBillingFirstnameDescription() {
+        return billingFirstnameDescription;
+    }
+
+    public void setBillingFirstnameDescription(
+            String billingFirstnameDescription) {
+        this.billingFirstnameDescription = billingFirstnameDescription;
+    }
+
+    public String getBillingLastnameDescription() {
+        return billingLastnameDescription;
+    }
+
+    public void setBillingLastnameDescription(String billingLastnameDescription) {
+        this.billingLastnameDescription = billingLastnameDescription;
+    }
+
+    public String getBillingStreetAddress() {
+        return billingStreetAddress;
+    }
+
+    public void setBillingStreetAddress(String billingStreetAddress) {
+        this.billingStreetAddress = billingStreetAddress;
+    }
+
+    public String getBillingSuburb() {
+        return billingSuburb;
+    }
+
+    public void setBillingSuburb(String billingSuburb) {
+        this.billingSuburb = billingSuburb;
+    }
+
+    public String getBillingCity() {
+        return billingCity;
+    }
+
+    public void setBillingCity(String billingCity) {
+        this.billingCity = billingCity;
+    }
+
+    public String getBillingState() {
+        return billingState;
+    }
+
+    public void setBillingState(String billingState) {
+        this.billingState = billingState;
+    }
+
+    public String getBillingPostcode() {
+        return billingPostcode;
+    }
+
+    public void setBillingPostcode(String billingPostcode) {
+        this.billingPostcode = billingPostcode;
+    }
+
+    public String getBillingTelephone() {
+        return billingTelephone;
+    }
+
+    public void setBillingTelephone(String billingTelephone) {
+        this.billingTelephone = billingTelephone;
+    }
+
+    public String getBillingCountryCode() {
+        return billingCountryCode;
+    }
+
+    public void setBillingCountryCode(String billingCountryCode) {
+        this.billingCountryCode = billingCountryCode;
+    }
+
+    public String getBillingLanguage() {
+        return billingLanguage;
+    }
+
+    public void setBillingLanguage(String billingLanguage) {
+        this.billingLanguage = billingLanguage;
+    }
+
+    public BigDecimal getOrderStatusId() {
+        return orderStatusId;
+    }
+
+    public void setOrderStatusId(BigDecimal orderStatusId) {
+        this.orderStatusId = orderStatusId;
+    }
+
+    public Date getUpdatedDate() {
+        return updatedDate;
+    }
+
+    public void setUpdatedDate(Date updatedDate) {
+        this.updatedDate = updatedDate;
+    }
+
+    public Date getPurchasedDate() {
+        return purchasedDate;
+    }
+
+    public void setPurchasedDate(Date purchasedDate) {
+        this.purchasedDate = purchasedDate;
+    }
+
+    public Date getFinishedDate() {
+        return finishedDate;
+    }
+
+    public void setFinishedDate(Date finishedDate) {
+        this.finishedDate = finishedDate;
+    }
+
+    public BigDecimal getPaymentMethodId() {
+        return paymentMethodId;
+    }
+
+    public void setPaymentMethodId(BigDecimal paymentMethodId) {
+        this.paymentMethodId = paymentMethodId;
+    }
+
+    public String getPaymentMethodCode() {
+        return paymentMethodCode;
+    }
+
+    public void setPaymentMethodCode(String paymentMethodCode) {
+        this.paymentMethodCode = paymentMethodCode;
+    }
+
+    public BigDecimal getOrderCardInfoId() {
+        return orderCardInfoId;
+    }
+
+    public void setOrderCardInfoId(BigDecimal orderCardInfoId) {
+        this.orderCardInfoId = orderCardInfoId;
+    }
+
+    public BigDecimal getPaymentStatusId() {
+        return paymentStatusId;
+    }
+
+    public void setPaymentStatusId(BigDecimal paymentStatusId) {
+        this.paymentStatusId = paymentStatusId;
+    }
+
+    public BigDecimal getSubTotalPrice() {
+        return subTotalPrice;
+    }
+
+    public void setSubTotalPrice(BigDecimal subTotalPrice) {
+        this.subTotalPrice = subTotalPrice;
+    }
+
+    public BigDecimal getTax() {
+        return tax;
+    }
+
+    public void setTax(BigDecimal tax) {
+        this.tax = tax;
+    }
+
+    public BigDecimal getDeliveryPrice() {
+        return deliveryPrice;
+    }
+
+    public void setDeliveryPrice(BigDecimal deliveryPrice) {
+        this.deliveryPrice = deliveryPrice;
+    }
+
+    public BigDecimal getPaymentFee() {
+        return paymentFee;
+    }
+
+    public void setPaymentFee(BigDecimal paymentFee) {
+        this.paymentFee = paymentFee;
+    }
+
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public String getDeliveryCompany() {
+        return deliveryCompany;
+    }
+
+    public void setDeliveryCompany(String deliveryCompany) {
+        this.deliveryCompany = deliveryCompany;
+    }
+
+    public String getDeliveryDepartment() {
+        return deliveryDepartment;
+    }
+
+    public void setDeliveryDepartment(String deliveryDepartment) {
+        this.deliveryDepartment = deliveryDepartment;
+    }
+
+    public String getDeliveryFirstname() {
+        return deliveryFirstname;
+    }
+
+    public void setDeliveryFirstname(String deliveryFirstname) {
+        this.deliveryFirstname = deliveryFirstname;
+    }
+
+    public String getDeliveryLastname() {
+        return deliveryLastname;
+    }
+
+    public void setDeliveryLastname(String deliveryLastname) {
+        this.deliveryLastname = deliveryLastname;
+    }
+
+    public String getDeliveryFirstnameDescription() {
+        return deliveryFirstnameDescription;
+    }
+
+    public void setDeliveryFirstnameDescription(
+            String deliveryFirstnameDescription) {
+        this.deliveryFirstnameDescription = deliveryFirstnameDescription;
+    }
+
+    public String getDeliveryLastnameDescription() {
+        return deliveryLastnameDescription;
+    }
+
+    public void setDeliveryLastnameDescription(
+            String deliveryLastnameDescription) {
+        this.deliveryLastnameDescription = deliveryLastnameDescription;
+    }
+
+    public String getDeliveryStreetAddress() {
+        return deliveryStreetAddress;
+    }
+
+    public void setDeliveryStreetAddress(String deliveryStreetAddress) {
+        this.deliveryStreetAddress = deliveryStreetAddress;
+    }
+
+    public String getDeliverySuburb() {
+        return deliverySuburb;
+    }
+
+    public void setDeliverySuburb(String deliverySuburb) {
+        this.deliverySuburb = deliverySuburb;
+    }
+
+    public String getDeliveryCity() {
+        return deliveryCity;
+    }
+
+    public void setDeliveryCity(String deliveryCity) {
+        this.deliveryCity = deliveryCity;
+    }
+
+    public String getDeliveryState() {
+        return deliveryState;
+    }
+
+    public void setDeliveryState(String deliveryState) {
+        this.deliveryState = deliveryState;
+    }
+
+    public String getDeliveryPostcode() {
+        return deliveryPostcode;
+    }
+
+    public void setDeliveryPostcode(String deliveryPostcode) {
+        this.deliveryPostcode = deliveryPostcode;
+    }
+
+    public String getDeliveryTelephone() {
+        return deliveryTelephone;
+    }
+
+    public void setDeliveryTelephone(String deliveryTelephone) {
+        this.deliveryTelephone = deliveryTelephone;
+    }
+
+    public BigDecimal getDeliveryStatusId() {
+        return deliveryStatusId;
+    }
+
+    public void setDeliveryStatusId(BigDecimal deliveryStatusId) {
+        this.deliveryStatusId = deliveryStatusId;
+    }
+
+    public BigDecimal getDeliveryMethodId() {
+        return deliveryMethodId;
+    }
+
+    public void setDeliveryMethodId(BigDecimal deliveryMethodId) {
+        this.deliveryMethodId = deliveryMethodId;
+    }
+
+    public String getDeliveryMethodCode() {
+        return deliveryMethodCode;
+    }
+
+    public void setDeliveryMethodCode(String deliveryMethodCode) {
+        this.deliveryMethodCode = deliveryMethodCode;
+    }
+
+    public String getDeliveryCountryCode() {
+        return deliveryCountryCode;
+    }
+
+    public void setDeliveryCountryCode(String deliveryCountryCode) {
+        this.deliveryCountryCode = deliveryCountryCode;
+    }
+
+    public String getDeliveryLanguage() {
+        return deliveryLanguage;
+    }
+
+    public void setDeliveryLanguage(String deliveryLanguage) {
+        this.deliveryLanguage = deliveryLanguage;
+    }
+
+    public BigDecimal getDeliveryCountryId() {
+        return deliveryCountryId;
+    }
+
+    public void setDeliveryCountryId(BigDecimal deliveryCountryId) {
+        this.deliveryCountryId = deliveryCountryId;
+    }
+
+    public BigDecimal getDeliveryZoneId() {
+        return deliveryZoneId;
+    }
+
+    public void setDeliveryZoneId(BigDecimal deliveryZoneId) {
+        this.deliveryZoneId = deliveryZoneId;
+    }
+
+    public Date getRequestedDate() {
+        return requestedDate;
+    }
+
+    public void setRequestedDate(Date requestedDate) {
+        this.requestedDate = requestedDate;
+    }
+
+    public Date getSentDate() {
+        return sentDate;
+    }
+
+    public void setSentDate(Date sentDate) {
+        this.sentDate = sentDate;
+    }
+
+    public Date getReceivedDate() {
+        return receivedDate;
+    }
+
+    public void setReceivedDate(Date receivedDate) {
+        this.receivedDate = receivedDate;
+    }
+
+    public String getSlipNumber() {
+        return slipNumber;
+    }
+
+    public void setSlipNumber(String slipNumber) {
+        this.slipNumber = slipNumber;
+    }
+
+    public BigDecimal getGiftWrap() {
+        return giftWrap;
+    }
+
+    public void setGiftWrap(BigDecimal giftWrap) {
+        this.giftWrap = giftWrap;
+    }
+
+    public String getGiftMessage() {
+        return giftMessage;
+    }
+
+    public void setGiftMessage(String giftMessage) {
+        this.giftMessage = giftMessage;
+    }
+
+    public String getEnvelopeLabel() {
+        return envelopeLabel;
+    }
+
+    public void setEnvelopeLabel(String envelopeLabel) {
+        this.envelopeLabel = envelopeLabel;
+    }
+
+    public BigDecimal getOrderProductId() {
+        return orderProductId;
+    }
+
+    public void setOrderProductId(BigDecimal orderProductId) {
+        this.orderProductId = orderProductId;
+    }
+
+    public BigDecimal getProductId() {
+        return productId;
+    }
+
+    public void setProductId(BigDecimal productId) {
+        this.productId = productId;
+    }
+
     public String getModel() {
         return model;
     }
 
-    /**
-     * @param model the model to set
-     */
     public void setModel(String model) {
         this.model = model;
     }
 
-    /**
-     * @return the price
-     */
-    public java.math.BigDecimal getPrice() {
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public BigDecimal getPrice() {
         return price;
     }
 
-    /**
-     * @param price the price to set
-     */
-    public void setPrice(java.math.BigDecimal price) {
+    public void setPrice(BigDecimal price) {
         this.price = price;
     }
 
-    /**
-     * @return the finalPrice
-     */
-    public java.math.BigDecimal getFinalPrice() {
+    public BigDecimal getFinalPrice() {
         return finalPrice;
     }
 
-    /**
-     * @param finalPrice the finalPrice to set
-     */
-    public void setFinalPrice(java.math.BigDecimal finalPrice) {
+    public void setFinalPrice(BigDecimal finalPrice) {
         this.finalPrice = finalPrice;
     }
 
-    /**
-     * @return the tax
-     */
-    public java.math.BigDecimal getTax() {
-        return tax;
+    public BigDecimal getQuantity() {
+        return quantity;
     }
 
-    /**
-     * @param tax the tax to set
-     */
-    public void setTax(java.math.BigDecimal tax) {
-        this.tax = tax;
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
     }
 
-    /**
-     * @return the quantity
-     */
-    public java.math.BigDecimal getQuantity() {
-        return quantity;
+    public String getProductName() {
+        return productName;
     }
 
-    /**
-     * @param quantity the quantity to set
-     */
-    public void setQuantity(java.math.BigDecimal quantity) {
-        this.quantity = quantity;
+    public void setProductName(String productName) {
+        this.productName = productName;
     }
 
+    public String getDisplayProductName() {
+        return displayProductName;
+    }
+
+    public void setDisplayProductName(String displayProductName) {
+        this.displayProductName = displayProductName;
+    }
+
+    public String getManufacturerName() {
+        return manufacturerName;
+    }
+
+    public void setManufacturerName(String manufacturerName) {
+        this.manufacturerName = manufacturerName;
+    }
+
+    public String getDisplayManufacturerName() {
+        return displayManufacturerName;
+    }
+
+    public void setDisplayManufacturerName(String displayManufacturerName) {
+        this.displayManufacturerName = displayManufacturerName;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -6,9 +6,9 @@
 import java.util.Map;
 
 import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
+import jp.sf.pal.pompei.exentity.Basket;
 
 public interface FeeCalculator extends Serializable {
-    public BigDecimal calculate(List<CustomerBasket> list,
+    public BigDecimal calculate(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -5,7 +5,7 @@
 import java.util.Map;
 
 import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.fee.FeeCalculator;
 
 public class BankPaymentCalculator implements FeeCalculator {
@@ -15,7 +15,7 @@
      */
     private static final long serialVersionUID = 2210867873710022790L;
 
-    public BigDecimal calculate(List<CustomerBasket> list,
+    public BigDecimal calculate(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         return new BigDecimal(0);
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -5,7 +5,7 @@
 import java.util.Map;
 
 import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.fee.FeeCalculator;
 
 public class CashOnDeliveryPaymentCalculator implements FeeCalculator {
@@ -15,7 +15,7 @@
      */
     private static final long serialVersionUID = 2769660903440943706L;
 
-    public BigDecimal calculate(List<CustomerBasket> list,
+    public BigDecimal calculate(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         return new BigDecimal(300);
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -7,7 +7,7 @@
 
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.fee.FeeCalculator;
 
 public class DefaultDeliveryMethodCalculator implements FeeCalculator {
@@ -54,7 +54,7 @@
         this.focPrice = BigDecimal.valueOf(Double.parseDouble(focPrice));
     }
 
-    public BigDecimal calculate(List<CustomerBasket> list,
+    public BigDecimal calculate(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         BigDecimal fee = defaultFee;
         if (zoneMap.get(deliveryAddressBook.getState()) != null) {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -6,7 +6,7 @@
 
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.fee.FeeCalculator;
 
 public class ECollectPaymentCalculator implements FeeCalculator {
@@ -22,7 +22,7 @@
 
     private String type;
 
-    public BigDecimal calculate(List<CustomerBasket> list,
+    public BigDecimal calculate(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
 
         if (CASH.equals(getType())) {
@@ -35,18 +35,18 @@
         return new BigDecimal(0);
     }
 
-    protected BigDecimal calculateForCash(List<CustomerBasket> list,
+    protected BigDecimal calculateForCash(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         return calculateCharge(list, deliveryAddressBook, informationMap).add(
                 calculateFiscal(list, deliveryAddressBook, informationMap));
     }
 
-    protected BigDecimal calculateForCreditcard(List<CustomerBasket> list,
+    protected BigDecimal calculateForCreditcard(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         return calculateCharge(list, deliveryAddressBook, informationMap);
     }
 
-    protected BigDecimal calculateCharge(List<CustomerBasket> list,
+    protected BigDecimal calculateCharge(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         BigDecimal subTotalPrice = (BigDecimal) informationMap
                 .get(PompeiConstants.SUB_TOTAL_PRICE);
@@ -74,7 +74,7 @@
         return BigDecimal.valueOf(4200);
     }
 
-    protected BigDecimal calculateFiscal(List<CustomerBasket> list,
+    protected BigDecimal calculateFiscal(List<Basket> list,
             AddressBook deliveryAddressBook, Map<String, Object> informationMap) {
         BigDecimal subTotalPrice = (BigDecimal) informationMap
                 .get(PompeiConstants.SUB_TOTAL_PRICE);

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -3,13 +3,15 @@
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
 
 import javax.faces.context.FacesContext;
 import javax.portlet.PortletConfig;
 import javax.portlet.RenderResponse;
 
-import jp.sf.pal.common.CommonException;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiDBConstants;
+import jp.sf.pal.pompei.PompeiException;
 
 import org.apache.jetspeed.administration.PortalAdministration;
 import org.apache.jetspeed.page.PageManager;
@@ -73,7 +75,7 @@
         return path + templateName;
     }
 
-    public static String getMessageDigest(String str) throws CommonException {
+    public static String getMessageDigest(String str) throws PompeiException {
         if (str == null) {
             str = "";
         }
@@ -102,10 +104,10 @@
             }
             return buf.toString();
         } catch (NoSuchAlgorithmException e) {
-            throw new CommonException("could.not.encode.secret.password",
+            throw new PompeiException("could.not.encode.secret.password",
                     "Could not encode secret password", e);
         } catch (UnsupportedEncodingException e) {
-            throw new CommonException("could.not.encode.secret.password",
+            throw new PompeiException("could.not.encode.secret.password",
                     "Could not encode secret password", e);
         }
     }
@@ -189,4 +191,20 @@
         }
         return new String(sb);
     }
+
+    public static String getDefaultLanguage() {
+        Locale locale = getFacesContext().getViewRoot().getLocale();
+        if (locale != null) {
+            locale.toString();
+        }
+        return PompeiDBConstants.DEFAULT_LANGUAGE;
+    }
+
+    public static String getCurrentLanguage() {
+        Locale locale = getFacesContext().getViewRoot().getLocale();
+        if (locale != null) {
+            locale.toString();
+        }
+        return PompeiDBConstants.DEFAULT_LANGUAGE;
+    }
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -12,9 +12,10 @@
 
 import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.StreamUtil;
-import jp.sf.pal.jsf.custom.fileupload.UploadedFile;
 import jp.sf.pal.pompei.PompeiConstants;
 
+import org.seasar.teeda.extension.util.UploadedFile;
+
 public class UploadedFileUtil {
     private static String getExtension(String name) {
         if (name == null) {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -3,107 +3,164 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 import org.seasar.teeda.extension.util.LabelHelper;
 
 public abstract class AbstractCustomerEditPage implements Serializable {
+    private String mode;
 
-    private BigDecimal addressBookId;
+    private LabelHelper labelHelper;
 
-    private String cellphone;
+    private List<Map<String, Object>> addressBookItems;
 
-    private String city;
+    // Customer
+    public BigDecimal customerId;
 
-    private String company;
+    public String portalId;
 
-    private BigDecimal customerId;
+    public String gender;
 
-    private Date dayOfBirth;
+    public String firstname;
 
-    private String department;
+    public String lastname;
 
-    private String emailAddress;
+    public String firstnameDescription;
 
-    private String fax;
+    public String lastnameDescription;
 
-    private String firstname;
+    public String nickname;
 
-    private String gender;
+    public java.util.Date dayOfBirth;
 
-    private String lastname;
+    public String emailAddress;
 
-    private String mode;
+    public Date createdDate;
 
-    private String postcode;
+    public Date updatedDate;
 
-    private String state;
+    // AddressBook
+    public BigDecimal addressBookId;
 
-    private String streetAddress;
+    public String company;
 
-    private String telephone;
+    public String department;
 
-    private LabelHelper labelHelper;
+    public String streetAddress;
 
+    public String suburb;
+
+    public String city;
+
+    public String state;
+
+    public String postcode;
+
+    public String telephone;
+
+    public String fax;
+
+    public String cellphone;
+
+    public BigDecimal defaultAddress;
+
+    public BigDecimal countryId;
+
+    public BigDecimal deliveryZoneId;
+
     public AbstractCustomerEditPage() {
         super();
     }
 
-    public BigDecimal getAddressBookId() {
-        return addressBookId;
+    public String getMode() {
+        return mode;
     }
 
-    public void setAddressBookId(BigDecimal addressBookId) {
-        this.addressBookId = addressBookId;
+    public void setMode(String mode) {
+        this.mode = mode;
     }
 
-    public String getCellphone() {
-        return cellphone;
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
     }
 
-    public void setCellphone(String cellphone) {
-        this.cellphone = cellphone;
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
     }
 
-    public String getCity() {
-        return city;
+    public BigDecimal getCustomerId() {
+        return customerId;
     }
 
-    public void setCity(String city) {
-        this.city = city;
+    public void setCustomerId(BigDecimal customerId) {
+        this.customerId = customerId;
     }
 
-    public String getCompany() {
-        return company;
+    public String getPortalId() {
+        return portalId;
     }
 
-    public void setCompany(String company) {
-        this.company = company;
+    public void setPortalId(String portalId) {
+        this.portalId = portalId;
     }
 
-    public BigDecimal getCustomerId() {
-        return customerId;
+    public String getGender() {
+        return gender;
     }
 
-    public void setCustomerId(BigDecimal customerId) {
-        this.customerId = customerId;
+    public void setGender(String gender) {
+        this.gender = gender;
     }
 
-    public Date getDayOfBirth() {
-        return dayOfBirth;
+    public String getFirstname() {
+        return firstname;
     }
 
-    public void setDayOfBirth(Date dayOfBirth) {
-        this.dayOfBirth = dayOfBirth;
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
     }
 
-    public String getDepartment() {
-        return department;
+    public String getLastname() {
+        return lastname;
     }
 
-    public void setDepartment(String department) {
-        this.department = department;
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
     }
 
+    public String getFirstnameDescription() {
+        return firstnameDescription;
+    }
+
+    public void setFirstnameDescription(String firstnameDescription) {
+        this.firstnameDescription = firstnameDescription;
+    }
+
+    public String getLastnameDescription() {
+        return lastnameDescription;
+    }
+
+    public void setLastnameDescription(String lastnameDescription) {
+        this.lastnameDescription = lastnameDescription;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public java.util.Date getDayOfBirth() {
+        return dayOfBirth;
+    }
+
+    public void setDayOfBirth(java.util.Date dayOfBirth) {
+        this.dayOfBirth = dayOfBirth;
+    }
+
     public String getEmailAddress() {
         return emailAddress;
     }
@@ -112,54 +169,70 @@
         this.emailAddress = emailAddress;
     }
 
-    public String getFax() {
-        return fax;
+    public Date getCreatedDate() {
+        return createdDate;
     }
 
-    public void setFax(String fax) {
-        this.fax = fax;
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
     }
 
-    public String getFirstname() {
-        return firstname;
+    public Date getUpdatedDate() {
+        return updatedDate;
     }
 
-    public void setFirstname(String firstname) {
-        this.firstname = firstname;
+    public void setUpdatedDate(Date updatedDate) {
+        this.updatedDate = updatedDate;
     }
 
-    public String getGender() {
-        return gender;
+    public BigDecimal getAddressBookId() {
+        return addressBookId;
     }
 
-    public void setGender(String gender) {
-        this.gender = gender;
+    public void setAddressBookId(BigDecimal addressBookId) {
+        this.addressBookId = addressBookId;
     }
 
-    public String getLastname() {
-        return lastname;
+    public String getCompany() {
+        return company;
     }
 
-    public void setLastname(String lastname) {
-        this.lastname = lastname;
+    public void setCompany(String company) {
+        this.company = company;
     }
 
-    public String getMode() {
-        return mode;
+    public String getDepartment() {
+        return department;
     }
 
-    public void setMode(String mode) {
-        this.mode = mode;
+    public void setDepartment(String department) {
+        this.department = department;
     }
 
-    public String getPostcode() {
-        return postcode;
+    public String getStreetAddress() {
+        return streetAddress;
     }
 
-    public void setPostcode(String postcode) {
-        this.postcode = postcode;
+    public void setStreetAddress(String streetAddress) {
+        this.streetAddress = streetAddress;
     }
 
+    public String getSuburb() {
+        return suburb;
+    }
+
+    public void setSuburb(String suburb) {
+        this.suburb = suburb;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
     public String getState() {
         return state;
     }
@@ -168,12 +241,12 @@
         this.state = state;
     }
 
-    public String getStreetAddress() {
-        return streetAddress;
+    public String getPostcode() {
+        return postcode;
     }
 
-    public void setStreetAddress(String streetAddress) {
-        this.streetAddress = streetAddress;
+    public void setPostcode(String postcode) {
+        this.postcode = postcode;
     }
 
     public String getTelephone() {
@@ -184,18 +257,52 @@
         this.telephone = telephone;
     }
 
-    /**
-     * @return labelHelper
-     */
-    public LabelHelper getLabelHelper() {
-        return labelHelper;
+    public String getFax() {
+        return fax;
     }
 
-    /**
-     * @param labelHelper 設定する labelHelper
-     */
-    public void setLabelHelper(LabelHelper labelHelper) {
-        this.labelHelper = labelHelper;
+    public void setFax(String fax) {
+        this.fax = fax;
     }
 
+    public String getCellphone() {
+        return cellphone;
+    }
+
+    public void setCellphone(String cellphone) {
+        this.cellphone = cellphone;
+    }
+
+    public BigDecimal getDefaultAddress() {
+        return defaultAddress;
+    }
+
+    public void setDefaultAddress(BigDecimal defaultAddress) {
+        this.defaultAddress = defaultAddress;
+    }
+
+    public BigDecimal getCountryId() {
+        return countryId;
+    }
+
+    public void setCountryId(BigDecimal countryId) {
+        this.countryId = countryId;
+    }
+
+    public BigDecimal getDeliveryZoneId() {
+        return deliveryZoneId;
+    }
+
+    public void setDeliveryZoneId(BigDecimal deliveryZoneId) {
+        this.deliveryZoneId = deliveryZoneId;
+    }
+
+    public List<Map<String, Object>> getAddressBookItems() {
+        return addressBookItems;
+    }
+
+    public void setAddressBookItems(List<Map<String, Object>> addressBookItems) {
+        this.addressBookItems = addressBookItems;
+    }
+
 }
\ No newline at end of file

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,24 +1,30 @@
 package jp.sf.pal.pompei.web.admin.customer;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiDBException;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
-import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.service.CustomerService;
+import jp.sf.pal.pompei.web.admin.order.OrderListAction;
 
+import org.seasar.framework.log.Logger;
+
 public class CustomerConfirmAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -2150284828406095184L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderListAction.class); // LOG CODE: ?PC013?
+
     private CustomerConfirmPage customerConfirmPage;
 
     private CustomerService customerService;
@@ -30,22 +36,30 @@
     }
 
     public Class<?> prerender() {
-        if (getCustomerConfirmPage().getCustomerId() != null
+        if (customerConfirmPage.getCustomerId() != null
                 && (isUpdate() || isDelete())) {
             if (isDelete()) {
-                // address book
-                AddressBook addressBook = getCustomerService()
-                        .getDefaultAddressBook(
-                                getCustomerConfirmPage().getCustomerId());
-                if (addressBook != null) {
-                    getCustomerDxo().convert(addressBook,
-                            getCustomerConfirmPage());
+                try {
+                    // customer
+                    Customer customer = customerService
+                            .getCustomer(customerConfirmPage.getCustomerId());
+                    customerDxo.convertFromCustomerToPage(customer,
+                            customerConfirmPage);
+
+                    // address book
+                    List<Map<String, Object>> addressBookItems = new ArrayList<Map<String, Object>>();
+                    customerDxo.convertFromAddressBookToMap(customer
+                            .getAddressBookList(), addressBookItems);
+                    customerConfirmPage.setAddressBookItems(addressBookItems);
+                } catch (Exception e) {
+                    FacesMessageUtil
+                            .addErrorMessage(
+                                    "could.not.find.customer.in.customerconfirm",
+                                    new Object[] { customerConfirmPage
+                                            .getCustomerId() });
+                    logger.log("EPC0131", new Object[] { this.toString() }, e);
+                    return CustomerListPage.class;
                 }
-
-                // customer
-                Customer customer = getCustomerService().getCustomer(
-                        getCustomerConfirmPage().getCustomerId());
-                getCustomerDxo().convert(customer, getCustomerConfirmPage());
             }
         } else {
             FacesMessageUtil
@@ -60,104 +74,96 @@
 
     public Class<?> doFinish() {
         if (isUpdate()) {
-            if (getCustomerConfirmPage().getCustomerId() == null) {
+            if (customerConfirmPage.getCustomerId() == null) {
                 FacesMessageUtil
                         .addErrorMessage("customer.is.not.specified.in.customerconfirm");
                 return CustomerListPage.class;
             }
-            Customer customer = getCustomerService().getCustomer(
-                    getCustomerConfirmPage().getCustomerId());
+            Customer customer = customerService.getCustomer(customerConfirmPage
+                    .getCustomerId());
             if (customer == null) {
-                FacesMessageUtil
-                        .addErrorMessage(
-                                "could.not.find.customer.info.in.customerconfirm",
-                                new Object[] { getCustomerConfirmPage()
-                                        .getCustomerId() });
+                FacesMessageUtil.addErrorMessage(
+                        "could.not.find.customer.info.in.customerconfirm",
+                        new Object[] { customerConfirmPage.getCustomerId() });
                 return CustomerListPage.class;
             }
 
-            getCustomerDxo().convert(getCustomerConfirmPage(), customer);
+            customerDxo.convertFromPageToCustomer(customerConfirmPage, customer);
 
-            AddressBook addressBook = null;
-            if (getCustomerConfirmPage().getAddressBookId() != null) {
-                addressBook = getCustomerService().getAddressBook(
-                        getCustomerConfirmPage().getAddressBookId());
-                getCustomerDxo().convert(getCustomerConfirmPage(), addressBook);
+            try {
+                customerService.updateCustomer(customer);
+
+                FacesMessageUtil
+                        .addInfoMessage("updated.customer.in.customerconfirm");
+                return CustomerListPage.class;
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage(
+                        "failed.to.update.customer.in.customerconfirm",
+                        new Object[] { customerConfirmPage.toString() });
+                logger.log("EPC0132", new Object[] { this.toString() }, e);
             }
-
-            getCustomerService().updateCustomer(customer, addressBook);
-
-            FacesMessageUtil
-                    .addInfoMessage("updated.customer.in.customerconfirm");
-            return CustomerListPage.class;
         } else if (isDelete()) {
-            if (getCustomerConfirmPage().getCustomerId() == null) {
+            if (customerConfirmPage.getCustomerId() == null) {
                 FacesMessageUtil
                         .addErrorMessage("customer.is.not.specified.in.customerconfirm.for.delete");
                 return CustomerListPage.class;
             }
 
-            getCustomerService().deleteCustomer(
-                    getCustomerConfirmPage().getCustomerId());
+            try {
+                customerService.deleteCustomer(customerConfirmPage
+                        .getCustomerId());
 
-            FacesMessageUtil
-                    .addInfoMessage("deleted.customer.in.customerconfirm");
-            return CustomerListPage.class;
+                FacesMessageUtil
+                        .addInfoMessage("deleted.customer.in.customerconfirm");
+                return CustomerListPage.class;
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage(
+                        "failed.to.delete.customer.in.customerconfirm",
+                        new Object[] { customerConfirmPage.toString() });
+                logger.log("EPC0133", new Object[] { this.toString() }, e);
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage(
+                        "failed.to.delete.customer.in.customerconfirm",
+                        new Object[] { customerConfirmPage.toString() });
+                logger.log("EPC0134", new Object[] { this.toString() }, e);
+            }
         } else {
             FacesMessageUtil
                     .addErrorMessage("unexpected.action.in.customerconfirm");
-            return null;
         }
+        return null;
     }
 
     private boolean isUpdate() {
-        return PompeiConstants.UPDATE_MODE.equals(getCustomerConfirmPage()
-                .getMode());
+        return PompeiConstants.UPDATE_MODE
+                .equals(customerConfirmPage.getMode());
     }
 
     private boolean isDelete() {
-        return PompeiConstants.DELETE_MODE.equals(getCustomerConfirmPage()
-                .getMode());
+        return PompeiConstants.DELETE_MODE
+                .equals(customerConfirmPage.getMode());
     }
 
-    /**
-     * @return customerConfirmPage
-     */
     public CustomerConfirmPage getCustomerConfirmPage() {
         return customerConfirmPage;
     }
 
-    /**
-     * @param customerConfirmPage 設定する customerConfirmPage
-     */
     public void setCustomerConfirmPage(CustomerConfirmPage customerConfirmPage) {
         this.customerConfirmPage = customerConfirmPage;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return customerDxo
-     */
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo 設定する customerDxo
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,8 +1,9 @@
 package jp.sf.pal.pompei.web.admin.customer;
 
-
 public class CustomerConfirmPage extends AbstractCustomerEditPage {
 
+    private static final long serialVersionUID = -5986707363868218117L;
+
     public String getGenderStr() {
         if (getLabelHelper() != null && getGender() != null) {
             return getLabelHelper().getLabelValue(getGender());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,24 +1,29 @@
 package jp.sf.pal.pompei.web.admin.customer;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
-import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.service.CustomerService;
+import jp.sf.pal.pompei.web.admin.order.OrderListAction;
 
+import org.seasar.framework.log.Logger;
+
 public class CustomerEditAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1427442393860756060L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderListAction.class); // LOG CODE: ?PC012?
+
     private CustomerEditPage customerEditPage;
 
     private CustomerService customerService;
@@ -30,22 +35,23 @@
     }
 
     public Class<?> prerender() {
-        if (getCustomerEditPage().getCustomerId() == null || !isUpdate()) {
+        if (customerEditPage.getCustomerId() == null || !isUpdate()) {
             FacesMessageUtil
                     .addErrorMessage("invalid.parameter.in.customeredit");
             return CustomerListPage.class;
         }
 
-        // address book
-        AddressBook addressBook = getCustomerService().getDefaultAddressBook(
-                getCustomerEditPage().getCustomerId());
-        getCustomerDxo().convert(addressBook, getCustomerEditPage());
-
         // customer
-        Customer customer = getCustomerService().getCustomer(
-                getCustomerEditPage().getCustomerId());
-        getCustomerDxo().convert(customer, getCustomerEditPage());
+        Customer customer = customerService.getCustomer(customerEditPage
+                .getCustomerId());
+        customerDxo.convertFromCustomerToPage(customer, customerEditPage);
 
+        // address book
+        List<Map<String, Object>> addressBookItems = new ArrayList<Map<String, Object>>();
+        customerDxo.convertFromAddressBookToMap(customer.getAddressBookList(),
+                addressBookItems);
+        customerEditPage.setAddressBookItems(addressBookItems);
+
         //render faces message
         FacesMessageUtil.renderMessages();
         return null;
@@ -56,50 +62,31 @@
     }
 
     private boolean isUpdate() {
-        return PompeiConstants.UPDATE_MODE.equals(getCustomerEditPage()
-                .getMode());
+        return PompeiConstants.UPDATE_MODE.equals(customerEditPage.getMode());
     }
 
-    /**
-     * @return customerService
-     */
+    public CustomerEditPage getCustomerEditPage() {
+        return customerEditPage;
+    }
+
+    public void setCustomerEditPage(CustomerEditPage customerEditPage) {
+        this.customerEditPage = customerEditPage;
+    }
+
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return customerDxo
-     */
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo 設定する customerDxo
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }
 
-    /**
-     * @return customerEditPage
-     */
-    public CustomerEditPage getCustomerEditPage() {
-        return customerEditPage;
-    }
-
-    /**
-     * @param customerEditPage 設定する customerEditPage
-     */
-    public void setCustomerEditPage(CustomerEditPage customerEditPage) {
-        this.customerEditPage = customerEditPage;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,10 +1,22 @@
 package jp.sf.pal.pompei.web.admin.customer;
 
+import java.util.List;
+import java.util.Map;
+
 public class CustomerEditPage extends AbstractCustomerEditPage {
 
-    /**
-     * 
-     */
+  
+
     private static final long serialVersionUID = 5782672253630576575L;
 
+    private List<Map<String, Object>> addressBookItems;
+
+    public List<Map<String, Object>> getAddressBookItems() {
+        return addressBookItems;
+    }
+
+    public void setAddressBookItems(List<Map<String, Object>> addressBookItems) {
+        this.addressBookItems = addressBookItems;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,84 +1,87 @@
 package jp.sf.pal.pompei.web.admin.customer;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
 import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.pager.CustomerPager;
 import jp.sf.pal.pompei.service.CustomerService;
+import jp.sf.pal.pompei.web.admin.order.OrderListAction;
 
+import org.seasar.framework.log.Logger;
+
 public class CustomerListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 8532394606295152264L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderListAction.class); // LOG CODE: ?PC011?
+
     private CustomerListPage customerListPage;
 
     private CustomerService customerService;
 
     private CustomerDxo customerDxo;
 
+    private CustomerPager customerPager;
+
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
+        //TODO pager
+        //TODO catch an exception
+
         // customer list
-        List<Customer> customerList = getCustomerService().getCustomerList();
-        getCustomerListPage().setCustomerItems(
-                getCustomerDxo().convert(customerList));
+        List<Customer> customerList = customerService
+                .getCustomerListByPager(customerPager);
+        List<Map<String, Object>> customerItems = new ArrayList<Map<String, Object>>();
+        customerDxo.convertFromCustomerToMap(customerList, customerItems);
+        customerListPage.setCustomerItems(customerItems);
 
         // render faces message
         FacesMessageUtil.renderMessages();
         return null;
     }
 
-    /**
-     * @return customerListPage
-     */
     public CustomerListPage getCustomerListPage() {
         return customerListPage;
     }
 
-    /**
-     * @param customerListPage 設定する customerListPage
-     */
     public void setCustomerListPage(CustomerListPage customerListPage) {
         this.customerListPage = customerListPage;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return customerDxo
-     */
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo 設定する customerDxo
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }
 
+    public CustomerPager getCustomerPager() {
+        return customerPager;
+    }
+
+    public void setCustomerPager(CustomerPager customerPager) {
+        this.customerPager = customerPager;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -8,35 +8,66 @@
 
 public class CustomerListPage implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -7603304026216388367L;
 
-    private BigDecimal customerId;
-
     private int customerIndex;
 
     private List<Map<String, Object>> customerItems;
 
-    private String emailAddress;
+    // Customer
+    public BigDecimal customerId;
 
-    private String firstName;
+    public String portalId;
 
-    private String lastName;
+    public String gender;
 
-    private String portalId;
+    public String firstname;
 
-    private Date dateAdded;
+    public String lastname;
 
-    public BigDecimal getCustomerId() {
-        return customerId;
-    }
+    public String firstnameDescription;
 
-    public void setCustomerId(BigDecimal customerId) {
-        this.customerId = customerId;
-    }
+    public String lastnameDescription;
 
+    public String nickname;
+
+    public java.util.Date dayOfBirth;
+
+    public String emailAddress;
+
+    public Date createdDate;
+
+    public Date updatedDate;
+
+    // AddressBook
+    public BigDecimal addressBookId;
+
+    public String company;
+
+    public String department;
+
+    public String streetAddress;
+
+    public String suburb;
+
+    public String city;
+
+    public String state;
+
+    public String postcode;
+
+    public String telephone;
+
+    public String fax;
+
+    public String cellphone;
+
+    public BigDecimal defaultAddress;
+
+    public BigDecimal countryId;
+
+    public BigDecimal deliveryZoneId;
+
     public int getCustomerIndex() {
         return customerIndex;
     }
@@ -53,6 +84,78 @@
         this.customerItems = customerItems;
     }
 
+    public BigDecimal getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(BigDecimal customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getPortalId() {
+        return portalId;
+    }
+
+    public void setPortalId(String portalId) {
+        this.portalId = portalId;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+
+    public String getFirstnameDescription() {
+        return firstnameDescription;
+    }
+
+    public void setFirstnameDescription(String firstnameDescription) {
+        this.firstnameDescription = firstnameDescription;
+    }
+
+    public String getLastnameDescription() {
+        return lastnameDescription;
+    }
+
+    public void setLastnameDescription(String lastnameDescription) {
+        this.lastnameDescription = lastnameDescription;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public java.util.Date getDayOfBirth() {
+        return dayOfBirth;
+    }
+
+    public void setDayOfBirth(java.util.Date dayOfBirth) {
+        this.dayOfBirth = dayOfBirth;
+    }
+
     public String getEmailAddress() {
         return emailAddress;
     }
@@ -61,42 +164,132 @@
         this.emailAddress = emailAddress;
     }
 
-    public String getFirstName() {
-        return firstName;
+    public Date getCreatedDate() {
+        return createdDate;
     }
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
     }
 
-    public String getLastName() {
-        return lastName;
+    public Date getUpdatedDate() {
+        return updatedDate;
     }
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
+    public void setUpdatedDate(Date updatedDate) {
+        this.updatedDate = updatedDate;
     }
 
-    public String getPortalId() {
-        return portalId;
+    public BigDecimal getAddressBookId() {
+        return addressBookId;
     }
 
-    public void setPortalId(String portalId) {
-        this.portalId = portalId;
+    public void setAddressBookId(BigDecimal addressBookId) {
+        this.addressBookId = addressBookId;
     }
 
-    /**
-     * @return dateAdded
-     */
-    public Date getDateAdded() {
-        return dateAdded;
+    public String getCompany() {
+        return company;
     }
 
-    /**
-     * @param dateAdded 設定する dateAdded
-     */
-    public void setDateAdded(Date dateAdded) {
-        this.dateAdded = dateAdded;
+    public void setCompany(String company) {
+        this.company = company;
     }
 
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getStreetAddress() {
+        return streetAddress;
+    }
+
+    public void setStreetAddress(String streetAddress) {
+        this.streetAddress = streetAddress;
+    }
+
+    public String getSuburb() {
+        return suburb;
+    }
+
+    public void setSuburb(String suburb) {
+        this.suburb = suburb;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getPostcode() {
+        return postcode;
+    }
+
+    public void setPostcode(String postcode) {
+        this.postcode = postcode;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getCellphone() {
+        return cellphone;
+    }
+
+    public void setCellphone(String cellphone) {
+        this.cellphone = cellphone;
+    }
+
+    public BigDecimal getDefaultAddress() {
+        return defaultAddress;
+    }
+
+    public void setDefaultAddress(BigDecimal defaultAddress) {
+        this.defaultAddress = defaultAddress;
+    }
+
+    public BigDecimal getCountryId() {
+        return countryId;
+    }
+
+    public void setCountryId(BigDecimal countryId) {
+        this.countryId = countryId;
+    }
+
+    public BigDecimal getDeliveryZoneId() {
+        return deliveryZoneId;
+    }
+
+    public void setDeliveryZoneId(BigDecimal deliveryZoneId) {
+        this.deliveryZoneId = deliveryZoneId;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -6,29 +6,59 @@
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
 import org.seasar.teeda.extension.util.LabelHelper;
 
 public abstract class AbstractOrderEditPage implements Serializable {
 
     private List<Map<String, Object>> orderProductItems;
 
-    private String model;
+    private String mode;
 
-    private String code;
+    private LabelHelper labelHelper;
 
-    private BigDecimal price;
+    // OrderForm 
+    private BigDecimal orderFormId;
 
-    private BigDecimal finalPrice;
+    private String orderFormNumber;
 
-    private BigDecimal quantity;
+    private BigDecimal customerId;
 
-    private String billingCity;
+    private String customerGender;
 
+    private String customerFirstname;
+
+    private String customerLastname;
+
+    private String customerFirstnameDescription;
+
+    private String customerLastnameDescription;
+
+    private java.util.Date customerDayOfBirth;
+
+    private String customerEmailAddress;
+
+    private String customerCompany;
+
+    private String customerDepartment;
+
+    private String customerStreetAddress;
+
+    private String customerSuburb;
+
+    private String customerCity;
+
+    private String customerState;
+
+    private String customerPostcode;
+
+    private String customerTelephone;
+
+    private String customerCountryCode;
+
+    private String customerLanguage;
+
     private String billingCompany;
 
-    private String billingCountryName;
-
     private String billingDepartment;
 
     private String billingFirstname;
@@ -39,61 +69,52 @@
 
     private String billingLastnameDescription;
 
-    private String billingLocaleName;
+    private String billingStreetAddress;
 
-    private String billingPostcode;
+    private String billingSuburb;
 
+    private String billingCity;
+
     private String billingState;
 
-    private String billingStreetAddress;
+    private String billingPostcode;
 
     private String billingTelephone;
 
-    private BigDecimal currencyId;
+    private String billingCountryCode;
 
-    private String currencyCode;
+    private String billingLanguage;
 
-    private String customerCity;
+    private BigDecimal orderStatusId;
 
-    private String customerCompany;
+    private Date updatedDate;
 
-    private String customerCountryName;
+    private Date purchasedDate;
 
-    @DateTimeConverter(pattern = "yyyy/MM/dd")
-    private Date customerDayOfBirth;
+    private Date finishedDate;
 
-    private String customerDepartment;
+    // OrderPayment
+    private BigDecimal paymentMethodId;
 
-    private String customerEmailAddress;
+    private String paymentMethodCode;
 
-    private String customerFirstname;
+    private BigDecimal orderCardInfoId;
 
-    private String customerFirstnameDescription;
+    private BigDecimal paymentStatusId;
 
-    private String customerGender;
+    private BigDecimal subTotalPrice;
 
-    private BigDecimal customerId;
+    private BigDecimal tax;
 
-    private String customerLastname;
+    private BigDecimal deliveryPrice;
 
-    private String customerLastnameDescription;
+    private BigDecimal paymentFee;
 
-    private String customerLocaleName;
+    private BigDecimal totalPrice;
 
-    private String customerPostcode;
-
-    private String customerState;
-
-    private String customerStreetAddress;
-
-    private String customerTelephone;
-
-    private String deliveryCity;
-
+    // OrderDelivery
     private String deliveryCompany;
 
-    private String deliveryCountryName;
-
     private String deliveryDepartment;
 
     private String deliveryFirstname;
@@ -104,77 +125,275 @@
 
     private String deliveryLastnameDescription;
 
-    private String deliveryLocaleName;
+    private String deliveryStreetAddress;
 
-    private String deliveryMethodCode;
+    private String deliverySuburb;
 
-    private BigDecimal deliveryMethodId;
+    private String deliveryCity;
 
+    private String deliveryState;
+
     private String deliveryPostcode;
 
-    private BigDecimal deliveryPrice;
+    private String deliveryTelephone;
 
-    private String deliveryState;
+    private BigDecimal deliveryStatusId;
 
-    private String deliveryStreetAddress;
+    private BigDecimal deliveryMethodId;
 
-    private String deliveryTelephone;
+    private String deliveryMethodCode;
 
-    private String deliveryNumber;
+    private String deliveryCountryCode;
 
-    @DateTimeConverter(pattern = "yyyy/MM/dd")
-    private Date finishedDate;
+    private String deliveryLanguage;
 
-    @DateTimeConverter(pattern = "yyyy/MM/dd")
-    private Date lastModified;
+    private BigDecimal deliveryCountryId;
 
-    private String mode;
+    private BigDecimal deliveryZoneId;
 
-    private BigDecimal orderFormId;
+    private Date requestedDate;
 
-    private String orderFormNumber;
+    private Date sentDate;
 
-    private BigDecimal orderStatusId;
+    private Date receivedDate;
 
-    private String paymentMethodCode;
+    private String slipNumber;
 
-    private BigDecimal paymentMethodId;
+    private BigDecimal giftWrap;
 
-    private BigDecimal paymentFee;
+    private String giftMessage;
 
-    @DateTimeConverter(pattern = "yyyy/MM/dd")
-    private Date purchasedDate;
+    private String envelopeLabel;
 
-    private BigDecimal subTotalPrice;
+    // OrderProduct
+    private BigDecimal orderProductId;
 
-    private BigDecimal tax;
+    private BigDecimal productId;
 
-    private BigDecimal totalPrice;
+    private String model;
 
-    private String cardCode;
+    private String code;
 
+    private BigDecimal price;
+
+    private BigDecimal finalPrice;
+
+    //    private BigDecimal tax;
+
+    private BigDecimal quantity;
+
+    private String productName;
+
+    private String displayProductName;
+
+    private String manufacturerName;
+
+    private String displayManufacturerName;
+
+    //OrderCardInfo
+
+    private BigDecimal cardTypeId;
+
+    private String cardTypeCode;
+
     private String cardOwner;
 
     private String cardNumber;
 
     private String cardExpires;
 
-    private BigDecimal orderCardInfoId;
+    private String cardPaymentType;
 
-    private LabelHelper labelHelper;
-
     public AbstractOrderEditPage() {
         super();
     }
 
-    public String getBillingCity() {
-        return billingCity;
+    public List<Map<String, Object>> getOrderProductItems() {
+        return orderProductItems;
     }
 
-    public void setBillingCity(String billingCity) {
-        this.billingCity = billingCity;
+    public void setOrderProductItems(List<Map<String, Object>> orderProductItems) {
+        this.orderProductItems = orderProductItems;
     }
 
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+    public BigDecimal getOrderFormId() {
+        return orderFormId;
+    }
+
+    public void setOrderFormId(BigDecimal orderFormId) {
+        this.orderFormId = orderFormId;
+    }
+
+    public String getOrderFormNumber() {
+        return orderFormNumber;
+    }
+
+    public void setOrderFormNumber(String orderFormNumber) {
+        this.orderFormNumber = orderFormNumber;
+    }
+
+    public BigDecimal getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(BigDecimal customerId) {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerGender() {
+        return customerGender;
+    }
+
+    public void setCustomerGender(String customerGender) {
+        this.customerGender = customerGender;
+    }
+
+    public String getCustomerFirstname() {
+        return customerFirstname;
+    }
+
+    public void setCustomerFirstname(String customerFirstname) {
+        this.customerFirstname = customerFirstname;
+    }
+
+    public String getCustomerLastname() {
+        return customerLastname;
+    }
+
+    public void setCustomerLastname(String customerLastname) {
+        this.customerLastname = customerLastname;
+    }
+
+    public String getCustomerFirstnameDescription() {
+        return customerFirstnameDescription;
+    }
+
+    public void setCustomerFirstnameDescription(
+            String customerFirstnameDescription) {
+        this.customerFirstnameDescription = customerFirstnameDescription;
+    }
+
+    public String getCustomerLastnameDescription() {
+        return customerLastnameDescription;
+    }
+
+    public void setCustomerLastnameDescription(
+            String customerLastnameDescription) {
+        this.customerLastnameDescription = customerLastnameDescription;
+    }
+
+    public java.util.Date getCustomerDayOfBirth() {
+        return customerDayOfBirth;
+    }
+
+    public void setCustomerDayOfBirth(java.util.Date customerDayOfBirth) {
+        this.customerDayOfBirth = customerDayOfBirth;
+    }
+
+    public String getCustomerEmailAddress() {
+        return customerEmailAddress;
+    }
+
+    public void setCustomerEmailAddress(String customerEmailAddress) {
+        this.customerEmailAddress = customerEmailAddress;
+    }
+
+    public String getCustomerCompany() {
+        return customerCompany;
+    }
+
+    public void setCustomerCompany(String customerCompany) {
+        this.customerCompany = customerCompany;
+    }
+
+    public String getCustomerDepartment() {
+        return customerDepartment;
+    }
+
+    public void setCustomerDepartment(String customerDepartment) {
+        this.customerDepartment = customerDepartment;
+    }
+
+    public String getCustomerStreetAddress() {
+        return customerStreetAddress;
+    }
+
+    public void setCustomerStreetAddress(String customerStreetAddress) {
+        this.customerStreetAddress = customerStreetAddress;
+    }
+
+    public String getCustomerSuburb() {
+        return customerSuburb;
+    }
+
+    public void setCustomerSuburb(String customerSuburb) {
+        this.customerSuburb = customerSuburb;
+    }
+
+    public String getCustomerCity() {
+        return customerCity;
+    }
+
+    public void setCustomerCity(String customerCity) {
+        this.customerCity = customerCity;
+    }
+
+    public String getCustomerState() {
+        return customerState;
+    }
+
+    public void setCustomerState(String customerState) {
+        this.customerState = customerState;
+    }
+
+    public String getCustomerPostcode() {
+        return customerPostcode;
+    }
+
+    public void setCustomerPostcode(String customerPostcode) {
+        this.customerPostcode = customerPostcode;
+    }
+
+    public String getCustomerTelephone() {
+        return customerTelephone;
+    }
+
+    public void setCustomerTelephone(String customerTelephone) {
+        this.customerTelephone = customerTelephone;
+    }
+
+    public String getCustomerCountryCode() {
+        return customerCountryCode;
+    }
+
+    public void setCustomerCountryCode(String customerCountryCode) {
+        this.customerCountryCode = customerCountryCode;
+    }
+
+    public String getCustomerLanguage() {
+        return customerLanguage;
+    }
+
+    public void setCustomerLanguage(String customerLanguage) {
+        this.customerLanguage = customerLanguage;
+    }
+
     public String getBillingCompany() {
         return billingCompany;
     }
@@ -183,14 +402,6 @@
         this.billingCompany = billingCompany;
     }
 
-    public String getBillingCountryName() {
-        return billingCountryName;
-    }
-
-    public void setBillingCountryName(String billingCountryName) {
-        this.billingCountryName = billingCountryName;
-    }
-
     public String getBillingDepartment() {
         return billingDepartment;
     }
@@ -215,22 +426,47 @@
         this.billingLastname = billingLastname;
     }
 
-    public String getBillingLocaleName() {
-        return billingLocaleName;
+    public String getBillingFirstnameDescription() {
+        return billingFirstnameDescription;
     }
 
-    public void setBillingLocaleName(String billingLocaleName) {
-        this.billingLocaleName = billingLocaleName;
+    public void setBillingFirstnameDescription(
+            String billingFirstnameDescription) {
+        this.billingFirstnameDescription = billingFirstnameDescription;
     }
 
-    public String getBillingPostcode() {
-        return billingPostcode;
+    public String getBillingLastnameDescription() {
+        return billingLastnameDescription;
     }
 
-    public void setBillingPostcode(String billingPostcode) {
-        this.billingPostcode = billingPostcode;
+    public void setBillingLastnameDescription(String billingLastnameDescription) {
+        this.billingLastnameDescription = billingLastnameDescription;
     }
 
+    public String getBillingStreetAddress() {
+        return billingStreetAddress;
+    }
+
+    public void setBillingStreetAddress(String billingStreetAddress) {
+        this.billingStreetAddress = billingStreetAddress;
+    }
+
+    public String getBillingSuburb() {
+        return billingSuburb;
+    }
+
+    public void setBillingSuburb(String billingSuburb) {
+        this.billingSuburb = billingSuburb;
+    }
+
+    public String getBillingCity() {
+        return billingCity;
+    }
+
+    public void setBillingCity(String billingCity) {
+        this.billingCity = billingCity;
+    }
+
     public String getBillingState() {
         return billingState;
     }
@@ -239,12 +475,12 @@
         this.billingState = billingState;
     }
 
-    public String getBillingStreetAddress() {
-        return billingStreetAddress;
+    public String getBillingPostcode() {
+        return billingPostcode;
     }
 
-    public void setBillingStreetAddress(String billingStreetAddress) {
-        this.billingStreetAddress = billingStreetAddress;
+    public void setBillingPostcode(String billingPostcode) {
+        this.billingPostcode = billingPostcode;
     }
 
     public String getBillingTelephone() {
@@ -255,142 +491,126 @@
         this.billingTelephone = billingTelephone;
     }
 
-    public BigDecimal getCurrencyId() {
-        return currencyId;
+    public String getBillingCountryCode() {
+        return billingCountryCode;
     }
 
-    public void setCurrencyId(BigDecimal currencyId) {
-        this.currencyId = currencyId;
+    public void setBillingCountryCode(String billingCountryCode) {
+        this.billingCountryCode = billingCountryCode;
     }
 
-    public String getCustomerCity() {
-        return customerCity;
+    public String getBillingLanguage() {
+        return billingLanguage;
     }
 
-    public void setCustomerCity(String customerCity) {
-        this.customerCity = customerCity;
+    public void setBillingLanguage(String billingLocaleName) {
+        this.billingLanguage = billingLocaleName;
     }
 
-    public String getCustomerCompany() {
-        return customerCompany;
+    public BigDecimal getOrderStatusId() {
+        return orderStatusId;
     }
 
-    public void setCustomerCompany(String customerCompany) {
-        this.customerCompany = customerCompany;
+    public void setOrderStatusId(BigDecimal orderStatusId) {
+        this.orderStatusId = orderStatusId;
     }
 
-    public String getCustomerCountryName() {
-        return customerCountryName;
+    public Date getUpdatedDate() {
+        return updatedDate;
     }
 
-    public void setCustomerCountryName(String customerCountryName) {
-        this.customerCountryName = customerCountryName;
+    public void setUpdatedDate(Date updatedDate) {
+        this.updatedDate = updatedDate;
     }
 
-    public Date getCustomerDayOfBirth() {
-        return customerDayOfBirth;
+    public Date getPurchasedDate() {
+        return purchasedDate;
     }
 
-    public void setCustomerDayOfBirth(Date customerDayOfBirth) {
-        this.customerDayOfBirth = customerDayOfBirth;
+    public void setPurchasedDate(Date purchasedDate) {
+        this.purchasedDate = purchasedDate;
     }
 
-    public String getCustomerDepartment() {
-        return customerDepartment;
+    public Date getFinishedDate() {
+        return finishedDate;
     }
 
-    public void setCustomerDepartment(String customerDepartment) {
-        this.customerDepartment = customerDepartment;
+    public void setFinishedDate(Date finishedDate) {
+        this.finishedDate = finishedDate;
     }
 
-    public String getCustomerEmailAddress() {
-        return customerEmailAddress;
+    public BigDecimal getPaymentMethodId() {
+        return paymentMethodId;
     }
 
-    public void setCustomerEmailAddress(String customerEmailAddress) {
-        this.customerEmailAddress = customerEmailAddress;
+    public void setPaymentMethodId(BigDecimal paymentMethodId) {
+        this.paymentMethodId = paymentMethodId;
     }
 
-    public String getCustomerFirstname() {
-        return customerFirstname;
+    public String getPaymentMethodCode() {
+        return paymentMethodCode;
     }
 
-    public void setCustomerFirstname(String customerFirstname) {
-        this.customerFirstname = customerFirstname;
+    public void setPaymentMethodCode(String paymentMethodCode) {
+        this.paymentMethodCode = paymentMethodCode;
     }
 
-    public String getCustomerGender() {
-        return customerGender;
+    public BigDecimal getOrderCardInfoId() {
+        return orderCardInfoId;
     }
 
-    public void setCustomerGender(String customerGender) {
-        this.customerGender = customerGender;
+    public void setOrderCardInfoId(BigDecimal orderCardInfoId) {
+        this.orderCardInfoId = orderCardInfoId;
     }
 
-    public BigDecimal getCustomerId() {
-        return customerId;
+    public BigDecimal getPaymentStatusId() {
+        return paymentStatusId;
     }
 
-    public void setCustomerId(BigDecimal customerId) {
-        this.customerId = customerId;
+    public void setPaymentStatusId(BigDecimal paymentStatusId) {
+        this.paymentStatusId = paymentStatusId;
     }
 
-    public String getCustomerLastname() {
-        return customerLastname;
+    public BigDecimal getSubTotalPrice() {
+        return subTotalPrice;
     }
 
-    public void setCustomerLastname(String customerLastname) {
-        this.customerLastname = customerLastname;
+    public void setSubTotalPrice(BigDecimal subTotalPrice) {
+        this.subTotalPrice = subTotalPrice;
     }
 
-    public String getCustomerLocaleName() {
-        return customerLocaleName;
+    public BigDecimal getTax() {
+        return tax;
     }
 
-    public void setCustomerLocaleName(String customerLocaleName) {
-        this.customerLocaleName = customerLocaleName;
+    public void setTax(BigDecimal tax) {
+        this.tax = tax;
     }
 
-    public String getCustomerPostcode() {
-        return customerPostcode;
+    public BigDecimal getDeliveryPrice() {
+        return deliveryPrice;
     }
 
-    public void setCustomerPostcode(String customerPostcode) {
-        this.customerPostcode = customerPostcode;
+    public void setDeliveryPrice(BigDecimal deliveryPrice) {
+        this.deliveryPrice = deliveryPrice;
     }
 
-    public String getCustomerState() {
-        return customerState;
+    public BigDecimal getPaymentFee() {
+        return paymentFee;
     }
 
-    public void setCustomerState(String customerState) {
-        this.customerState = customerState;
+    public void setPaymentFee(BigDecimal paymentFee) {
+        this.paymentFee = paymentFee;
     }
 
-    public String getCustomerStreetAddress() {
-        return customerStreetAddress;
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
     }
 
-    public void setCustomerStreetAddress(String customerStreetAddress) {
-        this.customerStreetAddress = customerStreetAddress;
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
     }
 
-    public String getCustomerTelephone() {
-        return customerTelephone;
-    }
-
-    public void setCustomerTelephone(String customerTelephone) {
-        this.customerTelephone = customerTelephone;
-    }
-
-    public String getDeliveryCity() {
-        return deliveryCity;
-    }
-
-    public void setDeliveryCity(String deliveryCity) {
-        this.deliveryCity = deliveryCity;
-    }
-
     public String getDeliveryCompany() {
         return deliveryCompany;
     }
@@ -399,14 +619,6 @@
         this.deliveryCompany = deliveryCompany;
     }
 
-    public String getDeliveryCountryName() {
-        return deliveryCountryName;
-    }
-
-    public void setDeliveryCountryName(String deliveryCountryName) {
-        this.deliveryCountryName = deliveryCountryName;
-    }
-
     public String getDeliveryDepartment() {
         return deliveryDepartment;
     }
@@ -431,44 +643,46 @@
         this.deliveryLastname = deliveryLastname;
     }
 
-    public String getDeliveryLocaleName() {
-        return deliveryLocaleName;
+    public String getDeliveryFirstnameDescription() {
+        return deliveryFirstnameDescription;
     }
 
-    public void setDeliveryLocaleName(String deliveryLocaleName) {
-        this.deliveryLocaleName = deliveryLocaleName;
+    public void setDeliveryFirstnameDescription(
+            String deliveryFirstnameDescription) {
+        this.deliveryFirstnameDescription = deliveryFirstnameDescription;
     }
 
-    public String getDeliveryMethodCode() {
-        return deliveryMethodCode;
+    public String getDeliveryLastnameDescription() {
+        return deliveryLastnameDescription;
     }
 
-    public void setDeliveryMethodCode(String deliveryMethodCode) {
-        this.deliveryMethodCode = deliveryMethodCode;
+    public void setDeliveryLastnameDescription(
+            String deliveryLastnameDescription) {
+        this.deliveryLastnameDescription = deliveryLastnameDescription;
     }
 
-    public BigDecimal getDeliveryMethodId() {
-        return deliveryMethodId;
+    public String getDeliveryStreetAddress() {
+        return deliveryStreetAddress;
     }
 
-    public void setDeliveryMethodId(BigDecimal deliveryMethodId) {
-        this.deliveryMethodId = deliveryMethodId;
+    public void setDeliveryStreetAddress(String deliveryStreetAddress) {
+        this.deliveryStreetAddress = deliveryStreetAddress;
     }
 
-    public String getDeliveryPostcode() {
-        return deliveryPostcode;
+    public String getDeliverySuburb() {
+        return deliverySuburb;
     }
 
-    public void setDeliveryPostcode(String deliveryPostcode) {
-        this.deliveryPostcode = deliveryPostcode;
+    public void setDeliverySuburb(String deliverySuburb) {
+        this.deliverySuburb = deliverySuburb;
     }
 
-    public BigDecimal getDeliveryPrice() {
-        return deliveryPrice;
+    public String getDeliveryCity() {
+        return deliveryCity;
     }
 
-    public void setDeliveryPrice(BigDecimal deliveryPrice) {
-        this.deliveryPrice = deliveryPrice;
+    public void setDeliveryCity(String deliveryCity) {
+        this.deliveryCity = deliveryCity;
     }
 
     public String getDeliveryState() {
@@ -479,12 +693,12 @@
         this.deliveryState = deliveryState;
     }
 
-    public String getDeliveryStreetAddress() {
-        return deliveryStreetAddress;
+    public String getDeliveryPostcode() {
+        return deliveryPostcode;
     }
 
-    public void setDeliveryStreetAddress(String deliveryStreetAddress) {
-        this.deliveryStreetAddress = deliveryStreetAddress;
+    public void setDeliveryPostcode(String deliveryPostcode) {
+        this.deliveryPostcode = deliveryPostcode;
     }
 
     public String getDeliveryTelephone() {
@@ -495,403 +709,252 @@
         this.deliveryTelephone = deliveryTelephone;
     }
 
-    public Date getFinishedDate() {
-        return finishedDate;
+    public BigDecimal getDeliveryStatusId() {
+        return deliveryStatusId;
     }
 
-    public void setFinishedDate(Date finishedDate) {
-        this.finishedDate = finishedDate;
+    public void setDeliveryStatusId(BigDecimal deliveryStatusId) {
+        this.deliveryStatusId = deliveryStatusId;
     }
 
-    public Date getLastModified() {
-        return lastModified;
+    public BigDecimal getDeliveryMethodId() {
+        return deliveryMethodId;
     }
 
-    public void setLastModified(Date lastModified) {
-        this.lastModified = lastModified;
+    public void setDeliveryMethodId(BigDecimal deliveryMethodId) {
+        this.deliveryMethodId = deliveryMethodId;
     }
 
-    public String getMode() {
-        return mode;
+    public String getDeliveryMethodCode() {
+        return deliveryMethodCode;
     }
 
-    public void setMode(String mode) {
-        this.mode = mode;
+    public void setDeliveryMethodCode(String deliveryMethodCode) {
+        this.deliveryMethodCode = deliveryMethodCode;
     }
 
-    public BigDecimal getOrderFormId() {
-        return orderFormId;
+    public String getDeliveryCountryCode() {
+        return deliveryCountryCode;
     }
 
-    public void setOrderFormId(BigDecimal orderFormId) {
-        this.orderFormId = orderFormId;
+    public void setDeliveryCountryCode(String deliveryCountryCode) {
+        this.deliveryCountryCode = deliveryCountryCode;
     }
 
-    public String getOrderFormNumber() {
-        return orderFormNumber;
+    public String getDeliveryLanguage() {
+        return deliveryLanguage;
     }
 
-    public void setOrderFormNumber(String orderFormNumber) {
-        this.orderFormNumber = orderFormNumber;
+    public void setDeliveryLanguage(String deliveryLanguage) {
+        this.deliveryLanguage = deliveryLanguage;
     }
 
-    public BigDecimal getOrderStatusId() {
-        return orderStatusId;
+    public BigDecimal getDeliveryCountryId() {
+        return deliveryCountryId;
     }
 
-    public void setOrderStatusId(BigDecimal orderStatusId) {
-        this.orderStatusId = orderStatusId;
+    public void setDeliveryCountryId(BigDecimal deliveryCountryId) {
+        this.deliveryCountryId = deliveryCountryId;
     }
 
-    public String getPaymentMethodCode() {
-        return paymentMethodCode;
+    public BigDecimal getDeliveryZoneId() {
+        return deliveryZoneId;
     }
 
-    public void setPaymentMethodCode(String paymentMethodCode) {
-        this.paymentMethodCode = paymentMethodCode;
+    public void setDeliveryZoneId(BigDecimal deliveryZoneId) {
+        this.deliveryZoneId = deliveryZoneId;
     }
 
-    public BigDecimal getPaymentMethodId() {
-        return paymentMethodId;
+    public Date getRequestedDate() {
+        return requestedDate;
     }
 
-    public void setPaymentMethodId(BigDecimal paymentMethodId) {
-        this.paymentMethodId = paymentMethodId;
+    public void setRequestedDate(Date requestedDate) {
+        this.requestedDate = requestedDate;
     }
 
-    public Date getPurchasedDate() {
-        return purchasedDate;
+    public Date getSentDate() {
+        return sentDate;
     }
 
-    public void setPurchasedDate(Date purchasedDate) {
-        this.purchasedDate = purchasedDate;
+    public void setSentDate(Date sentDate) {
+        this.sentDate = sentDate;
     }
 
-    public BigDecimal getSubTotalPrice() {
-        return subTotalPrice;
+    public Date getReceivedDate() {
+        return receivedDate;
     }
 
-    public void setSubTotalPrice(BigDecimal subTotalPrice) {
-        this.subTotalPrice = subTotalPrice;
+    public void setReceivedDate(Date receivedDate) {
+        this.receivedDate = receivedDate;
     }
 
-    public BigDecimal getTax() {
-        return tax;
+    public String getSlipNumber() {
+        return slipNumber;
     }
 
-    public void setTax(BigDecimal tax) {
-        this.tax = tax;
+    public void setSlipNumber(String slipNumber) {
+        this.slipNumber = slipNumber;
     }
 
-    public BigDecimal getTotalPrice() {
-        return totalPrice;
+    public BigDecimal getGiftWrap() {
+        return giftWrap;
     }
 
-    public void setTotalPrice(BigDecimal totalPrice) {
-        this.totalPrice = totalPrice;
+    public void setGiftWrap(BigDecimal giftWrap) {
+        this.giftWrap = giftWrap;
     }
 
-    public boolean isOrderCardInfo() {
-        return orderCardInfoId != null;
+    public String getGiftMessage() {
+        return giftMessage;
     }
 
-    /**
-     * @return cardCode
-     */
-    public String getCardCode() {
-        return cardCode;
+    public void setGiftMessage(String giftMessage) {
+        this.giftMessage = giftMessage;
     }
 
-    /**
-     * @param cardCode 設定する cardCode
-     */
-    public void setCardCode(String cardCode) {
-        this.cardCode = cardCode;
+    public String getEnvelopeLabel() {
+        return envelopeLabel;
     }
 
-    /**
-     * @return cardOwner
-     */
-    public String getCardOwner() {
-        return cardOwner;
+    public void setEnvelopeLabel(String envelopeLabel) {
+        this.envelopeLabel = envelopeLabel;
     }
 
-    /**
-     * @param cardOwner 設定する cardOwner
-     */
-    public void setCardOwner(String cardOwner) {
-        this.cardOwner = cardOwner;
+    public BigDecimal getOrderProductId() {
+        return orderProductId;
     }
 
-    /**
-     * @return cardNumber
-     */
-    public String getCardNumber() {
-        return cardNumber;
+    public void setOrderProductId(BigDecimal orderProductId) {
+        this.orderProductId = orderProductId;
     }
 
-    /**
-     * @param cardNumber 設定する cardNumber
-     */
-    public void setCardNumber(String cardNumber) {
-        this.cardNumber = cardNumber;
+    public BigDecimal getProductId() {
+        return productId;
     }
 
-    /**
-     * @return cardExpires
-     */
-    public String getCardExpires() {
-        return cardExpires;
+    public void setProductId(BigDecimal productId) {
+        this.productId = productId;
     }
 
-    /**
-     * @param cardExpires 設定する cardExpires
-     */
-    public void setCardExpires(String cardExpires) {
-        this.cardExpires = cardExpires;
+    public String getModel() {
+        return model;
     }
 
-    /**
-     * @return orderCardInfoId
-     */
-    public BigDecimal getOrderCardInfoId() {
-        return orderCardInfoId;
+    public void setModel(String model) {
+        this.model = model;
     }
 
-    /**
-     * @param orderCardInfoId 設定する orderCardInfoId
-     */
-    public void setOrderCardInfoId(BigDecimal orderCardInfoId) {
-        this.orderCardInfoId = orderCardInfoId;
+    public String getCode() {
+        return code;
     }
 
-    /**
-     * @return currencyCode
-     */
-    public String getCurrencyCode() {
-        return currencyCode;
+    public void setCode(String code) {
+        this.code = code;
     }
 
-    /**
-     * @param currencyCode 設定する currencyCode
-     */
-    public void setCurrencyCode(String currencyCode) {
-        this.currencyCode = currencyCode;
-    }
-
-    /**
-     * @return labelHelper
-     */
-    public LabelHelper getLabelHelper() {
-        return labelHelper;
-    }
-
-    /**
-     * @param labelHelper 設定する labelHelper
-     */
-    public void setLabelHelper(LabelHelper labelHelper) {
-        this.labelHelper = labelHelper;
-    }
-
-    /**
-     * @return orderProductItems
-     */
-    public List<Map<String, Object>> getOrderProductItems() {
-        return orderProductItems;
-    }
-
-    /**
-     * @param orderProductItems 設定する orderProductItems
-     */
-    public void setOrderProductItems(List<Map<String, Object>> orderProductItems) {
-        this.orderProductItems = orderProductItems;
-    }
-
-    /**
-     * @return model
-     */
-    public String getModel() {
-        return model;
-    }
-
-    /**
-     * @param model 設定する model
-     */
-    public void setModel(String model) {
-        this.model = model;
-    }
-
-    /**
-     * @return price
-     */
     public BigDecimal getPrice() {
         return price;
     }
 
-    /**
-     * @param price 設定する price
-     */
     public void setPrice(BigDecimal price) {
         this.price = price;
     }
 
-    /**
-     * @return finalPrice
-     */
     public BigDecimal getFinalPrice() {
         return finalPrice;
     }
 
-    /**
-     * @param finalPrice 設定する finalPrice
-     */
     public void setFinalPrice(BigDecimal finalPrice) {
         this.finalPrice = finalPrice;
     }
 
-    /**
-     * @return quantity
-     */
     public BigDecimal getQuantity() {
         return quantity;
     }
 
-    /**
-     * @param quantity 設定する quantity
-     */
     public void setQuantity(BigDecimal quantity) {
         this.quantity = quantity;
     }
 
-    /**
-     * @return code
-     */
-    public String getCode() {
-        return code;
+    public String getProductName() {
+        return productName;
     }
 
-    /**
-     * @param code 設定する code
-     */
-    public void setCode(String code) {
-        this.code = code;
+    public void setProductName(String productName) {
+        this.productName = productName;
     }
 
-    /**
-     * @return billingFirstnameDescription
-     */
-    public String getBillingFirstnameDescription() {
-        return billingFirstnameDescription;
+    public String getDisplayProductName() {
+        return displayProductName;
     }
 
-    /**
-     * @param billingFirstnameDescription 設定する billingFirstnameDescription
-     */
-    public void setBillingFirstnameDescription(
-            String billingFirstnameDescription) {
-        this.billingFirstnameDescription = billingFirstnameDescription;
+    public void setDisplayProductName(String displayProductName) {
+        this.displayProductName = displayProductName;
     }
 
-    /**
-     * @return billingLastnameDescription
-     */
-    public String getBillingLastnameDescription() {
-        return billingLastnameDescription;
+    public String getManufacturerName() {
+        return manufacturerName;
     }
 
-    /**
-     * @param billingLastnameDescription 設定する billingLastnameDescription
-     */
-    public void setBillingLastnameDescription(String billingLastnameDescription) {
-        this.billingLastnameDescription = billingLastnameDescription;
+    public void setManufacturerName(String manufacturerName) {
+        this.manufacturerName = manufacturerName;
     }
 
-    /**
-     * @return customerFirstnameDescription
-     */
-    public String getCustomerFirstnameDescription() {
-        return customerFirstnameDescription;
+    public String getDisplayManufacturerName() {
+        return displayManufacturerName;
     }
 
-    /**
-     * @param customerFirstnameDescription 設定する customerFirstnameDescription
-     */
-    public void setCustomerFirstnameDescription(
-            String customerFirstnameDescription) {
-        this.customerFirstnameDescription = customerFirstnameDescription;
+    public void setDisplayManufacturerName(String displayManufacturerName) {
+        this.displayManufacturerName = displayManufacturerName;
     }
 
-    /**
-     * @return customerLastnameDescription
-     */
-    public String getCustomerLastnameDescription() {
-        return customerLastnameDescription;
+    public BigDecimal getCardTypeId() {
+        return cardTypeId;
     }
 
-    /**
-     * @param customerLastnameDescription 設定する customerLastnameDescription
-     */
-    public void setCustomerLastnameDescription(
-            String customerLastnameDescription) {
-        this.customerLastnameDescription = customerLastnameDescription;
+    public void setCardTypeId(BigDecimal cardTypeId) {
+        this.cardTypeId = cardTypeId;
     }
 
-    /**
-     * @return deliveryFirstnameDescription
-     */
-    public String getDeliveryFirstnameDescription() {
-        return deliveryFirstnameDescription;
+    public String getCardTypeCode() {
+        return cardTypeCode;
     }
 
-    /**
-     * @param deliveryFirstnameDescription 設定する deliveryFirstnameDescription
-     */
-    public void setDeliveryFirstnameDescription(
-            String deliveryFirstnameDescription) {
-        this.deliveryFirstnameDescription = deliveryFirstnameDescription;
+    public void setCardTypeCode(String cardTypeCode) {
+        this.cardTypeCode = cardTypeCode;
     }
 
-    /**
-     * @return deliveryLastnameDescription
-     */
-    public String getDeliveryLastnameDescription() {
-        return deliveryLastnameDescription;
+    public String getCardOwner() {
+        return cardOwner;
     }
 
-    /**
-     * @param deliveryLastnameDescription 設定する deliveryLastnameDescription
-     */
-    public void setDeliveryLastnameDescription(
-            String deliveryLastnameDescription) {
-        this.deliveryLastnameDescription = deliveryLastnameDescription;
+    public void setCardOwner(String cardOwner) {
+        this.cardOwner = cardOwner;
     }
 
-    /**
-     * @return the deliveryNumber
-     */
-    public String getDeliveryNumber() {
-        return deliveryNumber;
+    public String getCardNumber() {
+        return cardNumber;
     }
 
-    /**
-     * @param deliveryNumber the deliveryNumber to set
-     */
-    public void setDeliveryNumber(String deliveryNumber) {
-        this.deliveryNumber = deliveryNumber;
+    public void setCardNumber(String cardNumber) {
+        this.cardNumber = cardNumber;
     }
 
-    /**
-     * @return the paymentFee
-     */
-    public BigDecimal getPaymentFee() {
-        return paymentFee;
+    public String getCardExpires() {
+        return cardExpires;
     }
 
-    /**
-     * @param paymentFee the paymentFee to set
-     */
-    public void setPaymentFee(BigDecimal paymentFee) {
-        this.paymentFee = paymentFee;
+    public void setCardExpires(String cardExpires) {
+        this.cardExpires = cardExpires;
     }
 
+    public String getCardPaymentType() {
+        return cardPaymentType;
+    }
+
+    public void setCardPaymentType(String cardPaymentType) {
+        this.cardPaymentType = cardPaymentType;
+    }
+
 }
\ No newline at end of file

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,154 +0,0 @@
-package jp.sf.pal.pompei.web.admin.order;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import jp.sf.pal.common.util.FacesMessageUtil;
-import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.DeliveryMethodDxo;
-import jp.sf.pal.pompei.exentity.DeliveryMethod;
-import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
-import jp.sf.pal.pompei.service.DeliveryMethodSerivce;
-
-import org.seasar.teeda.extension.annotation.takeover.TakeOver;
-import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
-
-public class DeliveryMethodEditAction implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -8204806329170528584L;
-
-    /**
-     * 
-     */
-    private DeliveryMethodEditPage deliveryMethodEditPage;
-
-    private DeliveryMethodSerivce deliveryMethodSerivce;
-
-    private DeliveryMethodDxo deliveryMethodDxo;
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> prerender() {
-        if (PompeiConstants.INSERT_MODE.equals(getDeliveryMethodEditPage()
-                .getMode())) {
-            // insert
-        } else if (PompeiConstants.UPDATE_MODE
-                .equals(getDeliveryMethodEditPage().getMode())) {
-            // update
-            if (getDeliveryMethodEditPage().getTargetId() == null) {
-                return DeliveryMethodListPage.class;
-            }
-            DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
-                    .getDeliveryMethodDescription(
-                            getDeliveryMethodEditPage().getTargetId());
-            if (dmd == null) {
-                FacesMessageUtil.addWarnMessage("could.not.find.target.item");
-                return DeliveryMethodListPage.class;
-            }
-            getDeliveryMethodDxo().convert(dmd, getDeliveryMethodEditPage());
-            getDeliveryMethodDxo().convert(dmd.getDeliveryMethod(),
-                    getDeliveryMethodEditPage());
-        } else {
-            return DeliveryMethodListPage.class;
-        }
-
-        // render FacesMessages
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-    @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,targetId")
-    public Class<?> doUpdate() {
-        if (PompeiConstants.INSERT_MODE.equals(getDeliveryMethodEditPage()
-                .getMode())) {
-            // insert
-            DeliveryMethodDescription dmd = new DeliveryMethodDescription();
-            dmd.setDeliveryMethod(new DeliveryMethod());
-            dmd.getDeliveryMethod().setDateAdded(
-                    new Timestamp(new Date().getTime()));
-            dmd.getDeliveryMethod().setLastModified(
-                    new Timestamp(new Date().getTime()));
-            getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(),
-                    dmd.getDeliveryMethod());
-            getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(), dmd);
-            //TODO LANGUAGE_ID
-            dmd.setLanguageId(new BigDecimal(1));
-            getDeliveryMethodSerivce().addDeliveryMethodDescription(dmd);
-            FacesMessageUtil.addInfoMessage("added.delivery.method");
-            return DeliveryMethodListPage.class;
-        } else if (PompeiConstants.UPDATE_MODE
-                .equals(getDeliveryMethodEditPage().getMode())) {
-            // update
-            DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
-                    .getDeliveryMethodDescription(
-                            getDeliveryMethodEditPage().getTargetId());
-            if (dmd == null) {
-                FacesMessageUtil.addWarnMessage("could.not.find.target.item");
-                return null;
-            }
-            dmd.getDeliveryMethod().setLastModified(
-                    new Timestamp(new Date().getTime()));
-            getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(),
-                    dmd.getDeliveryMethod());
-            getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(), dmd);
-            getDeliveryMethodSerivce().updateDeliveryMethodDescription(dmd);
-            FacesMessageUtil.addInfoMessage("updated.delivery.method");
-            return DeliveryMethodEditPage.class;
-        } else {
-            FacesMessageUtil.addWarnMessage("unknown.action");
-        }
-        return null;
-    }
-
-    /**
-     * @return deliveryMethodEditPage
-     */
-    public DeliveryMethodEditPage getDeliveryMethodEditPage() {
-        return deliveryMethodEditPage;
-    }
-
-    /**
-     * @param deliveryMethodEditPage 設定する deliveryMethodEditPage
-     */
-    public void setDeliveryMethodEditPage(
-            DeliveryMethodEditPage deliveryMethodEditPage) {
-        this.deliveryMethodEditPage = deliveryMethodEditPage;
-    }
-
-    /**
-     * @return deliveryMethodSerivce
-     */
-    public DeliveryMethodSerivce getDeliveryMethodSerivce() {
-        return deliveryMethodSerivce;
-    }
-
-    /**
-     * @param deliveryMethodSerivce 設定する deliveryMethodSerivce
-     */
-    public void setDeliveryMethodSerivce(
-            DeliveryMethodSerivce deliveryMethodSerivce) {
-        this.deliveryMethodSerivce = deliveryMethodSerivce;
-    }
-
-    /**
-     * @return deliveryMethodDxo
-     */
-    public DeliveryMethodDxo getDeliveryMethodDxo() {
-        return deliveryMethodDxo;
-    }
-
-    /**
-     * @param deliveryMethodDxo 設定する deliveryMethodDxo
-     */
-    public void setDeliveryMethodDxo(DeliveryMethodDxo deliveryMethodDxo) {
-        this.deliveryMethodDxo = deliveryMethodDxo;
-    }
-
-}

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,158 +0,0 @@
-package jp.sf.pal.pompei.web.admin.order;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-import org.seasar.teeda.extension.annotation.validator.Required;
-import org.seasar.teeda.extension.util.LabelHelper;
-
-public class DeliveryMethodEditPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -4656929386006745305L;
-
-    @Required
-    private String objectName;
-
-    @Required
-    private Integer status;
-
-    @Required
-    private String code;
-
-    private String mode;
-
-    @Required
-    private Integer sortOrder;
-
-    private BigDecimal targetId;
-
-    private String name;
-
-    private String description;
-
-    private LabelHelper labelHelper;
-
-    public String getObjectName() {
-        return objectName;
-    }
-
-    public void setObjectName(String deliveryClass) {
-        this.objectName = deliveryClass;
-    }
-
-    /**
-     * @return deliveryStatus
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * @param deliveryStatus 設定する deliveryStatus
-     */
-    public void setStatus(Integer deliveryStatus) {
-        this.status = deliveryStatus;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String deliveryMethodName) {
-        this.code = deliveryMethodName;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public BigDecimal getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(BigDecimal targetId) {
-        this.targetId = targetId;
-    }
-
-    /**
-     * @return deliveryMethodId
-     */
-    public BigDecimal getDeliveryMethodId() {
-        return targetId;
-    }
-
-    /**
-     * @param deliveryMethodId 設定する deliveryMethodId
-     */
-    public void setDeliveryMethodId(BigDecimal deliveryMethodId) {
-        this.targetId = deliveryMethodId;
-    }
-
-    /**
-     * @return labelHelper
-     */
-    public LabelHelper getLabelHelper() {
-        return labelHelper;
-    }
-
-    /**
-     * @param labelHelper 設定する labelHelper
-     */
-    public void setLabelHelper(LabelHelper labelHelper) {
-        this.labelHelper = labelHelper;
-    }
-
-    public String getDoUpdateValue() {
-        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;
-    }
-
-}

Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,123 +0,0 @@
-package jp.sf.pal.pompei.web.admin.order;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import jp.sf.pal.common.util.FacesMessageUtil;
-import jp.sf.pal.pompei.dxo.DeliveryMethodDxo;
-import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
-import jp.sf.pal.pompei.service.DeliveryMethodSerivce;
-
-public class DeliveryMethodListAction implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -3423909536402310913L;
-
-    /**
-     * 
-     */
-    private DeliveryMethodListPage deliveryMethodListPage;
-
-    private DeliveryMethodSerivce deliveryMethodSerivce;
-
-    private DeliveryMethodDxo deliveryMethodDxo;
-
-    public Class<?> initialize() {
-        return null;
-    }
-
-    public Class<?> prerender() {
-        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
-        getDeliveryMethodDxo().convert(
-                getDeliveryMethodSerivce().getDeliveryMethodDescriptionList(),
-                list);
-        getDeliveryMethodListPage().setDeliveryMethodItems(list);
-
-        // render FacesMessages
-        FacesMessageUtil.renderMessages();
-        return null;
-    }
-
-    public Class<?> doDelete() {
-        if (getDeliveryMethodListPage().getTargetId() == null) {
-            FacesMessageUtil.addWarnMessage("could.not.find.target.item");
-            return null;
-        }
-
-        try {
-            getDeliveryMethodSerivce().deleteDeliveryMethod(
-                    getDeliveryMethodListPage().getTargetId());
-        } catch (Exception e) {
-            FacesMessageUtil.addWarnMessage("could.not.delete.target.item");
-        }
-        return null;
-    }
-
-    public Class<?> doUpdate() {
-        if (getDeliveryMethodListPage().getTargetId() == null) {
-            FacesMessageUtil.addWarnMessage("could.not.find.target.item");
-            return null;
-        }
-        DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
-                .getDeliveryMethodDescription(
-                        getDeliveryMethodListPage().getTargetId());
-        if (dmd == null) {
-            FacesMessageUtil.addWarnMessage("target.item.does.not.exist");
-            return null;
-        }
-        return DeliveryMethodEditPage.class;
-    }
-
-    public Class<?> doAdd() {
-        return DeliveryMethodEditPage.class;
-    }
-
-    /**
-     * @return deliveryMethodListPage
-     */
-    public DeliveryMethodListPage getDeliveryMethodListPage() {
-        return deliveryMethodListPage;
-    }
-
-    /**
-     * @param deliveryMethodListPage 設定する deliveryMethodListPage
-     */
-    public void setDeliveryMethodListPage(
-            DeliveryMethodListPage deliveryMethodListPage) {
-        this.deliveryMethodListPage = deliveryMethodListPage;
-    }
-
-    /**
-     * @return deliveryMethodSerivce
-     */
-    public DeliveryMethodSerivce getDeliveryMethodSerivce() {
-        return deliveryMethodSerivce;
-    }
-
-    /**
-     * @param deliveryMethodSerivce 設定する deliveryMethodSerivce
-     */
-    public void setDeliveryMethodSerivce(
-            DeliveryMethodSerivce deliveryMethodSerivce) {
-        this.deliveryMethodSerivce = deliveryMethodSerivce;
-    }
-
-    /**
-     * @return deliveryMethodDxo
-     */
-    public DeliveryMethodDxo getDeliveryMethodDxo() {
-        return deliveryMethodDxo;
-    }
-
-    /**
-     * @param deliveryMethodDxo 設定する deliveryMethodDxo
-     */
-    public void setDeliveryMethodDxo(DeliveryMethodDxo deliveryMethodDxo) {
-        this.deliveryMethodDxo = deliveryMethodDxo;
-    }
-
-}

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,96 +0,0 @@
-package jp.sf.pal.pompei.web.admin.order;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-public class DeliveryMethodListPage implements Serializable {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2437233534751079761L;
-
-    private String code;
-
-    private BigDecimal deliveryMethodId;
-
-    private int deliveryMethodIndex;
-
-    private List<Map<String, Object>> deliveryMethodItems;
-
-    private String name;
-
-    private String mode;
-
-    private BigDecimal sortOrder;
-
-    private BigDecimal targetId;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String deliveryClass) {
-        this.code = deliveryClass;
-    }
-
-    public BigDecimal getDeliveryMethodId() {
-        return deliveryMethodId;
-    }
-
-    public void setDeliveryMethodId(BigDecimal deliveryMethodId) {
-        this.deliveryMethodId = deliveryMethodId;
-    }
-
-    public int getDeliveryMethodIndex() {
-        return deliveryMethodIndex;
-    }
-
-    public void setDeliveryMethodIndex(int deliveryMethodIndex) {
-        this.deliveryMethodIndex = deliveryMethodIndex;
-    }
-
-    public List<Map<String, Object>> getDeliveryMethodItems() {
-        return deliveryMethodItems;
-    }
-
-    public void setDeliveryMethodItems(
-            List<Map<String, Object>> deliveryMethodItems) {
-        this.deliveryMethodItems = deliveryMethodItems;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String deliveryMethodName) {
-        this.name = deliveryMethodName;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public BigDecimal getSortOrder() {
-        return sortOrder;
-    }
-
-    public void setSortOrder(BigDecimal sortOrder) {
-        this.sortOrder = sortOrder;
-    }
-
-    public BigDecimal getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(BigDecimal targetId) {
-        this.targetId = targetId;
-    }
-
-}

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,84 +1,103 @@
 package jp.sf.pal.pompei.web.admin.order;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.OrderFormDxo;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.dxo.OrderDxo;
 import jp.sf.pal.pompei.exentity.OrderCardInfo;
 import jp.sf.pal.pompei.exentity.OrderForm;
 import jp.sf.pal.pompei.exentity.OrderNotification;
-import jp.sf.pal.pompei.exentity.OrderStatusDescription;
-import jp.sf.pal.pompei.service.LanguageService;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.OrderStatus;
 import jp.sf.pal.pompei.service.OrderService;
+import jp.sf.pal.pompei.service.SystemService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class OrderConfirmAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 3702608842511957150L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderListAction.class); // LOG CODE: ?PC009?
+
     private OrderConfirmPage orderConfirmPage;
 
     private OrderService orderService;
 
-    private LanguageService languageService;
+    private SystemService systemService;
 
-    private OrderFormDxo orderFormDxo;
+    private OrderDxo orderDxo;
 
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
-        if (getOrderConfirmPage().getOrderFormId() != null
+        if (orderConfirmPage.getOrderFormId() != null
                 && (isUpdate() || isDelete())) {
-            if (isDelete()) {
-                // order form
-                OrderForm orderForm = getOrderService().getOrderForm(
-                        getOrderConfirmPage().getOrderFormId());
-                getOrderFormDxo().convert(orderForm, getOrderConfirmPage());
+            try {
+                if (isDelete()) {
+                    // order form
+                    OrderForm orderForm = orderService
+                            .getOrderForm(orderConfirmPage.getOrderFormId());
+                    orderDxo.convertFromOrderFormToPage(orderForm,
+                            orderConfirmPage);
 
-                // card info
-                if (orderForm.getOrderCardInfoId() != null) {
-                    OrderCardInfo oci = getOrderService().getOrderCardInfo(
-                            orderForm.getOrderCardInfoId());
-                    if (oci != null) {
-                        getOrderFormDxo().convert(oci, getOrderConfirmPage());
+                    // card info
+                    if (orderForm.getOrderCardInfoId() != null) {
+                        OrderCardInfo oci = orderService
+                                .getOrderCardInfo(orderForm
+                                        .getOrderCardInfoId());
+                        if (oci != null) {
+                            orderDxo.convertFromOrderCardInfoToPage(oci,
+                                    orderConfirmPage);
+                        }
                     }
+
+                    // order product
+                    List<OrderProduct> orderProductList = orderService
+                            .getOrderProductListByOrderFormId(orderForm
+                                    .getOrderFormId());
+                    List<Map<String, Object>> orderProductItems = new ArrayList<Map<String, Object>>();
+                    orderDxo.convertFromOrderProductToMap(orderProductList,
+                            orderProductItems);
+                    orderConfirmPage.setOrderProductItems(orderProductItems);
+
                 }
 
-                // order product
-                getOrderConfirmPage().setOrderProductItems(
-                        getOrderFormDxo().convertToOrderProductItems(
-                                getOrderService()
-                                        .getOrderProductListByOrderFormId(
-                                                orderForm.getOrderFormId())));
-            }
+                // order status
+                List<OrderStatus> orderStatusList = systemService
+                        .getOrderStatusList(SystemUtil.getCurrentLanguage());
+                for (OrderStatus orderStatus : orderStatusList) {
+                    if (orderStatus.getOrderStatusId().equals(
+                            orderConfirmPage.getOrderStatusId())) {
+                        orderConfirmPage.setOrderStatusName(orderStatus
+                                .getName());
+                    }
+                }
 
-            // order status
-            List<OrderStatusDescription> orderStatusDescriptionList = getOrderService()
-                    .getOrderStatusDescriptionList(
-                            getLanguageService().getDefaultLanguage()
-                                    .getLanguageId());
-            for (OrderStatusDescription osd : orderStatusDescriptionList) {
-                if (osd.getOrderStatusId().equals(
-                        getOrderConfirmPage().getOrderStatusId())) {
-                    getOrderConfirmPage().setOrderStatusName(osd.getName());
-                }
+                // render faces messages
+                FacesMessageUtil.renderMessages();
+                return null;
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage(
+                        "could.not.find.customer.info.in.customerconfirm",
+                        new Object[] { orderConfirmPage.getOrderFormId() });
+                logger.log("EPC0091", new Object[] { this.toString() }, e);
+                return OrderListPage.class;
             }
-
-            // render faces messages
-            FacesMessageUtil.renderMessages();
-            return null;
         } else {
             FacesMessageUtil.addErrorMessage("unexpected.mode.in.orderconfirm");
             return OrderListPage.class;
@@ -88,62 +107,76 @@
     @TakeOver(type = TakeOverType.INCLUDE, properties = "orderFormId")
     public Class<?> doUpdate() {
         if (isUpdate()) {
-            // order form
-            OrderForm orderForm = getOrderService().getOrderForm(
-                    getOrderConfirmPage().getOrderFormId());
-            if (orderForm == null) {
-                FacesMessageUtil.addErrorMessage(
-                        "could.not.find.order.in.orderconfirm",
-                        new Object[] { getOrderConfirmPage()
-                                .getOrderCardInfoId() });
-                return null;
-            }
-            getOrderFormDxo().convert(getOrderConfirmPage(), orderForm);
+            try {
+                // order form
+                OrderForm orderForm = orderService
+                        .getOrderForm(orderConfirmPage.getOrderFormId());
+                if (orderForm == null) {
+                    FacesMessageUtil.addErrorMessage(
+                            "could.not.find.order.in.orderconfirm",
+                            new Object[] { orderConfirmPage
+                                    .getOrderCardInfoId() });
+                    return null;
+                }
+                orderDxo
+                        .convertFromPageToOrderForm(orderConfirmPage, orderForm);
 
-            // order card info
-            OrderCardInfo orderCardInfo = null;
-            if (getOrderConfirmPage().getOrderCardInfoId() != null) {
-                orderCardInfo = getOrderService().getOrderCardInfo(
-                        getOrderConfirmPage().getOrderCardInfoId());
-                if (orderCardInfo != null) {
-                    getOrderFormDxo().convertToOrderCardInfo(
-                            getOrderConfirmPage(), orderCardInfo);
+                // order card info
+                OrderCardInfo orderCardInfo = null;
+                if (orderConfirmPage.getOrderCardInfoId() != null) {
+                    orderCardInfo = orderService
+                            .getOrderCardInfo(orderConfirmPage
+                                    .getOrderCardInfoId());
+                    if (orderCardInfo != null) {
+                        orderDxo.convertFromPageToOrderCardInfo(
+                                orderConfirmPage, orderCardInfo);
+                    }
                 }
-            }
 
-            // update
-            getOrderService().updateOrderForm(orderForm, orderCardInfo);
+                // update
+                orderService.updateOrderForm(orderForm, orderCardInfo);
 
-            FacesMessageUtil
-                    .addInfoMessage("updated.order.info.in.orderconfirm");
+                FacesMessageUtil
+                        .addInfoMessage("updated.order.info.in.orderconfirm");
 
-            List<OrderNotification> orderNotificationList = getOrderService()
-                    .getOrderNotificationListByOrderFormId(
-                            getOrderConfirmPage().getOrderFormId());
-            if (orderNotificationList != null
-                    && !orderNotificationList.isEmpty()) {
-                return OrderNotificationSelectPage.class;
-            } else {
-                return OrderListPage.class;
+                List<OrderNotification> orderNotificationList = systemService
+                        .getOrderNotificationListByOrderStatusId(orderForm
+                                .getOrderStatusId());
+                if (orderNotificationList != null
+                        && !orderNotificationList.isEmpty()) {
+                    return OrderNotificationSelectPage.class;
+                } else {
+                    return OrderListPage.class;
+                }
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage(
+                        "failed.to.update.order.in.orderconfirm",
+                        new Object[] { this.toString() });
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+                return null;
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage(
+                        "failed.to.update.order.in.orderconfirm",
+                        new Object[] { this.toString() });
+                logger.log("EPC0092", new Object[] { this.toString() }, e);
+                return null;
             }
         } else if (isDelete()) {
-            // order form
-            OrderForm orderForm = getOrderService().getOrderForm(
-                    getOrderConfirmPage().getOrderFormId());
-            if (orderForm == null) {
+            try {
+                // delete
+                orderService.deleteOrderForm(orderConfirmPage.getOrderFormId());
+
+                FacesMessageUtil
+                        .addInfoMessage("deleted.order.info.in.orderconfirm");
+                return OrderListPage.class;
+            } catch (Exception e) {
                 FacesMessageUtil.addErrorMessage(
-                        "could.not.find.order.in.orderconfirm.for.delete",
-                        new Object[] { getOrderConfirmPage()
-                                .getOrderCardInfoId() });
+                        "failed.to.delete.order.in.orderconfirm",
+                        new Object[] { this.toString() });
+                logger.log("EPC0093", new Object[] { this.toString() }, e);
                 return null;
             }
-
-            // delete
-            getOrderService().deleteOrderForm(orderForm);
-
-            FacesMessageUtil
-                    .addInfoMessage("deleted.order.info.in.orderconfirm");
-            return OrderListPage.class;
         } else {
             FacesMessageUtil
                     .addErrorMessage("unexpected.action.in.orderconfirm");
@@ -152,69 +185,43 @@
     }
 
     private boolean isUpdate() {
-        return PompeiConstants.UPDATE_MODE.equals(getOrderConfirmPage()
-                .getMode());
+        return PompeiConstants.UPDATE_MODE.equals(orderConfirmPage.getMode());
     }
 
     private boolean isDelete() {
-        return PompeiConstants.DELETE_MODE.equals(getOrderConfirmPage()
-                .getMode());
+        return PompeiConstants.DELETE_MODE.equals(orderConfirmPage.getMode());
     }
 
-    /**
-     * @return orderConfirmPage
-     */
     public OrderConfirmPage getOrderConfirmPage() {
         return orderConfirmPage;
     }
 
-    /**
-     * @param orderConfirmPage 設定する orderConfirmPage
-     */
     public void setOrderConfirmPage(OrderConfirmPage orderConfirmPage) {
         this.orderConfirmPage = orderConfirmPage;
     }
 
-    /**
-     * @return orderService
-     */
     public OrderService getOrderService() {
         return orderService;
     }
 
-    /**
-     * @param orderService 設定する orderService
-     */
     public void setOrderService(OrderService orderService) {
         this.orderService = orderService;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
+    public SystemService getSystemService() {
+        return systemService;
     }
 
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
+    public void setSystemService(SystemService systemService) {
+        this.systemService = systemService;
     }
 
-    /**
-     * @return orderFormDxo
-     */
-    public OrderFormDxo getOrderFormDxo() {
-        return orderFormDxo;
+    public OrderDxo getOrderDxo() {
+        return orderDxo;
     }
 
-    /**
-     * @param orderFormDxo 設定する orderFormDxo
-     */
-    public void setOrderFormDxo(OrderFormDxo orderFormDxo) {
-        this.orderFormDxo = orderFormDxo;
+    public void setOrderDxo(OrderDxo orderDxo) {
+        this.orderDxo = orderDxo;
     }
 
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -62,8 +62,8 @@
      */
     @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss")
     @Override
-    public void setLastModified(Date lastModified) {
-        super.setLastModified(lastModified);
+    public void setUpdatedDate(Date updatedDate) {
+        super.setUpdatedDate(updatedDate);
     }
 
     /* (non-Javadoc)

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,73 +1,81 @@
 package jp.sf.pal.pompei.web.admin.order;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.OrderFormDxo;
+import jp.sf.pal.pompei.dxo.OrderDxo;
 import jp.sf.pal.pompei.exentity.OrderCardInfo;
 import jp.sf.pal.pompei.exentity.OrderForm;
-import jp.sf.pal.pompei.exentity.OrderStatusDescription;
-import jp.sf.pal.pompei.service.LanguageService;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.OrderStatus;
 import jp.sf.pal.pompei.service.OrderService;
+import jp.sf.pal.pompei.service.SystemService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class OrderEditAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 9139379556735565068L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderEditAction.class); // LOG CODE: ?PC008?
+
     private OrderEditPage orderEditPage;
 
     private OrderService orderService;
 
-    private LanguageService languageService;
+    private SystemService systemService;
 
-    private OrderFormDxo orderFormDxo;
+    private OrderDxo orderDxo;
 
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
-        if (!isUpdate() || getOrderEditPage().getOrderFormId() == null) {
+        //TODO catch exception from db
+        if (!isUpdate() || orderEditPage.getOrderFormId() == null) {
             FacesMessageUtil.addErrorMessage("invalid.mode.in.orderedit");
             return OrderListPage.class;
         }
 
         // order form
-        OrderForm orderForm = getOrderService().getOrderForm(
-                getOrderEditPage().getOrderFormId());
-        getOrderFormDxo().convert(orderForm, getOrderEditPage());
+        OrderForm orderForm = orderService.getOrderForm(orderEditPage
+                .getOrderFormId());
+        orderDxo.convertFromOrderFormToPage(orderForm, orderEditPage);
 
         // card info
         if (orderForm.getOrderCardInfoId() != null) {
-            OrderCardInfo oci = getOrderService().getOrderCardInfo(
-                    orderForm.getOrderCardInfoId());
+            OrderCardInfo oci = orderService.getOrderCardInfo(orderForm
+                    .getOrderCardInfoId());
             if (oci != null) {
-                getOrderFormDxo().convert(oci, getOrderEditPage());
+                orderDxo.convertFromOrderCardInfoToPage(oci, orderEditPage);
             }
         }
 
         // order product
-        getOrderEditPage().setOrderProductItems(
-                getOrderFormDxo().convertToOrderProductItems(
-                        getOrderService().getOrderProductListByOrderFormId(
-                                orderForm.getOrderFormId())));
+        List<OrderProduct> orderProductList = orderService
+                .getOrderProductListByOrderFormId(orderForm.getOrderFormId());
+        List<Map<String, Object>> orderProductItems = new ArrayList<Map<String, Object>>();
+        orderDxo.convertFromOrderProductToMap(orderProductList,
+                orderProductItems);
+        orderEditPage.setOrderProductItems(orderProductItems);
 
         // order status
-        List<OrderStatusDescription> orderStatusDescriptionList = getOrderService()
-                .getOrderStatusDescriptionList(
-                        getLanguageService().getDefaultLanguage()
-                                .getLanguageId());
-        getOrderEditPage().setOrderStatusIdItems(
-                getOrderFormDxo().convertToOrderStatusItems(
-                        orderStatusDescriptionList));
+        List<OrderStatus> orderStatusList = systemService
+                .getOrderStatusList(SystemUtil.getCurrentLanguage());
+        List<Map<String, String>> orderStatusItems = new ArrayList<Map<String, String>>();
+        orderDxo.convertFromOrderStatusToLabel(orderStatusList,
+                orderStatusItems);
+        orderEditPage.setOrderStatusIdItems(orderStatusItems);
 
         // render faces messages
         FacesMessageUtil.renderMessages();
@@ -75,67 +83,43 @@
     }
 
     private boolean isUpdate() {
-        return PompeiConstants.UPDATE_MODE.equals(getOrderEditPage().getMode());
+        return PompeiConstants.UPDATE_MODE.equals(orderEditPage.getMode());
     }
 
     public Class<?> doConfirm() {
         return OrderConfirmPage.class;
     }
 
-    /**
-     * @return orderEditPage
-     */
     public OrderEditPage getOrderEditPage() {
         return orderEditPage;
     }
 
-    /**
-     * @param orderEditPage 設定する orderEditPage
-     */
     public void setOrderEditPage(OrderEditPage orderEditPage) {
         this.orderEditPage = orderEditPage;
     }
 
-    /**
-     * @return orderService
-     */
     public OrderService getOrderService() {
         return orderService;
     }
 
-    /**
-     * @param orderService 設定する orderService
-     */
     public void setOrderService(OrderService orderService) {
         this.orderService = orderService;
     }
 
-    /**
-     * @return orderFormDxo
-     */
-    public OrderFormDxo getOrderFormDxo() {
-        return orderFormDxo;
+    public SystemService getSystemService() {
+        return systemService;
     }
 
-    /**
-     * @param orderFormDxo 設定する orderFormDxo
-     */
-    public void setOrderFormDxo(OrderFormDxo orderFormDxo) {
-        this.orderFormDxo = orderFormDxo;
+    public void setSystemService(SystemService systemService) {
+        this.systemService = systemService;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
+    public OrderDxo getOrderDxo() {
+        return orderDxo;
     }
 
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
+    public void setOrderDxo(OrderDxo orderDxo) {
+        this.orderDxo = orderDxo;
     }
 
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -11,9 +11,6 @@
 
 public class OrderEditPage extends AbstractOrderEditPage {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1961839532521710788L;
 
     private List<Map<String, String>> orderStatusIdItems;
@@ -52,8 +49,9 @@
      */
     @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss")
     @Override
-    public void setLastModified(Date lastModified) {
-        super.setLastModified(lastModified);
+    public void setUpdatedDate(Date updatedDate) {
+        // TODO Auto-generated method stub
+        super.setUpdatedDate(updatedDate);
     }
 
     /* (non-Javadoc)

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -10,36 +10,39 @@
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean;
-import jp.sf.pal.pompei.dxo.OrderFormDxo;
+import jp.sf.pal.pompei.dxo.OrderDxo;
 import jp.sf.pal.pompei.dxo.PagerDxo;
 import jp.sf.pal.pompei.exentity.OrderForm;
-import jp.sf.pal.pompei.exentity.OrderStatusDescription;
+import jp.sf.pal.pompei.exentity.OrderStatus;
 import jp.sf.pal.pompei.pager.OrderFormPager;
-import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.service.OrderService;
+import jp.sf.pal.pompei.service.SystemService;
 import jp.sf.pal.pompei.util.PagingResultBeanWrapper;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class OrderListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1252504959359597358L;
 
     /**
-     *
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderListAction.class); // LOG CODE: ?PC007?
+
     private OrderListPage orderListPage;
 
     private OrderService orderService;
 
-    private LanguageService languageService;
+    private SystemService systemService;
 
-    private OrderFormDxo orderFormDxo;
+    private OrderFormPager orderFormPager;
 
     private PagerDxo pagerDxo;
 
-    private OrderFormPager orderFormPager;
+    private OrderDxo orderDxo;
 
     public Class<?> initialize() {
         return null;
@@ -57,31 +60,31 @@
         }
 
         // set page number and size
-        if (getOrderListPage().getPageNumber() != 0
-                && getOrderListPage().getPageSize() != 0) {
-            getPagerDxo().convert(getOrderListPage(), getOrderFormPager());
+        if (orderListPage.getPageNumber() != 0
+                && orderListPage.getPageSize() != 0) {
+            pagerDxo.convert(orderListPage, orderFormPager);
         }
 
         // sort order
-        if (getOrderListPage().getSortOrder() != null) {
-            getOrderFormPager().setSortOrder(getOrderListPage().getSortOrder());
+        if (orderListPage.getSortOrder() != null) {
+            orderFormPager.setSortOrder(orderListPage.getSortOrder());
         } else {
-            String sortOrder = getOrderFormPager().getSortOrder();
+            String sortOrder = orderFormPager.getSortOrder();
             if (sortOrder == null) {
                 sortOrder = PompeiConstants.ORDER_STATUS_ASC_ORDER;
-                getOrderFormPager().setSortOrder(sortOrder);
+                orderFormPager.setSortOrder(sortOrder);
             }
-            getOrderListPage().setSortOrder(sortOrder);
+            orderListPage.setSortOrder(sortOrder);
         }
 
         // order from 
-        PagingResultBean<OrderForm> orderFormList = getOrderService()
-                .getOrderFormListByPager(getOrderFormPager());
-        List<Map<String, Object>> items = getOrderFormDxo().convert(
-                orderFormList);
-        getOrderListPage().setOrderFormItems(items);
-        getPagerDxo().convert(new PagingResultBeanWrapper(orderFormList),
-                getOrderListPage());
+        PagingResultBean<OrderForm> orderFormList = orderService
+                .getOrderFormListByPager(orderFormPager);
+        List<Map<String, Object>> items = new ArrayList<Map<String, Object>>();
+        orderDxo.convertFromOrderFormToMap(orderFormList, items);
+        orderListPage.setOrderFormItems(items);
+        pagerDxo.convert(new PagingResultBeanWrapper(orderFormList),
+                orderListPage);
 
         // page range
         orderFormList.setPageRangeSize(PompeiConstants.DEFAULT_PAGE_RANGE_SIZE);
@@ -93,34 +96,34 @@
             map.put("pageNumber", new Integer(i));
             pageNumberItems.add(map);
         }
-        getOrderListPage().setPageNumberItems(pageNumberItems);
+        orderListPage.setPageNumberItems(pageNumberItems);
 
         // order status
-        List<OrderStatusDescription> orderStatusDescriptionList = getOrderService()
-                .getOrderStatusDescriptionList(
-                        getLanguageService().getDefaultLanguage()
-                                .getLanguageId());
+        List<OrderStatus> orderStatusList = systemService
+                .getOrderStatusList(SystemUtil.getCurrentLanguage());
         List<Map<String, Object>> orderStatusCountItems = new ArrayList<Map<String, Object>>();
         Map<BigDecimal, String> orderStatusNameMap = new HashMap<BigDecimal, String>();
         List<Map<String, String>> orderStatusIdItems = new ArrayList<Map<String, String>>();
-        for (OrderStatusDescription osd : orderStatusDescriptionList) {
-            orderStatusNameMap.put(osd.getOrderStatusId(), osd.getName());
+        for (OrderStatus orderStatus : orderStatusList) {
+            orderStatusNameMap.put(orderStatus.getOrderStatusId(), orderStatus
+                    .getName());
             // orderStatusCountItems
             Map<String, Object> map = new HashMap<String, Object>();
-            map.put("orderStatusId", osd.getOrderStatusId());
-            map.put("name", osd.getName());
-            map.put("count", new BigDecimal(getOrderService()
-                    .getOrderFormCountByOrderStatus(osd.getOrderStatusId())));
+            map.put("orderStatusId", orderStatus.getOrderStatusId());
+            map.put("name", orderStatus.getName());
+            map.put("count", new BigDecimal(orderService
+                    .getOrderFormCountByOrderStatus(orderStatus
+                            .getOrderStatusId())));
             orderStatusCountItems.add(map);
             // orderStatusIdItems
             Map<String, String> map2 = new HashMap<String, String>();
-            map2.put("label", osd.getName());
-            map2.put("value", osd.getOrderStatusId().toString());
+            map2.put("label", orderStatus.getName());
+            map2.put("value", orderStatus.getOrderStatusId().toString());
             orderStatusIdItems.add(map2);
         }
-        getOrderListPage().setOrderStatusNameMap(orderStatusNameMap);
-        getOrderListPage().setOrderStatusCountItems(orderStatusCountItems);
-        getOrderListPage().setOrderStatusIdItems(orderStatusIdItems);
+        orderListPage.setOrderStatusNameMap(orderStatusNameMap);
+        orderListPage.setOrderStatusCountItems(orderStatusCountItems);
+        orderListPage.setOrderStatusIdItems(orderStatusIdItems);
 
         // render FacesMessage
         FacesMessageUtil.renderMessages();
@@ -128,7 +131,7 @@
     }
 
     private boolean isDelete() {
-        if (PompeiConstants.DELETE_MODE.equals(getOrderListPage().getMode())) {
+        if (PompeiConstants.DELETE_MODE.equals(orderListPage.getMode())) {
             return true;
         }
         return false;
@@ -139,21 +142,14 @@
      * @return
      */
     public Class<?> doSearch() {
-        getOrderFormPager().setOrderStatusId(
-                getOrderListPage().getOrderStatusId());
+        orderFormPager.setOrderStatusId(orderListPage.getOrderStatusId());
         return null;
     }
 
-    /**
-     * @return orderListPage
-     */
     public OrderListPage getOrderListPage() {
         return orderListPage;
     }
 
-    /**
-     * @param orderListPage 設定する orderListPage
-     */
     public void setOrderListPage(OrderListPage orderListPage) {
         this.orderListPage = orderListPage;
     }
@@ -166,54 +162,36 @@
         this.orderService = orderService;
     }
 
-    public OrderFormDxo getOrderFormDxo() {
-        return orderFormDxo;
+    public SystemService getSystemService() {
+        return systemService;
     }
 
-    public void setOrderFormDxo(OrderFormDxo ordersDxo) {
-        this.orderFormDxo = ordersDxo;
+    public void setSystemService(SystemService systemService) {
+        this.systemService = systemService;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
-    /**
-     * @return orderFormPager
-     */
     public OrderFormPager getOrderFormPager() {
         return orderFormPager;
     }
 
-    /**
-     * @param orderFormPager 設定する orderFormPager
-     */
     public void setOrderFormPager(OrderFormPager orderFormPager) {
         this.orderFormPager = orderFormPager;
     }
 
-    /**
-     * @return pagerDxo
-     */
     public PagerDxo getPagerDxo() {
         return pagerDxo;
     }
 
-    /**
-     * @param pagerDxo 設定する pagerDxo
-     */
     public void setPagerDxo(PagerDxo pagerDxo) {
         this.pagerDxo = pagerDxo;
     }
 
+    public OrderDxo getOrderDxo() {
+        return orderDxo;
+    }
+
+    public void setOrderDxo(OrderDxo orderDxo) {
+        this.orderDxo = orderDxo;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,71 +1,107 @@
 package jp.sf.pal.pompei.web.admin.order;
 
 import java.io.Serializable;
+import java.io.StringWriter;
+import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
-import jp.sf.pal.common.CommonException;
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiException;
+import jp.sf.pal.pompei.dxo.OrderDxo;
+import jp.sf.pal.pompei.entity.notification.order.Order;
 import jp.sf.pal.pompei.exentity.OrderForm;
 import jp.sf.pal.pompei.exentity.OrderNotification;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.Product;
 import jp.sf.pal.pompei.service.OrderService;
+import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.service.SystemService;
+import jp.sf.pal.pompei.util.SystemUtil;
+import jp.sf.pal.pompei.util.VelocityUtil;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.seasar.framework.log.Logger;
+
 public class OrderNotificationSelectAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -8099143241154630299L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(OrderListAction.class); // LOG CODE: ?PC010?
+
     private OrderNotificationSelectPage orderNotificationSelectPage;
 
+    private ProductService productService;
+
     private OrderService orderService;
 
+    private SystemService systemService;
+
+    private OrderDxo orderDxo;
+
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
-        if (getOrderNotificationSelectPage().getOrderFormId() == null) {
+        if (orderNotificationSelectPage.getOrderFormId() == null) {
             FacesMessageUtil.addErrorMessage("orderformid.is.null");
             return OrderListPage.class;
         }
-        OrderForm orderForm = getOrderService().getOrderForm(
-                getOrderNotificationSelectPage().getOrderFormId());
+        OrderForm orderForm = orderService
+                .getOrderForm(orderNotificationSelectPage.getOrderFormId());
         if (orderForm == null) {
             FacesMessageUtil.addErrorMessage("could.not.find.orderformid");
             return OrderListPage.class;
         }
 
-        List<OrderNotification> orderNotificationList = getOrderService()
-                .getOrderNotificationListByOrderFormId(
-                        orderForm.getOrderFormId());
-        List<Map<String, String>> orderNotificationIdsItems = new ArrayList<Map<String, String>>();
-        for (OrderNotification orderNotification : orderNotificationList) {
-            Map<String, String> map = new HashMap<String, String>();
-            StringBuilder sb = new StringBuilder();
-            //TODO alignment?
-            sb.append(orderNotification.getTemplateName()).append(" (");
-            if (orderNotification.getEmailAddress() != null) {
-                sb.append(orderNotification.getEmailAddress());
-            } else {
-                sb.append(getOrderNotificationSelectPage().getLabelHelper()
-                        .getLabelValue("to_customer"));
+        try {
+            List<OrderNotification> orderNotificationList = systemService
+                    .getOrderNotificationListByOrderStatusId(orderForm
+                            .getOrderStatusId());
+            List<Map<String, String>> orderNotificationIdsItems = new ArrayList<Map<String, String>>();
+            for (OrderNotification orderNotification : orderNotificationList) {
+                Map<String, String> map = new HashMap<String, String>();
+                StringBuilder sb = new StringBuilder();
+                //TODO alignment?
+                sb.append(orderNotification.getTemplateName()).append(" (");
+                if (orderNotification.getEmailAddress() != null) {
+                    sb.append(orderNotification.getEmailAddress());
+                } else {
+                    sb.append(orderNotificationSelectPage.getLabelHelper()
+                            .getLabelValue("to_customer"));
+                }
+                sb.append(")");
+                map.put(PompeiConstants.LABEL, sb.toString());
+                map.put(PompeiConstants.VALUE, orderNotification
+                        .getOrderNotificationId().toString());
+                orderNotificationIdsItems.add(map);
             }
-            sb.append(")");
-            map.put(PompeiConstants.LABEL, sb.toString());
-            map.put(PompeiConstants.VALUE, orderNotification
-                    .getOrderNotificationId().toString());
-            orderNotificationIdsItems.add(map);
+            orderNotificationSelectPage
+                    .setOrderNotificationIdsItems(orderNotificationIdsItems);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage(
+                    "could.not.find.order.notification", new Object[] { this
+                            .toString() });
+            logger.log("EPC0101", new Object[] { this.toString() }, e);
         }
-        getOrderNotificationSelectPage().setOrderNotificationIdsItems(
-                orderNotificationIdsItems);
 
         // render faces messages
         FacesMessageUtil.renderMessages();
@@ -74,13 +110,13 @@
 
     public Class<?> doSend() {
         try {
-            getOrderService().sendOrderNotifications(
-                    getOrderNotificationSelectPage().getOrderFormId(),
-                    getOrderNotificationSelectPage().getOrderNotificationIds());
+            sendOrderNotifications(
+                    orderNotificationSelectPage.getOrderFormId(),
+                    orderNotificationSelectPage.getOrderNotificationIds());
             FacesMessageUtil.addInfoMessage("sent.order.notifications");
             //TODO test
             //            return OrderListPage.class;
-        } catch (CommonException e) {
+        } catch (PompeiException e) {
             if (e.getArgs() != null) {
                 FacesMessageUtil.addErrorMessage(e.getMessageId(), e.getArgs());
             } else {
@@ -90,33 +126,150 @@
         return null;
     }
 
-    /**
-     * @return the orderNotificationSelectPage
-     */
+    private void sendOrderNotifications(BigDecimal orderFormId,
+            BigDecimal[] orderNotificationIds) throws PompeiException {
+        if (orderFormId == null) {
+            throw new PompeiException("orderFormId.is.null.in.notification");
+        }
+        OrderForm orderForm = orderService.getOrderForm(orderFormId);
+        if (orderForm == null) {
+            throw new PompeiException(
+                    "could.not.find.orderformid.in.notification");
+        }
+        List<String> errors = new ArrayList<String>();
+        for (BigDecimal orderNotificationId : orderNotificationIds) {
+            OrderNotification orderNotification = systemService
+                    .getOrderNotification(orderNotificationId);
+            if (orderNotification != null) {
+                String to = orderNotification.getEmailAddress();
+                if (to == null || "".equals(to)) {
+                    to = orderForm.getCustomerEmailAddress();
+                }
+                try {
+                    sendOrderNotification(orderForm, to, SystemUtil
+                            .getAdministratorEmail(), orderNotification
+                            .getTemplateName());
+                } catch (Exception e) {
+                    logger.log("EPC0102", new Object[] {}, e);
+                    errors.add(orderNotification.getTemplateName() + "(" + to
+                            + ")");
+                }
+            }
+        }
+        if (!errors.isEmpty()) {
+            String templates = StringUtils.join(errors.toArray(), ", ");
+            throw new PompeiException("failed.to.send.some.order.notification",
+                    new String[] { templates });
+        }
+    }
+
+    private void sendOrderNotification(OrderForm orderForm, String to,
+            String from, String templateName) throws PompeiException {
+        try {
+            Order order = new Order();
+            orderDxo.convertFromOrderFormToOrder(orderForm, order);
+            List<OrderProduct> orderProductList = orderService
+                    .getOrderProductListByOrderFormId(orderForm
+                            .getOrderFormId());
+            for (OrderProduct orderProduct : orderProductList) {
+                //TODO i18n: pass language for user
+                Product productData = productService.getProduct(orderProduct
+                        .getProductId(), orderForm.getCustomerLanguage());
+                jp.sf.pal.pompei.entity.notification.order.Product product = new jp.sf.pal.pompei.entity.notification.order.Product();
+                orderDxo.convertFromProductToNotification(productData, product);
+                orderDxo.convertFromOrderProductToNotification(orderProduct, product);
+                order.addProduct(product);
+            }
+
+            // set velocity context
+            VelocityContext context = new VelocityContext();
+            context.put("order", order);
+
+            VelocityUtil.init();
+            StringWriter sw = new StringWriter();
+            String templatePath = SystemUtil
+                    .getOrderNotificationTemplatePath(templateName);
+            // TODO i18n: encoding
+            Template template = VelocityUtil.getTemplate(templatePath, "UTF-8");
+
+            template.merge(context, sw);
+
+            String content = sw.toString();
+            if (content == null) {
+                throw new PompeiException("notification.content.is.null");
+            }
+            int index = content.indexOf("\n");
+            String subject = null;
+            String body = null;
+            if (index != -1) {
+                subject = content.substring(0, index);
+                body = content.substring(index);
+            } else {
+                // TODO should throw exception?
+                subject = content;
+                body = content;
+            }
+
+            Properties props = System.getProperties();
+            // set smtp server
+            props.put("mail.smtp.host", SystemUtil.getSmtpHost());
+            Session session = Session.getDefaultInstance(props, null);
+            MimeMessage mimeMessage = new MimeMessage(session);
+            mimeMessage.setFrom(new InternetAddress(from));
+            mimeMessage.setRecipients(Message.RecipientType.TO, to);
+            //TODO i18n: encoding
+            mimeMessage.setSubject(subject, "iso-2022-jp");
+            //TODO i18n: encoding
+            mimeMessage.setText(body, "iso-2022-jp");
+            mimeMessage.setHeader("Content-Type", "text/plain");
+            mimeMessage.setSentDate(new Date());
+
+            Transport.send(mimeMessage);
+        } catch (Exception e) {
+            throw new PompeiException("faild.to.send.order.notification", e);
+        }
+
+    }
+
     public OrderNotificationSelectPage getOrderNotificationSelectPage() {
         return orderNotificationSelectPage;
     }
 
-    /**
-     * @param orderNotificationSelectPage the orderNotificationSelectPage to set
-     */
     public void setOrderNotificationSelectPage(
             OrderNotificationSelectPage orderNotificationSelectPage) {
         this.orderNotificationSelectPage = orderNotificationSelectPage;
     }
 
-    /**
-     * @return the orderService
-     */
+    public ProductService getProductService() {
+        return productService;
+    }
+
+    public void setProductService(ProductService productService) {
+        this.productService = productService;
+    }
+
     public OrderService getOrderService() {
         return orderService;
     }
 
-    /**
-     * @param orderService the orderService to set
-     */
     public void setOrderService(OrderService orderService) {
         this.orderService = orderService;
     }
 
+    public SystemService getSystemService() {
+        return systemService;
+    }
+
+    public void setSystemService(SystemService systemService) {
+        this.systemService = systemService;
+    }
+
+    public OrderDxo getOrderDxo() {
+        return orderDxo;
+    }
+
+    public void setOrderDxo(OrderDxo orderDxo) {
+        this.orderDxo = orderDxo;
+    }
+
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -2,83 +2,62 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.teeda.extension.annotation.takeover.TakeOver;
-import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
-
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CategoryDxo;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.dxo.ProductDxo;
 import jp.sf.pal.pompei.exentity.Category;
-import jp.sf.pal.pompei.exentity.CategoryDescription;
-import jp.sf.pal.pompei.service.CategoryService;
-import jp.sf.pal.pompei.service.LanguageService;
+import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+
 public class CategoryEditAction implements Serializable {
-    /**
-     * 
-     */
+
     private static final long serialVersionUID = 286938960714084338L;
 
-    private CategoryService categoryService;
-
     /**
-     * dxo
+     * Logger for this class
      */
-    private CategoryDxo categoryDxo;
+    private static final Logger logger = Logger
+            .getLogger(CategoryEditAction.class); // LOG CODE: ?PC002?
 
+    private ProductService productService;
+
+    private ProductDxo productDxo;
+
     /**
      * カテゴリ編集ページ
      */
     private CategoryEditPage categoryEditPage;
 
-    private LanguageService languageService;
-
-    /**
-    * @return languageService
-    */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
-    /**
-     * @return categoryEditPage
-     */
-    public CategoryEditPage getCategoryEditPage() {
-        return categoryEditPage;
-    }
-
-    /**
-     * @param categoryEditPage 設定する categoryEditPage
-     */
-    public void setCategoryEditPage(CategoryEditPage categoryEditPage) {
-        this.categoryEditPage = categoryEditPage;
-    }
-
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
         if (categoryEditPage.getMode().equals(PompeiConstants.UPDATE_MODE)) {
-            // update
-            CategoryDescription cd = categoryService.getCategoryDescription(
-                    categoryEditPage.getTargetId(), getLanguageService()
-                            .getDefaultLanguage().getLanguageId());
+            try {
+                // update
+                Category cd = productService.getCategory(categoryEditPage
+                        .getTargetId(), SystemUtil.getDefaultLanguage());
 
-            getCategoryDxo().convert(cd, getCategoryEditPage());
-            getCategoryDxo().convert(cd.getCategory(), getCategoryEditPage());
+                productDxo.convertFromCategoryToPage(cd, categoryEditPage);
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("could.not.load.category");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+                return CategoryListPage.class;
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("could.not.load.category");
+                logger.log("EPC0021", new Object[] { this.toString() }, e);
+                return CategoryListPage.class;
+            }
 
         } else {
             // insert
@@ -100,63 +79,75 @@
 
         Map<String, Object> m = list.get(index);
         BigDecimal parentId = (BigDecimal) m.get(PompeiConstants.CATEGORY_ID);
+        categoryEditPage.setParentId(parentId);
 
         if (categoryEditPage.getMode().equals(PompeiConstants.INSERT_MODE)) {
             // insert
-            CategoryDescription d = new CategoryDescription();
-            categoryDxo.convert(getCategoryEditPage(), d);
-            Category c = new Category();
-            // TODO dxo
-            c.setCategoryId(categoryEditPage.getTargetId());
-            c.setImage(categoryEditPage.getImage());
-            c.setSortOrder(categoryEditPage.getSortOrder());
-            d.setCategory(c);
-            c.setParentId(parentId);
-            categoryService.addCategoryDescription(d);
+            Category category = new Category();
+            productDxo.convertFromPageToCategory(categoryEditPage, category);
 
-            categoryEditPage.setTargetId(d.getCategoryId());
+            try {
+                productService.addCategory(category);
 
-            FacesMessageUtil.addInfoMessage("added.category.in.categoryedit");
+                categoryEditPage.setTargetId(category.getCategoryId());
+
+                FacesMessageUtil
+                        .addInfoMessage("added.category.in.categoryedit");
+                return CategoryListPage.class;
+            } catch (PompeiDBException e) {
+                FacesMessageUtil
+                        .addErrorMessage("failed.to.add.category.in.categoryedit");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil
+                        .addErrorMessage("failed.to.add.category.in.categoryedit");
+                logger.log("EPC0022", new Object[] { this.toString() }, e);
+            }
         } else {
-            // update
-            CategoryDescription d = getCategoryService()
-                    .getCategoryDescription(
-                            categoryEditPage.getTargetId(),
-                            getLanguageService().getDefaultLanguage()
-                                    .getLanguageId());
-            categoryDxo.convert(getCategoryEditPage(), d);
-            Category c = d.getCategory();
-            // TODO dxo
-            c.setCategoryId(categoryEditPage.getTargetId());
-            c.setImage(categoryEditPage.getImage());
-            c.setSortOrder(categoryEditPage.getSortOrder());
-            c.setLastModified(new Timestamp(new Date().getTime()));
-            c.setParentId(parentId);
-            categoryService.updateCategoryDescription(d);
+            try { // update
+                Category category = productService.getCategory(categoryEditPage
+                        .getTargetId(), SystemUtil.getDefaultLanguage());
+                productDxo
+                        .convertFromPageToCategory(categoryEditPage, category);
 
-            FacesMessageUtil.addInfoMessage("updated.category.in.categoryedit");
+                productService.updateCategory(category);
+
+                FacesMessageUtil
+                        .addInfoMessage("updated.category.in.categoryedit");
+                return CategoryListPage.class;
+            } catch (PompeiDBException e) {
+                FacesMessageUtil
+                        .addErrorMessage("failed.to.update.category.in.categoryedit");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil
+                        .addErrorMessage("failed.to.update.category.in.categoryedit");
+                logger.log("EPC0023", new Object[] { this.toString() }, e);
+            }
         }
 
         //needed?
         //        categoryEditPage.setTargetId(parentId);
 
-        return CategoryListPage.class;
+        return null;
     }
 
-    public CategoryService getCategoryService() {
-        return categoryService;
+    public ProductService getProductService() {
+        return productService;
     }
 
-    public void setCategoryService(CategoryService categoryListService) {
-        this.categoryService = categoryListService;
+    public void setProductService(ProductService productService) {
+        this.productService = productService;
     }
 
-    public CategoryDxo getCategoryDxo() {
-        return categoryDxo;
+    public CategoryEditPage getCategoryEditPage() {
+        return categoryEditPage;
     }
 
-    public void setCategoryDxo(CategoryDxo dxo) {
-        this.categoryDxo = dxo;
+    public void setCategoryEditPage(CategoryEditPage categoryEditPage) {
+        this.categoryEditPage = categoryEditPage;
     }
 
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -11,9 +11,6 @@
 
 public class CategoryEditPage implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -1500068209788825609L;
 
     public static final String categoriesName_TRequiredValidator = null;
@@ -35,17 +32,27 @@
     @SubapplicationScope
     private List<Map<String, Object>> breadcrumbItems;
 
-    private String image;
-
     @Required
     private String name;
 
-    private String description;
-
     private BigDecimal parentId;
 
     private BigDecimal sortOrder;
 
+    private String pageId;
+
+    private String templateName;
+
+    private String keyword;
+
+    private String description;
+
+    private String content1;
+
+    private String content2;
+
+    private String content3;
+
     /**
      * 処理モード
      */
@@ -55,14 +62,6 @@
 
     private LabelHelper labelHelper;
 
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String categoriesImage) {
-        this.image = categoriesImage;
-    }
-
     public String getName() {
         return name;
     }
@@ -150,4 +149,52 @@
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public String getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getContent1() {
+        return content1;
+    }
+
+    public void setContent1(String content1) {
+        this.content1 = content1;
+    }
+
+    public String getContent2() {
+        return content2;
+    }
+
+    public void setContent2(String content2) {
+        this.content2 = content2;
+    }
+
+    public String getContent3() {
+        return content3;
+    }
+
+    public void setContent3(String content3) {
+        this.content3 = content3;
+    }
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -7,51 +7,32 @@
 import java.util.List;
 import java.util.Map;
 
+import org.seasar.framework.log.Logger;
+
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CategoryDxo;
-import jp.sf.pal.pompei.exentity.CategoryDescription;
-import jp.sf.pal.pompei.service.CategoryService;
-import jp.sf.pal.pompei.service.LanguageService;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.exentity.Category;
+import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
 public class CategoryListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -8616177799734159313L;
 
     /**
-     *
+     * Logger for this class
      */
-    private CategoryDxo dxo;
+    private static final Logger logger = Logger
+            .getLogger(CategoryListAction.class); // LOG CODE: ?PC001?
 
-    /**
-     *
-     */
     private CategoryListPage categoryListPage;
 
-    /**
-     *
-     */
-    private CategoryService categoryService;
+    private ProductService productService;
 
-    private LanguageService languageService;
+    private ProductDxo productDxo;
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
     public Class<?> initialize() {
         return null;
     }
@@ -71,8 +52,8 @@
             m
                     .put(PompeiConstants.CATEGORY_ID,
                             PompeiConstants.ROOT_CATEGORY_ID);
-            m.put(PompeiConstants.BREADCRUMB, getCategoryListPage()
-                    .getLabelHelper().getLabelValue("top"));
+            m.put(PompeiConstants.BREADCRUMB, categoryListPage.getLabelHelper()
+                    .getLabelValue("top"));
             list.add(m);
             categoryListPage.setBreadcrumbItems(list);
 
@@ -88,12 +69,11 @@
         }
 
         //カテゴリ一覧の取得
-        List<CategoryDescription> list = categoryService
-                .getSubCategoryDescriptionList(categoryListPage.getParentId(),
-                        getLanguageService().getDefaultLanguage()
-                                .getLanguageId());
+        List<Category> list = productService
+                .getSubCategoryList(categoryListPage.getParentId(), SystemUtil
+                        .getDefaultLanguage());
         List<Map<String, Object>> cList = new ArrayList<Map<String, Object>>();
-        dxo.convert(list, cList);
+        productDxo.convertFromCategoryToMap(list, cList);
         categoryListPage.setCategoryItems(cList);
 
         // render FacesMessages
@@ -108,44 +88,30 @@
     public Class<?> doDelete() {
 
         //選択行を取得
-        BigDecimal id = getCategoryListPage().getTargetId();
+        BigDecimal id = categoryListPage.getTargetId();
         // TODO check if id is null
 
-        if (categoryService.hasChildCategory(id)) {
+        if (productService.hasChildCategory(id)) {
             FacesMessageUtil.addWarnMessage("has.child.categories");
             return null;
         }
 
-        // TODO check related tables
-        categoryService.deleteCategory(id);
+        try {
+            // TODO check related tables
+            productService.deleteCategory(id);
 
-        // TODO redirect wrong page??
+            // TODO redirect wrong page??
 
-        FacesMessageUtil.addInfoMessage("deleted.category");
-        return CategoryListPage.class;
+            FacesMessageUtil.addInfoMessage("deleted.category");
+            return CategoryListPage.class;
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.category");
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.category");
+        }
+        return null;
     }
 
-    /**
-     * @return categoryListPage
-     */
-    public CategoryListPage getCategoryListPage() {
-        return categoryListPage;
-    }
-
-    /**
-     * @param categoryListPage 設定する categoryListPage
-     */
-    public void setCategoryListPage(CategoryListPage categoryListPage) {
-        this.categoryListPage = categoryListPage;
-    }
-
-    /**
-     * @return categoryListService
-     */
-    public CategoryService getCategoryService() {
-        return categoryService;
-    }
-
     private List<Map<String, Object>> setBreadcrumb(
             List<Map<String, Object>> breadcrumbItems, BigDecimal id) {
         List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
@@ -156,38 +122,52 @@
             }
         }
 
-        CategoryDescription cd = categoryService.getCategoryDescription(
-                categoryListPage.getCategoryId(), getLanguageService()
-                        .getDefaultLanguage().getLanguageId());
+        Category category = null;
+        try {
+            category = productService.getCategory(categoryListPage
+                    .getCategoryId(), SystemUtil.getDefaultLanguage());
+        } catch (PompeiDBException e) {
+            FacesMessageUtil
+                    .addWarnMessage("could.not.load.category.for.breadcrumb");
+        }
 
-        if (cd == null) {
+        if (category == null) {
             return list;
         }
 
         Map<String, Object> m = new HashMap<String, Object>();
         m.put(PompeiConstants.CATEGORY_ID, id);
-        m.put(PompeiConstants.BREADCRUMB, cd.getName());
+        m.put(PompeiConstants.BREADCRUMB, category.getName());
         list.add(m);
         return list;
     }
 
-    /**
-     * @param categoryListService 設定する categoryListService
-     */
-    public void setCategoryService(CategoryService categoryListService) {
-        this.categoryService = categoryListService;
+    public Class<?> doUpdate() {
+        return CategoryEditPage.class;
     }
 
-    public CategoryDxo getDxo() {
-        return dxo;
+    public CategoryListPage getCategoryListPage() {
+        return categoryListPage;
     }
 
-    public void setDxo(CategoryDxo dxo) {
-        this.dxo = dxo;
+    public void setCategoryListPage(CategoryListPage categoryListPage) {
+        this.categoryListPage = categoryListPage;
     }
 
-    public Class<?> doUpdate() {
-        return CategoryEditPage.class;
+    public ProductService getProductService() {
+        return productService;
     }
 
+    public void setProductService(ProductService productService) {
+        this.productService = productService;
+    }
+
+    public ProductDxo getProductDxo() {
+        return productDxo;
+    }
+
+    public void setProductDxo(ProductDxo productDxo) {
+        this.productDxo = productDxo;
+    }
+
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -28,7 +28,7 @@
 
     private BigDecimal categoryId;
 
-    private String image;
+    private String pageId;
 
     private String name;
 
@@ -54,14 +54,6 @@
 
     private LabelHelper labelHelper;
 
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String categoriesImage) {
-        this.image = categoriesImage;
-    }
-
     public String getName() {
         return name;
     }
@@ -171,4 +163,12 @@
     public void setLabelHelper(LabelHelper labelHelper) {
         this.labelHelper = labelHelper;
     }
+
+    public String getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
+    }
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -3,35 +3,34 @@
 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.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.ManufacturerDxo;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.dxo.ProductDxo;
 import jp.sf.pal.pompei.exentity.Manufacturer;
-import jp.sf.pal.pompei.exentity.ManufacturerDescription;
-import jp.sf.pal.pompei.service.LanguageService;
-import jp.sf.pal.pompei.service.ManufacturerService;
+import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+
 public class ManufacturerEditAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -5265247570402988033L;
 
     /**
-     *
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(ManufacturerEditAction.class); // LOG CODE: ?PC004?
+
     private ManufacturerEditPage manufacturerEditPage;
 
-    private LanguageService languageService;
+    private ProductService productService;
 
-    private ManufacturerService manufacturerService;
+    private ProductDxo productDxo;
 
-    private ManufacturerDxo manufacturersDxo;
-
     public Class<?> initialize() {
 
         return null;
@@ -45,14 +44,28 @@
 
     public Class<?> prerender() {
         if (isUpdate()) {
-            BigDecimal id = manufacturerEditPage.getManufacturerId();
-            ManufacturerDescription info = manufacturerService
-                    .getManufactureDescription(id, getLanguageService()
-                            .getDefaultLanguage().getLanguageId());
-            if (info != null) {
-                manufacturersDxo.convert(info, manufacturerEditPage);
+            Manufacturer manufacturer=null;
+            try {
+                manufacturer = productService.getManufacturer(
+                        manufacturerEditPage.getManufacturerId(), SystemUtil
+                                .getDefaultLanguage());
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("could.not.find.manufacturer");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+                return ManufacturerListPage.class;
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("could.not.find.manufacturer");
+                logger.log("EPC0041", new Object[] { this.toString() }, e);
+                return ManufacturerListPage.class;
+            }
+
+            if (manufacturer != null) {
+                productDxo.convertFromManufacturerToPage(manufacturer,
+                        manufacturerEditPage);
             } else {
-                //TODO exception and then move to a list page
+                FacesMessageUtil.addErrorMessage("could.not.find.manufacturer");
+                return ManufacturerListPage.class;
             }
         } else {
             manufacturerEditPage.setMode(PompeiConstants.INSERT_MODE);
@@ -63,83 +76,51 @@
     @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,manufacturerId")
     public Class<?> doUpdate() {
         if (isUpdate()) {
-            // update
-            BigDecimal id = getManufacturerEditPage().getManufacturerId();
-            ManufacturerDescription info = getManufacturerService()
-                    .getManufactureDescription(
-                            id,
-                            getLanguageService().getDefaultLanguage()
-                                    .getLanguageId());
-            getManufacturersDxo().convert(getManufacturerEditPage(), info);
-            Manufacturer manufacturers = info.getManufacturer();
-            getManufacturersDxo().convert(getManufacturerEditPage(),
-                    manufacturers);
-            manufacturers.setName(manufacturerEditPage.getName());
-            manufacturers.setImage(manufacturerEditPage.getImage());
-            manufacturerService.updateManufactureDescription(info);
+            try {
+                // update
+                BigDecimal manufacturerId = manufacturerEditPage
+                        .getManufacturerId();
+                Manufacturer manufacturer = productService.getManufacturer(
+                        manufacturerId, SystemUtil.getDefaultLanguage());
 
-            FacesMessageUtil.addInfoMessage("updated.manufacturer");
-            return ManufacturerEditPage.class;
+                productDxo.convertFromPageToManufacturer(manufacturerEditPage,
+                        manufacturer);
+
+                productService.updateManufacture(manufacturer);
+
+                FacesMessageUtil.addInfoMessage("updated.manufacturer");
+                return ManufacturerEditPage.class;
+            } catch (PompeiDBException e) {
+                FacesMessageUtil
+                        .addErrorMessage("faild.to.update.manufacturer");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil
+                        .addErrorMessage("faild.to.update.manufacturer");
+                logger.log("EPC0042", new Object[] { this.toString() }, e);
+            }
         } else {
             // insert
-            ManufacturerDescription info = new ManufacturerDescription();
-            getManufacturersDxo().convert(getManufacturerEditPage(), info);
-            info.setLanguageId(getLanguageService().getDefaultLanguage()
-                    .getLanguageId());
-            Manufacturer manufacturers = new Manufacturer();
-            getManufacturersDxo().convert(getManufacturerEditPage(),
-                    manufacturers);
-            info.setManufacturer(manufacturers);
-            getManufacturerService().addManufactureDescription(info);
+            Manufacturer manufacturer = new Manufacturer();
+            productDxo.convertFromPageToManufacturer(manufacturerEditPage,
+                    manufacturer);
 
-            FacesMessageUtil.addInfoMessage("added.manufacturer");
-            return ManufacturerListPage.class;
+            try {
+                productService.addManufacture(manufacturer);
+
+                FacesMessageUtil.addInfoMessage("added.manufacturer");
+                return ManufacturerListPage.class;
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("faild.to.add.manufacturer");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("faild.to.add.manufacturer");
+                logger.log("EPC0043", new Object[] { this.toString() }, e);
+            }
         }
+        return null;
     }
 
-    /**
-     * @return manufacturerEditPage
-     */
-    public ManufacturerEditPage getManufacturerEditPage() {
-        return manufacturerEditPage;
-    }
-
-    /**
-     * @param manufacturerEditPage 設定する manufacturerEditPage
-     */
-    public void setManufacturerEditPage(
-            ManufacturerEditPage manufacturerEditPage) {
-        this.manufacturerEditPage = manufacturerEditPage;
-    }
-
-    public ManufacturerDxo getManufacturersDxo() {
-        return manufacturersDxo;
-    }
-
-    public void setManufacturersDxo(ManufacturerDxo dxo) {
-        this.manufacturersDxo = dxo;
-    }
-
-    public ManufacturerService getManufacturerService() {
-        return manufacturerService;
-    }
-
-    public void setManufacturerService(ManufacturerService manufacturerService) {
-        this.manufacturerService = manufacturerService;
-    }
-
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -7,9 +7,6 @@
 
 public class ManufacturerEditPage implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 8556055996092048443L;
 
     public static final String manufacturersName_TRequiredValidator = null;
@@ -18,13 +15,9 @@
 
     private BigDecimal manufacturerId;
 
-    private String image;
-
-    private String longDescription;
-
     private String name;
 
-    private String shortDescription;
+    private String description;
 
     private String url;
 
@@ -51,22 +44,6 @@
         this.targetId = targetId;
     }
 
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String manufacturersImage) {
-        this.image = manufacturersImage;
-    }
-
-    public String getLongDescription() {
-        return longDescription;
-    }
-
-    public void setLongDescription(String manufacturersLongDesc) {
-        this.longDescription = manufacturersLongDesc;
-    }
-
     public String getName() {
         return name;
     }
@@ -75,14 +52,6 @@
         this.name = manufacturersName;
     }
 
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String manufacturersShortDesc) {
-        this.shortDescription = manufacturersShortDesc;
-    }
-
     public String getUrl() {
         return url;
     }
@@ -124,4 +93,12 @@
     public String getDoUpdateValue() {
         return getLabelHelper().getLabelValue(getMode());
     }
+
+    public String getDescription() {
+        return 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/ManufacturerListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -6,32 +6,30 @@
 import java.util.Map;
 
 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;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.exentity.Manufacturer;
+import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class ManufacturerListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 841279946405958157L;
 
     /**
-     *
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(ManufacturerListAction.class); // LOG CODE: ?PC003?
+
     private ManufacturerListPage manufacturerListPage;
 
-    /**
-     *
-     */
-    private ManufacturerService manufacturerService;
+    private ProductService productService;
 
-    private LanguageService languageService;
+    private ProductDxo productDxo;
 
-    private ManufacturerDxo manufacturersDxo;
-
     public Class<?> initialize() {
         return null;
     }
@@ -39,23 +37,39 @@
     public Class<?> prerender() {
         //		List list = getMockList();
         //		makerListPage.setManufacturerItems(list);
-        List<ManufacturerDescription> list = manufacturerService
-                .getManufactureDescriptionList(getLanguageService()
-                        .getDefaultLanguage().getLanguageId());
-        List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-        manufacturersDxo.convert(list, mapList);
-        getManufacturerListPage().setManufacturerItems(mapList);
+        try {
+            List<Manufacturer> list = productService
+                    .getManufacturerList(SystemUtil.getDefaultLanguage());
+            List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+            productDxo.convertFromManufacturerToMap(list, mapList);
+            getManufacturerListPage().setManufacturerItems(mapList);
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.manufacturers");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.manufacturers");
+            logger.log("EPC0031", new Object[] { this.toString() }, e);
+        }
 
-        // redner FacesMessage
+        // render FacesMessage
         FacesMessageUtil.renderMessages();
         return null;
     }
 
     public Class<?> doDelete() {
-        manufacturerService.deleteManufacture(getManufacturerListPage()
-                .getTargetId());
+        try {
+            productService.deleteManufacturer(getManufacturerListPage()
+                    .getTargetId());
 
-        FacesMessageUtil.addInfoMessage("deleted.manufacturer");
+            FacesMessageUtil.addInfoMessage("deleted.manufacturer");
+            return ManufacturerListPage.class;
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.manufacturer");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.manufacturer");
+            logger.log("EPC0032", new Object[] { this.toString() }, e);
+        }
         return null;
     }
 
@@ -70,42 +84,6 @@
     }
 
     /**
-     * @return manufacturerService
-     */
-    public ManufacturerService getManufacturerService() {
-        return manufacturerService;
-    }
-
-    /**
-     * @param manufacturerService 設定する manufacturerService
-     */
-    public void setManufacturerService(ManufacturerService manufacturerService) {
-        this.manufacturerService = manufacturerService;
-    }
-
-    public ManufacturerDxo getManufacturersDxo() {
-        return manufacturersDxo;
-    }
-
-    public void setManufacturersDxo(ManufacturerDxo dxo) {
-        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() {
@@ -121,4 +99,20 @@
         this.manufacturerListPage = manufacuturerListPage;
     }
 
+    public ProductService getProductService() {
+        return productService;
+    }
+
+    public void setProductService(ProductService productService) {
+        this.productService = productService;
+    }
+
+    public ProductDxo getProductDxo() {
+        return productDxo;
+    }
+
+    public void setProductDxo(ProductDxo productDxo) {
+        this.productDxo = productDxo;
+    }
+
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -6,87 +6,106 @@
 import java.util.List;
 import java.util.Map;
 
-import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.ManufacturerDxo;
+import jp.sf.pal.pompei.PompeiDBException;
 import jp.sf.pal.pompei.dxo.ProductDxo;
-import jp.sf.pal.pompei.dxo.TaxDxo;
+import jp.sf.pal.pompei.exentity.DeliveryType;
 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.ProductImage;
-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;
+import jp.sf.pal.pompei.exentity.TaxType;
+import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.service.SystemService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class ProductEditAction implements Serializable {
 
+    private static final long serialVersionUID = -9187256555144964188L;
+
     /**
-     * 
+     * Logger for this class
      */
-    private static final long serialVersionUID = -9187256555144964188L;
+    private static final Logger logger = Logger
+            .getLogger(ProductEditAction.class); // LOG CODE: ?PC006?
 
-    /**	 */
     private ProductEditPage productEditPage;
 
-    /**	 */
-    private ProductServiceImpl productService;
+    private ProductService productService;
 
-    private LanguageService languageService;
+    //TODO cache
+    private SystemService systemService;
 
-    /**	 */
     private ProductDxo productDxo;
 
-    private TaxDxo taxDxo;
-
-    /**	 */
-    private ManufacturerService manufacturerService;
-
-    private TaxService taxService;
-
-    /**	 */
-    private ManufacturerDxo manufacturerDxo;
-
     public Class<?> initialize() {
         // manufacturer
-        getProductEditPage().setManufacturerIdItems(getManufacturerIdList());
+        productEditPage.setManufacturerIdItems(getManufacturerIdList());
         // tax
-        getProductEditPage().setTaxClassIdItems(getTaxClassIdList());
+        productEditPage.setTaxTypeIdItems(getTaxTypeIdList());
+        // delivery
+        productEditPage.setDeliveryTypeIdItems(getDeliveryTypeIdList());
         // status
-        getProductEditPage().setStatusItems(getStatusList());
+        productEditPage.setStatusItems(getStatusList());
 
         return null;
     }
 
     private List<Map<String, String>> getManufacturerIdList() {
-        List<Manufacturer> mList = manufacturerService.getManufacturerList();
         List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-        manufacturerDxo.convertCombo(mList, list);
+        try {
+            List<Manufacturer> manufacturerList = productService
+                    .getManufacturerList(SystemUtil.getDefaultLanguage(), true,
+                            false, false);
+            productDxo.convertFromManufacturerToLabel(manufacturerList, list);
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("could.not.load.manufacturers");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("could.not.load.manufacturers");
+            logger.log("EPC0061", new Object[] { this.toString() }, e);
+        }
         return list;
     }
 
-    private List<Map<String, String>> getTaxClassIdList() {
-        List<TaxClass> mList = getTaxService().getTaxClassList();
+    private List<Map<String, String>> getTaxTypeIdList() {
         List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-        getTaxDxo().convert(mList, list);
+        try {
+            List<TaxType> taxTypeList = systemService.getTaxTypeList(SystemUtil
+                    .getDefaultLanguage());
+            productDxo.convertFromTaxTypeToLabel(taxTypeList, list);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("could.not.load.taxtypes");
+            logger.log("EPC0062", new Object[] { this.toString() }, e);
+        }
         return list;
     }
 
+    private List<Map<String, String>> getDeliveryTypeIdList() {
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        try {
+            List<DeliveryType> deliveryTypeList = systemService
+                    .getDeliveryTypeList(SystemUtil.getDefaultLanguage());
+            productDxo.convertFromDeliveryTypeToLabel(deliveryTypeList, list);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("could.not.load.deliverytypes");
+            logger.log("EPC0063", new Object[] { this.toString() }, e);
+        }
+        return list;
+    }
+
     private List<Map<String, String>> getStatusList() {
         List<Map<String, String>> list = new ArrayList<Map<String, String>>();
         Map<String, String> map1 = new HashMap<String, String>();
-        map1.put("label", getProductEditPage().getLabelHelper().getLabelValue(
+        map1.put("label", productEditPage.getLabelHelper().getLabelValue(
                 "enabled"));
         map1.put("value", PompeiConstants.TRUE_BIGDECIMAL.toString());
         list.add(map1);
         Map<String, String> map2 = new HashMap<String, String>();
-        map2.put("label", getProductEditPage().getLabelHelper().getLabelValue(
+        map2.put("label", productEditPage.getLabelHelper().getLabelValue(
                 "disabled"));
         map2.put("value", PompeiConstants.FALSE_BIGDECIMAL.toString());
         list.add(map2);
@@ -97,11 +116,18 @@
 
         if (isUpdate()) {
             // update
-            ProductDescription description = productService
-                    .getProdcutDescription(productEditPage.getProductId(),
-                            getLanguageService().getDefaultLanguage()
-                                    .getLanguageId());
-            productDxo.convert(description, productEditPage);
+            try {
+                Product product = productService.getProduct(productEditPage
+                        .getProductId(), SystemUtil.getDefaultLanguage());
+                productDxo.convertFromProductToPage(product, productEditPage);
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("could.not.load.product");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("could.not.load.product");
+                logger.log("EPC0064", new Object[] { this.toString() }, e);
+            }
         }
 
         // render faces messages
@@ -114,65 +140,40 @@
 
         if (isInsert()) {
             // insert
-            ProductDescription pd = productDxo.convert(productEditPage);
-            Product product = productDxo.convertProduct(productEditPage);
+            Product product = new Product();
 
-            pd.setProduct(product);
-            pd.setLanguageId(getLanguageService().getDefaultLanguage()
-                    .getLanguageId());
+            productDxo.covertFromPageToProduct(productEditPage, product);
 
-            List<ProductImage> productImageList = new ArrayList<ProductImage>();
-            if (getProductEditPage().getImageFile() != null) {
-                ProductImage productImage = new ProductImage();
-                productImage.setImageFile(getProductEditPage().getImageFile());
-                productImage.setType(PompeiConstants.DETAILS_IMAGE_TYPE);
-                productImageList.add(productImage);
-            }
-            if (getProductEditPage().getThumbnailFile() != null) {
-                ProductImage productImage = new ProductImage();
-                productImage.setImageFile(getProductEditPage().getThumbnailFile());
-                productImage.setType(PompeiConstants.THUMBNAIL_IMAGE_TYPE);
-                productImageList.add(productImage);
-            }
-            product.setProductImageList(productImageList);
-
             try {
-                productService.addProductDescription(pd, productEditPage
+                productService.addProduct(product, productEditPage
                         .getParentId());
                 FacesMessageUtil.addInfoMessage("added.product");
-            } catch (CommonException e) {
-                FacesMessageUtil.addErrorMessage(e.getMessageId());
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("failed.to.add.product");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("failed.to.add.product");
+                logger.log("EPC0065", new Object[] { this.toString() }, e);
             }
 
         } else if (isUpdate()) {
-            ProductDescription pd = getProductService().getProdcutDescription(
-                    getProductEditPage().getProductId(),
-                    getLanguageService().getDefaultLanguage().getLanguageId());
-            getProductDxo().convertPageToDescription(getProductEditPage(), pd);
+            try {
+                Product product = productService.getProduct(productEditPage
+                        .getProductId(), SystemUtil.getDefaultLanguage(), true,
+                        true, true, true, false, true, false, false);
 
-            Product product = pd.getProduct();
-            getProductDxo().convertPageToProduct(getProductEditPage(), product);
+                productDxo.covertFromPageToProduct(productEditPage, product);
 
-            List<ProductImage> productImageList = new ArrayList<ProductImage>();
-            if (getProductEditPage().getImageFile() != null) {
-                ProductImage productImage = new ProductImage();
-                productImage.setImageFile(getProductEditPage().getImageFile());
-                productImage.setType(PompeiConstants.DETAILS_IMAGE_TYPE);
-                productImageList.add(productImage);
-            }
-            if (getProductEditPage().getThumbnailFile() != null) {
-                ProductImage productImage = new ProductImage();
-                productImage.setImageFile(getProductEditPage().getThumbnailFile());
-                productImage.setType(PompeiConstants.THUMBNAIL_IMAGE_TYPE);
-                productImageList.add(productImage);
-            }
-            product.setProductImageList(productImageList);
-
-            try {
-                productService.updateProductDescription(pd);
+                productService.updateProduct(product);
                 FacesMessageUtil.addInfoMessage("updated.product");
-            } catch (CommonException e) {
-                FacesMessageUtil.addErrorMessage(e.getMessageId());
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("failed.to.update.product");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("failed.to.update.product");
+                logger.log("EPC0066", new Object[] { this.toString() }, e);
             }
 
         } else {
@@ -185,100 +186,11 @@
     }
 
     private boolean isUpdate() {
-        return PompeiConstants.UPDATE_MODE.equals(getProductEditPage()
-                .getMode());
+        return PompeiConstants.UPDATE_MODE.equals(productEditPage.getMode());
     }
 
     private boolean isInsert() {
-        return PompeiConstants.INSERT_MODE.equals(getProductEditPage()
-                .getMode());
+        return PompeiConstants.INSERT_MODE.equals(productEditPage.getMode());
     }
 
-    /**
-     * @return productEditPage
-     */
-    public ProductEditPage getProductEditPage() {
-        return productEditPage;
-    }
-
-    /**
-     * @param productEditPage 設定する productEditPage
-     */
-    public void setProductEditPage(ProductEditPage productEditPage) {
-        this.productEditPage = productEditPage;
-    }
-
-    public ProductServiceImpl getProductService() {
-        return productService;
-    }
-
-    public void setProductService(ProductServiceImpl productService) {
-        this.productService = productService;
-    }
-
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
-    public ManufacturerDxo getManufacturerDxo() {
-        return manufacturerDxo;
-    }
-
-    public void setManufacturerDxo(ManufacturerDxo manufacturersDxo) {
-        this.manufacturerDxo = manufacturersDxo;
-    }
-
-    public ManufacturerService getManufacturerService() {
-        return manufacturerService;
-    }
-
-    public void setManufacturerService(ManufacturerService manufacturerService) {
-        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;
-    }
-
-    public ProductDxo getProductDxo() {
-        return productDxo;
-    }
-
-    public void setProductDxo(ProductDxo productDxo) {
-        this.productDxo = productDxo;
-    }
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -2,11 +2,10 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import jp.sf.pal.jsf.custom.fileupload.UploadedFile;
-
 import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter;
 import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
 import org.seasar.teeda.extension.annotation.validator.Required;
@@ -14,9 +13,6 @@
 
 public class ProductEditPage implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 2187705411622892857L;
 
     private String breadcrumb;
@@ -26,70 +22,91 @@
     @SubapplicationScope
     private List<Map<String, Object>> breadcrumbItems;
 
-    private List<Map<String, String>> manufacturerIdItems;
-
-    private List<Map<String, String>> statusItems;
-
-    @Required
-    private BigDecimal manufacturerId;
-
     private String mode;
 
     private BigDecimal parentId;
 
+    private BigDecimal targetId;
+
+    /* product */
     private BigDecimal productId;
 
-    private String imageName;
+    private String code;
 
-    private UploadedFile imageFile;
-
-    private String thumbnailName;
-
-    private UploadedFile thumbnailFile;
-
     private String model;
 
-    @Required
-    private String name;
+    private BigDecimal stock;
 
     //TODO i18n
     @BigDecimalConverter(pattern = "###,###")
+    private BigDecimal catalogPrice;
+
+    //TODO i18n
+    @BigDecimalConverter(pattern = "###,###")
     @Required
     private BigDecimal price;
 
-    @Required
-    private BigDecimal quantity;
+    private BigDecimal weight;
 
-    @Required
-    private BigDecimal status;
+    private String size;
 
-    private List<Map<String, String>> taxClassIdItems;
+    private BigDecimal limitPurchase;
 
+    private Date releaseDate;
+
+    private Date startDate;
+
+    private Date endDate;
+
+    private List<Map<String, String>> manufacturerIdItems;
+
     @Required
-    private BigDecimal taxClassId;
+    private BigDecimal manufacturerId;
 
-    private BigDecimal weight;
+    private List<Map<String, String>> statusItems;
 
-    private BigDecimal targetId;
+    @Required
+    public BigDecimal status;
 
-    private String code;
+    private List<Map<String, String>> taxTypeIdItems;
 
-    private String size;
+    @Required
+    private BigDecimal taxTypeId;
 
-    private BigDecimal ordered;
+    private List<Map<String, String>> deliveryTypeIdItems;
 
-    private BigDecimal reviewed;
+    @Required
+    private BigDecimal deliveryTypeId;
 
-    private BigDecimal rating;
+    /* product info */
+    @Required
+    private String name;
 
     private String title;
 
     private String url;
 
-    private BigDecimal viewed;
+    /* product page info*/;
 
+    @Required
+    private String pageId;
+
+    private String templateName;
+
+    private String keyword;
+
     private String description;
 
+    /* product description */
+    private String productDescription;
+
+    /* product content */
+    private String content1;
+
+    private String content2;
+
+    private String content3;
+
     private LabelHelper labelHelper;
 
     public String getBreadcrumb() {
@@ -116,15 +133,6 @@
         this.breadcrumbItems = breadcrumbItems;
     }
 
-    public List<Map<String, String>> getManufacturerIdItems() {
-        return manufacturerIdItems;
-    }
-
-    public void setManufacturerIdItems(
-            List<Map<String, String>> manufacturerItems) {
-        this.manufacturerIdItems = manufacturerItems;
-    }
-
     public String getMode() {
         return mode;
     }
@@ -141,300 +149,268 @@
         this.parentId = parentId;
     }
 
-    public String getImageName() {
-        return imageName;
+    public BigDecimal getTargetId() {
+        return targetId;
     }
 
-    public void setImageName(String productsImage) {
-        this.imageName = productsImage;
+    public void setTargetId(BigDecimal targetId) {
+        this.targetId = targetId;
     }
 
-    /**
-     * @return productsImageFile
-     */
-    public UploadedFile getImageFile() {
-        return imageFile;
+    public BigDecimal getProductId() {
+        return productId;
     }
 
-    /**
-     * @param productsImageFile 設定する productsImageFile
-     */
-    public void setImageFile(UploadedFile productsImageFile) {
-        this.imageFile = productsImageFile;
+    public void setProductId(BigDecimal productId) {
+        this.productId = productId;
     }
 
-    public String getModel() {
-        return model;
+    public String getCode() {
+        return code;
     }
 
-    public void setModel(String productsModel) {
-        this.model = productsModel;
+    public void setCode(String code) {
+        this.code = code;
     }
 
-    public String getName() {
-        return name;
+    public String getModel() {
+        return model;
     }
 
-    public void setName(String productsName) {
-        this.name = productsName;
+    public void setModel(String model) {
+        this.model = model;
     }
 
-    public BigDecimal getPrice() {
-        return price;
+    public BigDecimal getStock() {
+        return stock;
     }
 
-    public void setPrice(BigDecimal productsPrice) {
-        this.price = productsPrice;
+    public void setStock(BigDecimal stock) {
+        this.stock = stock;
     }
 
-    public BigDecimal getQuantity() {
-        return quantity;
+    public BigDecimal getCatalogPrice() {
+        return catalogPrice;
     }
 
-    public void setQuantity(BigDecimal productsQuantity) {
-        this.quantity = productsQuantity;
+    public void setCatalogPrice(BigDecimal catalogPrice) {
+        this.catalogPrice = catalogPrice;
     }
 
-    public BigDecimal getStatus() {
-        return status;
+    public BigDecimal getPrice() {
+        return price;
     }
 
-    public void setStatus(BigDecimal productsStatus) {
-        this.status = productsStatus;
+    public void setPrice(BigDecimal price) {
+        this.price = price;
     }
 
-    public BigDecimal getTaxClassId() {
-        return taxClassId;
+    public BigDecimal getWeight() {
+        return weight;
     }
 
-    public void setTaxClassId(BigDecimal productsTaxClassId) {
-        this.taxClassId = productsTaxClassId;
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
     }
 
-    public BigDecimal getWeight() {
-        return weight;
+    public String getSize() {
+        return size;
     }
 
-    public void setWeight(BigDecimal productsWeight) {
-        this.weight = productsWeight;
+    public void setSize(String size) {
+        this.size = size;
     }
 
-    public BigDecimal getTargetId() {
-        return targetId;
+    public BigDecimal getLimitPurchase() {
+        return limitPurchase;
     }
 
-    public void setTargetId(BigDecimal targetId) {
-        this.targetId = targetId;
+    public void setLimitPurchase(BigDecimal limitPurchase) {
+        this.limitPurchase = limitPurchase;
     }
 
-    public BigDecimal getManufacturerId() {
-        return manufacturerId;
+    public Date getReleaseDate() {
+        return releaseDate;
     }
 
-    public void setManufacturerId(BigDecimal manufacturersId) {
-        this.manufacturerId = manufacturersId;
+    public void setReleaseDate(Date releaseDate) {
+        this.releaseDate = releaseDate;
     }
 
-    public BigDecimal getProductId() {
-        return productId;
+    public Date getStartDate() {
+        return startDate;
     }
 
-    public void setProductId(BigDecimal productsId) {
-        this.productId = productsId;
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
     }
 
-    /**
-     * @return thumbnail
-     */
-    public String getThumbnailName() {
-        return thumbnailName;
+    public Date getEndDate() {
+        return endDate;
     }
 
-    /**
-     * @param thumbnail 設定する thumbnail
-     */
-    public void setThumbnailName(String thumbnail) {
-        this.thumbnailName = thumbnail;
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
     }
 
-    /**
-     * @return thumbnailFile
-     */
-    public UploadedFile getThumbnailFile() {
-        return thumbnailFile;
+    public List<Map<String, String>> getManufacturerIdItems() {
+        return manufacturerIdItems;
     }
 
-    /**
-     * @param thumbnailFile 設定する thumbnailFile
-     */
-    public void setThumbnailFile(UploadedFile thumbnailFile) {
-        this.thumbnailFile = thumbnailFile;
+    public void setManufacturerIdItems(
+            List<Map<String, String>> manufacturerIdItems) {
+        this.manufacturerIdItems = manufacturerIdItems;
     }
 
-    /**
-     * @return taxClassIdItems
-     */
-    public List<Map<String, String>> getTaxClassIdItems() {
-        return taxClassIdItems;
+    public BigDecimal getManufacturerId() {
+        return manufacturerId;
     }
 
-    /**
-     * @param taxClassIdItems 設定する taxClassIdItems
-     */
-    public void setTaxClassIdItems(List<Map<String, String>> taxClassIdItems) {
-        this.taxClassIdItems = taxClassIdItems;
+    public void setManufacturerId(BigDecimal manufacturerId) {
+        this.manufacturerId = manufacturerId;
     }
 
-    /**
-     * @return statusItems
-     */
     public List<Map<String, String>> getStatusItems() {
         return statusItems;
     }
 
-    /**
-     * @param statusItems 設定する statusItems
-     */
     public void setStatusItems(List<Map<String, String>> statusItems) {
         this.statusItems = statusItems;
     }
 
-    /**
-     * @return code
-     */
-    public String getCode() {
-        return code;
+    public BigDecimal getStatus() {
+        return status;
     }
 
-    /**
-     * @param code 設定する code
-     */
-    public void setCode(String code) {
-        this.code = code;
+    public void setStatus(BigDecimal status) {
+        this.status = status;
     }
 
-    /**
-     * @return size
-     */
-    public String getSize() {
-        return size;
+    public List<Map<String, String>> getTaxTypeIdItems() {
+        return taxTypeIdItems;
     }
 
-    /**
-     * @param size 設定する size
-     */
-    public void setSize(String size) {
-        this.size = size;
+    public void setTaxTypeIdItems(List<Map<String, String>> taxTypeIdItems) {
+        this.taxTypeIdItems = taxTypeIdItems;
     }
 
-    /**
-     * @return ordered
-     */
-    public BigDecimal getOrdered() {
-        return ordered;
+    public BigDecimal getTaxTypeId() {
+        return taxTypeId;
     }
 
-    /**
-     * @param ordered 設定する ordered
-     */
-    public void setOrdered(BigDecimal ordered) {
-        this.ordered = ordered;
+    public void setTaxTypeId(BigDecimal taxTypeId) {
+        this.taxTypeId = taxTypeId;
     }
 
-    /**
-     * @return reviewed
-     */
-    public BigDecimal getReviewed() {
-        return reviewed;
+    public List<Map<String, String>> getDeliveryTypeIdItems() {
+        return deliveryTypeIdItems;
     }
 
-    /**
-     * @param reviewed 設定する reviewed
-     */
-    public void setReviewed(BigDecimal reviewed) {
-        this.reviewed = reviewed;
+    public void setDeliveryTypeIdItems(
+            List<Map<String, String>> deliveryTypeIdItems) {
+        this.deliveryTypeIdItems = deliveryTypeIdItems;
     }
 
-    /**
-     * @return rating
-     */
-    public BigDecimal getRating() {
-        return rating;
+    public BigDecimal getDeliveryTypeId() {
+        return deliveryTypeId;
     }
 
-    /**
-     * @param rating 設定する rating
-     */
-    public void setRating(BigDecimal rating) {
-        this.rating = rating;
+    public void setDeliveryTypeId(BigDecimal deliveryTypeId) {
+        this.deliveryTypeId = deliveryTypeId;
     }
 
-    /**
-     * @return title
-     */
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getTitle() {
         return title;
     }
 
-    /**
-     * @param title 設定する title
-     */
     public void setTitle(String title) {
         this.title = title;
     }
 
-    /**
-     * @return url
-     */
     public String getUrl() {
         return url;
     }
 
-    /**
-     * @param url 設定する url
-     */
     public void setUrl(String url) {
         this.url = url;
     }
 
-    /**
-     * @return viewed
-     */
-    public BigDecimal getViewed() {
-        return viewed;
+    public String getPageId() {
+        return pageId;
     }
 
-    /**
-     * @param viewed 設定する viewed
-     */
-    public void setViewed(BigDecimal viewed) {
-        this.viewed = viewed;
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
     }
 
-    /**
-     * @return description
-     */
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
     public String getDescription() {
         return description;
     }
 
-    /**
-     * @param description 設定する description
-     */
     public void setDescription(String description) {
         this.description = description;
     }
 
-    /**
-     * @return labelHelper
-     */
+    public String getProductDescription() {
+        return productDescription;
+    }
+
+    public void setProductDescription(String productDescription) {
+        this.productDescription = productDescription;
+    }
+
+    public String getContent1() {
+        return content1;
+    }
+
+    public void setContent1(String content1) {
+        this.content1 = content1;
+    }
+
+    public String getContent2() {
+        return content2;
+    }
+
+    public void setContent2(String content2) {
+        this.content2 = content2;
+    }
+
+    public String getContent3() {
+        return content3;
+    }
+
+    public void setContent3(String content3) {
+        this.content3 = content3;
+    }
+
     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/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -9,51 +9,42 @@
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CategoryDxo;
+import jp.sf.pal.pompei.PompeiDBException;
 import jp.sf.pal.pompei.dxo.ProductDxo;
-import jp.sf.pal.pompei.exentity.CategoryDescription;
+import jp.sf.pal.pompei.exentity.Category;
 import jp.sf.pal.pompei.exentity.Product;
-import jp.sf.pal.pompei.service.CategoryService;
-import jp.sf.pal.pompei.service.LanguageService;
+import jp.sf.pal.pompei.pager.ProductPager;
 import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class ProductListAction implements Serializable {
+
+    private static final long serialVersionUID = 3259525565087243422L;
+
     /**
-     * 
+     * Logger for this class
      */
-    private static final long serialVersionUID = 3259525565087243422L;
+    private static final Logger logger = Logger
+            .getLogger(ProductListAction.class); // LOG CODE: ?PC005?
 
-    /**  */
     private ProductListPage productListPage;
 
-    /**	 */
     private ProductService productService;
 
-    /**	 */
     private ProductDxo productDxo;
 
-    /**	 */
-    private CategoryService categoryService;
+    private ProductPager productPager;
 
-    private LanguageService languageService;
-
-    /**	 */
-    private CategoryDxo categoriesDxo;
-
     public Class<?> initialize() {
         return null;
     }
 
-    public Class<?> doDelete() {
-        productService.deleteProduct(productListPage.getProductId());
-        FacesMessageUtil.addInfoMessage("deleted.product");
-        return null;
-    }
-
     private boolean isDelete() {
-        return getProductListPage().getMode() != null
-                && getProductListPage().getMode().equals(
-                        PompeiConstants.DELETE_MODE);
+        return productListPage.getMode() != null
+                && productListPage.getMode()
+                        .equals(PompeiConstants.DELETE_MODE);
     }
 
     public Class<?> prerender() {
@@ -75,9 +66,8 @@
             m
                     .put(PompeiConstants.CATEGORY_ID,
                             PompeiConstants.ROOT_CATEGORY_ID);
-            m.put(PompeiConstants.BREADCRUMB, getProductListPage()
-                    .getLabelHelper().getLabelValue(
-                            PompeiConstants.TOP_CATEGORY));
+            m.put(PompeiConstants.BREADCRUMB, productListPage.getLabelHelper()
+                    .getLabelValue(PompeiConstants.TOP_CATEGORY));
             list.add(m);
             productListPage.setBreadcrumbItems(list);
 
@@ -97,86 +87,42 @@
         productListPage.setCategoryItems(cList);
 
         //商品一覧の取得
-        List<Product> list = productService.getProductList(productListPage
-                .getParentId());
-        List<Map<String, Object>> sList = new ArrayList<Map<String, Object>>();
-        productDxo.convert(list, sList);
-        productListPage.setProductItems(sList);
+        if (productPager != null) {
+            if (productPager.getCategoryId() != null
+                    && !productPager.getCategoryId().equals(
+                            productListPage.getParentId())) {
+                productPager.clear();
+                productPager.setCategoryId(productListPage.getParentId());
+            }
 
+        } else {
+            productPager = new ProductPager();
+        }
+        try {
+            List<Product> list = productService.getProductListByPager(
+                    productPager, SystemUtil.getDefaultLanguage());
+            List<Map<String, Object>> sList = new ArrayList<Map<String, Object>>();
+            productDxo.convertFromProductToMap(list, sList);
+            productListPage.setProductItems(sList);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("could.not.find.products");
+            logger.log("EPC0051", new Object[] { this.toString() }, e);
+        }
+
         // render faces messages
         FacesMessageUtil.renderMessages();
         return null;
     }
 
     private List<Map<String, Object>> getCategoryList() {
-        List<CategoryDescription> list = categoryService
-                .getSubCategoryDescriptionList(productListPage.getParentId(),
-                        getLanguageService().getDefaultLanguage()
-                                .getLanguageId());
-        List<Map<String, Object>> cList = new ArrayList<Map<String, Object>>();
-        categoriesDxo.convert(list, cList);
-        return cList;
+        List<Category> categoryList = productService.getSubCategoryList(
+                productListPage.getParentId(), SystemUtil.getDefaultLanguage());
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        productDxo.convertFromCategoryToMap(categoryList, list);
+        return list;
     }
 
     /**
-     * @return productListPage
-     */
-    public ProductListPage getProductListPage() {
-        return productListPage;
-    }
-
-    /**
-     * @param productListPage 設定する productListPage
-     */
-    public void setProductListPage(ProductListPage productListPage) {
-        this.productListPage = productListPage;
-    }
-
-    /**
-     * @return productService
-     */
-    public ProductService getProductService() {
-        return productService;
-    }
-
-    /**
-     * @param productService 設定する productService
-     */
-    public void setProductService(ProductService productService) {
-        this.productService = productService;
-    }
-
-    public CategoryService getCategoryService() {
-        return categoryService;
-    }
-
-    public void setCategoryService(CategoryService categoryListService) {
-        this.categoryService = categoryListService;
-    }
-
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
-    public CategoryDxo getCategoriesDxo() {
-        return categoriesDxo;
-    }
-
-    public void setCategoriesDxo(CategoryDxo categoriesDxo) {
-        this.categoriesDxo = categoriesDxo;
-    }
-
-    /**
      * パンくずリストを返します。
      * @param breadcrumbItems
      * @param id
@@ -191,21 +137,61 @@
                 return list;
             }
         }
-        CategoryDescription d = categoryService.getCategoryDescription(
-                productListPage.getCategoryId(), getLanguageService()
-                        .getDefaultLanguage().getLanguageId());
+        Category category = null;
+        try {
+            category = productService.getCategory(productListPage
+                    .getCategoryId(), SystemUtil.getDefaultLanguage());
+        } catch (PompeiDBException e) {
+            FacesMessageUtil
+                    .addErrorMessage("could.not.load.category.for.breadcrumb");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil
+                    .addErrorMessage("could.not.load.category.for.breadcrumb");
+            logger.log("EPC0052", new Object[] { this.toString() }, e);
+        }
 
-        if (d == null) {
+        if (category == null) {
             return list;
         }
 
         Map<String, Object> m = new HashMap<String, Object>();
         m.put(PompeiConstants.CATEGORY_ID, id);
-        m.put(PompeiConstants.BREADCRUMB, d.getName());
+        m.put(PompeiConstants.BREADCRUMB, category.getName());
         list.add(m);
         return list;
     }
 
+    public Class<?> doDelete() {
+        try {
+            productService.deleteProduct(productListPage.getProductId());
+            FacesMessageUtil.addInfoMessage("deleted.product");
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.product");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.product");
+            logger.log("EPC0053", new Object[] { this.toString() }, e);
+        }
+        return null;
+    }
+
+    public ProductListPage getProductListPage() {
+        return productListPage;
+    }
+
+    public void setProductListPage(ProductListPage productListPage) {
+        this.productListPage = productListPage;
+    }
+
+    public ProductService getProductService() {
+        return productService;
+    }
+
+    public void setProductService(ProductService productService) {
+        this.productService = productService;
+    }
+
     public ProductDxo getProductDxo() {
         return productDxo;
     }
@@ -214,4 +200,11 @@
         this.productDxo = productDxo;
     }
 
+    public ProductPager getProductPager() {
+        return productPager;
+    }
+
+    public void setProductPager(ProductPager productPager) {
+        this.productPager = productPager;
+    }
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -7,8 +7,6 @@
 import java.util.Map;
 
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.exentity.ProductDescription;
-import jp.sf.pal.pompei.service.LanguageService;
 
 import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter;
 import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
@@ -71,8 +69,6 @@
 
     private LabelHelper labelHelper;
 
-    private LanguageService languageService;
-
     /**
      * @return mode
      */
@@ -231,18 +227,6 @@
         this.name = categoriesName;
     }
 
-    //    public List getDescriptionList() {
-    //        return new ArrayList();
-    //    }
-    //
-    //    public void setDescriptionList(List list) {
-    //        if (list != null && list.size() > 0) {
-    //            this.productsName = ((ProductDescription) list.get(0))
-    //                    .getProductsName();
-    //        } else {
-    //            this.productsName = "";
-    //        }
-    //    }
 
     public BigDecimal getProductId() {
         return productId;
@@ -266,39 +250,6 @@
         this.labelHelper = labelHelper;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
-    public String getDefaultName() {
-        //TODO remove?
-        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()
-                            .getDefaultLanguage().getLanguageId();
-                    if (pd.getLanguageId().equals(languagesId)) {
-                        return pd.getName();
-                    }
-                }
-            }
-        }
-        return "-";
-    }
-
     public String getStatusStr() {
         if (PompeiConstants.TRUE_BIGDECIMAL.equals(getStatus())) {
             return getLabelHelper().getLabelValue("enabled");

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -11,15 +11,16 @@
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
-import jp.sf.pal.pompei.exentity.ProductDescription;
-import jp.sf.pal.pompei.service.CartService;
+import jp.sf.pal.pompei.exentity.Product;
 import jp.sf.pal.pompei.service.CustomerService;
-import jp.sf.pal.pompei.service.ManufacturerService;
 import jp.sf.pal.pompei.service.ProductService;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 /**
  * カート画面でのアクション処理を記述します。
  * TODO セッション内のカート情報を表示
@@ -29,28 +30,20 @@
  */
 public class ProductListAction implements Serializable {
 
+    private static final long serialVersionUID = -7622016737871221829L;
+
     /**
-     * 
+     * Logger for this class
      */
-    private static final long serialVersionUID = -7622016737871221829L;
+    private static final Logger logger = Logger
+            .getLogger(ProductListAction.class); // LOG CODE: ?PC018?
 
-    private ManufacturerService manufacturerService;
+    private ProductListPage productListPage;
 
     private ProductService productService;
 
-    private CartService cartService;
-
     private CustomerService customerService;
 
-    private ProductDxo productDxo;
-
-    public Class<?> doDelete() {
-        getCartService().deleteCustomerBasket(
-                getProductListPage().getCustomerBasketId());
-        FacesMessageUtil.addInfoMessage("deleted.product.from.cart");
-        return null;
-    }
-
     public Class<?> initialize() {
         return null;
     }
@@ -61,18 +54,18 @@
                 .getExternalContext().getRemoteUser();
         Customer customer = null;
         if (remoteUser == null) {
-            getProductListPage().setLogin(false);
-            getProductListPage().setUser(false);
+            productListPage.setLogin(false);
+            productListPage.setUser(false);
             return null;
         } else {
-            getProductListPage().setLogin(true);
+            productListPage.setLogin(true);
             // check user
-            customer = getCustomerService().getCustomerByPortalId(remoteUser);
+            customer = customerService.getCustomerByPortalId(remoteUser);
             if (customer == null) {
-                getProductListPage().setUser(false);
+                productListPage.setUser(false);
                 return null;
             } else {
-                getProductListPage().setUser(true);
+                productListPage.setUser(true);
             }
         }
 
@@ -81,35 +74,48 @@
             doDelete();
         }
 
-        getCartService().cleanupCustomerBasket(customer.getCustomerId());
+        try {
+            //TODO expiredTime needs to be moved to portlet.xml
+            customerService.cleanupBasket(customer.getCustomerId(), System
+                    .currentTimeMillis()
+                    - 24 * 60 * 60 * 1000);
 
-        List<CustomerBasket> baskets = getCartService().getCustomerBasketList(
-                customer.getCustomerId());
+            List<Basket> baskets = customerService.getBasketListByCustomerId(
+                    customer.getCustomerId(), SystemUtil.getCurrentLanguage());
 
-        BigDecimal totalPrice = new BigDecimal(0);
-        List<Map<String, Object>> products = new ArrayList<Map<String, Object>>();
-        // TODO Dxo... it may be difficult..
-        for (CustomerBasket basket : baskets) {
-            totalPrice = totalPrice.add(basket.getFinalPrice());
-            ProductDescription pd = getProductService().getProdcutDescription(
-                    basket.getProductId());
-            //            ManufacturerDescription mi = getManufacturerService()
-            //                    .getManufactureDescription(
-            //                            basket.getProduct().getManufacturerId());
-            Map<String, Object> map = new HashMap<String, Object>();
-            map.put("customerBasketId", basket.getCustomerBasketId());
-            map.put("productName", pd.getName());
-            map.put("productUrl", pd.getUrl());
-            map.put("productModel", basket.getProduct().getModel());
-            map.put("productCode", basket.getProduct().getCode());
-            map.put("productPrice", basket.getProduct().getPrice());
-            //            map.put("manufacturerName", mi.getManufacturer().getName());
-            map.put("quantity", basket.getQuantity());
-            map.put("finalPrice", basket.getFinalPrice());
-            products.add(map);
+            BigDecimal totalPrice = new BigDecimal(0);
+            List<Map<String, Object>> products = new ArrayList<Map<String, Object>>();
+            // TODO Dxo... it may be difficult..
+            for (Basket basket : baskets) {
+                totalPrice = totalPrice.add(basket.getFinalPrice());
+                Product pd = productService.getProduct(basket.getProductId(),
+                        SystemUtil.getCurrentLanguage());
+                //            ManufacturerDescription mi = getManufacturerService()
+                //                    .getManufactureDescription(
+                //                            basket.getProduct().getManufacturerId());
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("customerBasketId", basket.getBasketId());
+                map.put("productName", pd.getName());
+                map.put("productUrl", pd.getUrl());
+                map.put("productModel", basket.getProduct().getModel());
+                map.put("productCode", basket.getProduct().getCode());
+                map.put("productPrice", basket.getProduct().getPrice());
+                //            map.put("manufacturerName", mi.getManufacturer().getName());
+                map.put("quantity", basket.getQuantity());
+                map.put("finalPrice", basket.getFinalPrice());
+                products.add(map);
+            }
+            productListPage.setTotalPrice(totalPrice);
+            productListPage.setProductItems(products);
+        } catch (PompeiDBException e) {
+            FacesMessageUtil
+                    .addErrorMessage("failed.to.load.product.in.basket");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil
+                    .addErrorMessage("failed.to.load.product.in.basket");
+            logger.log("EPC0181", new Object[] { this.toString() }, e);
         }
-        getProductListPage().setTotalPrice(totalPrice);
-        getProductListPage().setProductItems(products);
 
         // render FacesMessages
         FacesMessageUtil.renderMessages();
@@ -117,110 +123,61 @@
     }
 
     private boolean isDelete() {
-        return getProductListPage().getMode() != null
-                && getProductListPage().getMode().equals(
-                        PompeiConstants.DELETE_MODE);
+        return productListPage.getMode() != null
+                && productListPage.getMode()
+                        .equals(PompeiConstants.DELETE_MODE);
     }
 
-    /**
-     *
-     */
-    private ProductListPage productListPage;
+    public Class<?> doDelete() {
+        try {
+            customerService.deleteBasket(productListPage.getBasketId());
+            FacesMessageUtil.addInfoMessage("deleted.product.from.cart");
+        } catch (PompeiDBException e) {
+            FacesMessageUtil
+                    .addErrorMessage("failed.to.delete.product.in.basket");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil
+                    .addErrorMessage("failed.to.delete.product.in.basket");
+            logger.log("EPC0182", new Object[] { this.toString() }, e);
+        }
+        return null;
+    }
 
     public Class<?> doUpdate() {
         return null;
     }
 
-    /**
-     * @return productListPage
-     */
+    public String doJumpProductList() {
+        return "../product/productList";
+    }
+
+    public String doJumpCheckoutEdit() {
+        return "../checkout/checkoutEdit";
+    }
+
     public ProductListPage getProductListPage() {
         return productListPage;
     }
 
-    /**
-     * @param productListPage 設定する productListPage
-     */
     public void setProductListPage(ProductListPage productListPage) {
         this.productListPage = productListPage;
     }
 
-    /**
-     * @return manufacturerService
-     */
-    public ManufacturerService getManufacturerService() {
-        return manufacturerService;
-    }
-
-    /**
-     * @param manufacturerService 設定する manufacturerService
-     */
-    public void setManufacturerService(ManufacturerService manufacturerService) {
-        this.manufacturerService = manufacturerService;
-    }
-
-    /**
-     * @return productService
-     */
     public ProductService getProductService() {
         return productService;
     }
 
-    /**
-     * @param productService 設定する productService
-     */
     public void setProductService(ProductService productService) {
         this.productService = productService;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return cartService
-     */
-    public CartService getCartService() {
-        return cartService;
-    }
-
-    /**
-     * @param cartService 設定する cartService
-     */
-    public void setCartService(CartService cartService) {
-        this.cartService = cartService;
-    }
-
-    /**
-    * @return productDxo
-    */
-    public ProductDxo getProductDxo() {
-        return productDxo;
-    }
-
-    /**
-     * @param productDxo 設定する productDxo
-     */
-    public void setProductDxo(ProductDxo productDxo) {
-        this.productDxo = productDxo;
-    }
-
-    public String doJumpProductList() {
-        return "../product/productList";
-    }
-
-    public String doJumpCheckoutEdit() {
-        return "../checkout/checkoutEdit";
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -20,7 +20,7 @@
 
     private BigDecimal quantity;
 
-    private BigDecimal customerBasketId;
+    private BigDecimal basketId;
 
     private String manufacturerName;
 
@@ -53,15 +53,15 @@
     /**
      * @return customersBasketId
      */
-    public BigDecimal getCustomerBasketId() {
-        return customerBasketId;
+    public BigDecimal getBasketId() {
+        return basketId;
     }
 
     /**
      * @param customersBasketId 設定する customersBasketId
      */
-    public void setCustomerBasketId(BigDecimal customersBasketId) {
-        this.customerBasketId = customersBasketId;
+    public void setBasketId(BigDecimal customersBasketId) {
+        this.basketId = customersBasketId;
     }
 
     public BigDecimal getQuantity() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -4,6 +4,8 @@
 
 import javax.faces.context.FacesContext;
 
+import org.seasar.framework.log.Logger;
+
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.service.CustomerService;
@@ -11,14 +13,14 @@
 
 public class CheckoutCompleteAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 4915206497601066893L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(CheckoutConfirmAction.class); // LOG CODE: ?PC027?
+
     private CheckoutCompletePage checkoutCompletePage;
 
     private CustomerService customerService;
@@ -36,13 +38,12 @@
         }
 
         // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(
-                remoteUser);
+        Customer customers = customerService.getCustomerByPortalId(remoteUser);
         if (customers == null) {
             return UserInfoEditPage.class;
         }
 
-        if (getCheckoutCompletePage().getOrderFormNumber() == null) {
+        if (checkoutCompletePage.getOrderFormNumber() == null) {
             return UserInfoEditPage.class;
         }
 
@@ -58,33 +59,4 @@
         return null;
     }
 
-    /**
-     * @return checkoutCompletePage
-     */
-    public CheckoutCompletePage getCheckoutCompletePage() {
-        return checkoutCompletePage;
-    }
-
-    /**
-     * @param checkoutCompletePage 設定する checkoutCompletePage
-     */
-    public void setCheckoutCompletePage(
-            CheckoutCompletePage checkoutCompletePage) {
-        this.checkoutCompletePage = checkoutCompletePage;
-    }
-
-    /**
-     * @return customerService
-     */
-    public CustomerService getCustomerService() {
-        return customerService;
-    }
-
-    /**
-     * @param customerService 設定する customerService
-     */
-    public void setCustomerService(CustomerService customerService) {
-        this.customerService = customerService;
-    }
-
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,79 +1,88 @@
 package jp.sf.pal.pompei.web.user.checkout;
 
 import java.io.Serializable;
+import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 import javax.faces.context.FacesContext;
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
 
 import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.PompeiException;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
-import jp.sf.pal.pompei.dxo.OrderFormDxo;
+import jp.sf.pal.pompei.dxo.OrderDxo;
+import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.entity.notification.order.Order;
 import jp.sf.pal.pompei.exentity.AddressBook;
-import jp.sf.pal.pompei.exentity.Currency;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
-import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
-import jp.sf.pal.pompei.exentity.ManufacturerDescription;
+import jp.sf.pal.pompei.exentity.DeliveryMethod;
 import jp.sf.pal.pompei.exentity.OrderCardInfo;
-import jp.sf.pal.pompei.exentity.PaymentMethodDescription;
-import jp.sf.pal.pompei.exentity.ProductDescription;
-import jp.sf.pal.pompei.exentity.TaxRate;
+import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderNotification;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.OrderStatus;
+import jp.sf.pal.pompei.exentity.PaymentMethod;
+import jp.sf.pal.pompei.exentity.Product;
 import jp.sf.pal.pompei.fee.FeeCalculator;
-import jp.sf.pal.pompei.service.CartService;
 import jp.sf.pal.pompei.service.CustomerService;
-import jp.sf.pal.pompei.service.DeliveryMethodSerivce;
-import jp.sf.pal.pompei.service.ManufacturerService;
 import jp.sf.pal.pompei.service.OrderService;
-import jp.sf.pal.pompei.service.PaymentMethodService;
 import jp.sf.pal.pompei.service.ProductService;
-import jp.sf.pal.pompei.service.TaxService;
+import jp.sf.pal.pompei.service.SystemService;
 import jp.sf.pal.pompei.util.SessionUtil;
+import jp.sf.pal.pompei.util.SystemUtil;
+import jp.sf.pal.pompei.util.VelocityUtil;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
 import org.seasar.framework.container.ComponentNotFoundRuntimeException;
 import org.seasar.framework.container.CyclicReferenceRuntimeException;
 import org.seasar.framework.container.S2Container;
 import org.seasar.framework.container.TooManyRegistrationRuntimeException;
+import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class CheckoutConfirmAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 1684922335841191730L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(CheckoutConfirmAction.class); // LOG CODE: ?PC025?, ?PC026?
+
     private CheckoutConfirmPage checkoutConfirmPage;
 
     private CustomerService customerService;
 
-    private CartService cartService;
-
     private ProductService productService;
 
-    private ManufacturerService manufacturerService;
+    private SystemService systemService;
 
-    private DeliveryMethodSerivce deliveryMethodSerivce;
-
-    private PaymentMethodService paymentMethodService;
-
-    private TaxService taxService;
-
     private OrderService orderService;
 
     private CustomerDxo customerDxo;
 
-    private OrderFormDxo orderFormDxo;
+    private OrderDxo orderDxo;
 
+    private ProductDxo productDxo;
+
     private transient S2Container container;
 
     public Class<?> initialize() {
@@ -88,191 +97,201 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customers == null) {
-            return UserInfoEditPage.class;
-        }
+        try {
+            // check user info
+            Customer customers = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customers == null) {
+                return UserInfoEditPage.class;
+            }
 
-        Map<String, Object> orderProcessMap = getOrderProcessMap();
-        if (orderProcessMap == null) {
-            // expires session
-            FacesMessageUtil
-                    .addErrorMessage("expire.order.process.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
+            Map<String, Object> orderProcessMap = getOrderProcessMap();
+            if (orderProcessMap == null) {
+                // expires session
+                FacesMessageUtil
+                        .addErrorMessage("expire.order.process.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
 
-        List<CustomerBasket> baskets = getCartService().getCustomerBasketList(
-                customers.getCustomerId());
-        if (baskets.isEmpty()) {
-            // clean up in the cart
-            FacesMessageUtil
-                    .addErrorMessage("cart.is.empty.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
+            List<Basket> baskets = customerService.getBasketListByCustomerId(
+                    customers.getCustomerId(), SystemUtil.getCurrentLanguage());
+            if (baskets.isEmpty()) {
+                // clean up in the cart
+                FacesMessageUtil
+                        .addErrorMessage("cart.is.empty.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
 
-        List<BigDecimal> customersBasketIdList = new ArrayList<BigDecimal>();
+            List<BigDecimal> customersBasketIdList = new ArrayList<BigDecimal>();
 
-        BigDecimal subTotalPrice = new BigDecimal(0);
-        List<Map<String, Object>> products = new ArrayList<Map<String, Object>>();
-        // TODO Dxo... it may be difficult..
-        for (CustomerBasket basket : baskets) {
-            customersBasketIdList.add(basket.getCustomerBasketId());
-            subTotalPrice = subTotalPrice.add(basket.getFinalPrice());
-            ProductDescription pd = getProductService().getProdcutDescription(
-                    basket.getProductId());
-            ManufacturerDescription mi = getManufacturerService()
-                    .getManufactureDescription(
-                            basket.getProduct().getManufacturerId());
-            Map<String, Object> map = new HashMap<String, Object>();
-            map.put("customerBasketId", basket.getCustomerBasketId());
-            map.put("name", pd.getName());
-            map.put("url", pd.getUrl());
-            map.put("model", basket.getProduct().getModel());
-            map.put("manufacturerName", mi.getManufacturer().getName());
-            map.put("quantity", basket.getQuantity());
-            map.put("price", basket.getProduct().getPrice());
-            map.put("finalPrice", basket.getFinalPrice());
-            products.add(map);
-        }
-        getCheckoutConfirmPage().setSubTotalPrice(subTotalPrice);
-        getCheckoutConfirmPage().setCustomerBasketItems(products);
+            BigDecimal subTotalPrice = new BigDecimal(0);
+            List<Map<String, Object>> products = new ArrayList<Map<String, Object>>();
+            // TODO Dxo... it may be difficult..
+            for (Basket basket : baskets) {
+                customersBasketIdList.add(basket.getBasketId());
+                subTotalPrice = subTotalPrice.add(basket.getFinalPrice());
+                Product product = productService.getProduct(basket
+                        .getProductId(), SystemUtil.getCurrentLanguage());
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("basketId", basket.getBasketId());
+                map.put("name", product.getName());
+                map.put("url", product.getUrl());
+                map.put("model", product.getModel());
+                map.put("manufacturerName", product.getManufacturerName());
+                map.put("quantity", basket.getQuantity());
+                map.put("price", basket.getProduct().getPrice());
+                map.put("finalPrice", basket.getFinalPrice());
+                products.add(map);
+            }
+            checkoutConfirmPage.setSubTotalPrice(subTotalPrice);
+            checkoutConfirmPage.setBasketItems(products);
 
-        orderProcessMap.put(PompeiConstants.CUSTOMER_BASKET_ID_LIST,
-                customersBasketIdList);
+            orderProcessMap.put(PompeiConstants.CUSTOMER_BASKET_ID_LIST,
+                    customersBasketIdList);
 
-        // address
-        String deliveryAddressBookId = (String) orderProcessMap
-                .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID);
-        if (deliveryAddressBookId == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.delivery.addressbook.id.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        AddressBook deliveryAddressBook;
-        try {
-            deliveryAddressBook = getCustomerService().getAddressBook(
-                    new BigDecimal(deliveryAddressBookId));
-        } catch (NumberFormatException e) {
-            FacesMessageUtil
-                    .addErrorMessage("invalid.delivery.addressbook.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        if (deliveryAddressBook == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.delivery.addressbook.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        getCustomerDxo().convert(deliveryAddressBook, getCheckoutConfirmPage());
+            // address
+            String deliveryAddressBookId = (String) orderProcessMap
+                    .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID);
+            if (deliveryAddressBookId == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.delivery.addressbook.id.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            AddressBook deliveryAddressBook = null;
+            try {
+                deliveryAddressBook = customerService
+                        .getAddressBook(new BigDecimal(deliveryAddressBookId));
+            } catch (NumberFormatException e) {
+                FacesMessageUtil
+                        .addErrorMessage("invalid.delivery.addressbook.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            if (deliveryAddressBook == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.delivery.addressbook.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            customerDxo.convertFromAddressBookToPage(deliveryAddressBook,
+                    checkoutConfirmPage);
 
-        //  tax
-        TaxRate taxRates = getTaxService().getTaxRateByZoneId(
-                deliveryAddressBook.getZone().getZoneId());
-        if (taxRates == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.tax.rate.incheckoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        BigDecimal tax = subTotalPrice.multiply(taxRates.getRate()).divide(
-                new BigDecimal(100));
-        getCheckoutConfirmPage().setTax(tax);
+            //  TODO tax
+            //        TaxRate taxRates = getTaxService().getTaxRateByZoneId(
+            //                deliveryAddressBook.getZone().getZoneId());
+            //        if (taxRates == null) {
+            //            FacesMessageUtil
+            //                    .addErrorMessage("could.not.find.tax.rate.incheckoutconfirm");
+            //            return UserInfoEditPage.class;
+            //        }
+            //      BigDecimal tax = subTotalPrice.multiply(taxRates.getRate()).divide(
+            //      new BigDecimal(100));
+            BigDecimal tax = new BigDecimal(0);
+            checkoutConfirmPage.setTax(tax);
 
-        Map<String, Object> informationMap = new HashMap<String, Object>();
-        informationMap.put(PompeiConstants.SUB_TOTAL_PRICE, subTotalPrice);
-        informationMap.put(PompeiConstants.TAX, tax);
+            Map<String, Object> informationMap = new HashMap<String, Object>();
+            informationMap.put(PompeiConstants.SUB_TOTAL_PRICE, subTotalPrice);
+            informationMap.put(PompeiConstants.TAX, tax);
 
-        // payment
-        BigDecimal paymentMethodId = (BigDecimal) orderProcessMap
-                .get(PompeiConstants.PAYMENT_METHOD_ID);
-        if (paymentMethodId == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.payment.method.id.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        PaymentMethodDescription pmd = getPaymentMethodService()
-                .getPaymentMethodDescription(paymentMethodId);
-        if (pmd == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.payment.method.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        getCheckoutConfirmPage().setPaymentMethodName(pmd.getName());
+            // payment
+            BigDecimal paymentMethodId = (BigDecimal) orderProcessMap
+                    .get(PompeiConstants.PAYMENT_METHOD_ID);
+            if (paymentMethodId == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.payment.method.id.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            PaymentMethod paymentMethod = systemService.getPaymentMethod(
+                    paymentMethodId, SystemUtil.getCurrentLanguage());
+            if (paymentMethod == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.payment.method.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            checkoutConfirmPage.setPaymentMethodName(paymentMethod.getName());
 
-        // payment fee
-        String paymentMethodObjectName = pmd.getPaymentMethod().getObjectName();
-        BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE;
-        try {
-            FeeCalculator pmc = (FeeCalculator) getContainer().getComponent(
-                    paymentMethodObjectName);
-            paymentFee = pmc.calculate(baskets, deliveryAddressBook,
-                    informationMap);
-            getCheckoutConfirmPage().setPaymentFee(paymentFee);
-        } catch (ComponentNotFoundRuntimeException e) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.calculate.payment.fee.1");
-            //TODO logger
-            return UserInfoEditPage.class;
-        } catch (TooManyRegistrationRuntimeException e) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.calculate.payment.fee.2");
-            //TODO logger
-            return UserInfoEditPage.class;
-        } catch (CyclicReferenceRuntimeException e) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.calculate.payment.fee.3");
-            //TODO logger
-            return UserInfoEditPage.class;
-        }
+            // payment fee
+            String paymentMethodObjectName = paymentMethod.getObjectName();
+            BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE;
+            try {
+                FeeCalculator pmc = (FeeCalculator) container
+                        .getComponent(paymentMethodObjectName);
+                paymentFee = pmc.calculate(baskets, deliveryAddressBook,
+                        informationMap);
+                checkoutConfirmPage.setPaymentFee(paymentFee);
+            } catch (ComponentNotFoundRuntimeException e) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.calculate.payment.fee.1");
+                logger.log("EPC0251", new Object[] { this.toString() }, e);
+                return UserInfoEditPage.class;
+            } catch (TooManyRegistrationRuntimeException e) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.calculate.payment.fee.2");
+                logger.log("EPC0252", new Object[] { this.toString() }, e);
+                return UserInfoEditPage.class;
+            } catch (CyclicReferenceRuntimeException e) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.calculate.payment.fee.3");
+                logger.log("EPC0253", new Object[] { this.toString() }, e);
+                return UserInfoEditPage.class;
+            }
 
-        // deliveryMethod
-        BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap
-                .get(PompeiConstants.DELIVERY_METHOD_ID);
-        if (deliveryMethodId == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.delivery.method.id.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
-                .getDeliveryMethodDescription(deliveryMethodId);
-        if (dmd == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.delivery.method.in.checkoutconfirm");
-            return UserInfoEditPage.class;
-        }
-        getCheckoutConfirmPage().setDeliveryMethodName(dmd.getName());
+            // deliveryMethod
+            BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap
+                    .get(PompeiConstants.DELIVERY_METHOD_ID);
+            if (deliveryMethodId == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.delivery.method.id.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            DeliveryMethod deliveryMethod = systemService.getDeliveryMethod(
+                    deliveryMethodId, SystemUtil.getCurrentLanguage());
+            if (deliveryMethod == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.delivery.method.in.checkoutconfirm");
+                return UserInfoEditPage.class;
+            }
+            checkoutConfirmPage.setDeliveryMethodName(deliveryMethod.getName());
 
-        // delivery fee
-        String deliveryMethodObjectName = dmd.getDeliveryMethod()
-                .getObjectName();
-        BigDecimal deliveryPrice = PompeiConstants.DEFAULT_DELIVERY_PRICE;
-        try {
-            FeeCalculator dmc = (FeeCalculator) getContainer().getComponent(
-                    deliveryMethodObjectName);
-            deliveryPrice = dmc.calculate(baskets, deliveryAddressBook,
-                    informationMap);
-            getCheckoutConfirmPage().setDeliveryPrice(deliveryPrice);
-        } catch (ComponentNotFoundRuntimeException e) {
+            // delivery fee
+            String deliveryMethodObjectName = deliveryMethod.getObjectName();
+            BigDecimal deliveryPrice = PompeiConstants.DEFAULT_DELIVERY_PRICE;
+            try {
+                FeeCalculator dmc = (FeeCalculator) container
+                        .getComponent(deliveryMethodObjectName);
+                deliveryPrice = dmc.calculate(baskets, deliveryAddressBook,
+                        informationMap);
+                checkoutConfirmPage.setDeliveryPrice(deliveryPrice);
+            } catch (ComponentNotFoundRuntimeException e) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.calculate.delivery.price.1");
+                logger.log("EPC0254", new Object[] { this.toString() }, e);
+                return UserInfoEditPage.class;
+            } catch (TooManyRegistrationRuntimeException e) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.calculate.delivery.price.2");
+                logger.log("EPC0255", new Object[] { this.toString() }, e);
+                return UserInfoEditPage.class;
+            } catch (CyclicReferenceRuntimeException e) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.calculate.delivery.price.3");
+                logger.log("EPC0256", new Object[] { this.toString() }, e);
+                return UserInfoEditPage.class;
+            }
+
+            // total
+            checkoutConfirmPage.setTotalPrice(subTotalPrice.add(tax).add(
+                    deliveryPrice).add(paymentFee));
+        } catch (PompeiDBException e) {
             FacesMessageUtil
-                    .addErrorMessage("could.not.calculate.delivery.price.1");
-            //TODO logger
+                    .addErrorMessage("failed.to.load.order.in.checkout.process");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
             return UserInfoEditPage.class;
-        } catch (TooManyRegistrationRuntimeException e) {
+        } catch (Exception e) {
             FacesMessageUtil
-                    .addErrorMessage("could.not.calculate.delivery.price.2");
-            //TODO logger
+                    .addErrorMessage("failed.to.load.order.in.checkout.process");
+            logger.log("EPC0257", new Object[] { this.toString() }, e);
             return UserInfoEditPage.class;
-        } catch (CyclicReferenceRuntimeException e) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.calculate.delivery.price.3");
-            //TODO logger
-            return UserInfoEditPage.class;
         }
 
-        // total
-        getCheckoutConfirmPage().setTotalPrice(
-                subTotalPrice.add(tax).add(deliveryPrice).add(paymentFee));
-
         // render FacesMessages
         FacesMessageUtil.renderMessages();
         return null;
@@ -287,100 +306,288 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customer = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customer == null) {
-            return UserInfoEditPage.class;
-        }
+        try {
+            // check user info
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                return UserInfoEditPage.class;
+            }
 
-        Map<String, Object> map = (Map<String, Object>) SessionUtil
-                .getFromLocalScope(getCheckoutConfirmPage().getOrderProcessId());
-        if (map == null) {
-            // expires session
-            // TODO clear session info for card
+            Map<String, Object> map = (Map<String, Object>) SessionUtil
+                    .getFromLocalScope(checkoutConfirmPage.getOrderProcessId());
+            if (map == null) {
+                // expires session
+                // TODO clear session info for card
+                FacesMessageUtil
+                        .addErrorMessage("expire.order.process.in.checkoutconfirm.for.confirm");
+                return UserInfoEditPage.class;
+            }
+
+            BigDecimal paymentMethodId = (BigDecimal) map
+                    .get(PompeiConstants.PAYMENT_METHOD_ID);
+            String cardCode = (String) map.get(PompeiConstants.CARD_TYPE);
+            String cardNumber = (String) map.get(PompeiConstants.CARD_NUMBER);
+            String cardOwner = (String) map.get(PompeiConstants.CARD_OWNER);
+            String cardExpires = (String) map.get(PompeiConstants.CARD_EXPIRES);
+            BigDecimal deliveryMethodId = (BigDecimal) map
+                    .get(PompeiConstants.DELIVERY_METHOD_ID);
+            String deliveryAddressBookIdStr = (String) map
+                    .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID);
+            List<BigDecimal> basketIdList = (List<BigDecimal>) map
+                    .get(PompeiConstants.CUSTOMER_BASKET_ID_LIST);
+
+            if (basketIdList.isEmpty()) {
+                FacesMessageUtil.addErrorMessage("cart.is.empty");
+                return null;
+            }
+
+            if (paymentMethodId == null || deliveryMethodId == null
+                    || deliveryAddressBookIdStr == null || basketIdList == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.cart.info.in.checkoutconfirm");
+                return null;
+            }
+
+            OrderCardInfo orderCardInfo = null;
+            if (cardCode != null) {
+                orderCardInfo = new OrderCardInfo();
+                orderCardInfo.setCardTypeCode(cardCode);
+                orderCardInfo.setCardNumber(cardNumber);
+                orderCardInfo.setCardOwner(cardOwner);
+                orderCardInfo.setCardExpires(cardExpires);
+            }
+
+            BigDecimal deliveryAddressBookId = new BigDecimal(
+                    deliveryAddressBookIdStr);
+
+            PaymentMethod paymentMethod = systemService.getPaymentMethod(
+                    paymentMethodId, SystemUtil.getCurrentLanguage());
+            DeliveryMethod deliveryMethod = systemService.getDeliveryMethod(
+                    deliveryMethodId, SystemUtil.getCurrentLanguage());
+            AddressBook defaultAddressBook = customerService
+                    .getDefaultAddressBook(customer.getCustomerId());
+            AddressBook deliveryAddressBook = customerService
+                    .getAddressBook(deliveryAddressBookId);
+
+            OrderForm orderForm = new OrderForm();
+            orderDxo.convertFromCustomerAddressBookToOrderForm(
+                    defaultAddressBook, orderForm);
+            // TODO select billing address book
+            orderDxo.convertFromBillingAddressBookToOrderForm(
+                    defaultAddressBook, orderForm);
+            orderDxo.convertFromDeliveryAddressBookToOrderForm(
+                    defaultAddressBook, orderForm);
+            orderDxo.convertFromCustomerToOrderForm(customer, orderForm);
+
+            orderForm.setPaymentMethodId(paymentMethod.getPaymentMethodId());
+            orderForm.setDeliveryMethodId(deliveryMethod.getDeliveryMethodId());
+            //TODO others
+            orderForm.setSubTotalPrice(checkoutConfirmPage.getSubTotalPrice());
+            orderForm.setTax(checkoutConfirmPage.getTax());
+            orderForm.setDeliveryPrice(checkoutConfirmPage.getDeliveryPrice());
+            orderForm.setPaymentFee(checkoutConfirmPage.getPaymentFee());
+            orderForm.setTotalPrice(checkoutConfirmPage.getTotalPrice());
+
+            // basketIdList
+            List<Basket> basketList;
+            try {
+                basketList = customerService.getBasketList(basketIdList,
+                        SystemUtil.getCurrentLanguage());
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("could.not.find.cart.info");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+                return null;
+            }
+
+            // customer basket
+            List<OrderProduct> orderProductList = new ArrayList<OrderProduct>();
+            for (Basket basket : basketList) {
+
+                OrderProduct orderProduct = new OrderProduct();
+                orderDxo.convertFromProductToOrderProduct(basket.getProduct(),
+                        orderProduct);
+                orderProduct.setOrderFormId(orderForm.getOrderFormId());
+                // TODO bargain price
+                orderProduct.setFinalPrice(basket.getFinalPrice());
+                //TODO tax
+                orderProduct.setTax(new BigDecimal(0));
+                orderProduct.setQuantity(basket.getQuantity());
+
+                //TODO sync? stock info 
+                //            Product product = basket.getProduct();
+                //            if (product.getStock() != null) {
+                //                BigDecimal quantity = product.getStock().subtract(
+                //                        basket.getQuantity());
+                //                if (quantity.intValue() < 0) {
+                //                    FacesMessageUtil.addErrorMessage("prodocut.is.shortage");
+                //                    logger.log("EPC0258", new Object[] { this.toString() });
+                //                    return null;
+                //                }
+                //                product.setStock(quantity);
+                //            }
+                orderProductList.add(orderProduct);
+            }
+            orderForm.setOrderProductList(orderProductList);
+
+            String orderFormNumber = orderService.addOrderForm(orderForm,
+                    orderCardInfo);
+            checkoutConfirmPage.setOrderFormNumber(orderFormNumber);
+
+            // send mail
+            OrderStatus orderStatus = systemService.getOrderStatus(orderForm
+                    .getOrderStatusId(), SystemUtil.getCurrentLanguage());
+            if (orderStatus != null
+                    && PompeiConstants.NEW_ORDER_STATUS_TYPE.equals(orderStatus
+                            .getType())) {
+                List<OrderNotification> orderNotificationList = orderStatus
+                        .getOrderNotificationList();
+                if (orderNotificationList != null
+                        && !orderNotificationList.isEmpty()) {
+                    BigDecimal[] orderNotificationIds = new BigDecimal[orderNotificationList
+                            .size()];
+                    int count = 0;
+                    for (OrderNotification orderNotification : orderNotificationList) {
+                        orderNotificationIds[count] = orderNotification
+                                .getOrderNotificationId();
+                        count++;
+                    }
+                    try {
+                        sendOrderNotifications(orderForm, orderNotificationIds);
+                    } catch (PompeiException e) {
+                        //TODO cancel order?
+                        FacesMessageUtil.addErrorMessage(e.getMessageId(), e
+                                .getArgs());
+                        logger.log("EPC0259", new Object[] { this.toString() },
+                                e);
+                    } catch (Exception e) {
+                        //TODO cancel order?
+                        logger.log("EPC0260", new Object[] { this.toString() },
+                                e);
+                    }
+                }
+            }
+
+            // remove order process id
+            SessionUtil.removeFromLocalScope(checkoutConfirmPage
+                    .getOrderProcessId());
+
+            return CheckoutCompletePage.class;
+        } catch (PompeiDBException e) {
             FacesMessageUtil
-                    .addErrorMessage("expire.order.process.in.checkoutconfirm.for.confirm");
-            return UserInfoEditPage.class;
+                    .addErrorMessage("system.error.occurs.in.order.process");
+            logger.log("EPC0262", new Object[] { this.toString() }, e);
         }
+        return null;
+    }
 
-        BigDecimal paymentMethodId = (BigDecimal) map
-                .get(PompeiConstants.PAYMENT_METHOD_ID);
-        String cardCode = (String) map.get(PompeiConstants.CARD_TYPE);
-        String cardNumber = (String) map.get(PompeiConstants.CARD_NUMBER);
-        String cardOwner = (String) map.get(PompeiConstants.CARD_OWNER);
-        String cardExpires = (String) map.get(PompeiConstants.CARD_EXPIRES);
-        BigDecimal deliveryMethodId = (BigDecimal) map
-                .get(PompeiConstants.DELIVERY_METHOD_ID);
-        String deliveryAddressBookIdStr = (String) map
-                .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID);
-        List<BigDecimal> customerBasketIdList = (List<BigDecimal>) map
-                .get(PompeiConstants.CUSTOMER_BASKET_ID_LIST);
-        if (paymentMethodId == null || deliveryMethodId == null
-                || deliveryAddressBookIdStr == null
-                || customerBasketIdList == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.cart.info.in.checkoutconfirm");
-            return null;
+    protected void sendOrderNotifications(OrderForm orderForm,
+            BigDecimal[] orderNotificationIds) throws PompeiException {
+        if (orderForm == null) {
+            throw new PompeiException(
+                    "could.not.find.orderformid.in.notification");
         }
 
-        OrderCardInfo orderCardInfo = null;
-        if (cardCode != null) {
-            orderCardInfo = new OrderCardInfo();
-            orderCardInfo.setCardCode(cardCode);
-            orderCardInfo.setCardNumber(cardNumber);
-            orderCardInfo.setCardOwner(cardOwner);
-            orderCardInfo.setCardExpires(cardExpires);
+        List<String> errors = new ArrayList<String>();
+        for (BigDecimal orderNotificationId : orderNotificationIds) {
+            OrderNotification orderNotification = systemService
+                    .getOrderNotification(orderNotificationId);
+            if (orderNotification != null) {
+                String to = orderNotification.getEmailAddress();
+                if (to == null || "".equals(to)) {
+                    to = orderForm.getCustomerEmailAddress();
+                }
+                try {
+                    sendOrderNotification(orderForm, to, SystemUtil
+                            .getAdministratorEmail(), orderNotification
+                            .getTemplateName());
+                } catch (Exception e) {
+                    logger.log("EPC0261", new Object[] { this.toString() }, e);
+                    errors.add(orderNotification.getTemplateName() + "(" + to
+                            + ")");
+                }
+            }
         }
+        if (!errors.isEmpty()) {
+            String templates = StringUtils.join(errors.toArray(), ", ");
+            throw new PompeiException("failed.to.send.some.order.notification",
+                    new String[] { templates });
+        }
+    }
 
-        BigDecimal deliveryAddressBookId = new BigDecimal(
-                deliveryAddressBookIdStr);
+    private void sendOrderNotification(OrderForm orderForm, String to,
+            String from, String templateName) throws PompeiException {
+        try {
+            Order order = new Order();
+            orderDxo.convertFromOrderFormToNotification(orderForm, order);
+            List<OrderProduct> orderProductList = orderService
+                    .getOrderProductListByOrderFormId(orderForm
+                            .getOrderFormId());
+            for (OrderProduct orderProduct : orderProductList) {
+                //TODO i18n: pass language id
+                Product product = productService.getProduct(orderProduct
+                        .getProductId(), SystemUtil.getCurrentLanguage());
+                jp.sf.pal.pompei.entity.notification.order.Product productNotification = new jp.sf.pal.pompei.entity.notification.order.Product();
+                productDxo.convertFromProductToNotification(product,
+                        productNotification);
+                orderDxo.convertFromOrderProductToNotification(orderProduct,
+                        productNotification);
+                order.addProduct(productNotification);
+            }
 
-        PaymentMethodDescription pmd = getPaymentMethodService()
-                .getPaymentMethodDescription(paymentMethodId);
-        DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
-                .getDeliveryMethodDescription(deliveryMethodId);
-        AddressBook defaultAddressBook = getCustomerService()
-                .getDefaultAddressBook(customer.getCustomerId());
-        AddressBook deliveryAddressBook = getCustomerService().getAddressBook(
-                deliveryAddressBookId);
-        Currency currency = getOrderService().getCurrency(
-                PompeiConstants.DEFAULT_CURRENCY_ID);
+            // set velocity context
+            VelocityContext context = new VelocityContext();
+            context.put("order", order);
 
-        // TODO select billing address book
-        // TODO currency
-        try {
-            String orderFormNumber = getOrderService().addOrderForm(customer,
-                    customerBasketIdList, defaultAddressBook,
-                    deliveryAddressBook, defaultAddressBook,
-                    pmd.getPaymentMethod(), dmd.getDeliveryMethod(),
-                    orderCardInfo, currency,
-                    getCheckoutConfirmPage().getSubTotalPrice(),
-                    getCheckoutConfirmPage().getTax(),
-                    getCheckoutConfirmPage().getDeliveryPrice(),
-                    getCheckoutConfirmPage().getPaymentFee(),
-                    getCheckoutConfirmPage().getTotalPrice());
-            getCheckoutConfirmPage().setOrderFormNumber(orderFormNumber);
-        } catch (CommonException e) {
-            FacesMessageUtil.addErrorMessage(e.getMessageId());
-            //TODO logger
-            return null;
+            VelocityUtil.init();
+            StringWriter sw = new StringWriter();
+            String templatePath = SystemUtil
+                    .getOrderNotificationTemplatePath(templateName);
+            // TODO i18n: encoding
+            Template template = VelocityUtil.getTemplate(templatePath, "UTF-8");
+
+            template.merge(context, sw);
+
+            String content = sw.toString();
+            if (content == null) {
+                throw new CommonException("notification.content.is.null");
+            }
+            int index = content.indexOf("\n");
+            String subject = null;
+            String body = null;
+            if (index != -1) {
+                subject = content.substring(0, index);
+                body = content.substring(index);
+            } else {
+                // TODO should throw exception?
+                subject = content;
+                body = content;
+            }
+            Properties props = System.getProperties();
+            // set smtp server
+            props.put("mail.smtp.host", SystemUtil.getSmtpHost());
+            Session session = Session.getDefaultInstance(props, null);
+            MimeMessage mimeMessage = new MimeMessage(session);
+            mimeMessage.setFrom(new InternetAddress(from));
+            mimeMessage.setRecipients(Message.RecipientType.TO, to);
+            //TODO i18n: encoding
+            mimeMessage.setSubject(subject, "iso-2022-jp");
+            //TODO i18n: encoding
+            mimeMessage.setText(body, "iso-2022-jp");
+            mimeMessage.setHeader("Content-Type", "text/plain");
+            mimeMessage.setSentDate(new Date());
+
+            Transport.send(mimeMessage);
         } catch (Exception e) {
-            FacesMessageUtil.addErrorMessage("could.not.store.order");
-            //TODO logger
-            return null;
+            throw new PompeiException("faild.to.send.order.notification", e);
         }
 
-        // remove order process id
-        SessionUtil.removeFromLocalScope(getCheckoutConfirmPage()
-                .getOrderProcessId());
-
-        return CheckoutCompletePage.class;
     }
 
     @TakeOver(type = TakeOverType.NEVER)
     public Class<?> doCancel() {
-        SessionUtil.removeFromLocalScope(getCheckoutConfirmPage()
+        SessionUtil.removeFromLocalScope(checkoutConfirmPage
                 .getOrderProcessId());
         FacesMessageUtil.addInfoMessage("canceled.order");
         return UserInfoEditPage.class;
@@ -388,177 +595,79 @@
 
     private Map<String, Object> getOrderProcessMap() {
         return (Map<String, Object>) SessionUtil
-                .getFromLocalScope(getCheckoutConfirmPage().getOrderProcessId());
+                .getFromLocalScope(checkoutConfirmPage.getOrderProcessId());
     }
 
-    /**
-     * @return checkoutConfirmPage
-     */
     public CheckoutConfirmPage getCheckoutConfirmPage() {
         return checkoutConfirmPage;
     }
 
-    /**
-     * @param checkoutConfirmPage 設定する checkoutConfirmPage
-     */
     public void setCheckoutConfirmPage(CheckoutConfirmPage checkoutConfirmPage) {
         this.checkoutConfirmPage = checkoutConfirmPage;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return cartService
-     */
-    public CartService getCartService() {
-        return cartService;
-    }
-
-    /**
-     * @param cartService 設定する cartService
-     */
-    public void setCartService(CartService cartService) {
-        this.cartService = cartService;
-    }
-
-    /**
-     * @return productService
-     */
     public ProductService getProductService() {
         return productService;
     }
 
-    /**
-     * @param productService 設定する productService
-     */
     public void setProductService(ProductService productService) {
         this.productService = productService;
     }
 
-    /**
-     * @return manufacturerService
-     */
-    public ManufacturerService getManufacturerService() {
-        return manufacturerService;
+    public SystemService getSystemService() {
+        return systemService;
     }
 
-    /**
-     * @param manufacturerService 設定する manufacturerService
-     */
-    public void setManufacturerService(ManufacturerService manufacturerService) {
-        this.manufacturerService = manufacturerService;
+    public void setSystemService(SystemService systemService) {
+        this.systemService = systemService;
     }
 
-    /**
-     * @return customerDxo
-     */
+    public OrderService getOrderService() {
+        return orderService;
+    }
+
+    public void setOrderService(OrderService orderService) {
+        this.orderService = orderService;
+    }
+
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo 設定する customerDxo
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }
 
-    /**
-     * @return deliveryMethodSerivce
-     */
-    public DeliveryMethodSerivce getDeliveryMethodSerivce() {
-        return deliveryMethodSerivce;
+    public OrderDxo getOrderDxo() {
+        return orderDxo;
     }
 
-    /**
-     * @param deliveryMethodSerivce 設定する deliveryMethodSerivce
-     */
-    public void setDeliveryMethodSerivce(
-            DeliveryMethodSerivce deliveryMethodSerivce) {
-        this.deliveryMethodSerivce = deliveryMethodSerivce;
+    public void setOrderDxo(OrderDxo orderDxo) {
+        this.orderDxo = orderDxo;
     }
 
-    /**
-     * @return taxService
-     */
-    public TaxService getTaxService() {
-        return taxService;
+    public ProductDxo getProductDxo() {
+        return productDxo;
     }
 
-    /**
-     * @param taxService 設定する taxService
-     */
-    public void setTaxService(TaxService taxService) {
-        this.taxService = taxService;
+    public void setProductDxo(ProductDxo productDxo) {
+        this.productDxo = productDxo;
     }
 
-    /**
-     * @return container
-     */
     public S2Container getContainer() {
         return container;
     }
 
-    /**
-     * @param container 設定する container
-     */
     public void setContainer(S2Container container) {
         this.container = container;
     }
 
-    /**
-     * @return paymentMethodService
-     */
-    public PaymentMethodService getPaymentMethodService() {
-        return paymentMethodService;
-    }
-
-    /**
-     * @param paymentMethodService 設定する paymentMethodService
-     */
-    public void setPaymentMethodService(
-            PaymentMethodService paymentMethodService) {
-        this.paymentMethodService = paymentMethodService;
-    }
-
-    /**
-     * @return orderFormDxo
-     */
-    public OrderFormDxo getOrderFormDxo() {
-        return orderFormDxo;
-    }
-
-    /**
-     * @param orderFormDxo 設定する orderFormDxo
-     */
-    public void setOrderFormDxo(OrderFormDxo orderFormDxo) {
-        this.orderFormDxo = orderFormDxo;
-    }
-
-    /**
-     * @return orderService
-     */
-    public OrderService getOrderService() {
-        return orderService;
-    }
-
-    /**
-     * @param orderService 設定する orderService
-     */
-    public void setOrderService(OrderService orderService) {
-        this.orderService = orderService;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -21,7 +21,7 @@
 
     private LabelHelper labelHelper;
 
-    private List<Map<String, Object>> customerBasketItems;
+    private List<Map<String, Object>> basketItems;
 
     private String deliveryMethodName;
 
@@ -104,16 +104,16 @@
     /**
      * @return customersBasketItems
      */
-    public List<Map<String, Object>> getCustomerBasketItems() {
-        return customerBasketItems;
+    public List<Map<String, Object>> getBasketItems() {
+        return basketItems;
     }
 
     /**
      * @param customersBasketItems 設定する customersBasketItems
      */
-    public void setCustomerBasketItems(
+    public void setBasketItems(
             List<Map<String, Object>> customersBasketItems) {
-        this.customerBasketItems = customersBasketItems;
+        this.basketItems = customersBasketItems;
     }
 
     public String getDeliveryMethodName() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -13,49 +13,39 @@
 import jp.sf.pal.common.util.DateUtil;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CardTypeDxo;
-import jp.sf.pal.pompei.dxo.DeliveryMethodDxo;
-import jp.sf.pal.pompei.dxo.PaymentMethodDxo;
-import jp.sf.pal.pompei.exentity.CardTypeDescription;
+import jp.sf.pal.pompei.dxo.SystemDxo;
+import jp.sf.pal.pompei.exentity.CardType;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
-import jp.sf.pal.pompei.exentity.PaymentMethodDescription;
-import jp.sf.pal.pompei.service.CardTypeService;
+import jp.sf.pal.pompei.exentity.DeliveryMethod;
+import jp.sf.pal.pompei.exentity.PaymentMethod;
 import jp.sf.pal.pompei.service.CustomerService;
-import jp.sf.pal.pompei.service.DeliveryMethodSerivce;
-import jp.sf.pal.pompei.service.PaymentMethodService;
+import jp.sf.pal.pompei.service.SystemService;
 import jp.sf.pal.pompei.util.SessionUtil;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
 import org.seasar.framework.util.StringUtil;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class PaymentSelectAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 5613498829230308147L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(PaymentSelectAction.class); // LOG CODE: ?PC024?
+
     private PaymentSelectPage paymentSelectPage;
 
     private CustomerService customerService;
 
-    private DeliveryMethodSerivce deliveryMethodSerivce;
+    private SystemService systemService;
 
-    private PaymentMethodService paymentMethodService;
+    private SystemDxo systemDxo;
 
-    private CardTypeService cardTypeService;
-
-    private DeliveryMethodDxo deliveryMethodDxo;
-
-    private PaymentMethodDxo paymentMethodDxo;
-
-    private CardTypeDxo cardTypeDxo;
-
     public Class<?> initialize() {
         // ccExpiresYear
         Date now = new Date();
@@ -67,8 +57,8 @@
             map.put("value", Integer.toString(year + i));
             ccExpiresYearItems.add(map);
         }
-        getPaymentSelectPage().setCcExpiresYearItems(ccExpiresYearItems);
-        //        getPaymentSelectPage().setCcExpiresYear(Integer.toString(year));
+        paymentSelectPage.setCcExpiresYearItems(ccExpiresYearItems);
+        //        paymentSelectPage.setCcExpiresYear(Integer.toString(year));
 
         // ccExpiresMonth
         List<Map<String, String>> ccExpiresMonthItems = new ArrayList<Map<String, String>>();
@@ -78,8 +68,8 @@
             map.put("value", Integer.toString(i));
             ccExpiresMonthItems.add(map);
         }
-        getPaymentSelectPage().setCcExpiresMonthItems(ccExpiresMonthItems);
-        //        getPaymentSelectPage().setCcExpiresMonth(
+        paymentSelectPage.setCcExpiresMonthItems(ccExpiresMonthItems);
+        //        paymentSelectPage.setCcExpiresMonth(
         //                Integer.toString(DateUtil.getMonth(now) + 1));
 
         return null;
@@ -93,54 +83,72 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customers == null) {
+        try {
+            // check user info
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                return UserInfoEditPage.class;
+            }
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.customer");
+            logger.log("EPC0241", new Object[] { this.toString() }, e);
             return UserInfoEditPage.class;
         }
 
-        // set delivery method
-        List<DeliveryMethodDescription> dmd = getDeliveryMethodSerivce()
-                .getDeliveryMethodDescriptionList();
-        getPaymentSelectPage().setDeliveryMethodItems(
-                getDeliveryMethodDxo().convert(dmd));
+        try {
+            // set delivery method
+            List<DeliveryMethod> deliveryMethodList = systemService
+                    .getDeliveryMethodList(SystemUtil.getCurrentLanguage());
+            List<Map<String, Object>> deliveryMethodItems = new ArrayList<Map<String, Object>>();
+            systemDxo.convertFromDeliveryMethodToMap(deliveryMethodList,
+                    deliveryMethodItems);
+            paymentSelectPage.setDeliveryMethodItems(deliveryMethodItems);
 
-        // set payment method
-        List<PaymentMethodDescription> pmd = getPaymentMethodService()
-                .getPaymentMethodDescriptionList();
-        getPaymentSelectPage().setPaymentMethodItems(
-                getPaymentMethodDxo().convert(pmd));
+            // set payment method
+            List<PaymentMethod> paymentMethodList = systemService
+                    .getPaymentMethodList(SystemUtil.getCurrentLanguage());
+            List<Map<String, Object>> paymentMethodItems = new ArrayList<Map<String, Object>>();
+            systemDxo.convertFromPaymentMethodToMap(paymentMethodList,
+                    paymentMethodItems);
+            paymentSelectPage.setPaymentMethodItems(paymentMethodItems);
 
-        // check credit card
-        getPaymentSelectPage().setCreditcard(false);
-        for (PaymentMethodDescription paymentMethodDescription : pmd) {
-            if (PompeiConstants.CREDITCARD_PAYMENT_METHOD
-                    .equals(paymentMethodDescription.getPaymentMethod()
-                            .getCode())) {
-                getPaymentSelectPage().setCreditcard(true);
+            // check credit card
+            paymentSelectPage.setCreditcard(false);
+            for (PaymentMethod paymentMethod : paymentMethodList) {
+                if (PompeiConstants.CREDITCARD_PAYMENT_METHOD
+                        .equals(paymentMethod.getCode())) {
+                    paymentSelectPage.setCreditcard(true);
+                }
             }
-        }
 
-        // set card type
-        List<CardTypeDescription> ctd = getCardTypeService()
-                .getCardTypeDescriptionList();
-        getPaymentSelectPage().setCardCodeItems(getCardTypeDxo().convert(ctd));
+            // set card type
+            List<CardType> cardTypeList = systemService
+                    .getCardTypeList(SystemUtil.getCurrentLanguage());
+            List<Map<String, Object>> cardTypeItems = new ArrayList<Map<String, Object>>();
+            systemDxo.convertFromCardTypeToMap(cardTypeList, cardTypeItems);
+            paymentSelectPage.setCardCodeItems(cardTypeItems);
 
-        // set default value
-        if (getPaymentSelectPage().getPaymentMethodItems() != null
-                && getPaymentSelectPage().getPaymentMethodItems().size() == 1) {
-            getPaymentSelectPage().setPaymentMethodId(
-                    (BigDecimal) getPaymentSelectPage().getPaymentMethodItems()
-                            .get(0).get("paymentMethodId"));
+            // set default value
+            if (paymentSelectPage.getPaymentMethodItems() != null
+                    && paymentSelectPage.getPaymentMethodItems().size() == 1) {
+                paymentSelectPage
+                        .setPaymentMethodId((BigDecimal) paymentSelectPage
+                                .getPaymentMethodItems().get(0).get(
+                                        "paymentMethodId"));
+            }
+            if (paymentSelectPage.getDeliveryMethodItems() != null
+                    && paymentSelectPage.getDeliveryMethodItems().size() == 1) {
+                paymentSelectPage
+                        .setDeliveryMethodId((BigDecimal) paymentSelectPage
+                                .getDeliveryMethodItems().get(0).get(
+                                        "deliveryMethodId"));
+            }
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.system.info");
+            logger.log("EPC0242", new Object[] { this.toString() }, e);
+            return UserInfoEditPage.class;
         }
-        if (getPaymentSelectPage().getDeliveryMethodItems() != null
-                && getPaymentSelectPage().getDeliveryMethodItems().size() == 1) {
-            getPaymentSelectPage().setDeliveryMethodId(
-                    (BigDecimal) getPaymentSelectPage()
-                            .getDeliveryMethodItems().get(0).get(
-                                    "deliveryMethodId"));
-        }
 
         // render FacesMessage
         FacesMessageUtil.renderMessages();
@@ -156,228 +164,153 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customer = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customer == null) {
-            return UserInfoEditPage.class;
-        }
+        try {
+            // check user info
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                return UserInfoEditPage.class;
+            }
 
-        Map<String, Object> map = (Map<String, Object>) SessionUtil
-                .getFromLocalScope(getPaymentSelectPage().getOrderProcessId());
-        if (map == null) {
-            // expires session
-            // TODO clear session info for card
-            FacesMessageUtil
-                    .addErrorMessage("expire.order.process.in.paymentselect");
-            return UserInfoEditPage.class;
-        }
-
-        BigDecimal paymentMethodId = getPaymentSelectPage()
-                .getTargetPaymentMethodId();
-        if (paymentMethodId == null) {
-            // TODO clear session info for card
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.payment.method.id.in.paymentselect");
-            return null;
-        }
-        PaymentMethodDescription pmd = getPaymentMethodService()
-                .getPaymentMethodDescription(paymentMethodId);
-        if (pmd == null) {
-            // invalid payment string
-            // TODO clear session info for card
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.payment.method.in.paymentselect");
-            return null;
-        }
-        map.put(PompeiConstants.PAYMENT_METHOD_ID, pmd.getPaymentMethodId());
-
-        // card
-        if (PompeiConstants.CREDITCARD_PAYMENT_METHOD.equals(pmd
-                .getPaymentMethod().getCode())) {
-            // card type
-            if (!StringUtil.isEmpty(getPaymentSelectPage().getCcOwner())) {
-                map.put(PompeiConstants.CARD_TYPE, getPaymentSelectPage()
-                        .getCardCode());
-            } else {
-                // invalid card owner
+            Map<String, Object> map = (Map<String, Object>) SessionUtil
+                    .getFromLocalScope(paymentSelectPage.getOrderProcessId());
+            if (map == null) {
+                // expires session
+                // TODO clear session info for card
                 FacesMessageUtil
-                        .addErrorMessage("could.not.find.card.type.in.paymentselect");
-                return null;
+                        .addErrorMessage("expire.order.process.in.paymentselect");
+                return UserInfoEditPage.class;
             }
-            // card number
-            if (!StringUtil.isEmpty(getPaymentSelectPage().getCcNumber1())
-                    && !StringUtil.isEmpty(getPaymentSelectPage()
-                            .getCcNumber2())
-                    && !StringUtil.isEmpty(getPaymentSelectPage()
-                            .getCcNumber3())
-                    && !StringUtil.isEmpty(getPaymentSelectPage()
-                            .getCcNumber4())) {
-                map.put(PompeiConstants.CARD_NUMBER, getPaymentSelectPage()
-                        .getCcNumber1()
-                        + getPaymentSelectPage().getCcNumber2()
-                        + getPaymentSelectPage().getCcNumber3()
-                        + getPaymentSelectPage().getCcNumber4());
-            } else {
-                // invalid card number
+
+            BigDecimal paymentMethodId = paymentSelectPage
+                    .getTargetPaymentMethodId();
+            if (paymentMethodId == null) {
                 // TODO clear session info for card
                 FacesMessageUtil
-                        .addErrorMessage("could.not.find.card.number.in.paymentselect");
+                        .addErrorMessage("could.not.find.payment.method.id.in.paymentselect");
                 return null;
             }
-            // owner
-            if (!StringUtil.isEmpty(getPaymentSelectPage().getCcOwner())) {
-                map.put(PompeiConstants.CARD_OWNER, getPaymentSelectPage()
-                        .getCcOwner());
-            } else {
-                // invalid card number
+            PaymentMethod pmd = systemService.getPaymentMethod(paymentMethodId,
+                    SystemUtil.getCurrentLanguage());
+            if (pmd == null) {
+                // invalid payment string
                 // TODO clear session info for card
                 FacesMessageUtil
-                        .addErrorMessage("could.not.find.card.owner.in.paymentselect");
+                        .addErrorMessage("could.not.find.payment.method.in.paymentselect");
                 return null;
             }
-            // expire
-            if (!StringUtil.isEmpty(getPaymentSelectPage().getCcExpiresMonth())
-                    && !StringUtil.isEmpty(getPaymentSelectPage()
-                            .getCcExpiresYear())) {
-                map.put(PompeiConstants.CARD_EXPIRES, getPaymentSelectPage()
-                        .getCcExpiresMonth()
-                        + getPaymentSelectPage().getCcExpiresYear());
+            map
+                    .put(PompeiConstants.PAYMENT_METHOD_ID, pmd
+                            .getPaymentMethodId());
+
+            // card
+            if (PompeiConstants.CREDITCARD_PAYMENT_METHOD.equals(pmd.getCode())) {
+                // card type
+                if (!StringUtil.isEmpty(paymentSelectPage.getCcOwner())) {
+                    map.put(PompeiConstants.CARD_TYPE, paymentSelectPage
+                            .getCardCode());
+                } else {
+                    // invalid card owner
+                    FacesMessageUtil
+                            .addErrorMessage("could.not.find.card.type.in.paymentselect");
+                    return null;
+                }
+                // card number
+                if (!StringUtil.isEmpty(paymentSelectPage.getCcNumber1())
+                        && !StringUtil
+                                .isEmpty(paymentSelectPage.getCcNumber2())
+                        && !StringUtil
+                                .isEmpty(paymentSelectPage.getCcNumber3())
+                        && !StringUtil
+                                .isEmpty(paymentSelectPage.getCcNumber4())) {
+                    map.put(PompeiConstants.CARD_NUMBER, paymentSelectPage
+                            .getCcNumber1()
+                            + paymentSelectPage.getCcNumber2()
+                            + paymentSelectPage.getCcNumber3()
+                            + paymentSelectPage.getCcNumber4());
+                } else {
+                    // invalid card number
+                    // TODO clear session info for card
+                    FacesMessageUtil
+                            .addErrorMessage("could.not.find.card.number.in.paymentselect");
+                    return null;
+                }
+                // owner
+                if (!StringUtil.isEmpty(paymentSelectPage.getCcOwner())) {
+                    map.put(PompeiConstants.CARD_OWNER, paymentSelectPage
+                            .getCcOwner());
+                } else {
+                    // invalid card number
+                    // TODO clear session info for card
+                    FacesMessageUtil
+                            .addErrorMessage("could.not.find.card.owner.in.paymentselect");
+                    return null;
+                }
+                // expire
+                if (!StringUtil.isEmpty(paymentSelectPage.getCcExpiresMonth())
+                        && !StringUtil.isEmpty(paymentSelectPage
+                                .getCcExpiresYear())) {
+                    map.put(PompeiConstants.CARD_EXPIRES, paymentSelectPage
+                            .getCcExpiresMonth()
+                            + paymentSelectPage.getCcExpiresYear());
+                } else {
+                    // invalid card number
+                    // TODO clear session info for card
+                    FacesMessageUtil
+                            .addErrorMessage("could.not.find.card.expire.in.paymentselect");
+                    return null;
+                }
+            }
+
+            // delivery method
+            BigDecimal deliveryMethodId = paymentSelectPage
+                    .getTargetDeliveryMethodId();
+            if (deliveryMethodId != null) {
+                map.put(PompeiConstants.DELIVERY_METHOD_ID, deliveryMethodId);
             } else {
-                // invalid card number
-                // TODO clear session info for card
                 FacesMessageUtil
-                        .addErrorMessage("could.not.find.card.expire.in.paymentselect");
+                        .addErrorMessage("could.not.find.delivery.method.id.in.paymentselect");
                 return null;
             }
-        }
-
-        // delivery method
-        BigDecimal deliveryMethodId = getPaymentSelectPage()
-                .getTargetDeliveryMethodId();
-        if (deliveryMethodId != null) {
-            map.put(PompeiConstants.DELIVERY_METHOD_ID, deliveryMethodId);
-        } else {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.delivery.method.id.in.paymentselect");
+            return CheckoutConfirmPage.class;
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("system.error.occur.in.payment");
+            logger.log("EPC0243", new Object[] { this.toString() }, e);
             return null;
         }
 
-        return CheckoutConfirmPage.class;
     }
 
-    /**
-     * @return paymentSelectPage
-     */
     public PaymentSelectPage getPaymentSelectPage() {
         return paymentSelectPage;
     }
 
-    /**
-     * @param paymentSelectPage 設定する paymentSelectPage
-     */
     public void setPaymentSelectPage(PaymentSelectPage paymentSelectPage) {
         this.paymentSelectPage = paymentSelectPage;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return deliveryMethodSerivce
-     */
-    public DeliveryMethodSerivce getDeliveryMethodSerivce() {
-        return deliveryMethodSerivce;
+    public SystemService getSystemService() {
+        return systemService;
     }
 
-    /**
-     * @param deliveryMethodSerivce 設定する deliveryMethodSerivce
-     */
-    public void setDeliveryMethodSerivce(
-            DeliveryMethodSerivce deliveryMethodSerivce) {
-        this.deliveryMethodSerivce = deliveryMethodSerivce;
+    public void setSystemService(SystemService systemService) {
+        this.systemService = systemService;
     }
 
-    /**
-     * @return deliveryMethodDxo
-     */
-    public DeliveryMethodDxo getDeliveryMethodDxo() {
-        return deliveryMethodDxo;
+    public SystemDxo getSystemDxo() {
+        return systemDxo;
     }
 
-    /**
-     * @param deliveryMethodDxo 設定する deliveryMethodDxo
-     */
-    public void setDeliveryMethodDxo(DeliveryMethodDxo deliveryMethodDxo) {
-        this.deliveryMethodDxo = deliveryMethodDxo;
+    public void setSystemDxo(SystemDxo systemDxo) {
+        this.systemDxo = systemDxo;
     }
 
-    /**
-     * @return paymentMethodService
-     */
-    public PaymentMethodService getPaymentMethodService() {
-        return paymentMethodService;
-    }
-
-    /**
-     * @param paymentMethodService 設定する paymentMethodService
-     */
-    public void setPaymentMethodService(
-            PaymentMethodService paymentMethodService) {
-        this.paymentMethodService = paymentMethodService;
-    }
-
-    /**
-     * @return paymentMethodDxo
-     */
-    public PaymentMethodDxo getPaymentMethodDxo() {
-        return paymentMethodDxo;
-    }
-
-    /**
-     * @param paymentMethodDxo 設定する paymentMethodDxo
-     */
-    public void setPaymentMethodDxo(PaymentMethodDxo paymentMethodDxo) {
-        this.paymentMethodDxo = paymentMethodDxo;
-    }
-
-    /**
-     * @return cardTypeService
-     */
-    public CardTypeService getCardTypeService() {
-        return cardTypeService;
-    }
-
-    /**
-     * @param cardTypeService 設定する cardTypeService
-     */
-    public void setCardTypeService(CardTypeService cardTypeService) {
-        this.cardTypeService = cardTypeService;
-    }
-
-    /**
-     * @return cardTypeDxo
-     */
-    public CardTypeDxo getCardTypeDxo() {
-        return cardTypeDxo;
-    }
-
-    /**
-     * @param cardTypeDxo 設定する cardTypeDxo
-     */
-    public void setCardTypeDxo(CardTypeDxo cardTypeDxo) {
-        this.cardTypeDxo = cardTypeDxo;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -36,7 +36,7 @@
 
     private int cardCodeIndex;
 
-    private List<Map<String, String>> cardCodeItems;
+    private List<Map<String, Object>> cardCodeItems;
 
     private String cardCode;
 
@@ -231,14 +231,14 @@
     /**
      * @return cardCodeItems
      */
-    public List<Map<String, String>> getCardCodeItems() {
+    public List<Map<String, Object>> getCardCodeItems() {
         return cardCodeItems;
     }
 
     /**
      * @param cardCodeItems 設定する cardCodeItems
      */
-    public void setCardCodeItems(List<Map<String, String>> cardCodeItems) {
+    public void setCardCodeItems(List<Map<String, Object>> cardCodeItems) {
         this.cardCodeItems = cardCodeItems;
     }
 
@@ -341,21 +341,32 @@
     public void setCreditcard(boolean creditcard) {
         this.creditcard = creditcard;
     }
-	
-	public static String getDoNextSrc() {
-	    return FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm.png";
-	}
-	
-	public static String getDoNextOnmouseover() {
-	    return "src='" + FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm_over.png'";
-	}
-	
-	public static String getDoNextOnmousedown() {
-	    return "src='" + FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm_down.png'";
-	}
-	
-	public static String getDoNextOnmouseout() {
-	    return "src='" + FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm.png'";
-	}
 
+    public static String getDoNextSrc() {
+        return FacesContext.getCurrentInstance().getExternalContext()
+                .getRequestContextPath()
+                + "/images/buttons/gococonfirm.png";
+    }
+
+    public static String getDoNextOnmouseover() {
+        return "src='"
+                + FacesContext.getCurrentInstance().getExternalContext()
+                        .getRequestContextPath()
+                + "/images/buttons/gococonfirm_over.png'";
+    }
+
+    public static String getDoNextOnmousedown() {
+        return "src='"
+                + FacesContext.getCurrentInstance().getExternalContext()
+                        .getRequestContextPath()
+                + "/images/buttons/gococonfirm_down.png'";
+    }
+
+    public static String getDoNextOnmouseout() {
+        return "src='"
+                + FacesContext.getCurrentInstance().getExternalContext()
+                        .getRequestContextPath()
+                + "/images/buttons/gococonfirm.png'";
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -11,41 +11,39 @@
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiDBException;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
 import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.Zone;
 import jp.sf.pal.pompei.service.CustomerService;
-import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.util.SessionUtil;
 import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class UserAddressSelectAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 761671774909133184L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(UserAddressSelectAction.class); // LOG CODE: ?PC023?
+
     private UserAddressSelectPage userAddressSelectPage;
 
     private CustomerService customerService;
 
-    private LanguageService languageService;
-
     private CustomerDxo customerDxo;
 
     public Class<?> initialize() {
         // state items
         List<Map<String, String>> stateItems = new ArrayList<Map<String, String>>();
-        String states = getUserAddressSelectPage().getLabelHelper()
-                .getLabelValue("state.items");
+        String states = userAddressSelectPage.getLabelHelper().getLabelValue(
+                "state.items");
         String[] stateArray = states.split(",");
         for (String state : stateArray) {
             Map<String, String> map = new HashMap<String, String>();
@@ -53,7 +51,7 @@
             map.put("value", state);
             stateItems.add(map);
         }
-        getUserAddressSelectPage().setStateItems(stateItems);
+        userAddressSelectPage.setStateItems(stateItems);
         return null;
     }
 
@@ -65,40 +63,45 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customer = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customer == null) {
-            return UserInfoEditPage.class;
-        }
+        try {
+            // check user info
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                return UserInfoEditPage.class;
+            }
 
-        // set default address book
-        AddressBook defaultAddressBook = getCustomerService()
-                .getDefaultAddressBook(customer.getCustomerId());
-        if (defaultAddressBook != null) {
-            getUserAddressSelectPage().setAddressBookId(
-                    defaultAddressBook.getAddressBookId().toString());
-        } else {
-            FacesMessageUtil
-                    .addWarnMessage("could.not.find.default.address.book");
-            return UserInfoEditPage.class;
-        }
+            // set default address book
+            AddressBook defaultAddressBook = customer.getDefaultAddressBook();
+            if (defaultAddressBook != null) {
+                userAddressSelectPage.setAddressBookId(defaultAddressBook
+                        .getAddressBookId().toString());
+            } else {
+                FacesMessageUtil
+                        .addWarnMessage("could.not.find.default.address.book");
+                return UserInfoEditPage.class;
+            }
 
-        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-        List<AddressBook> addressBookList = getCustomerService()
-                .getAddressBookList(customer.getCustomerId());
-        //TODO Dxo??
-        for (AddressBook addressBook : addressBookList) {
-            Map<String, String> map = new HashMap<String, String>();
-            map.put("value", addressBook.getAddressBookId().toString());
-            //TODO address format
-            map.put("label", addressBook.getPostcode() + " "
-                    + addressBook.getState() + addressBook.getCity()
-                    + addressBook.getStreetAddress() + " "
-                    + addressBook.getLastname() + addressBook.getFirstname());
-            list.add(map);
+            List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+            List<AddressBook> addressBookList = customerService
+                    .getAddressBookListByCustomerId(customer.getCustomerId());
+            //TODO Dxo??
+            for (AddressBook addressBook : addressBookList) {
+                Map<String, String> map = new HashMap<String, String>();
+                map.put("value", addressBook.getAddressBookId().toString());
+                //TODO address format
+                map.put("label", addressBook.getPostcode() + " "
+                        + addressBook.getState() + addressBook.getCity()
+                        + addressBook.getStreetAddress() + " "
+                        + addressBook.getLastname()
+                        + addressBook.getFirstname());
+                list.add(map);
+            }
+            userAddressSelectPage.setAddressBookIdItems(list);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.customer");
+            logger.log("EPC0231", new Object[] { this.toString() }, e);
         }
-        getUserAddressSelectPage().setAddressBookIdItems(list);
 
         // render FacesMessages
         FacesMessageUtil.renderMessages();
@@ -107,21 +110,21 @@
 
     //    private void postprocessingForRender() {
     //        // postcode
-    //        if (getUserAddressSelectPage().getPostcode() != null) {
-    //            String[] postcode = getUserAddressSelectPage().getPostcode().split(
+    //        if (userAddressSelectPage.getPostcode() != null) {
+    //            String[] postcode = userAddressSelectPage.getPostcode().split(
     //                    "-");
     //            if (postcode.length == 2) {
-    //                getUserAddressSelectPage().setPrimaryPostcode(postcode[0]);
-    //                getUserAddressSelectPage().setSecondaryPostcode(postcode[1]);
+    //                userAddressSelectPage.setPrimaryPostcode(postcode[0]);
+    //                userAddressSelectPage.setSecondaryPostcode(postcode[1]);
     //            }
     //        }
     //    }
 
     private void preprocessingForUpdate() {
         // postcode
-        getUserAddressSelectPage().setPostcode(
-                getUserAddressSelectPage().getPrimaryPostcode() + "-"
-                        + getUserAddressSelectPage().getSecondaryPostcode());
+        userAddressSelectPage.setPostcode(userAddressSelectPage
+                .getPrimaryPostcode()
+                + "-" + userAddressSelectPage.getSecondaryPostcode());
     }
 
     public Class<?> doEdit() {
@@ -133,9 +136,8 @@
     @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId")
     public Class<?> doAdd() {
         // convert cp932 to jis
-        getUserAddressSelectPage().setStreetAddress(
-                SystemUtil.convertToJIS(getUserAddressSelectPage()
-                        .getStreetAddress()));
+        userAddressSelectPage.setStreetAddress(SystemUtil
+                .convertToJIS(userAddressSelectPage.getStreetAddress()));
 
         // check login
         String remoteUser = FacesContext.getCurrentInstance()
@@ -144,33 +146,36 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customer = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customer == null) {
-            return UserInfoEditPage.class;
-        }
+        try {
+            // check user info
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                return UserInfoEditPage.class;
+            }
 
-        preprocessingForUpdate();
+            preprocessingForUpdate();
 
-        AddressBook addressBook = new AddressBook();
-        getCustomerDxo().convert(getUserAddressSelectPage(), addressBook);
-        addressBook.setAddressBookId(null);
-        addressBook.setCustomerId(customer.getCustomerId());
-        //TODO zone and check if it's null
-        Zone zones = getCustomerService().getZone(new BigDecimal(130));
-        addressBook.setZoneId(zones.getZoneId());
-        //TODO countries and check if it's null
-        addressBook.setCountryId(zones.getCountry().getCountryId());
-        //TODO select language
-        addressBook.setLanguageId(getLanguageService().getDefaultLanguage()
-                .getLanguageId());
-        // set default id
-        addressBook.setDefaultAddress(PompeiConstants.FALSE_BIGDECIMAL);
-        getCustomerService().addAddressBook(addressBook);
+            AddressBook addressBook = new AddressBook();
+            customerDxo.convertFromPageToAddressBook(userAddressSelectPage,
+                    addressBook);
+            addressBook.setAddressBookId(null);
+            addressBook.setCustomerId(customer.getCustomerId());
 
-        FacesMessageUtil.addInfoMessage("added.addressbook");
-        return UserAddressSelectPage.class;
+            //TODO country
+            //TODO delivery zone
+
+            // set default id
+            addressBook.setDefaultAddress(PompeiConstants.FALSE_BIGDECIMAL);
+            customerService.addAddressBook(addressBook);
+
+            FacesMessageUtil.addInfoMessage("added.addressbook");
+            return UserAddressSelectPage.class;
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.add.addressbook");
+            logger.log("EPC0232", new Object[] { this.toString() }, e);
+        }
+        return null;
     }
 
     public Class<?> doDelete() {
@@ -181,57 +186,65 @@
             return UserInfoEditPage.class;
         }
 
-        // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customers == null) {
-            return UserInfoEditPage.class;
-        }
+        try {
+            // check user info
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                return UserInfoEditPage.class;
+            }
 
-        if (getUserAddressSelectPage().getAddressBookId() == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.address.book.id.inuseraddressselect");
-            return UserAddressSelectPage.class;
-        }
+            if (userAddressSelectPage.getAddressBookId() == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.address.book.id.inuseraddressselect");
+                return UserAddressSelectPage.class;
+            }
 
-        BigDecimal addressBookId = null;
-        try {
-            addressBookId = new BigDecimal(getUserAddressSelectPage()
-                    .getAddressBookId());
-        } catch (NumberFormatException e) {
-            FacesMessageUtil
-                    .addErrorMessage("invalid.address.book.id.inuseraddressselect");
-            return UserAddressSelectPage.class;
-        }
+            BigDecimal addressBookId = null;
+            try {
+                addressBookId = new BigDecimal(userAddressSelectPage
+                        .getAddressBookId());
+            } catch (NumberFormatException e) {
+                FacesMessageUtil
+                        .addErrorMessage("invalid.address.book.id.inuseraddressselect");
+                return UserAddressSelectPage.class;
+            }
 
-        // check if address book is default
-        AddressBook defaultAddressBook = getCustomerService()
-                .getDefaultAddressBook(customers.getCustomerId());
-        if (defaultAddressBook != null
-                && addressBookId.equals(defaultAddressBook.getAddressBookId())) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.delete.default.address.book.in.useraddressselect");
-            return UserAddressSelectPage.class;
-        }
+            // check if address book is default
+            AddressBook defaultAddressBook = customer.getDefaultAddressBook();
+            if (defaultAddressBook != null
+                    && addressBookId.equals(defaultAddressBook
+                            .getAddressBookId())) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.delete.default.address.book.in.useraddressselect");
+                return UserAddressSelectPage.class;
+            }
 
-        AddressBook addressBook = getCustomerService().getAddressBook(
-                addressBookId);
-        if (addressBook == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.address.book.inuseraddressselect");
+            AddressBook addressBook = customerService
+                    .getAddressBook(addressBookId);
+            if (addressBook == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.address.book.inuseraddressselect");
+                return UserAddressSelectPage.class;
+            }
+            customerService.deleteAddressBook(addressBookId);
+
+            FacesMessageUtil.addInfoMessage("deleted.address.book");
             return UserAddressSelectPage.class;
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.addressbook");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.delete.addressbook");
+            logger.log("EPC0233", new Object[] { this.toString() }, e);
         }
-        getCustomerService().deleteAddressBook(addressBook);
-
-        FacesMessageUtil.addInfoMessage("deleted.address.book");
         return null;
     }
 
     @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId")
     public Class<?> doNext() {
         Map<String, Object> map = (Map<String, Object>) SessionUtil
-                .getFromLocalScope(getUserAddressSelectPage()
-                        .getOrderProcessId());
+                .getFromLocalScope(userAddressSelectPage.getOrderProcessId());
         if (map == null) {
             // expires session
             FacesMessageUtil
@@ -239,66 +252,34 @@
             return UserInfoEditPage.class;
         }
         // set address book
-        map.put(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID,
-                getUserAddressSelectPage().getAddressBookId());
+        map.put(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID, userAddressSelectPage
+                .getAddressBookId());
         return PaymentSelectPage.class;
     }
 
-    /**
-     * @return userAddressSelectPage
-     */
     public UserAddressSelectPage getUserAddressSelectPage() {
         return userAddressSelectPage;
     }
 
-    /**
-     * @param userAddressSelectPage 設定する userAddressSelectPage
-     */
     public void setUserAddressSelectPage(
             UserAddressSelectPage userAddressSelectPage) {
         this.userAddressSelectPage = userAddressSelectPage;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return customerDxo
-     */
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo 設定する customerDxo
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,8 +1,6 @@
 package jp.sf.pal.pompei.web.user.checkout;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -14,44 +12,39 @@
 import jp.sf.pal.common.util.DateUtil;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiDBException;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
 import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
-import jp.sf.pal.pompei.exentity.Zone;
-import jp.sf.pal.pompei.service.CartService;
 import jp.sf.pal.pompei.service.CustomerService;
-import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.util.SessionUtil;
 import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class UserInfoEditAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -8211846393931284507L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(UserInfoEditAction.class); // LOG CODE: ?PC022?
+
     private UserInfoEditPage userInfoEditPage;
 
     private CustomerService customerService;
 
-    private LanguageService languageService;
-
-    private CartService cartService;
-
     private CustomerDxo customerDxo;
 
     public Class<?> initialize() {
         // state items
         List<Map<String, String>> stateItems = new ArrayList<Map<String, String>>();
-        String states = getUserInfoEditPage().getLabelHelper().getLabelValue(
+        String states = userInfoEditPage.getLabelHelper().getLabelValue(
                 "state.items");
         String[] stateArray = states.split(",");
         for (String state : stateArray) {
@@ -60,7 +53,7 @@
             map.put("value", state);
             stateItems.add(map);
         }
-        getUserInfoEditPage().setStateItems(stateItems);
+        userInfoEditPage.setStateItems(stateItems);
         // dayOfBirth
         Date now = new Date();
         List<Map<String, String>> yearOfDayOfBirthItems = new ArrayList<Map<String, String>>();
@@ -71,8 +64,8 @@
             map.put("value", Integer.toString(year - i));
             yearOfDayOfBirthItems.add(map);
         }
-        getUserInfoEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems);
-        getUserInfoEditPage().setYearOfDayOfBirth(Integer.valueOf(year));
+        userInfoEditPage.setYearOfDayOfBirthItems(yearOfDayOfBirthItems);
+        userInfoEditPage.setYearOfDayOfBirth(Integer.valueOf(year));
 
         List<Map<String, String>> monthOfDayOfBirthItems = new ArrayList<Map<String, String>>();
         for (int i = 1; i < 13; i++) {
@@ -81,9 +74,9 @@
             map.put("value", Integer.toString(i));
             monthOfDayOfBirthItems.add(map);
         }
-        getUserInfoEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems);
-        getUserInfoEditPage().setMonthOfDayOfBirth(
-                Integer.valueOf(DateUtil.getMonth(now) + 1));
+        userInfoEditPage.setMonthOfDayOfBirthItems(monthOfDayOfBirthItems);
+        userInfoEditPage.setMonthOfDayOfBirth(Integer.valueOf(DateUtil
+                .getMonth(now) + 1));
 
         List<Map<String, String>> dateOfDayOfBirthItems = new ArrayList<Map<String, String>>();
         for (int i = 1; i < 32; i++) {
@@ -92,9 +85,9 @@
             map.put("value", Integer.toString(i));
             dateOfDayOfBirthItems.add(map);
         }
-        getUserInfoEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems);
-        getUserInfoEditPage().setDateOfDayOfBirth(
-                Integer.valueOf(DateUtil.getDate(now)));
+        userInfoEditPage.setDateOfDayOfBirthItems(dateOfDayOfBirthItems);
+        userInfoEditPage.setDateOfDayOfBirth(Integer.valueOf(DateUtil
+                .getDate(now)));
         return null;
     }
 
@@ -103,40 +96,52 @@
         String remoteUser = FacesContext.getCurrentInstance()
                 .getExternalContext().getRemoteUser();
         if (remoteUser == null) {
-            getUserInfoEditPage().setLogin(false);
-            getUserInfoEditPage().setUser(false);
+            userInfoEditPage.setLogin(false);
+            userInfoEditPage.setUser(false);
             return null;
         }
-        getUserInfoEditPage().setLogin(true);
-        getUserInfoEditPage().setPortalId(remoteUser);
+        userInfoEditPage.setLogin(true);
+        userInfoEditPage.setPortalId(remoteUser);
 
-        Customer customer = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customer == null) {
-            getUserInfoEditPage().setUser(false);
-            return null;
-        }
-        getUserInfoEditPage().setUser(true);
+        try {
+            Customer customer = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customer == null) {
+                userInfoEditPage.setUser(false);
+                return null;
+            }
+            userInfoEditPage.setUser(true);
 
-        getCustomerDxo().convert(customer, getUserInfoEditPage());
-        // set default address
-        AddressBook defaultAddressBook = getCustomerService()
-                .getDefaultAddressBook(customer.getCustomerId());
-        if (defaultAddressBook != null) {
-            getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage());
-        }
+            // set default address
+            AddressBook defaultAddressBook = customerService
+                    .getDefaultAddressBook(customer.getCustomerId());
+            if (defaultAddressBook != null) {
+                customerDxo.convertFromAddressBookToPage(defaultAddressBook,
+                        userInfoEditPage);
+            }
 
-        if (getUserInfoEditPage().isEdit()) {
-            postprocessingForRender();
-        }
+            // set customer
+            customerDxo.convertFromCustomerToPage(customer, userInfoEditPage);
 
-        // check cart
-        List<CustomerBasket> customerBasketList = getCartService()
-                .getCustomerBasketList(customer.getCustomerId());
-        if (customerBasketList != null && !customerBasketList.isEmpty()) {
-            getUserInfoEditPage().setBasket(true);
-        } else {
-            getUserInfoEditPage().setBasket(false);
+            if (userInfoEditPage.isEdit()) {
+                postprocessingForRender();
+            }
+
+            // check cart
+            List<Basket> customerBasketList = customerService
+                    .getBasketListByCustomerId(customer.getCustomerId(),
+                            SystemUtil.getCurrentLanguage());
+            if (customerBasketList != null && !customerBasketList.isEmpty()) {
+                userInfoEditPage.setBasket(true);
+            } else {
+                userInfoEditPage.setBasket(false);
+            }
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.customer");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.customer");
+            logger.log("EPC0221", new Object[] { this.toString() }, e);
         }
 
         // render FacesMessages
@@ -146,58 +151,53 @@
 
     private void postprocessingForRender() {
         // day of birth
-        if (getUserInfoEditPage().getDayOfBirth() != null) {
-            Date b = getUserInfoEditPage().getDayOfBirth();
-            getUserInfoEditPage().setYearOfDayOfBirth(
-                    DateUtil.getYear(b) + 1900);
-            getUserInfoEditPage()
-                    .setMonthOfDayOfBirth(DateUtil.getMonth(b) + 1);
-            getUserInfoEditPage().setDateOfDayOfBirth(DateUtil.getDate(b));
+        if (userInfoEditPage.getDayOfBirth() != null) {
+            Date b = userInfoEditPage.getDayOfBirth();
+            userInfoEditPage.setYearOfDayOfBirth(DateUtil.getYear(b) + 1900);
+            userInfoEditPage.setMonthOfDayOfBirth(DateUtil.getMonth(b) + 1);
+            userInfoEditPage.setDateOfDayOfBirth(DateUtil.getDate(b));
         }
 
         // postcode
-        if (getUserInfoEditPage().getPostcode() != null) {
-            String[] postcode = getUserInfoEditPage().getPostcode().split("-");
+        if (userInfoEditPage.getPostcode() != null) {
+            String[] postcode = userInfoEditPage.getPostcode().split("-");
             if (postcode.length == 2) {
-                getUserInfoEditPage().setPrimaryPostcode(postcode[0]);
-                getUserInfoEditPage().setSecondaryPostcode(postcode[1]);
+                userInfoEditPage.setPrimaryPostcode(postcode[0]);
+                userInfoEditPage.setSecondaryPostcode(postcode[1]);
             }
         }
 
         // email Confirmation
-        getUserInfoEditPage().setEmailAddressConfirm(
-                getUserInfoEditPage().getEmailAddress());
+        userInfoEditPage.setEmailAddressConfirm(userInfoEditPage
+                .getEmailAddress());
     }
 
     private void preprocessingForUpdate() {
         // day of birth
-        getUserInfoEditPage().setDayOfBirth(
-                DateUtil.get(
-                        getUserInfoEditPage().getYearOfDayOfBirth() - 1900,
-                        getUserInfoEditPage().getMonthOfDayOfBirth() - 1,
-                        getUserInfoEditPage().getDateOfDayOfBirth()));
+        userInfoEditPage.setDayOfBirth(DateUtil.get(userInfoEditPage
+                .getYearOfDayOfBirth() - 1900, userInfoEditPage
+                .getMonthOfDayOfBirth() - 1, userInfoEditPage
+                .getDateOfDayOfBirth()));
 
         // postcode
-        getUserInfoEditPage().setPostcode(
-                getUserInfoEditPage().getPrimaryPostcode() + "-"
-                        + getUserInfoEditPage().getSecondaryPostcode());
+        userInfoEditPage.setPostcode(userInfoEditPage.getPrimaryPostcode()
+                + "-" + userInfoEditPage.getSecondaryPostcode());
     }
 
     public Class<?> doUpdate() {
         // convert cp932 to jis
-        getUserInfoEditPage().setStreetAddress(
-                SystemUtil.convertToJIS(getUserInfoEditPage()
-                        .getStreetAddress()));
+        userInfoEditPage.setStreetAddress(SystemUtil
+                .convertToJIS(userInfoEditPage.getStreetAddress()));
 
         // check email
-        if (!getUserInfoEditPage().getEmailAddress().equals(
-                getUserInfoEditPage().getEmailAddressConfirm())) {
+        if (!userInfoEditPage.getEmailAddress().equals(
+                userInfoEditPage.getEmailAddressConfirm())) {
             FacesMessageUtil.addWarnMessage("email.address.does.not.match");
             return null;
         }
 
         preprocessingForUpdate();
-        if (PompeiConstants.UPDATE_MODE.equals(getUserInfoEditPage().getMode())) {
+        if (PompeiConstants.UPDATE_MODE.equals(userInfoEditPage.getMode())) {
             // update
             // check login
             String remoteUser = FacesContext.getCurrentInstance()
@@ -207,57 +207,58 @@
                 return null;
             }
 
-            Customer customer = getCustomerService().getCustomerByPortalId(
-                    remoteUser);
-            if (customer == null) {
-                FacesMessageUtil
-                        .addErrorMessage("could.not.find.customer.in.userinfoedit");
-                return null;
-            }
+            try {
+                Customer customer = customerService
+                        .getCustomerByPortalId(remoteUser);
+                if (customer == null) {
+                    FacesMessageUtil
+                            .addErrorMessage("could.not.find.customer.in.userinfoedit");
+                    return null;
+                }
 
-            AddressBook defaultAddressBook = getCustomerService()
-                    .getDefaultAddressBook(customer.getCustomerId());
-            if (defaultAddressBook == null) {
-                FacesMessageUtil
-                        .addErrorMessage("could.not.find.default.address.book.in.userinfoedit");
-                return null;
-            }
+                AddressBook defaultAddressBook = customer
+                        .getDefaultAddressBook();
 
-            Date now = new Date();
-            customer.setLastModified(new Timestamp(now.getTime()));
+                // do not put customerId and addressBookId on user's userInfoEdit.html
+                customerDxo.convertFromPageToCustomer(userInfoEditPage,
+                        customer);
+                customerDxo.convertFromPageToAddressBook(userInfoEditPage,
+                        defaultAddressBook);
 
-            // do not put customerId and addressBookId on user's userInfoEdit.html
-            getCustomerDxo().convert(getUserInfoEditPage(), customer);
-            getCustomerDxo().convert(getUserInfoEditPage(), defaultAddressBook);
+                customerService.updateCustomer(customer);
 
-            getCustomerService().updateCustomer(customer, defaultAddressBook);
-
-            getUserInfoEditPage().setMode(null);
-            FacesMessageUtil.addInfoMessage("updated.customer");
+                userInfoEditPage.setMode(null);
+                FacesMessageUtil.addInfoMessage("updated.customer");
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("failed.to.update.customer");
+                logger.log("EPC0222", new Object[] { this.toString() }, e);
+            }
         } else {
-            // new
-            Date now = new Date();
-            Customer customer = new Customer();
-            customer.setDateAdded(new Timestamp(now.getTime()));
-            customer.setLastModified(new Timestamp(now.getTime()));
-            AddressBook addressBook = new AddressBook();
-            getCustomerDxo().convert(getUserInfoEditPage(), customer);
-            getCustomerDxo().convert(getUserInfoEditPage(), addressBook);
+            try {
+                // new
+                Customer customer = new Customer();
+                AddressBook addressBook = customer.getDefaultAddressBook();
+                customerDxo.convertFromPageToCustomer(userInfoEditPage,
+                        customer);
+                customerDxo.convertFromPageToAddressBook(userInfoEditPage,
+                        addressBook);
 
-            //TODO zone and check if it's null
-            Zone zones = getCustomerService().getZone(new BigDecimal(130));
-            addressBook.setZoneId(zones.getZoneId());
-            //TODO countries and check if it's null
-            addressBook.setCountryId(zones.getCountry().getCountryId());
-            //TODO select language
-            addressBook.setLanguageId(getLanguageService().getDefaultLanguage()
-                    .getLanguageId());
-            // set default address
-            addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL);
+                //TODO country
+                //TODO delivery zone
+                // set default address
+                addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL);
 
-            getCustomerService().addCustomer(customer, addressBook);
+                customerService.addCustomer(customer);
 
-            FacesMessageUtil.addInfoMessage("added.customer");
+                FacesMessageUtil.addInfoMessage("added.customer");
+            } catch (PompeiDBException e) {
+                FacesMessageUtil.addErrorMessage("failed.to.create.customer");
+                logger.log(e.getMessageId(), new Object[] { this.toString() },
+                        e);
+            } catch (Exception e) {
+                FacesMessageUtil.addErrorMessage("failed.to.create.customer");
+                logger.log("EPC0223", new Object[] { this.toString() }, e);
+            }
         }
 
         return UserInfoEditPage.class;
@@ -266,100 +267,52 @@
     @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId")
     public Class<?> doNext() {
         // start order process
-        if (getUserInfoEditPage().getCustomerId() == null) {
+        if (userInfoEditPage.getCustomerId() == null) {
             FacesMessageUtil
                     .addErrorMessage("could.not.find.customer.id.in.userinfoedit");
             return UserInfoEditAction.class;
         }
-        getUserInfoEditPage().setOrderProcessId(
-                getUserInfoEditPage().getCustomerId()
-                        + String.valueOf(new Date().getTime()));
+        userInfoEditPage.setOrderProcessId(userInfoEditPage.getCustomerId()
+                + String.valueOf(new Date().getTime()));
         // set info to session
-        SessionUtil.removeFromLocalScope(getUserInfoEditPage()
-                .getOrderProcessId());
-        SessionUtil.putToLocalScope(getUserInfoEditPage().getOrderProcessId(),
+        SessionUtil.removeFromLocalScope(userInfoEditPage.getOrderProcessId());
+        SessionUtil.putToLocalScope(userInfoEditPage.getOrderProcessId(),
                 new HashMap<String, Object>());
         return UserAddressSelectPage.class;
     }
 
     public Class<?> doModify() {
-        getUserInfoEditPage().setMode(PompeiConstants.UPDATE_MODE);
+        userInfoEditPage.setMode(PompeiConstants.UPDATE_MODE);
         return UserInfoEditPage.class;
     }
 
     public Class<?> doCancel() {
-        getUserInfoEditPage().setMode(null);
+        userInfoEditPage.setMode(null);
         return UserInfoEditPage.class;
     }
 
-    /**
-     * @return userInfoEditPage
-     */
     public UserInfoEditPage getUserInfoEditPage() {
         return userInfoEditPage;
     }
 
-    /**
-     * @param userInfoEditPage 設定する userInfoEditPage
-     */
     public void setUserInfoEditPage(UserInfoEditPage userInfoEditPage) {
         this.userInfoEditPage = userInfoEditPage;
     }
 
-    /**
-     * @return customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService 設定する customerService
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return customerDxo
-     */
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo 設定する customerDxo
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
-    /**
-     * @return cartService
-     */
-    public CartService getCartService() {
-        return cartService;
-    }
-
-    /**
-     * @param cartService 設定する cartService
-     */
-    public void setCartService(CartService cartService) {
-        this.cartService = cartService;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -8,26 +8,31 @@
 
 import javax.faces.context.FacesContext;
 
+import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.dxo.CategoryDxo;
-import jp.sf.pal.pompei.service.CategoryService;
+import jp.sf.pal.pompei.PompeiDBException;
+import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.service.ProductService;
 import jp.sf.pal.pompei.util.SessionUtil;
+import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class CategoryListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 8175924737246519774L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(CategoryListAction.class); // LOG CODE: ?PC016?
+
     private CategoryListPage categoryListPage;
 
-    private CategoryService categoryService;
+    private ProductService productService;
 
-    private CategoryDxo categoryDxo;
+    private ProductDxo productDxo;
 
     public Class<?> initialize() {
         return null;
@@ -54,65 +59,77 @@
     public Class<?> prerender() {
         BigDecimal currentCategoryId = getCurrentCategoryId();
 
-        // current category
-        if (getCategoryListPage().getCategoryId() == null) {
-            getCategoryListPage().setCategoryId(currentCategoryId);
-            if (getCategoryListPage().getCategoryId() == null) {
-                getCategoryListPage().setCategoryId(
-                        PompeiConstants.ROOT_CATEGORY_ID);
-            }
-            //  refresh breadcrumb
-            List<Map<String, Object>> breadcrumbItems = new ArrayList<Map<String, Object>>();
-            getCategoryDxo().convert(
-                    getCategoryService().getCategoryDescriptionBreadcrumb(
-                            getCategoryListPage().getCategoryId()),
-                    breadcrumbItems);
-            getCategoryListPage().setBreadcrumbItems(breadcrumbItems);
+        try {
+            // current category
+            if (categoryListPage.getCategoryId() == null) {
+                categoryListPage.setCategoryId(currentCategoryId);
+                if (categoryListPage.getCategoryId() == null) {
+                    categoryListPage
+                            .setCategoryId(PompeiConstants.ROOT_CATEGORY_ID);
+                }
+                //  refresh breadcrumb
+                List<Map<String, Object>> breadcrumbItems = new ArrayList<Map<String, Object>>();
+                productDxo
+                        .convertFromCategoryToBreadcrumb(productService
+                                .getCategoryBreadcrumb(categoryListPage
+                                        .getCategoryId(), SystemUtil
+                                        .getCurrentLanguage()), breadcrumbItems);
+                categoryListPage.setBreadcrumbItems(breadcrumbItems);
 
-            // set current id
-            SessionUtil.putToApplicationScope(
-                    PompeiConstants.CURRENT_CATEGORY_ID, getCategoryListPage()
-                            .getCategoryId());
-        } else if (!getCategoryListPage().getCategoryId().equals(
-                currentCategoryId)) {
-            // update categoryId
-            getCategoryListPage().setCategoryId(currentCategoryId);
-            //  refresh breadcrumb
-            List<Map<String, Object>> breadcrumbItems = new ArrayList<Map<String, Object>>();
-            getCategoryDxo().convert(
-                    getCategoryService().getCategoryDescriptionBreadcrumb(
-                            getCategoryListPage().getCategoryId()),
-                    breadcrumbItems);
-            getCategoryListPage().setBreadcrumbItems(breadcrumbItems);
+                // set current id
+                SessionUtil.putToApplicationScope(
+                        PompeiConstants.CURRENT_CATEGORY_ID, categoryListPage
+                                .getCategoryId());
+            } else if (!categoryListPage.getCategoryId().equals(
+                    currentCategoryId)) {
+                // update categoryId
+                categoryListPage.setCategoryId(currentCategoryId);
+                //  refresh breadcrumb
+                List<Map<String, Object>> breadcrumbItems = new ArrayList<Map<String, Object>>();
+                productDxo
+                        .convertFromCategoryToBreadcrumb(productService
+                                .getCategoryBreadcrumb(categoryListPage
+                                        .getCategoryId(), SystemUtil
+                                        .getCurrentLanguage()), breadcrumbItems);
+                categoryListPage.setBreadcrumbItems(breadcrumbItems);
 
-            // set current id
-            SessionUtil.putToApplicationScope(
-                    PompeiConstants.CURRENT_CATEGORY_ID, getCategoryListPage()
-                            .getCategoryId());
+                // set current id
+                SessionUtil.putToApplicationScope(
+                        PompeiConstants.CURRENT_CATEGORY_ID, categoryListPage
+                                .getCategoryId());
 
-        }
+            }
 
-        // category breadcrumb
-        if (getCategoryListPage().getBreadcrumbItems() == null) {
-            //  refresh breadcrumb
-            List<Map<String, Object>> breadcrumbItems = new ArrayList<Map<String, Object>>();
-            getCategoryDxo().convert(
-                    getCategoryService().getCategoryDescriptionBreadcrumb(
-                            getCategoryListPage().getCategoryId()),
-                    breadcrumbItems);
-            getCategoryListPage().setBreadcrumbItems(breadcrumbItems);
-        }
+            // category breadcrumb
+            if (categoryListPage.getBreadcrumbItems() == null) {
+                //  refresh breadcrumb
+                List<Map<String, Object>> breadcrumbItems = new ArrayList<Map<String, Object>>();
+                productDxo
+                        .convertFromCategoryToBreadcrumb(productService
+                                .getCategoryBreadcrumb(categoryListPage
+                                        .getCategoryId(), SystemUtil
+                                        .getCurrentLanguage()), breadcrumbItems);
+                categoryListPage.setBreadcrumbItems(breadcrumbItems);
+            }
 
-        // TODO check if breadcrumb should be put to session..
+            // TODO check if breadcrumb should be put to session..
 
-        // set sub categories
-        getCategoryListPage().setCategoryItems(
-                getCategoryDxo().convert(
-                        getCategoryService().getSubCategoryDescriptionList(
-                                getCategoryListPage().getCategoryId())));
+            // set sub categories
+            List<Map<String, Object>> categoryItems = new ArrayList<Map<String, Object>>();
+            productDxo.convertFromCategoryToMap(productService
+                    .getSubCategoryList(categoryListPage.getCategoryId(),
+                            SystemUtil.getCurrentLanguage()), categoryItems);
+            categoryListPage.setCategoryItems(categoryItems);
 
-        // set current category id
-        getCategoryListPage().setCurrentCategoryId(currentCategoryId);
+            // set current category id
+            categoryListPage.setCurrentCategoryId(currentCategoryId);
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.category");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("failed.to.load.category");
+            logger.log("EPC0161", new Object[] { this.toString() }, e);
+        }
 
         return null;
     }
@@ -120,51 +137,9 @@
     public Class<?> doFinish() {
         // set current id
         SessionUtil.putToApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID,
-                getCategoryListPage().getTargetId());
+                categoryListPage.getTargetId());
 
         return CategoryListPage.class;
     }
 
-    /**
-     * @return categoryListPage
-     */
-    public CategoryListPage getCategoryListPage() {
-        return categoryListPage;
-    }
-
-    /**
-     * @param categoryListPage 設定する categoryListPage
-     */
-    public void setCategoryListPage(CategoryListPage categoryListPage) {
-        this.categoryListPage = categoryListPage;
-    }
-
-    /**
-     * @return categoryService
-     */
-    public CategoryService getCategoryService() {
-        return categoryService;
-    }
-
-    /**
-     * @param categoryService 設定する categoryService
-     */
-    public void setCategoryService(CategoryService categoryService) {
-        this.categoryService = categoryService;
-    }
-
-    /**
-     * @return categoryDxo
-     */
-    public CategoryDxo getCategoryDxo() {
-        return categoryDxo;
-    }
-
-    /**
-     * @param categoryDxo 設定する categoryDxo
-     */
-    public void setCategoryDxo(CategoryDxo categoryDxo) {
-        this.categoryDxo = categoryDxo;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -9,39 +9,35 @@
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiDBException;
 import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.exentity.Basket;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.CustomerBasket;
-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.ProductImage;
-import jp.sf.pal.pompei.service.CartService;
 import jp.sf.pal.pompei.service.CustomerService;
 import jp.sf.pal.pompei.service.ProductService;
 import jp.sf.pal.pompei.util.SessionUtil;
 import jp.sf.pal.pompei.util.SystemUtil;
-import jp.sf.pal.pompei.util.UploadedFileUtil;
 import jp.sf.pal.pompei.util.UrlBuilderUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class ProductDetailsAction implements Serializable {
 
+    private static final long serialVersionUID = -5249493116727297180L;
+
     /**
-     * 
+     * Logger for this class
      */
-    private static final long serialVersionUID = -5249493116727297180L;
+    private static final Logger logger = Logger
+            .getLogger(ProductDetailsAction.class); // LOG CODE: ?PC015?
 
-    /**  */
     private ProductDetailsPage productDetailsPage;
 
-    /**	 */
     private ProductService productService;
 
     private CustomerService customerService;
 
-    private CartService cartService;
-
-    /**	 */
     private ProductDxo productDxo;
 
     public Class<?> initialize() {
@@ -55,7 +51,7 @@
         if (productId != null) {
             try {
                 long id = Long.parseLong(productId);
-                getProductDetailsPage().setProductId(BigDecimal.valueOf(id));
+                productDetailsPage.setProductId(BigDecimal.valueOf(id));
                 return true;
             } catch (NumberFormatException e) {
             }
@@ -69,18 +65,18 @@
         String remoteUser = FacesContext.getCurrentInstance()
                 .getExternalContext().getRemoteUser();
         if (remoteUser == null) {
-            getProductDetailsPage().setLogin(false);
-            getProductDetailsPage().setUser(false);
+            productDetailsPage.setLogin(false);
+            productDetailsPage.setUser(false);
         } else {
-            getProductDetailsPage().setLogin(true);
+            productDetailsPage.setLogin(true);
             // check user
-            Customer customers = getCustomerService().getCustomerByPortalId(
-                    remoteUser);
+            Customer customers = customerService
+                    .getCustomerByPortalId(remoteUser);
             if (customers == null) {
                 FacesMessageUtil.addWarnMessage("need.to.register.as.customer");
-                getProductDetailsPage().setUser(false);
+                productDetailsPage.setUser(false);
             } else {
-                getProductDetailsPage().setUser(true);
+                productDetailsPage.setUser(true);
             }
         }
 
@@ -98,60 +94,62 @@
 
         // check product
         if (!isProductDetails()) {
-            if (getProductDetailsPage().getProductId() == null) {
+            if (productDetailsPage.getProductId() == null) {
                 SessionUtil.putToLocalScope(
                         PompeiConstants.IS_FROM_DETAILS_PAGE, Boolean.TRUE);
                 return ProductListPage.class;
             }
         }
 
-        ProductDescription description = productService
-                .getProdcutDescription(getProductDetailsPage().getProductId());
-        productDxo.convert(description, productDetailsPage);
+        try {
+            Product product = productService.getProduct(productDetailsPage
+                    .getProductId(), SystemUtil.getCurrentLanguage());
+            productDxo.convertFromProductToPage(product, productDetailsPage);
 
-        Manufacturer manufacturers = productService.getManufacturer(description
-                .getProduct().getManufacturerId());
-        productDetailsPage.setManufacturersName(manufacturers.getName());
+            // TODO details image
+            //        FileData productImage = productService
+            //                .getProductImageByProductIdAndType(
+            //                        productDetailsPage.getProductId(),
+            //                        PompeiConstants.DETAILS_IMAGE_TYPE);
+            //        if (productImage != null) {
+            //            productDetailsPage.setDetailsImageUrl(UploadedFileUtil
+            //                    .getProductImageUrl(productImage.getImageName()));
+            //        } else {
+            //            // default image
+            //            productDetailsPage
+            //                    .setDetailsImageUrl(UploadedFileUtil
+            //                            .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME));
+            //        }
 
-        // details image
-        ProductImage productImage = getProductService()
-                .getProductImageByProductIdAndType(
-                        productDetailsPage.getProductId(),
-                        PompeiConstants.DETAILS_IMAGE_TYPE);
-        if (productImage != null) {
-            getProductDetailsPage().setDetailsImageUrl(
-                    UploadedFileUtil.getProductImageUrl(productImage
-                            .getImageName()));
-        } else {
-            // default image
-            getProductDetailsPage()
-                    .setDetailsImageUrl(
-                            UploadedFileUtil
-                                    .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME));
+            // TODO large image
+            //        ProductImage largeProductImage = productService
+            //                .getProductImageByProductIdAndType(
+            //                        productDetailsPage.getProductId(),
+            //                        PompeiConstants.LARGE_IMAGE_TYPE);
+            //        if (largeProductImage != null) {
+            //            productDetailsPage.setLargeImageUrl(UploadedFileUtil
+            //                    .getProductImageUrl(largeProductImage.getImageName()));
+            //        } else {
+            //            // default image
+            //            productDetailsPage
+            //                    .setLargeImageUrl(UploadedFileUtil
+            //                            .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME));
+            //        }
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("could.not.load.product");
+            logger.log(e.getMessageId(), new Object[] { this.toString() }, e);
+            return ProductListPage.class;
+        } catch (Exception e) {
+            FacesMessageUtil.addErrorMessage("could.not.load.product");
+            logger.log("EPC0151", new Object[] { this.toString() }, e);
+            return ProductListPage.class;
         }
 
-        // large image
-        ProductImage largeProductImage = getProductService()
-                .getProductImageByProductIdAndType(
-                        productDetailsPage.getProductId(),
-                        PompeiConstants.LARGE_IMAGE_TYPE);
-        if (largeProductImage != null) {
-            getProductDetailsPage().setLargeImageUrl(
-                    UploadedFileUtil.getProductImageUrl(largeProductImage
-                            .getImageName()));
-        } else {
-            // default image
-            getProductDetailsPage()
-                    .setLargeImageUrl(
-                            UploadedFileUtil
-                                    .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME));
-        }
-
         // set order quantity
-        getProductDetailsPage().setOrderQuantity(BigDecimal.valueOf(1));
+        productDetailsPage.setOrderQuantity(BigDecimal.valueOf(1));
 
         // set title
-        SystemUtil.setWindowTitle(getProductDetailsPage().getLabelHelper()
+        SystemUtil.setWindowTitle(productDetailsPage.getLabelHelper()
                 .getLabelValue("windowTitle"));
 
         // render faces messages
@@ -172,62 +170,76 @@
             return null;
         }
 
-        Customer customers = getCustomerService().getCustomerByPortalId(
-                remoteUser);
-        if (customers == null) {
-            FacesMessageUtil.addWarnMessage("need.to.register.as.customer");
-            return null;
-        }
+        try {
+            Customer customers = customerService
+                    .getCustomerByPortalId(remoteUser);
+            if (customers == null) {
+                FacesMessageUtil.addWarnMessage("need.to.register.as.customer");
+                return null;
+            }
 
-        Product products = productService.getProdcut(productDetailsPage
-                .getProductId());
-        if (products == null) {
-            FacesMessageUtil
-                    .addErrorMessage("could.not.find.product.in.productdetail");
-            return null;
-        }
-        getCartService().cleanupCustomerBasket(customers.getCustomerId());
+            Product products = productService.getProduct(productDetailsPage
+                    .getProductId(), SystemUtil.getCurrentLanguage());
+            if (products == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.product.in.productdetail");
+                return null;
+            }
 
-        CustomerBasket customersBasket = getCartService().getCustomerBasket(
-                customers.getCustomerId(), products.getProductId());
-        if (customersBasket == null) {
-            //  new
-            customersBasket = new CustomerBasket();
-            customersBasket.setCustomerId(customers.getCustomerId());
-            customersBasket.setProductId(products.getProductId());
-            customersBasket.setQuantity(getProductDetailsPage()
-                    .getOrderQuantity());
-            customersBasket.setDateAdded(new Timestamp(new Date().getTime()));
-            customersBasket.setProduct(products);
-            customersBasket.setFinalPrice(calculateFinalPrice(customersBasket));
-            cartService.addCustomerBasket(customersBasket);
-            FacesMessageUtil.addInfoMessage("added.new.product.to.cart");
-        } else {
-            //  add
-            customersBasket.setQuantity(customersBasket.getQuantity().add(
-                    getProductDetailsPage().getOrderQuantity()));
-            customersBasket.setDateAdded(new Timestamp(new Date().getTime()));
-            customersBasket.setFinalPrice(calculateFinalPrice(customersBasket));
-            cartService.updateCustomerBasket(customersBasket);
-            FacesMessageUtil.addInfoMessage("added.product.to.cart");
-        }
+            //TODO expiredTime needs to be moved to portlet.xml
+            customerService.cleanupBasket(customers.getCustomerId(), System
+                    .currentTimeMillis()
+                    - 24 * 60 * 60 * 1000);
 
-        // jump to cart page
-        StringBuilder buf = new StringBuilder();
-        buf.append("<script type=\"text/javascript\"><!--\n");
-        buf.append("setTimeout(\"jumpToCart()\", 1000);\n");
-        buf.append("function jumpToCart(){\n");
-        buf.append("location.href = \"").append(UrlBuilderUtil.createCartUrl())
-                .append("\";\n");
-        buf.append("}\n");
-        buf.append("//-->\n");
-        buf.append("</script>\n");
-        getProductDetailsPage().setJumpToCart(buf.toString());
+            Basket customersBasket = customerService.getBasket(customers
+                    .getCustomerId(), products.getProductId(), SystemUtil
+                    .getCurrentLanguage());
+            if (customersBasket == null) {
+                //  new
+                customersBasket = new Basket();
+                customersBasket.setCustomerId(customers.getCustomerId());
+                customersBasket.setProductId(products.getProductId());
+                customersBasket.setQuantity(productDetailsPage
+                        .getOrderQuantity());
+                customersBasket.setUpdatedDate(new Timestamp(new Date()
+                        .getTime()));
+                customersBasket.setProduct(products);
+                customersBasket
+                        .setFinalPrice(calculateFinalPrice(customersBasket));
+                customerService.addBasket(customersBasket);
+                FacesMessageUtil.addInfoMessage("added.new.product.to.cart");
+            } else {
+                //  add
+                customersBasket.setQuantity(customersBasket.getQuantity().add(
+                        productDetailsPage.getOrderQuantity()));
+                customersBasket.setUpdatedDate(new Timestamp(new Date()
+                        .getTime()));
+                customersBasket
+                        .setFinalPrice(calculateFinalPrice(customersBasket));
+                customerService.updateBasket(customersBasket);
+                FacesMessageUtil.addInfoMessage("added.product.to.cart");
+            }
 
+            // jump to cart page
+            StringBuilder buf = new StringBuilder();
+            buf.append("<script type=\"text/javascript\"><!--\n");
+            buf.append("setTimeout(\"jumpToCart()\", 1000);\n");
+            buf.append("function jumpToCart(){\n");
+            buf.append("location.href = \"").append(
+                    UrlBuilderUtil.createCartUrl()).append("\";\n");
+            buf.append("}\n");
+            buf.append("//-->\n");
+            buf.append("</script>\n");
+            productDetailsPage.setJumpToCart(buf.toString());
+        } catch (PompeiDBException e) {
+            FacesMessageUtil.addErrorMessage("failed.to.add.product.to.cart");
+            logger.log("EPC0152", new Object[] { this.toString() }, e);
+        }
+
         return null;
     }
 
-    private BigDecimal calculateFinalPrice(CustomerBasket customersBasket) {
+    private BigDecimal calculateFinalPrice(Basket customersBasket) {
         if (customersBasket != null) {
             //TODO tax
             return customersBasket.getProduct().getPrice().multiply(
@@ -236,62 +248,4 @@
         return null;
     }
 
-    /**
-     * @return productDetailsPage
-     */
-    public ProductDetailsPage getProductDetailsPage() {
-        return productDetailsPage;
-    }
-
-    /**
-     * @param productDetailsPage 設定する productDetailsPage
-     */
-    public void setProductDetailsPage(ProductDetailsPage productDetailsPage) {
-        this.productDetailsPage = productDetailsPage;
-    }
-
-    public ProductDxo getProductDxo() {
-        return productDxo;
-    }
-
-    public void setProductDxo(ProductDxo productDxo) {
-        this.productDxo = productDxo;
-    }
-
-    public ProductService getProductService() {
-        return productService;
-    }
-
-    public void setProductService(ProductService productService) {
-        this.productService = productService;
-    }
-
-    /**
-     * @return customerService
-     */
-    public CustomerService getCustomerService() {
-        return customerService;
-    }
-
-    /**
-     * @param customerService 設定する customerService
-     */
-    public void setCustomerService(CustomerService customerService) {
-        this.customerService = customerService;
-    }
-
-    /**
-     * @return cartService
-     */
-    public CartService getCartService() {
-        return cartService;
-    }
-
-    /**
-     * @param cartService 設定する cartService
-     */
-    public void setCartService(CartService cartService) {
-        this.cartService = cartService;
-    }
-
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -12,49 +12,38 @@
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean;
-import jp.sf.pal.pompei.dxo.CategoryDxo;
 import jp.sf.pal.pompei.dxo.PagerDxo;
 import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.exentity.FileData;
 import jp.sf.pal.pompei.exentity.Product;
-import jp.sf.pal.pompei.exentity.ProductImage;
 import jp.sf.pal.pompei.pager.ProductPager;
-import jp.sf.pal.pompei.service.CategoryService;
 import jp.sf.pal.pompei.service.ProductService;
 import jp.sf.pal.pompei.util.PagingResultBeanWrapper;
 import jp.sf.pal.pompei.util.SessionUtil;
 import jp.sf.pal.pompei.util.SystemUtil;
 import jp.sf.pal.pompei.util.UploadedFileUtil;
+import jp.sf.pal.pompei.web.admin.order.OrderListAction;
 
-import org.seasar.teeda.extension.util.LabelHelper;
+import org.seasar.framework.log.Logger;
 
 public class ProductListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 5503626496198881360L;
 
     /**
-     *
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(ProductListAction.class); // LOG CODE: ?PC014?
+
     private ProductListPage productListPage;
 
-    /**	 */
     private ProductService productService;
 
-    /**	 */
     private ProductDxo productDxo;
 
-    /**	 */
-    private CategoryService categoryService;
-
-    /**	 */
-    private CategoryDxo categoryDxo;
-
     private PagerDxo pagerDxo;
 
-    private LabelHelper labelHelper;
-
     private ProductPager productPager;
 
     public Class<?> initialize() {
@@ -92,7 +81,7 @@
             }
             try {
                 long id = Long.parseLong(productId);
-                getProductListPage().setProductId(BigDecimal.valueOf(id));
+                productListPage.setProductId(BigDecimal.valueOf(id));
                 return true;
             } catch (NumberFormatException e) {
             }
@@ -127,9 +116,9 @@
 
         if (isChangeCategory) {
             // change category
-            getProductListPage().setPageNumber(
-                    PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER);
-            getProductListPage().setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE);
+            productListPage
+                    .setPageNumber(PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER);
+            productListPage.setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE);
 
             // clear flag from details page
             SessionUtil
@@ -140,50 +129,52 @@
             }
 
             // set page number and size
-            if (getProductListPage().getPageNumber() != 0
-                    && getProductListPage().getPageSize() != 0) {
-                getPagerDxo().convert(getProductListPage(), getProductPager());
+            if (productListPage.getPageNumber() != 0
+                    && productListPage.getPageSize() != 0) {
+                pagerDxo.convert(productListPage, productPager);
             }
         }
 
         // set display mode
-        if (getProductListPage().getDisplayMode() != null) {
-            getProductPager().setDisplayMode(
-                    getProductListPage().getDisplayMode());
+        if (productListPage.getDisplayMode() != null) {
+            productPager.setDisplayMode(productListPage.getDisplayMode());
         } else {
-            String displayMode = getProductPager().getDisplayMode();
+            String displayMode = productPager.getDisplayMode();
             if (displayMode == null) {
                 // set default
                 displayMode = PompeiConstants.THUMBNAIL_DISPLAY;
-                getProductPager().setDisplayMode(displayMode);
+                productPager.setDisplayMode(displayMode);
             }
-            getProductListPage().setDisplayMode(displayMode);
+            productListPage.setDisplayMode(displayMode);
         }
 
         // set order mode
-        if (getProductListPage().getOrderMode() != null) {
-            getProductPager().setOrderMode(getProductListPage().getOrderMode());
+        if (productListPage.getOrderMode() != null) {
+            productPager.setOrderMode(productListPage.getOrderMode());
         } else {
-            String orderMode = getProductPager().getOrderMode();
+            String orderMode = productPager.getOrderMode();
             if (orderMode == null) {
                 // set default
                 orderMode = PompeiConstants.CHEAP_ORDER;
-                getProductPager().setOrderMode(orderMode);
+                productPager.setOrderMode(orderMode);
             }
-            getProductListPage().setOrderMode(orderMode);
+            productListPage.setOrderMode(orderMode);
         }
 
         // set categoryId to pager
-        getProductPager().setCategoryId(currentCategoryId);
+        productPager.setCategoryId(currentCategoryId);
 
+        //TODO catch an exception
+
         //商品一覧の取得
-        PagingResultBean<Product> productList = getProductService()
-                .getProductListByPager(getProductPager());
+        PagingResultBean<Product> productList = productService
+                .getProductListByPager(productPager, SystemUtil
+                        .getCurrentLanguage());
         List<Map<String, Object>> sList = new ArrayList<Map<String, Object>>();
-        getProductDxo().convert(productList, sList);
-        getProductListPage().setProductItems(sList);
-        getPagerDxo().convert(new PagingResultBeanWrapper(productList),
-                getProductListPage());
+        productDxo.convertFromProductToMap(productList, sList);
+        productListPage.setProductItems(sList);
+        pagerDxo.convert(new PagingResultBeanWrapper(productList),
+                productListPage);
 
         // page range
         productList.setPageRangeSize(PompeiConstants.DEFAULT_PAGE_RANGE_SIZE);
@@ -194,19 +185,18 @@
             map.put("pageNumber", Integer.valueOf(i));
             pageNumberItems.add(map);
         }
-        getProductListPage().setPageNumberItems(pageNumberItems);
+        productListPage.setPageNumberItems(pageNumberItems);
 
         // load thumbnail
         loadThumbnail(sList);
 
         // default display mode
-        if (getProductListPage().getDisplayMode() == null) {
-            getProductListPage().setDisplayMode(
-                    PompeiConstants.THUMBNAIL_DISPLAY);
+        if (productListPage.getDisplayMode() == null) {
+            productListPage.setDisplayMode(PompeiConstants.THUMBNAIL_DISPLAY);
         }
 
         // set title
-        SystemUtil.setWindowTitle(getProductListPage().getLabelHelper()
+        SystemUtil.setWindowTitle(productListPage.getLabelHelper()
                 .getLabelValue("windowTitle"));
 
         // render faces messages
@@ -216,15 +206,13 @@
 
     private void loadThumbnail(List<Map<String, Object>> productList) {
         for (Map<String, Object> map : productList) {
-            BigDecimal productId = (BigDecimal) map.get("productId");
-            if (productId != null) {
-                ProductImage productImage = getProductService()
-                        .getProductImageByProductIdAndType(productId,
-                                PompeiConstants.THUMBNAIL_IMAGE_TYPE);
-                if (productImage != null) {
+            BigDecimal fileDataId = (BigDecimal) map.get("fileDataId");
+            if (fileDataId != null) {
+                FileData fileData = productService.getFileData(fileDataId);
+                if (fileData != null) {
                     map.put(PompeiConstants.THUMBNAIL_IMAGE_URL,
-                            UploadedFileUtil.getProductImageUrl(productImage
-                                    .getImageName()));
+                            UploadedFileUtil.getProductImageUrl(fileData
+                                    .getName()));
                 } else {
                     //  set default image path
                     map
@@ -238,96 +226,4 @@
         }
     }
 
-    /**
-     * @return productListPage
-     */
-    public ProductListPage getProductListPage() {
-        return productListPage;
-    }
-
-    /**
-     * @param productListPage 設定する productListPage
-     */
-    public void setProductListPage(ProductListPage productListPage) {
-        this.productListPage = productListPage;
-    }
-
-    public CategoryDxo getCategoryDxo() {
-        return categoryDxo;
-    }
-
-    public void setCategoryDxo(CategoryDxo categoriesDxo) {
-        this.categoryDxo = categoriesDxo;
-    }
-
-    public CategoryService getCategoryService() {
-        return categoryService;
-    }
-
-    public void setCategoryService(CategoryService categoryService) {
-        this.categoryService = categoryService;
-    }
-
-    public ProductDxo getProductDxo() {
-        return productDxo;
-    }
-
-    public void setProductDxo(ProductDxo productDxo) {
-        this.productDxo = productDxo;
-    }
-
-    public ProductService getProductService() {
-        return productService;
-    }
-
-    public void setProductService(ProductService productService) {
-        this.productService = productService;
-    }
-
-    public String doCart() {
-
-        return "../cart/productList";
-    }
-
-    /**
-     * @return labelHelper
-     */
-    public LabelHelper getLabelHelper() {
-        return labelHelper;
-    }
-
-    /**
-     * @param labelHelper 設定する labelHelper
-     */
-    public void setLabelHelper(LabelHelper labelHelper) {
-        this.labelHelper = labelHelper;
-    }
-
-    /**
-     * @return productPager
-     */
-    public ProductPager getProductPager() {
-        return productPager;
-    }
-
-    /**
-     * @param productPager 設定する productPager
-     */
-    public void setProductPager(ProductPager productPager) {
-        this.productPager = productPager;
-    }
-
-    /**
-     * @return pagerDxo
-     */
-    public PagerDxo getPagerDxo() {
-        return pagerDxo;
-    }
-
-    /**
-     * @param pagerDxo 設定する pagerDxo
-     */
-    public void setPagerDxo(PagerDxo pagerDxo) {
-        this.pagerDxo = pagerDxo;
-    }
 }

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -5,8 +5,6 @@
 import java.util.Map;
 
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.exentity.ProductDescription;
-import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.util.UrlBuilderUtil;
 import jp.sf.pal.pompei.web.PagingResultPage;
 
@@ -15,9 +13,6 @@
 
 public class ProductListPage extends PagingResultPage {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -2356477849446203183L;
 
     private LabelHelper labelHelper;
@@ -36,8 +31,10 @@
 
     private String orderMode;
 
-    private LanguageService languageService;
+    private String name;
 
+    private String title;
+
     public int getProductIndex() {
         return productIndex;
     }
@@ -70,59 +67,36 @@
         this.productId = productsId;
     }
 
-    public String getCartLinkHref() {
-        return UrlBuilderUtil.createCartUrl();
+    public String getName() {
+        return name;
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
+    public String getTitle() {
+        return title;
     }
 
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCartLinkHref() {
+        return UrlBuilderUtil.createCartUrl();
+    }
+
     public String getProductName() {
-        //TODO
-        if (getProductItems() != null
-                && getProductIndex() < getProductItems().size()) {
-            List<ProductDescription> list = (List<ProductDescription>) productItems
-                    .get(productIndex).get(
-                            PompeiConstants.PRODUCT_DESCRIPTION_LIST);
-            for (ProductDescription pd : list) {
-                BigDecimal languagesId = getLanguageService()
-                        .getCurrentLanguage().getLanguageId();
-                if (pd.getLanguageId().equals(languagesId)) {
-                    return pd.getName();
-                }
-            }
-            // TODO need default lang?
+        if (getName() != null) {
+            return getName();
         }
         return "-";
     }
 
     public String getProductTitle() {
-        //TODO
-        if (getProductItems() != null
-                && getProductIndex() < getProductItems().size()) {
-            List<ProductDescription> list = (List<ProductDescription>) productItems
-                    .get(productIndex).get(
-                            PompeiConstants.PRODUCT_DESCRIPTION_LIST);
-            for (ProductDescription pd : list) {
-                BigDecimal languagesId = getLanguageService()
-                        .getCurrentLanguage().getLanguageId();
-                if (pd.getLanguageId().equals(languagesId)) {
-                    // TODO cut a long message?
-                    return pd.getTitle();
-                }
-            }
-            // TODO need default lang?
+        if (getTitle() != null) {
+            return getTitle();
         }
         return "-";
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -10,28 +10,28 @@
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean;
 import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.exentity.FileData;
 import jp.sf.pal.pompei.exentity.Product;
-import jp.sf.pal.pompei.exentity.ProductImage;
 import jp.sf.pal.pompei.service.ProductService;
 import jp.sf.pal.pompei.util.SystemUtil;
 import jp.sf.pal.pompei.util.UploadedFileUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class TopProductListAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -3171043762530754438L;
 
     /**
-     *
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(TopProductListAction.class); // LOG CODE: ?PC017?
+
     private TopProductListPage topProductListPage;
 
-    /**	 */
     private ProductService productService;
 
-    /**	 */
     private ProductDxo productDxo;
 
     public Class<?> initialize() {
@@ -45,11 +45,11 @@
         int num = SystemUtil.getNumOfTopProducts();
 
         //商品一覧の取得
-        PagingResultBean<Product> productList = getProductService()
-                .getTopProductList(type, num);
+        PagingResultBean<Product> productList = productService
+                .getTopProductList(type, num, SystemUtil.getCurrentLanguage());
         List<Map<String, Object>> sList = new ArrayList<Map<String, Object>>();
-        getProductDxo().convert(productList, sList);
-        getTopProductListPage().setProductItems(sList);
+        productDxo.convertFromProductToMap(productList, sList);
+        topProductListPage.setProductItems(sList);
 
         // load thumbnail
         loadThumbnail(sList);
@@ -61,16 +61,13 @@
 
     private void loadThumbnail(List<Map<String, Object>> productList) {
         for (Map<String, Object> map : productList) {
-            BigDecimal productId = (BigDecimal) map.get("productId");
-            if (productId != null) {
-                // TODO improvement
-                ProductImage productImage = getProductService()
-                        .getProductImageByProductIdAndType(productId,
-                                PompeiConstants.THUMBNAIL_IMAGE_TYPE);
-                if (productImage != null) {
+            BigDecimal fileDataId = (BigDecimal) map.get("fileDataId");
+            if (fileDataId != null) {
+                FileData fileData = productService.getFileData(fileDataId);
+                if (fileData != null) {
                     map.put(PompeiConstants.THUMBNAIL_IMAGE_URL,
-                            UploadedFileUtil.getProductImageUrl(productImage
-                                    .getImageName()));
+                            UploadedFileUtil.getProductImageUrl(fileData
+                                    .getName()));
                 } else {
                     //  set default image path
                     map
@@ -84,46 +81,4 @@
         }
     }
 
-    /**
-     * @return the topProductListPage
-     */
-    public TopProductListPage getTopProductListPage() {
-        return topProductListPage;
-    }
-
-    /**
-     * @param topProductListPage the topProductListPage to set
-     */
-    public void setTopProductListPage(TopProductListPage topProductListPage) {
-        this.topProductListPage = topProductListPage;
-    }
-
-    /**
-     * @return the productService
-     */
-    public ProductService getProductService() {
-        return productService;
-    }
-
-    /**
-     * @param productService the productService to set
-     */
-    public void setProductService(ProductService productService) {
-        this.productService = productService;
-    }
-
-    /**
-     * @return the productDxo
-     */
-    public ProductDxo getProductDxo() {
-        return productDxo;
-    }
-
-    /**
-     * @param productDxo the productDxo to set
-     */
-    public void setProductDxo(ProductDxo productDxo) {
-        this.productDxo = productDxo;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -6,17 +6,12 @@
 import java.util.Map;
 
 import jp.sf.pal.pompei.PompeiConstants;
-import jp.sf.pal.pompei.exentity.ProductDescription;
-import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.util.UrlBuilderUtil;
 
 import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter;
 
 public class TopProductListPage implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -8096518146757092176L;
 
     private int productIndex;
@@ -29,8 +24,10 @@
     @BigDecimalConverter(pattern = "###,###")
     private BigDecimal price;
 
-    private LanguageService languageService;
+    private String name;
 
+    private String title;
+
     public int getProductIndex() {
         return productIndex;
     }
@@ -67,55 +64,16 @@
         return UrlBuilderUtil.createCartUrl();
     }
 
-    /**
-     * @return languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService 設定する languageService
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
     public String getProductName() {
-        //TODO
-        if (getProductItems() != null
-                && getProductIndex() < getProductItems().size()) {
-            List<ProductDescription> list = (List<ProductDescription>) productItems
-                    .get(productIndex).get(
-                            PompeiConstants.PRODUCT_DESCRIPTION_LIST);
-            for (ProductDescription pd : list) {
-                BigDecimal languagesId = getLanguageService()
-                        .getCurrentLanguage().getLanguageId();
-                if (pd.getLanguageId().equals(languagesId)) {
-                    return pd.getName();
-                }
-            }
-            // TODO need default lang?
+        if (getName() != null) {
+            return getName();
         }
         return "-";
     }
 
     public String getProductTitle() {
-        //TODO
-        if (getProductItems() != null
-                && getProductIndex() < getProductItems().size()) {
-            List<ProductDescription> list = (List<ProductDescription>) productItems
-                    .get(productIndex).get(
-                            PompeiConstants.PRODUCT_DESCRIPTION_LIST);
-            for (ProductDescription pd : list) {
-                BigDecimal languagesId = getLanguageService()
-                        .getCurrentLanguage().getLanguageId();
-                if (pd.getLanguageId().equals(languagesId)) {
-                    // TODO cut a long message?
-                    return pd.getTitle();
-                }
-            }
-            // TODO need default lang?
+        if (getTitle() != null) {
+            return getTitle();
         }
         return "-";
     }
@@ -141,4 +99,20 @@
     public String getProductNameLinkHref() {
         return getProductLinkHref();
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -4,16 +4,18 @@
 
 import jp.sf.pal.common.util.FacesMessageUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class SignupCompleteAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 2689633390570340463L;
 
     /**
-     * 
+     * Logger for this class
      */
+    private static final Logger logger = Logger
+            .getLogger(SignupCompleteAction.class); // LOG CODE: ?PC021?
+
     private SignupCompletePage signupCompletePage;
 
     public Class<?> initialize() {
@@ -24,7 +26,7 @@
         getSignupCompletePage().setNotifiedEmailAddress(
                 getSignupCompletePage().getEmailAddress());
         getSignupCompletePage().setEmailAddress(null);
-        
+
         // render faces messages
         FacesMessageUtil.renderMessages();
         return null;

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,93 +1,100 @@
 package jp.sf.pal.pompei.web.user.signup;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
+import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
 
-import jp.sf.pal.common.CommonException;
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.PompeiException;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
 import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
-import jp.sf.pal.pompei.exentity.Zone;
 import jp.sf.pal.pompei.service.CustomerService;
-import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.util.SessionUtil;
 import jp.sf.pal.pompei.util.SystemUtil;
+import jp.sf.pal.pompei.util.UserRegistrationUtil;
+import jp.sf.pal.pompei.util.VelocityUtil;
 
+import org.apache.jetspeed.JetspeedActions;
+import org.apache.jetspeed.administration.AdministrationEmailException;
+import org.apache.jetspeed.om.common.SecurityConstraint;
+import org.apache.jetspeed.om.folder.Folder;
+import org.apache.jetspeed.page.PageManager;
+import org.apache.jetspeed.security.User;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
 import org.seasar.framework.log.Logger;
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
 import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
 
 public class SignupConfirmAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 4440511977300860903L;
 
     /**
      * Logger for this class
      */
     private static final Logger logger = Logger
-            .getLogger(SignupConfirmAction.class);
+            .getLogger(SignupConfirmAction.class); // LOG CODE: ?PC020?
 
-    /**
-     * 
-     */
     private SignupConfirmPage signupConfirmPage;
 
     private CustomerDxo customerDxo;
 
     private CustomerService customerService;
 
-    private LanguageService languageService;
-
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
-        getSignupConfirmPage().setUserSecretAnswer(
-                PompeiConstants.DUMMY_SECRET_ANSWER);
+        signupConfirmPage
+                .setUserSecretAnswer(PompeiConstants.DUMMY_SECRET_ANSWER);
 
         // render faces messages
         FacesMessageUtil.renderMessages();
         return null;
     }
 
-    public Class<?> doCancel() {
-        return SignupEditPage.class;
-    }
-
     @TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress")
     public Class<?> doOnceCreate() {
         // convert cp932 to jis
-        getSignupConfirmPage().setStreetAddress(
-                SystemUtil.convertToJIS(getSignupConfirmPage()
-                        .getStreetAddress()));
+        signupConfirmPage.setStreetAddress(SystemUtil
+                .convertToJIS(signupConfirmPage.getStreetAddress()));
 
         // new
         Date now = new Date();
         Customer customer = new Customer();
-        customer.setDateAdded(new Timestamp(now.getTime()));
-        customer.setLastModified(new Timestamp(now.getTime()));
-        AddressBook addressBook = new AddressBook();
-        getCustomerDxo().convert(getSignupConfirmPage(), customer);
-        getCustomerDxo().convert(getSignupConfirmPage(), addressBook);
+        customerDxo.convertFromPageToCustomer(signupConfirmPage, customer);
+        AddressBook addressBook = null;
+        if (customer.getAddressBookList() != null
+                && !customer.getAddressBookList().isEmpty()) {
+            addressBook = customer.getAddressBookList().get(0);
+        } else {
+            addressBook = new AddressBook();
+            List<AddressBook> addressBookList = new ArrayList<AddressBook>();
+            addressBookList.add(addressBook);
+            customer.setAddressBookList(addressBookList);
+        }
+        customerDxo
+                .convertFromPageToAddressBook(signupConfirmPage, addressBook);
 
-        //TODO zone and check if it's null
-        Zone zones = getCustomerService().getZone(new BigDecimal(130));
-        addressBook.setZoneId(zones.getZoneId());
-        //TODO countries and check if it's null
-        addressBook.setCountryId(zones.getCountry().getCountryId());
-        //TODO select language
-        addressBook.setLanguageId(getLanguageService().getDefaultLanguage()
-                .getLanguageId());
+        //TODO country
+        //TODO delivery zone
+
         // set default address
         addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL);
 
@@ -102,70 +109,70 @@
                             SystemUtil
                                     .getMessageDigest((String) SessionUtil
                                             .getFromLocalScope(PompeiConstants.USER_SECRET_ANSWER)));
-        } catch (CommonException e) {
+        } catch (PompeiException e) {
             FacesMessageUtil.addErrorMessage(e.getMessageId());
             logger.log(e);
             return null;
         }
-        userInfo.put(PompeiConstants.USER_NAME, getSignupConfirmPage()
-                .getUserName());
+        userInfo
+                .put(PompeiConstants.USER_NAME, signupConfirmPage.getUserName());
         userInfo.put(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL,
-                getSignupConfirmPage().getEmailAddress());
-        userInfo.put(PompeiConstants.USER_SECRET_QUESTION,
-                getSignupConfirmPage().getUserSecretQuestion());
+                signupConfirmPage.getEmailAddress());
+        userInfo.put(PompeiConstants.USER_SECRET_QUESTION, signupConfirmPage
+                .getUserSecretQuestion());
         userInfo.put("user.home-info.telecom.mobile.number",
-                convertNotNull(getSignupConfirmPage().getCellphone()));
+                convertNotNull(signupConfirmPage.getCellphone()));
         userInfo.put("user.home-info.postal.city",
-                convertNotNull(getSignupConfirmPage().getCity()));
-        userInfo.put("user.employer", convertNotNull(getSignupConfirmPage()
+                convertNotNull(signupConfirmPage.getCity()));
+        userInfo.put("user.employer", convertNotNull(signupConfirmPage
                 .getCompany()));
-        userInfo.put("user.department", convertNotNull(getSignupConfirmPage()
+        userInfo.put("user.department", convertNotNull(signupConfirmPage
                 .getDepartment()));
         userInfo.put("user.home-info.online.email",
-                convertNotNull(getSignupConfirmPage().getEmailAddress()));
+                convertNotNull(signupConfirmPage.getEmailAddress()));
         userInfo.put("user.home-info.telecom.fax.number",
-                convertNotNull(getSignupConfirmPage().getFax()));
-        userInfo.put("user.name.given", convertNotNull(getSignupConfirmPage()
+                convertNotNull(signupConfirmPage.getFax()));
+        userInfo.put("user.name.given", convertNotNull(signupConfirmPage
                 .getFirstname()));
-        userInfo
-                .put("user.name.given.yomi",
-                        convertNotNull(getSignupConfirmPage()
-                                .getFirstnameDescription()));
-        userInfo.put("user.gender", convertNotNull(getSignupConfirmPage()
+        userInfo.put("user.name.given.yomi", convertNotNull(signupConfirmPage
+                .getFirstnameDescription()));
+        userInfo.put("user.gender", convertNotNull(signupConfirmPage
                 .getGender()));
-        userInfo.put("user.name.family", convertNotNull(getSignupConfirmPage()
+        userInfo.put("user.name.family", convertNotNull(signupConfirmPage
                 .getLastname()));
-        userInfo
-                .put("user.name.family.yomi",
-                        convertNotNull(getSignupConfirmPage()
-                                .getLastnameDescription()));
+        userInfo.put("user.name.family.yomi", convertNotNull(signupConfirmPage
+                .getLastnameDescription()));
         userInfo.put("user.home-info.postal.postalcode",
-                convertNotNull(getSignupConfirmPage().getPostcode()));
+                convertNotNull(signupConfirmPage.getPostcode()));
         userInfo.put("user.home-info.postal.stateprov",
-                convertNotNull(getSignupConfirmPage().getState()));
+                convertNotNull(signupConfirmPage.getState()));
         userInfo.put("user.home-info.postal.street",
-                convertNotNull(getSignupConfirmPage().getStreetAddress()));
+                convertNotNull(signupConfirmPage.getStreetAddress()));
         userInfo.put("user.home-info.telecom.telephone.number",
-                convertNotNull(getSignupConfirmPage().getTelephone()));
-        userInfo.put("user.bdate", convertNotNull(getSignupConfirmPage()
+                convertNotNull(signupConfirmPage.getTelephone()));
+        userInfo.put("user.bdate", convertNotNull(signupConfirmPage
                 .getDayOfBirth().toString()));
 
         try {
-            getCustomerService().addCustomer(userInfo, customer, addressBook);
-        } catch (CommonException e) {
-            FacesMessageUtil.addErrorMessage(e.getMessageId());
-            logger.log(e);
+            signupCustomer(userInfo, customer);
+        } catch (PompeiException e) {
+            FacesMessageUtil.addErrorMessage(e.getMessageId(), e.getArgs());
+            logger.log("EPC0201", new Object[] { this.toString() }, e);
             return null;
         } catch (Exception e) {
             FacesMessageUtil
                     .addErrorMessage("could.not.create.user.by.system.error");
-            logger.log(e);
+            logger.log("EPC0202", new Object[] { this.toString() }, e);
             return null;
         }
 
         return SignupCompletePage.class;
     }
 
+    public Class<?> doCancel() {
+        return SignupEditPage.class;
+    }
+
     private String convertNotNull(String str) {
         if (str == null) {
             return "";
@@ -173,60 +180,273 @@
         return str;
     }
 
-    /**
-     * @return the signupConfirmPage
-     */
+    protected void signupCustomer(Map<String, String> userInfo,
+            Customer customer) throws PompeiException {
+
+        String password = userInfo.remove(PompeiConstants.USER_PASSWORD);
+        String verifyPassword = userInfo
+                .remove(PompeiConstants.USER_VERIFY_PASSWORD);
+        if (!UserRegistrationUtil
+                .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) {
+            if (password == null || password.equals("")) {
+                throw new PompeiException("error.lacking.password",
+                        "The password is null.");
+            }
+        }
+
+        if (UserRegistrationUtil
+                .getBoolean(PompeiConstants.FORCE_USE_EMAIL_AS_USERNAME)) {
+            // force user.name to be same as email
+            userInfo.put(PompeiConstants.USER_NAME, userInfo
+                    .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL));
+        }
+
+        boolean userIdExistsFlag = true;
+        try {
+            SystemUtil.getUserManager().getUser(
+                    userInfo.get(PompeiConstants.USER_NAME));
+        } catch (org.apache.jetspeed.security.SecurityException e) {
+            userIdExistsFlag = false;
+        }
+
+        if (userIdExistsFlag) {
+            throw new PompeiException("error.userid_already_exists",
+                    "The user id already exists.");
+        }
+
+        if (UserRegistrationUtil.getBoolean(PompeiConstants.FORCE_UNIQUE_EMAIL)) {
+            boolean emailExistsFlag = true;
+            User user = null;
+            try {
+                user = SystemUtil
+                        .getPortalAdministration()
+                        .lookupUserFromEmail(
+                                userInfo
+                                        .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL));
+            } catch (AdministrationEmailException e) {
+                emailExistsFlag = false;
+            }
+            if ((emailExistsFlag) || (user != null)) {
+                throw new PompeiException("error.email_already_exists",
+                        "The email already exists.");
+            }
+
+        }
+
+        if (UserRegistrationUtil
+                .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) {
+            try {
+                password = SystemUtil.getPortalAdministration()
+                        .generatePassword();
+            } catch (Exception e) {
+                throw new PompeiException("error.failed_to_generate_password",
+                        "Could not create password.", e);
+            }
+        } else {
+            if (verifyPassword == null || !verifyPassword.equals(password)) {
+                throw new PompeiException("error.two_passwords_do_not_match",
+                        "Two passwords do not match.");
+            }
+        }
+
+        String userName = userInfo.get(PompeiConstants.USER_NAME);
+        Customer c = customerService.getCustomerByPortalId(userName);
+        if (c != null) {
+            try {
+                customerService.deleteCustomer(c.getCustomerId());
+            } catch (Exception e) {
+                //TODO nothing?
+            }
+        }
+
+        try {
+            SystemUtil.getPortalAdministration().registerUser(
+                    userName,
+                    password,
+                    UserRegistrationUtil.getStringList(PompeiConstants.ROLES),
+                    UserRegistrationUtil.getStringList(PompeiConstants.GROUPS),
+                    userInfo, // note use of only
+                    // PLT.D values here.
+                    UserRegistrationUtil.getStringMap(PompeiConstants.RULES),
+                    PompeiConstants.DEFAULT_USER_TEMPLATE_FOLDER); // TODO default template path
+        } catch (Exception e) {
+            cancelToAddCustomer(userInfo, customer);
+            throw new PompeiException("error.failed_to_add",
+                    "Could not register a user.", e);
+        }
+
+        // set security constraint
+        String userhome = Folder.USER_FOLDER + userName;
+        try {
+            PageManager pageManager = SystemUtil.getPageManager();
+            SecurityConstraint sc = pageManager.newPageSecurityConstraint();
+            sc.setUsers(parseCSVList(userName));
+            List<String> permissions = new ArrayList<String>();
+            permissions.add(JetspeedActions.VIEW);
+            permissions.add(JetspeedActions.EDIT);
+            permissions.add(JetspeedActions.HELP);
+            sc.setPermissions(permissions);
+            Folder userFolder = pageManager.getFolder(userhome);
+
+            if (userFolder.getSecurityConstraints() == null) {
+                userFolder.setSecurityConstraints(pageManager
+                        .newSecurityConstraints());
+            }
+            userFolder.getSecurityConstraints().getSecurityConstraints()
+                    .add(sc);
+
+            pageManager.updateFolder(userFolder);
+            pageManager.reset();
+        } catch (Exception e) {
+            cancelToAddCustomer(userInfo, customer);
+            throw new PompeiException("could.not.access.folder",
+                    "Could not access a folder: " + userhome, e);
+        }
+
+        // set portal id
+        customer.setPortalId(userName);
+
+        try {
+            // create customer
+            customerService.addCustomer(customer);
+        } catch (Exception e) {
+            cancelToAddCustomer(userInfo, customer);
+            throw new PompeiException("could.not.insert.customer.data",
+                    "Could not insert customer data. ", e);
+        }
+
+        if (UserRegistrationUtil.getBoolean(PompeiConstants.SEND_MAIL)) {
+            if (password != null) {
+                userInfo.put("password", password);
+            }
+
+            try {
+                //TODO move user-signup.vm to init-param
+                sendSignupMail(userInfo, userInfo
+                        .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL),
+                        SystemUtil.getAdministratorEmail(), "user-signup.vm");
+            } catch (Exception e) {
+                cancelToAddCustomer(userInfo, customer);
+                throw new PompeiException(
+                        "error.registration_completed_but_could_not_send",
+                        "Could not send a registration mail.", e);
+            }
+        }
+
+    }
+
+    private void sendSignupMail(Map<String, String> userInfo, String to,
+            String from, String templateName) throws Exception {
+        // set velocity context
+        VelocityContext context = new VelocityContext();
+        context.put("map", userInfo);
+
+        VelocityUtil.init();
+        StringWriter sw = new StringWriter();
+        String templatePath = SystemUtil
+                .getSignupNotificationTemplatePath(templateName);
+        // TODO i18n: encoding
+        Template template = VelocityUtil.getTemplate(templatePath, "UTF-8");
+
+        template.merge(context, sw);
+
+        String content = sw.toString();
+        if (content == null) {
+            throw new PompeiException("signup.content.is.null");
+        }
+        int index = content.indexOf("\n");
+        String subject = null;
+        String body = null;
+        if (index != -1) {
+            subject = content.substring(0, index);
+            body = content.substring(index);
+        } else {
+            // TODO should throw exception?
+            subject = content;
+            body = content;
+        }
+
+        Properties props = System.getProperties();
+        // set smtp server
+        props.put("mail.smtp.host", SystemUtil.getSmtpHost());
+        Session session = Session.getDefaultInstance(props, null);
+        MimeMessage mimeMessage = new MimeMessage(session);
+        mimeMessage.setFrom(new InternetAddress(from));
+        mimeMessage.setRecipients(Message.RecipientType.TO, to);
+        //TODO i18n: encoding
+        mimeMessage.setSubject(subject, "iso-2022-jp");
+        //TODO i18n: encoding
+        mimeMessage.setText(body, "iso-2022-jp");
+        mimeMessage.setHeader("Content-Type", "text/plain");
+        mimeMessage.setSentDate(new Date());
+
+        Transport.send(mimeMessage);
+
+    }
+
+    protected void cancelToAddCustomer(Map<String, String> userInfo,
+            Customer customer) {
+        // delete customer
+        if (customer.getCustomerId() != null) {
+            try {
+                customerService.deleteCustomer(customer.getCustomerId());
+            } catch (Exception e) {
+            }
+        }
+
+        try {
+            String userhome = Folder.USER_FOLDER
+                    + userInfo.get(PompeiConstants.USER_NAME);
+            PageManager pageManager = SystemUtil.getPageManager();
+            Folder folder = pageManager.getFolder(userhome);
+            pageManager.removeFolder(folder);
+        } catch (Exception e) {
+        }
+
+        try {
+            SystemUtil.getUserManager().removeUser(
+                    userInfo.get(PompeiConstants.USER_NAME));
+        } catch (Exception e) {
+        }
+    }
+
+    private List<String> parseCSVList(String csv) {
+        List<String> csvList = new ArrayList<String>();
+        if (csv != null) {
+            if (csv.indexOf(',') != -1) {
+                StringTokenizer csvTokens = new StringTokenizer(csv, ",");
+                while (csvTokens.hasMoreTokens()) {
+                    csvList.add(csvTokens.nextToken().trim());
+                }
+            } else {
+                csvList.add(csv);
+            }
+        }
+        return csvList;
+    }
+
     public SignupConfirmPage getSignupConfirmPage() {
         return signupConfirmPage;
     }
 
-    /**
-     * @param signupConfirmPage the signupConfirmPage to set
-     */
     public void setSignupConfirmPage(SignupConfirmPage signupConfirmPage) {
         this.signupConfirmPage = signupConfirmPage;
     }
 
-    /**
-     * @return the customerDxo
-     */
     public CustomerDxo getCustomerDxo() {
         return customerDxo;
     }
 
-    /**
-     * @param customerDxo the customerDxo to set
-     */
     public void setCustomerDxo(CustomerDxo customerDxo) {
         this.customerDxo = customerDxo;
     }
 
-    /**
-     * @return the customerService
-     */
     public CustomerService getCustomerService() {
         return customerService;
     }
 
-    /**
-     * @param customerService the customerService to set
-     */
     public void setCustomerService(CustomerService customerService) {
         this.customerService = customerService;
     }
 
-    /**
-     * @return the languageService
-     */
-    public LanguageService getLanguageService() {
-        return languageService;
-    }
-
-    /**
-     * @param languageService the languageService to set
-     */
-    public void setLanguageService(LanguageService languageService) {
-        this.languageService = languageService;
-    }
-
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java	2008-04-08 05:03:44 UTC (rev 880)
@@ -13,36 +13,30 @@
 import java.util.List;
 import java.util.Map;
 
-import org.seasar.framework.log.Logger;
-
 import jp.sf.pal.common.util.DateUtil;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.util.SessionUtil;
 import jp.sf.pal.pompei.util.SystemUtil;
 
+import org.seasar.framework.log.Logger;
+
 public class SignupEditAction implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -2384511292540333093L;
 
     /**
      * Logger for this class
      */
     private static final Logger logger = Logger
-            .getLogger(SignupEditAction.class);
+            .getLogger(SignupEditAction.class); // LOG CODE: ?PC019?
 
-    /**
-     * 
-     */
     private SignupEditPage signupEditPage;
 
     public Class<?> initialize() {
         // state items
         List<Map<String, String>> stateItems = new ArrayList<Map<String, String>>();
-        String states = getSignupEditPage().getLabelHelper().getLabelValue(
+        String states = signupEditPage.getLabelHelper().getLabelValue(
                 "state.items");
         String[] stateArray = states.split(",");
         for (String state : stateArray) {
@@ -51,7 +45,7 @@
             map.put("value", state);
             stateItems.add(map);
         }
-        getSignupEditPage().setStateItems(stateItems);
+        signupEditPage.setStateItems(stateItems);
         // dayOfBirth
         Date now = new Date();
         List<Map<String, String>> yearOfDayOfBirthItems = new ArrayList<Map<String, String>>();
@@ -62,8 +56,8 @@
             map.put("value", Integer.toString(year - i));
             yearOfDayOfBirthItems.add(map);
         }
-        getSignupEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems);
-        getSignupEditPage().setYearOfDayOfBirth(Integer.valueOf(year));
+        signupEditPage.setYearOfDayOfBirthItems(yearOfDayOfBirthItems);
+        signupEditPage.setYearOfDayOfBirth(Integer.valueOf(year));
 
         List<Map<String, String>> monthOfDayOfBirthItems = new ArrayList<Map<String, String>>();
         for (int i = 1; i < 13; i++) {
@@ -72,9 +66,9 @@
             map.put("value", Integer.toString(i));
             monthOfDayOfBirthItems.add(map);
         }
-        getSignupEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems);
-        getSignupEditPage().setMonthOfDayOfBirth(
-                Integer.valueOf(DateUtil.getMonth(now) + 1));
+        signupEditPage.setMonthOfDayOfBirthItems(monthOfDayOfBirthItems);
+        signupEditPage.setMonthOfDayOfBirth(Integer.valueOf(DateUtil
+                .getMonth(now) + 1));
 
         List<Map<String, String>> dateOfDayOfBirthItems = new ArrayList<Map<String, String>>();
         for (int i = 1; i < 32; i++) {
@@ -83,35 +77,35 @@
             map.put("value", Integer.toString(i));
             dateOfDayOfBirthItems.add(map);
         }
-        getSignupEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems);
-        getSignupEditPage().setDateOfDayOfBirth(
-                Integer.valueOf(DateUtil.getDate(now)));
+        signupEditPage.setDateOfDayOfBirthItems(dateOfDayOfBirthItems);
+        signupEditPage.setDateOfDayOfBirth(Integer.valueOf(DateUtil
+                .getDate(now)));
 
         // Load Secret Question
         List<Map<String, String>> questionItems = new ArrayList<Map<String, String>>();
-        int numOfQuestions = Integer.parseInt(getSignupEditPage()
-                .getLabelHelper().getLabelValue("secretQuestion.num"));
+        int numOfQuestions = Integer.parseInt(signupEditPage.getLabelHelper()
+                .getLabelValue("secretQuestion.num"));
         for (int i = 1; i <= numOfQuestions; i++) {
             Map<String, String> map = new HashMap<String, String>(2);
-            String value = getSignupEditPage().getLabelHelper().getLabelValue(
+            String value = signupEditPage.getLabelHelper().getLabelValue(
                     "secretQuestion." + i);
             map.put("label", value);
             map.put("value", value);
             questionItems.add(map);
         }
-        getSignupEditPage().setUserSecretQuestionSelectionItems(questionItems);
+        signupEditPage.setUserSecretQuestionSelectionItems(questionItems);
 
         return null;
     }
 
     public Class<?> prerender() {
         // Load Term Of Service
-        String filename = getSignupEditPage().getLabelHelper().getLabelValue(
+        String filename = signupEditPage.getLabelHelper().getLabelValue(
                 "termOfServiceFile");
         if (filename == null) {
             filename = "/WEB-INF/template/term_of_service.txt";
         }
-        String encoding = getSignupEditPage().getLabelHelper().getLabelValue(
+        String encoding = signupEditPage.getLabelHelper().getLabelValue(
                 "termOfServiceEncoding");
         if (encoding == null) {
             encoding = "UTF-8";
@@ -128,13 +122,13 @@
             }
         } catch (UnsupportedEncodingException e) {
             FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPC0001", new Object[] { this.toString() }, e);
+            logger.log("EPC0191", new Object[] { this.toString() }, e);
         } catch (FileNotFoundException e) {
             FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPC0002", new Object[] { this.toString() }, e);
+            logger.log("EPC0192", new Object[] { this.toString() }, e);
         } catch (IOException e) {
             FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
-            logger.log("EPC0003", new Object[] { this.toString() }, e);
+            logger.log("EPC0193", new Object[] { this.toString() }, e);
         } finally {
             if (reader != null) {
                 try {
@@ -143,10 +137,10 @@
                 }
             }
         }
-        getSignupEditPage().setTermOfService(buf.toString());
+        signupEditPage.setTermOfService(buf.toString());
 
         // reset secret answer
-        getSignupEditPage().setUserSecretAnswer("");
+        signupEditPage.setUserSecretAnswer("");
 
         // render faces messages
         FacesMessageUtil.renderMessages();
@@ -155,31 +149,30 @@
 
     private void preprocessingForUpdate() {
         // day of birth
-        getSignupEditPage().setDayOfBirth(
-                DateUtil.get(getSignupEditPage().getYearOfDayOfBirth() - 1900,
-                        getSignupEditPage().getMonthOfDayOfBirth() - 1,
-                        getSignupEditPage().getDateOfDayOfBirth()));
+        signupEditPage.setDayOfBirth(DateUtil.get(signupEditPage
+                .getYearOfDayOfBirth() - 1900, signupEditPage
+                .getMonthOfDayOfBirth() - 1, signupEditPage
+                .getDateOfDayOfBirth()));
 
         // postcode
-        getSignupEditPage().setPostcode(
-                getSignupEditPage().getPrimaryPostcode() + "-"
-                        + getSignupEditPage().getSecondaryPostcode());
+        signupEditPage.setPostcode(signupEditPage.getPrimaryPostcode() + "-"
+                + signupEditPage.getSecondaryPostcode());
     }
 
     public Class<?> doConfirm() {
         // TODO teeda bug? required validator for radio button does not work
-        if (getSignupEditPage().getGender() == null) {
+        if (signupEditPage.getGender() == null) {
             FacesMessageUtil.addErrorMessage("need.to.select.gender");
             return null;
         }
 
-        if (getSignupEditPage().getUserSecretQuestionSelection() != null) {
-            getSignupEditPage().setUserSecretQuestion(
-                    getSignupEditPage().getUserSecretQuestionSelection());
+        if (signupEditPage.getUserSecretQuestionSelection() != null) {
+            signupEditPage.setUserSecretQuestion(signupEditPage
+                    .getUserSecretQuestionSelection());
         }
         // check secret question
-        if (getSignupEditPage().getUserSecretQuestion() == null
-                || getSignupEditPage().getUserSecretQuestion().equals("")) {
+        if (signupEditPage.getUserSecretQuestion() == null
+                || signupEditPage.getUserSecretQuestion().equals("")) {
             FacesMessageUtil.addErrorMessage("type.secret.question");
             return null;
         }
@@ -188,23 +181,16 @@
 
         // put secret answer to session
         SessionUtil.putToLocalScope(PompeiConstants.USER_SECRET_ANSWER,
-                getSignupEditPage().getUserSecretAnswer());
-        getSignupEditPage().setUserSecretAnswer(
-                PompeiConstants.DUMMY_SECRET_ANSWER);
+                signupEditPage.getUserSecretAnswer());
+        signupEditPage.setUserSecretAnswer(PompeiConstants.DUMMY_SECRET_ANSWER);
 
         return SignupConfirmPage.class;
     }
 
-    /**
-     * @return signupEditPage
-     */
     public SignupEditPage getSignupEditPage() {
         return signupEditPage;
     }
 
-    /**
-     * @param signupEditPage 設定する signupEditPage
-     */
     public void setSignupEditPage(SignupEditPage signupEditPage) {
         this.signupEditPage = signupEditPage;
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,5 +1,80 @@
 EPC0001=Could not read a term of service.
 EPC0002=Could not read a term of service.
 EPC0003=Could not read a term of service.
-EPC0004=Could not send order notification.
-EPC0005=Could not send order notification when order occurs.
\ No newline at end of file
+EPC0005=Could not send order notification when order occurs.
+
+
+EPC0021=Could not load a category: {0}
+EPC0022=Failed to add a category: {0}
+EPC0023=Failed to update a category: {0}
+
+EPC0031=Could not load manufacturers: {0}
+EPC0032=Failed to delete a manufacturer: {0}
+
+EPC0041=Could not load a manufacturer: {0}
+EPC0043=Failed to add a manufacturer: {0}
+EPC0042=Failed to update a manufacturer: {0}
+
+EPC0051=Could not load product: {0}
+EPC0052=Could not load a category: {0}
+EPC0053=Failed to delete a product: {0}
+
+EPC0061=Could not load a manufacturer: {0}
+EPC0062=Could not load a tax type: {0}
+EPC0063=Could not load a delivery type: {0}
+EPC0064=Could not load a product: {0}
+EPC0065=Failed to add a product: {0}
+EPC0066=Failed to update a product: {0}
+
+EPC0091=Could not load a order form: {0}
+EPC0092=Failed to update a order form: {0}
+EPC0093=Failed to delete a order form: {0}
+
+EPC0101=Could not load a order notification: {0}
+EPC0102=Could not send order notification.
+
+EPC0131=Could not load a customer: {0}
+EPC0132=Failed to update a customer: {0}
+EPC0133=Failed to delete a customer: {0}
+EPC0134=Failed to delete a customer: {0}
+
+EPC0151=Could not load a product: {0}
+EPC0152=Failed to add a product to cart:: {0}
+
+EPC0161=Could not load a category: {0}
+
+EPC0181=Could not load a product in a cart: {0}
+EPC0182=Failed to delete a product in a cart: {0}
+
+EPC0191=Could not read a term of service.
+EPC0192=Could not read a term of service.
+EPC0193=Could not read a term of service.
+
+EPC0201=Could not add a customer: {0}
+EPC0202=Could not add a customer: {0}
+
+EPC0221=Failed to load a customer info: {0}
+EPC0222=Failed to update a customer info: {0}
+EPC0223=Failed to create a customer info: {0}
+
+EPC0231=Failed to load a customer info: {0}
+EPC0232=Failed to add a address book: {0}
+EPC0233=Failed to delete a address book: {0}
+
+EPC0241=Failed to load a customer info: {0}
+EPC0242=Failed to load a system info: {0}
+EPC0243=System Error: {0}
+
+EPC0251=Could not calculate a payment fee: {0}
+EPC0252=Could not calculate a payment fee: {0}
+EPC0253=Could not calculate a payment fee: {0}
+EPC0254=Could not calculate a delivery price: {0}
+EPC0255=Could not calculate a delivery price: {0}
+EPC0256=Could not calculate a delivery price: {0}
+EPC0257=Could not load an order info: {0}
+EPC0258=The product is a shortage: {0}
+EPC0259=Could not send order notification when order occurs: {0}
+EPC0260=Could not send order notification when order occurs: {0}
+EPC0261=Could not send order notification: {0}
+EPC0262=System Error: {0}
+

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties	2008-04-08 05:03:44 UTC (rev 880)
@@ -31,6 +31,8 @@
 customer.is.not.specified.in.customerconfirm.for.delete=\u4f1a\u54e1\u60c5\u5831\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 deleted.customer.in.customerconfirm=\u4f1a\u54e1\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
 unexpected.action.in.customerconfirm=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.update.customer.in.customerconfirm=\u4f1a\u54e1\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.delete.customer.in.customerconfirm=\u4f1a\u54e1\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # CustomerEditAction.java
 invalid.parameter.in.customeredit=\u4f1a\u54e1\u60c5\u5831\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
@@ -42,35 +44,66 @@
 could.not.find.order.in.orderconfirm.for.delete=\u6ce8\u6587\u60c5\u5831(ID:{0})\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 deleted.order.info.in.orderconfirm=\u6ce8\u6587\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
 unexpected.action.in.orderconfirm=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.update.order.in.orderconfirm=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.delete.order.in.orderconfirm=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # OrderEditAction.java
 invalid.mode.in.orderedit=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
+# OrderNotificationAction.java
+could.not.find.order.notification=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u901a\u77e5\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+
 # CategoryEditAction.java
 updated.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
 added.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
+could.not.load.category=\u5bfe\u8c61\u306e\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.add.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.update.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # CategoryListAction.java
 has.child.categories=\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308b\u30ab\u30c6\u30b4\u30ea\u5185\u306b\u30b5\u30d6\u30ab\u30c6\u30b4\u30ea\u304c\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002\u30b5\u30d6\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3057\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 deleted.category=\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+failed.to.delete.category=\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.load.category.for.breadcrumb=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
+# CategoryListAction.java
+failed.to.load.category=\u30ab\u30c6\u30b4\u30ea\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+
 # ManufacturerEditAction.java
 updated.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
 added.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+could.not.find.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+faild.to.update.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+faild.to.add.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # ManufacturerListAction.java
 deleted.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+failed.to.load.manufacturers=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.delete.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # ProductEditAction.java
 added.product=\u5546\u54c1\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
 updated.product=\u5546\u54c1\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
 unexpected.action.in.productedit=\u6307\u5b9a\u3055\u308c\u305f\u5546\u54c1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.load.manufacturers=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.load.taxtypes=\u7a0e\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.load.deliveryypes=\u914d\u9001\u65b9\u6cd5\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.load.product=\u5546\u54c1\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.add.product=\u5546\u54c1\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.update.product=\u5546\u54c1\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # ProductListAction.java
 deleted.product=\u5546\u54c1\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+could.not.find.products=\u5546\u54c1\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.delete.product=\u5546\u54c1\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
+# ProductEditAction.java
+failed.to.add.product.to.cart=\u30ab\u30fc\u30c8\u3078\u306e\u5546\u54c1\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+
 # ProductListAction.java for cart
 deleted.product.from.cart=\u30ab\u30fc\u30c8\u304b\u3089\u5546\u54c1\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+failed.to.load.product.in.basket=\u30ab\u30fc\u30c8\u5185\u306e\u5546\u54c1\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.delete.product.in.basket=\u30ab\u30fc\u30c8\u5185\u306e\u5546\u54c1\u60c5\u5831\u3092\u524a\u9664\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # CheckoutConfirmAction.java
 expire.order.process.in.checkoutconfirm=\u6ce8\u6587\u30d7\u30ed\u30bb\u30b9\u306e\u6709\u52b9\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -103,6 +136,8 @@
 could.not.find.card.type.in.paymentselect=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u306e\u7a2e\u985e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 could.not.find.card.expire.in.paymentselect=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u306e\u6709\u52b9\u671f\u9650\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 could.not.find.delivery.method.id.in.paymentselect=\u6307\u5b9a\u3055\u308c\u305f\u914d\u9054\u65b9\u6cd5\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+failed.to.load.system.info=\u30b7\u30b9\u30c6\u30e0\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+system.error.occur.in.payment=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # UserAddressSelectAction.java
 added.addressbook=\u4f4f\u6240\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002
@@ -113,6 +148,8 @@
 deleted.address.book=\u4f4f\u6240\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
 expire.order.process.in.useraddressselect=\u6ce8\u6587\u30d7\u30ed\u30bb\u30b9\u306e\u6709\u52b9\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 could.not.find.default.address.book=\u4f4f\u6240\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u5c11\u306a\u304f\u3066\u3082 1 \u3064\u306e\u4f4f\u6240\u60c5\u5831\u306e\u767b\u9332\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002
+failed.to.add.addressbook=\u4f4f\u6240\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.delete.addressbook=\u4f4f\u6240\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # UserInfoEditAction.java
 added.customer=\u4f1a\u54e1\u60c5\u5831\u3092\u767b\u9332\u3057\u307e\u3057\u305f\u3002
@@ -121,6 +158,9 @@
 could.not.find.customer.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 could.not.find.default.address.book.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 email.address.does.not.match=\u78ba\u8a8d\u7528\u306b\u5165\u529b\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002
+failed.to.load.customer=\u4f1a\u54e1\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.update.customer=\u4f1a\u54e1\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.create.customer=\u4f1a\u54e1\u60c5\u5831\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
 
 # ProductDetailsAction.java
 could.not.find.product.in.productdetail=\u5bfe\u8c61\u306e\u5546\u54c1\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
@@ -159,3 +199,7 @@
 failed.to.send.some.order.notification=\u6b21\u306e\u6ce8\u6587\u901a\u77e5\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
 sent.order.notifications=\u6ce8\u6587\u901a\u77e5\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002
 
+# CheckoutConfirmAction.java
+failed.to.load.order.in.checkout.process=\u6ce8\u6587\u51e6\u7406\u4e2d\u306b\u6ce8\u6587\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+system.error.occurs.in.order.process=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+

Deleted: pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR2.1//DTD S2Container//EN"
-	"http://www.seasar.org/dtd/components21.dtd">
-
-<components namespace="dbflute">
-
-    <include path="j2ee.dicon"/>
-
-
-    <!-- S2Dao component. -->
-    <component class="org.seasar.dao.impl.AnnotationReaderFactoryImpl"/>
-    <component class="org.seasar.dao.impl.ValueTypeFactoryImpl"/>
-
-    <component class="jp.sf.pal.pompei.allcommon.s2dao.S2DaoMetaDataFactoryImpl">
-    </component>
-
-    <component name="interceptor" class="jp.sf.pal.pompei.allcommon.s2dao.S2DaoInterceptor"/>
-
-
-    <component class="jp.sf.pal.pompei.allcommon.s2dao.S2BeanMetaDataFactoryImpl"/>
-    <component class="org.seasar.dao.impl.DaoNamingConventionImpl"/>
-    <component class="org.seasar.dao.impl.BeanEnhancerImpl"/>
-
-    <!-- Common column setup interceptor. -->
-    <component name="commonColumnSetupBeforeInsertInterceptor" class="jp.sf.pal.pompei.allcommon.interceptor.CommonColumnSetupBeforeInsertInterceptor"/>
-    <component name="commonColumnSetupBeforeUpdateInterceptor" class="jp.sf.pal.pompei.allcommon.interceptor.CommonColumnSetupBeforeUpdateInterceptor"/>
-    <component name="commonColumnSetupBeforeDeleteInterceptor" class="jp.sf.pal.pompei.allcommon.interceptor.CommonColumnSetupBeforeDeleteInterceptor"/>
-
-    <!-- Dao selector. -->
-    <component name="daoSelector" class="jp.sf.pal.pompei.allcommon.CacheDaoSelector">
-        <destroyMethod name="destroy"/>
-    </component>
-
-
-    <!-- Original dao component. -->
-    
-
-    <!-- Original behavior aspect. -->
-    
-
-    <!-- ADDRESS_BOOK -->
-  
-    <component name="addressBookDao" class="jp.sf.pal.pompei.exdao.AddressBookDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="addressBookBhv" class="jp.sf.pal.pompei.exbhv.AddressBookBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- BARGAIN -->
-  
-    <component name="bargainDao" class="jp.sf.pal.pompei.exdao.BargainDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="bargainBhv" class="jp.sf.pal.pompei.exbhv.BargainBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CARD_TYPE -->
-  
-    <component name="cardTypeDao" class="jp.sf.pal.pompei.exdao.CardTypeDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="cardTypeBhv" class="jp.sf.pal.pompei.exbhv.CardTypeBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CARD_TYPE_DESCRIPTION -->
-  
-    <component name="cardTypeDescriptionDao" class="jp.sf.pal.pompei.exdao.CardTypeDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="cardTypeDescriptionBhv" class="jp.sf.pal.pompei.exbhv.CardTypeDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CATEGORY -->
-  
-    <component name="categoryDao" class="jp.sf.pal.pompei.exdao.CategoryDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="categoryBhv" class="jp.sf.pal.pompei.exbhv.CategoryBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CATEGORY_DESCRIPTION -->
-  
-    <component name="categoryDescriptionDao" class="jp.sf.pal.pompei.exdao.CategoryDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="categoryDescriptionBhv" class="jp.sf.pal.pompei.exbhv.CategoryDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- COUNTRY -->
-  
-    <component name="countryDao" class="jp.sf.pal.pompei.exdao.CountryDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="countryBhv" class="jp.sf.pal.pompei.exbhv.CountryBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CURRENCY -->
-  
-    <component name="currencyDao" class="jp.sf.pal.pompei.exdao.CurrencyDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="currencyBhv" class="jp.sf.pal.pompei.exbhv.CurrencyBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CURRENCY_DESCRIPTION -->
-  
-    <component name="currencyDescriptionDao" class="jp.sf.pal.pompei.exdao.CurrencyDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="currencyDescriptionBhv" class="jp.sf.pal.pompei.exbhv.CurrencyDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CUSTOMER -->
-  
-    <component name="customerDao" class="jp.sf.pal.pompei.exdao.CustomerDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="customerBhv" class="jp.sf.pal.pompei.exbhv.CustomerBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CUSTOMER_BASKET -->
-  
-    <component name="customerBasketDao" class="jp.sf.pal.pompei.exdao.CustomerBasketDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="customerBasketBhv" class="jp.sf.pal.pompei.exbhv.CustomerBasketBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- CUSTOMER_BASKET_ATTRIBUTE -->
-  
-    <component name="customerBasketAttributeDao" class="jp.sf.pal.pompei.exdao.CustomerBasketAttributeDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="customerBasketAttributeBhv" class="jp.sf.pal.pompei.exbhv.CustomerBasketAttributeBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- DELIVERY_METHOD -->
-  
-    <component name="deliveryMethodDao" class="jp.sf.pal.pompei.exdao.DeliveryMethodDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="deliveryMethodBhv" class="jp.sf.pal.pompei.exbhv.DeliveryMethodBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- DELIVERY_METHOD_DESCRIPTION -->
-  
-    <component name="deliveryMethodDescriptionDao" class="jp.sf.pal.pompei.exdao.DeliveryMethodDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="deliveryMethodDescriptionBhv" class="jp.sf.pal.pompei.exbhv.DeliveryMethodDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- GEO_ZONE -->
-  
-    <component name="geoZoneDao" class="jp.sf.pal.pompei.exdao.GeoZoneDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="geoZoneBhv" class="jp.sf.pal.pompei.exbhv.GeoZoneBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- LANGUAGE -->
-  
-    <component name="languageDao" class="jp.sf.pal.pompei.exdao.LanguageDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="languageBhv" class="jp.sf.pal.pompei.exbhv.LanguageBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- MANUFACTURER -->
-  
-    <component name="manufacturerDao" class="jp.sf.pal.pompei.exdao.ManufacturerDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="manufacturerBhv" class="jp.sf.pal.pompei.exbhv.ManufacturerBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- MANUFACTURER_DESCRIPTION -->
-  
-    <component name="manufacturerDescriptionDao" class="jp.sf.pal.pompei.exdao.ManufacturerDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="manufacturerDescriptionBhv" class="jp.sf.pal.pompei.exbhv.ManufacturerDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_CARD_INFO -->
-  
-    <component name="orderCardInfoDao" class="jp.sf.pal.pompei.exdao.OrderCardInfoDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderCardInfoBhv" class="jp.sf.pal.pompei.exbhv.OrderCardInfoBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_COMMENT -->
-  
-    <component name="orderCommentDao" class="jp.sf.pal.pompei.exdao.OrderCommentDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderCommentBhv" class="jp.sf.pal.pompei.exbhv.OrderCommentBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_FORM -->
-  
-    <component name="orderFormDao" class="jp.sf.pal.pompei.exdao.OrderFormDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderFormBhv" class="jp.sf.pal.pompei.exbhv.OrderFormBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_NOTIFICATION -->
-  
-    <component name="orderNotificationDao" class="jp.sf.pal.pompei.exdao.OrderNotificationDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderNotificationBhv" class="jp.sf.pal.pompei.exbhv.OrderNotificationBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_PRODUCT -->
-  
-    <component name="orderProductDao" class="jp.sf.pal.pompei.exdao.OrderProductDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderProductBhv" class="jp.sf.pal.pompei.exbhv.OrderProductBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_PRODUCT_ATTRIBUTE -->
-  
-    <component name="orderProductAttributeDao" class="jp.sf.pal.pompei.exdao.OrderProductAttributeDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderProductAttributeBhv" class="jp.sf.pal.pompei.exbhv.OrderProductAttributeBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_PRODUCT_DOWNLOAD -->
-  
-    <component name="orderProductDownloadDao" class="jp.sf.pal.pompei.exdao.OrderProductDownloadDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderProductDownloadBhv" class="jp.sf.pal.pompei.exbhv.OrderProductDownloadBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_STATUS -->
-  
-    <component name="orderStatusDao" class="jp.sf.pal.pompei.exdao.OrderStatusDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderStatusBhv" class="jp.sf.pal.pompei.exbhv.OrderStatusBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_STATUS_DESCRIPTION -->
-  
-    <component name="orderStatusDescriptionDao" class="jp.sf.pal.pompei.exdao.OrderStatusDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderStatusDescriptionBhv" class="jp.sf.pal.pompei.exbhv.OrderStatusDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ORDER_STATUS_HISTORY -->
-  
-    <component name="orderStatusHistoryDao" class="jp.sf.pal.pompei.exdao.OrderStatusHistoryDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="orderStatusHistoryBhv" class="jp.sf.pal.pompei.exbhv.OrderStatusHistoryBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PAYMENT_METHOD -->
-  
-    <component name="paymentMethodDao" class="jp.sf.pal.pompei.exdao.PaymentMethodDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="paymentMethodBhv" class="jp.sf.pal.pompei.exbhv.PaymentMethodBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PAYMENT_METHOD_DESCRIPTION -->
-  
-    <component name="paymentMethodDescriptionDao" class="jp.sf.pal.pompei.exdao.PaymentMethodDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="paymentMethodDescriptionBhv" class="jp.sf.pal.pompei.exbhv.PaymentMethodDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT -->
-  
-    <component name="productDao" class="jp.sf.pal.pompei.exdao.ProductDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productBhv" class="jp.sf.pal.pompei.exbhv.ProductBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_ATTRIBUTE -->
-  
-    <component name="productAttributeDao" class="jp.sf.pal.pompei.exdao.ProductAttributeDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productAttributeBhv" class="jp.sf.pal.pompei.exbhv.ProductAttributeBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_ATTRIBUTE_DOWNLOAD -->
-  
-    <component name="productAttributeDownloadDao" class="jp.sf.pal.pompei.exdao.ProductAttributeDownloadDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productAttributeDownloadBhv" class="jp.sf.pal.pompei.exbhv.ProductAttributeDownloadBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_DESCRIPTION -->
-  
-    <component name="productDescriptionDao" class="jp.sf.pal.pompei.exdao.ProductDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productDescriptionBhv" class="jp.sf.pal.pompei.exbhv.ProductDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_IMAGE -->
-  
-    <component name="productImageDao" class="jp.sf.pal.pompei.exdao.ProductImageDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productImageBhv" class="jp.sf.pal.pompei.exbhv.ProductImageBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_NOTIFICATION -->
-  
-    <component name="productNotificationDao" class="jp.sf.pal.pompei.exdao.ProductNotificationDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productNotificationBhv" class="jp.sf.pal.pompei.exbhv.ProductNotificationBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_OPTION -->
-  
-    <component name="productOptionDao" class="jp.sf.pal.pompei.exdao.ProductOptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productOptionBhv" class="jp.sf.pal.pompei.exbhv.ProductOptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_OPTION_DESCRIPTION -->
-  
-    <component name="productOptionDescriptionDao" class="jp.sf.pal.pompei.exdao.ProductOptionDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productOptionDescriptionBhv" class="jp.sf.pal.pompei.exbhv.ProductOptionDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_OPTION_VALUE -->
-  
-    <component name="productOptionValueDao" class="jp.sf.pal.pompei.exdao.ProductOptionValueDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productOptionValueBhv" class="jp.sf.pal.pompei.exbhv.ProductOptionValueBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_OPTION_VALUE_DESCRIPTION -->
-  
-    <component name="productOptionValueDescriptionDao" class="jp.sf.pal.pompei.exdao.ProductOptionValueDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productOptionValueDescriptionBhv" class="jp.sf.pal.pompei.exbhv.ProductOptionValueDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION -->
-  
-    <component name="productOptionValueToProductOptionDao" class="jp.sf.pal.pompei.exdao.ProductOptionValueToProductOptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productOptionValueToProductOptionBhv" class="jp.sf.pal.pompei.exbhv.ProductOptionValueToProductOptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- PRODUCT_TO_CATEGORY -->
-  
-    <component name="productToCategoryDao" class="jp.sf.pal.pompei.exdao.ProductToCategoryDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="productToCategoryBhv" class="jp.sf.pal.pompei.exbhv.ProductToCategoryBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- REVIEW -->
-  
-    <component name="reviewDao" class="jp.sf.pal.pompei.exdao.ReviewDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="reviewBhv" class="jp.sf.pal.pompei.exbhv.ReviewBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- REVIEW_DESCRIPTION -->
-  
-    <component name="reviewDescriptionDao" class="jp.sf.pal.pompei.exdao.ReviewDescriptionDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="reviewDescriptionBhv" class="jp.sf.pal.pompei.exbhv.ReviewDescriptionBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- TAX_CLASS -->
-  
-    <component name="taxClassDao" class="jp.sf.pal.pompei.exdao.TaxClassDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="taxClassBhv" class="jp.sf.pal.pompei.exbhv.TaxClassBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- TAX_RATE -->
-  
-    <component name="taxRateDao" class="jp.sf.pal.pompei.exdao.TaxRateDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="taxRateBhv" class="jp.sf.pal.pompei.exbhv.TaxRateBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ZONE -->
-  
-    <component name="zoneDao" class="jp.sf.pal.pompei.exdao.ZoneDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="zoneBhv" class="jp.sf.pal.pompei.exbhv.ZoneBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-    <!-- ZONE_TO_GEO_ZONE -->
-  
-    <component name="zoneToGeoZoneDao" class="jp.sf.pal.pompei.exdao.ZoneToGeoZoneDao">
-        <aspect>dbflute.interceptor</aspect>
-    </component>
-        
-    <component name="zoneToGeoZoneBhv" class="jp.sf.pal.pompei.exbhv.ZoneToGeoZoneBhv">
-        <aspect pointcut=".*NewTx">requiresNewTx</aspect>
-        <aspect pointcut=".*Tx">requiredTx</aspect>
-    
-    </component>
-      
-</components>

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon	2008-04-08 05:03:44 UTC (rev 880)
@@ -19,139 +19,30 @@
 	<component class="org.seasar.extension.jdbc.impl.OracleResultSetFactory"/>
 	<component class="org.seasar.extension.jdbc.impl.BooleanToIntStatementFactory"/>
 	-->
-	<!-- for Derby Embedded-->
-	<component name="xaDataSource"
-		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
-		<property name="driverClassName">
-			"org.apache.derby.jdbc.EmbeddedDriver"
-		</property>
-		<property name="URL">
-			"jdbc:derby:directory:" + container.getComponent(@java.lang.Class ＠ forName("javax.servlet.ServletContext")).getRealPath("/WEB-INF/db/pompei")
-		</property>
-		<property name="user">""</property>
-		<property name="password">""</property>
-	</component>
 
 	<!-- for H2 -->
-    <!--
 	<component name="xaDataSource"
 		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
 		<property name="driverClassName">
 			"org.h2.Driver"
 		</property>
 		<property name="URL">
-			"jdbc:h2:tcp://localhost:9092/demo"
+			"jdbc:h2:file:"
+			+ container.getComponent(@java.lang.Class ＠ forName("javax.servlet.ServletContext")).getRealPath("/WEB-INF/db/pompei")
 		</property>
 		<property name="user">"sa"</property>
 		<property name="password">""</property>
-	</component>
-    -->
-	<!-- for Oracle -->
-	<!--
-	<component name="xaDataSource"
-		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
-		<property name="driverClassName">
-			"oracle.jdbc.driver.OracleDriver"
-		</property>
-		<property name="URL">
-			"jdbc:oracle:thin:@xxx:1521:xxx"
-		</property>
-		<property name="user">"xxx"</property>
-		<property name="password">"xxx"</property>
-	</component>
-	-->
+		<destroyMethod>
+			@org.seasar.framework.util.DriverManagerUtil ＠ deregisterAllDrivers()
+		</destroyMethod>
+   	</component>
 
-	<!-- for PostgreSQL -->
-	<!--
-	<component name="xaDataSource"
-		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
-		<property name="driverClassName">
-			"org.postgresql.Driver"
-        </property>
-        <property name="URL">
-          "jdbc:postgresql://localhost/TEST"
-        </property>
-        <property name="user">"xxxx"</property>
-        <property name="password">"xxxx"</property>
-    </component>
-    -->
-
-	<!-- MySQL
-	- MySQL4.0以下でマルチバイト文字を扱う場合には，URL指定の後に，
-		以下の接続パラメータを追加で指定してください．
-		useUnicode=true
-		characterEncoding=[MySQLのエンコーディングに対応した
-		Javaのエンコーディング名]
-		例："jdbc:mysql://localhost:3306/test?useUnicode=true" +
-		"&amp;characterEncoding=Windows-31J"
-		
-	- MySQL5.0以降で，エンコーディングがeucjpmsの列を扱う場合には，
-		URL指定の後に，以下の接続パラメータを追加で指定してください．
-		characterEncoding=UTF-8またはWindows-31J
-		characterSetResults=UTF-8またはWindows-31J
-		例："jdbc:mysql://localhost:3306/test?characterEncoding=UTF-8" +
-		"&amp;characterSetResults=UTF-8"
-		この指定をしない場合，Java側でUCS-2⇔EUC_JP_Solarisの変換が
-		行なわれるため，ユーザー定義外字などの一部の文字が化けます．
-		この指定をすることで，MySQL側でeucjpms⇔ucs2⇔utf8(cp932)の
-		変換が行なわれ，Java側でUCS-2⇔UTF-8(Windows-31J)の変換が
-		行なわれるようになります．この結果，文字化けを防げます．
-		なおJIS X 0212(補助漢字)を使用する場合は，Windows-31Jではなく
-		UTF-8を指定する必要があります．
-		
-	- 上記以外の場合は，my.cnfでdefault-character-setの設定を適切に
-		(cp932やutf8など．デフォルトのlatin1は不可)行なっていれば，
-		文字化けは防げます．
-	<component name="xaDataSource"
-		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
-		<property name="driverClassName">
-			"com.mysql.jdbc.Driver"
-		</property>
-		<property name="URL">
-			"jdbc:mysql://localhost:3306/test"
-		</property>
-		<property name="user">"xxx"</property>
-		<property name="password">"xxx"</property>
-	</component>
-	-->
-
-	<!-- for SQLServer -->
-	<!--
-	<component name="xaDataSource"
-		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
-		<property name="driverClassName">
-			"net.sourceforge.jtds.jdbc.Driver"
-        </property>
-        <property name="URL">
-            "jdbc:jtds:sqlserver://localhost/TEST;instance=SQLEXPRESS"
-        </property>
-        <property name="user">"xxxx"</property>
-        <property name="password">"xxxx"</property>
-    </component>
-	-->
-
-	<component name="connectionPool"
-		class="org.seasar.extension.dbcp.impl.ConnectionPoolImpl">
+	<component class="org.seasar.extension.dbcp.impl.ConnectionPoolImpl">
 		<property name="timeout">600</property>
 		<property name="maxPoolSize">10</property>
-		<property name="allowLocalTx">true</property>
 		<destroyMethod name="close"/>
 	</component>
 
-	<component name="dataSource"
-		class="org.seasar.extension.dbcp.impl.DataSourceImpl"
-	/>
-
-	<!-- from JNDI -->
-	<!--
-	<component name="dataSource"
-		class="javax.sql.DataSource">
-		@org.seasar.extension.j2ee.JndiResourceLocator ＠ lookup("java:comp/env/jdbc/DataSource")
-	</component>
-	-->
+	<component class="org.seasar.extension.dbcp.impl.DataSourceImpl"/>
 	
-	<!--
-	<component name="dataSource"
-		class="org.seasar.extension.datasource.impl.SelectableDataSourceProxy"/>
-	-->
-</components>
\ No newline at end of file
+</components>

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_down.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_down.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_over.png
===================================================================
(Binary files differ)


Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_over.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="title-head">配送方法登録/編集画面</title>
-  </head>
-  <body onload="try{parent.init()}catch(e){}">
-    <form id="form" method="post">
-      <div class="portlet-msg">
-        <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
-      </div>
-      <input type="hidden" id="mode" />
-      <input type="hidden" id="targetId" />
-      <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="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>
-            <!-- TODO pull-down -->
-            <input type="text" id="status" />
-          </td>
-        </tr>
-        <tr style="dummy" height="20px">
-          <th>
-            <label>表示順</label>
-          </th>
-          <td>
-            <input type="text" id="sortOrder" />
-          </td>
-        </tr>
-      </table>
-      <input type="submit" id="doUpdate" value="登録する" />
-      <input type="submit" id="jumpDeliveryMethodList" value="一覧に戻る" />
-    </form>
-  </body>
-</html>

Deleted: 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title id="title-head">配送方法設定画面</title>
-  </head>
-  <body onload="try{parent.init()}catch(e){}">
-    <script language="javascript"><!--
-function setTargetId(form, id){
-	children = form.childNodes;
-	children[1].value = id;
-}
-function setMode(form, mode){
-	children = form.childNodes;
-	children[0].value = mode;
-}
- --></script>
-    <form id="deliveryMethodListForm" method="post"><input type="hidden" id="mode" /><input type="hidden" id="targetId" />
-      <div class="portlet-msg">
-        <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
-      </div>
-      <table border="1">
-        <thead>
-          <tr style="dummy">
-            <th height="20px">表示順</th>
-            <th>配送方法名</th>
-            <th>コード名</th>
-            <th>&nbsp;</th>
-          </tr>
-        </thead>
-        <tbody id="deliveryMethodItems">
-          <tr style="dummy">
-            <td align="center">
-              <span id="sortOrder">2</span>
-            </td>
-            <td>
-              <span id="name">配送方法</span>
-            </td>
-            <td>
-              <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}" />
-            </td>
-          </tr>
-        </tbody>
-        <tfoot></tfoot>
-      </table>
-      <br />
-      <input type="submit" id="doAdd" value="配送方法を追加する" onclick="setMode(this.form,'insert')" />
-<!--<input type="submit" id="doChangeOrder" value="表示順を変更する"/>-->
-    </form>
-  </body>
-</html>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -51,15 +51,9 @@
                       </td>
                     </tr>
                     <tr>
-                      <th>通貨コード:</th>
-                      <td>
-                        <span id="currencyCode-display">abc</span><input type="hidden" id="currencyCode"/>
-                      </td>
-                    </tr>
-                    <tr>
                       <th>配送お問い合わせ番号:</th>
                       <td>
-                        <span id="deliveryNumber-display">abc</span><input type="hidden" id="deliveryNumber"/>
+                        <span id="slipNumber-display">abc</span><input type="hidden" id="deliveryNumber"/>
                       </td>
                     </tr>
                     <tr>
@@ -107,13 +101,13 @@
                     <tr>
                       <th>最終更新日時:</th>
                       <td>
-                        <span id="lastModified">yyyy/MM/DD</span>
+                        <span id="updatedDate">yyyy/MM/DD</span>
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="paymentMethodId"/>
-                  <input type="hidden" id="deliveryMethodId"/>
-                  <input type="hidden" id="currencyId"/>
+                  <input type="hidden" id="paymentMethodId" />
+                  <input type="hidden" id="deliveryMethodId" />
+                  <input type="hidden" id="paymentStatusId" />
                 </td>
               </tr>
             </table>
@@ -131,7 +125,7 @@
                       <tr>
                         <th>カードコード:</th>
                         <td>
-                          <span id="cardCode-display">abc</span><input type="hidden" id="cardCode"/>
+                          <span id="cardCode-display">abc</span><input type="hidden" id="cardTypeCode"/>
                         </td>
                       </tr>
                       <tr>
@@ -153,7 +147,9 @@
                         </td>
                       </tr>
                     </table>
-                    <input type="hidden" id="orderCardInfoId"/>
+                    <input type="hidden" id="cardPaymentType"/>
+                    <input type="hidden" id="orderCardInfoId" />
+                    <input type="hidden" id="cardTypeId"/>
                   </td>
                 </tr>
               </table>
@@ -177,6 +173,9 @@
                         <label>型番</label>
                       </th>
                       <th>
+                        <label>商品名</label>
+                      </th>
+                      <th>
                         <label>価格</label>
                       </th>
                       <th>
@@ -195,6 +194,9 @@
                           <span id="model"></span>
                         </td>
                         <td>
+                          <span id="productName"></span>
+                        </td>
+                        <td>
                           <b style="color: #990000;"><span id="price"></span></b>
                         </td>
                         <td>
@@ -313,8 +315,9 @@
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="customerCountryName"/>
-                  <input type="hidden" id="customerLocaleName"/>
+                  <input type="hidden" id="customerSuburb"/>
+                  <input type="hidden" id="customerCountryCode"/>
+                  <input type="hidden" id="customerLanguage"/>
                 </td>
               </tr>
             </table>
@@ -396,8 +399,18 @@
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="deliveryCountryName"/>
-                  <input type="hidden" id="deliveryLocaleName"/>
+                  <input type="hidden" id="deliverySuburb"/>
+                  <input type="hidden" id="deliveryStatusId"/>
+                  <input type="hidden" id="deliveryCountryCode"/>
+                  <input type="hidden" id="deliveryLanguage"/>
+                  <input type="hidden" id="deliveryCountryId"/>
+                  <input type="hidden" id="deliveryZoneId"/>
+                  <input type="hidden" id="requestedDate"/>
+                  <input type="hidden" id="sentDate"/>
+                  <input type="hidden" id="receivedDate"/>
+                  <input type="hidden" id="giftWrap"/>
+                  <input type="hidden" id="giftMessage"/>
+                  <input type="hidden" id="envelopeLabel"/>
                 </td>
               </tr>
             </table>
@@ -479,8 +492,9 @@
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="billingCountryName"/>
-                  <input type="hidden" id="billingLocaleName"/>
+                  <input type="hidden" id="billingLanguage" />
+                  <input type="hidden" id="billingSuburb"/>
+                  <input type="hidden" id="billingCountryCode" />
                 </td>
               </tr>
             </table>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -53,15 +53,9 @@
                       </td>
                     </tr>
                     <tr>
-                      <th>通貨コード:</th>
-                      <td>
-                        <input type="text" id="currencyCode" size="20"/>
-                      </td>
-                    </tr>
-                    <tr>
                       <th>配送お問い合わせ番号:</th>
                       <td>
-                        <input type="text" id="deliveryNumber" size="20"/>
+                        <input type="text" id="slipNumber" size="20"/>
                       </td>
                     </tr>
                     <tr>
@@ -111,13 +105,13 @@
                     <tr>
                       <th>最終更新日時:</th>
                       <td>
-                        <span id="lastModified">yyyy/MM/DD</span>
+                        <span id="updatedDate">yyyy/MM/DD</span>
                       </td>
                     </tr>
                   </table>
                   <input type="hidden" id="paymentMethodId" />
                   <input type="hidden" id="deliveryMethodId" />
-                  <input type="hidden" id="currencyId" />
+                  <input type="hidden" id="paymentStatusId" />
                 </td>
               </tr>
             </table>
@@ -135,7 +129,7 @@
                       <tr>
                         <th>カードコード:</th>
                         <td>
-                          <input type="text" id="cardCode" size="10"/>
+                          <input type="text" id="cardTypeCode" size="10"/>
                         </td>
                       </tr>
                       <tr>
@@ -157,7 +151,9 @@
                         </td>
                       </tr>
                     </table>
+                    <input type="hidden" id="cardPaymentType"/>
                     <input type="hidden" id="orderCardInfoId" />
+                    <input type="hidden" id="cardTypeId"/>
                   </td>
                 </tr>
               </table>
@@ -181,6 +177,9 @@
                         <label>型番</label>
                       </th>
                       <th>
+                        <label>商品名</label>
+                      </th>
+                      <th>
                         <label>価格</label>
                       </th>
                       <th>
@@ -199,6 +198,9 @@
                           <span id="model"></span>
                         </td>
                         <td>
+                          <span id="productName"></span>
+                        </td>
+                        <td>
                           <b style="color: #990000;"><span id="price"></span></b>
                         </td>
                         <td>
@@ -320,8 +322,9 @@
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="customerCountryName" />
-                  <input type="hidden" id="customerLocaleName" />
+                  <input type="hidden" id="customerSuburb"/>
+                  <input type="hidden" id="customerCountryCode"/>
+                  <input type="hidden" id="customerLanguage"/>
                 </td>
               </tr>
             </table>
@@ -403,8 +406,18 @@
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="deliveryCountryName" />
-                  <input type="hidden" id="deliveryLocaleName" />
+                  <input type="hidden" id="deliverySuburb"/>
+                  <input type="hidden" id="deliveryStatusId"/>
+                  <input type="hidden" id="deliveryCountryCode"/>
+                  <input type="hidden" id="deliveryLanguage"/>
+                  <input type="hidden" id="deliveryCountryId"/>
+                  <input type="hidden" id="deliveryZoneId"/>
+                  <input type="hidden" id="requestedDate"/>
+                  <input type="hidden" id="sentDate"/>
+                  <input type="hidden" id="receivedDate"/>
+                  <input type="hidden" id="giftWrap"/>
+                  <input type="hidden" id="giftMessage"/>
+                  <input type="hidden" id="envelopeLabel"/>
                 </td>
               </tr>
             </table>
@@ -486,8 +499,9 @@
                       </td>
                     </tr>
                   </table>
-                  <input type="hidden" id="billingCountryName" />
-                  <input type="hidden" id="billingLocaleName" />
+                  <input type="hidden" id="billingLanguage" />
+                  <input type="hidden" id="billingSuburb"/>
+                  <input type="hidden" id="billingCountryCode" />
                 </td>
               </tr>
             </table>

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -19,15 +19,30 @@
 <input type="hidden" id="parentId" />
 <table>
 	<tr style="dummy" height="20px">
+		<th><label>ページID</label></th><td><input type="text" id="pageId" /></td>
+	</tr>
+	<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>
+		<th><label>テンプレート名</label></th><td><input type="text" id="templateName" /></td>
 	</tr>
+	<tr style="dummy" height="20px">
+		<th><label>キーワード (meta keywords)</label></th><td><input type="text" id="keyword" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th><label>説明文 (meta description)</label></th><td><input type="text" id="description" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th><label>フリースペース1</label></th><td><input type="text" id="content1" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th><label>フリースペース2</label></th><td><input type="text" id="content2" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th><label>フリースペース3</label></th><td><input type="text" id="content3" /></td>
+	</tr>
 	<tr style="dummy" height="20px">
-		<th><label>イメージ</label></th><td><input type="file" id="image" /></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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -31,16 +31,16 @@
 	<thead>
 		<tr style="dummy" height="20px">
 			<th>表示順</th>
+			<th>ページID</th>
 			<th>カテゴリ名</th>
-			<th>イメージ</th>
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
    <tbody id="categoryItems">
 		<tr style="dummy">
 			<td align="center"><span id="sortOrder">2</span><input type="hidden" id="categoryIndex"/></td>
+			<td><span id="pageId">ID</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="categoryId" /><input type="button" id="doDelete" value="削除" onclick="if(confirm('削除します。よろしいですか？')){setMode(this.form,'delete');setTargetId(this.form,this.previousSibling.value)}else{return false}" />
 			</td>
@@ -49,7 +49,7 @@
 	<tfoot></tfoot>
 </table>
 <br/>
-<input type="submit" id="goCategoryEdit" value="カテゴリを追加する" onClick="setMode(this.form,'insert')"/>
+<input type="submit" id="goCategoryEdit" value="カテゴリを追加する" onclick="setMode(this.form,'insert')"/>
 <!--<input type="submit" id="doChangeOrder" value="表示順を変更する"/>-->
 </form>
 </body></html>

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -28,15 +28,13 @@
 		<tr style="dummy" height="20px">
 			<th><label>NO</label></th>
 			<th><label>メーカー名</label></th>
-			<th><label>説明</label></th>
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
 	<tbody id="manufacturerItems">
 		<tr style="dummy">
 			<td><span id="manufacturerIndex">1</span></td>
-			<td><span id="name">アディダス</span>&amp;nbsp;</td>
-			<td><span id="shortDescription">ドイツのスポーツメーカー</span>&amp;nbsp;</td>
+			<td><span id="name">アディダス</span></td>
 			<td>
               <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>

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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja" xmlns:pal="http://pal.sourceforge.jp/jsf4portlet">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja" >
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title id="title-head">商品登録編集画面</title>
@@ -18,25 +18,40 @@
 <input type="hidden" id="targetId" />
 <input type="hidden" id="parentId" />
 <input type="hidden" id="productId" />
-<table border="1">
+<table border="1">
 	<tr style="dummy" height="20px">
-		<th>商品コード</th><td><input id="code" /></td>
+		<th>商品コード(変更不可)</th><td><input id="code" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th>型番</th><td><input id="model" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>在庫数</th><td><input id="quantity" /></td>
+		<th>在庫数</th><td><input id="stock" /></td>
 	</tr>
-	<tr style="dummy" height="20px">
-		<th>価格</th><td><input id="price" /></td>
-	</tr>
 	<tr style="dummy" height="20px">
+		<th>定価</th><td><input id="catalogPrice" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th>販売価格</th><td><input id="price" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
 		<th>重量</th><td><input id="weight" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
 		<th>サイズ</th><td><input id="size" /></td>
 	</tr>
+	<tr style="dummy" height="20px">
+		<th>購入制限数</th><td><input id="limitPurchase" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th>発売日</th><td><input id="releaseDate" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th>販売期間：開始日時</th><td><input id="startDate" /></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th>販売期間：終了日時</th><td><input id="endDate" /></td>
+	</tr>
 	<tr style="dummy" height="20px">
 		<th>ステータス</th>
 		<td>
@@ -45,15 +60,6 @@
 			</select>
 		</td>
 	</tr>
-	<tr style="dummy" height="20px">
-		<th>総注文数</th><td><input id="ordered" /></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>総レビュー数</th><td><input id="reviewed" /></td>
-	</tr>
-	<tr style="dummy" height="20px">
-		<th>評価値</th><td><input id="rating" /></td>
-	</tr>
 	<tr style="dummy" height="20px">
 		<th>メーカー</th>
 		<td>
@@ -62,39 +68,69 @@
 			</select>
 		</td>
 	</tr>
+	<tr style="dummy" height="20px">
+		<th>税種別</th>
+		<td><select id="taxTypeId">
+				<option value="0"></option>
+			</select>
+		</td>
+	</tr>
 	<tr style="dummy" height="20px">
-		<th>税種別ID</th>
-		<td><select id="taxClassId">
+		<th>配送種別</th>
+		<td><select id="taxTypeId">
 				<option value="0"></option>
 			</select>
 		</td>
 	</tr>
+<!-- product info -->
 	<tr style="dummy" height="20px">
-		<th>イメージ</th><td><input id="imageName" type="hidden"/>
-		<pal:inputFileUpload id="imageFile" value="#{admin_product_productEditPage.imageFile}"></pal:inputFileUpload></td>
+		<th>商品名</th><td><input id="name" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>サムネイル</th><td><input id="thumbnailName" type="hidden"/>
-		<pal:inputFileUpload id="thumbnailFile" value="#{admin_product_productEditPage.thumbnailFile}"></pal:inputFileUpload></td>
+		<th>キャッチコピー</th><td><input id="title" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>商品名</th><td><input id="name" /></td>
+		<th>メーカーのURL</th><td><input id="url" /></td>
 	</tr>
+<!-- product page info -->
 	<tr style="dummy" height="20px">
-		<th>キャッチコピー</th><td><input id="title" /></td>
+		<th>ページID</th><td><input id="pageId" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>メーカーのURL</th><td><input id="url" /></td>
+		<th><label>テンプレート名</label></th><td><input type="text" id="templateName" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th>総表示数</th><td><input id="viewed" /></td>
+		<th><label>キーワード (meta keywords)</label></th><td><input type="text" id="keyword" /></td>
 	</tr>
 	<tr style="dummy" height="20px">
-		<th colspan="2">説明文</th>
+		<th><label>説明文 (meta description)</label></th><td><input type="text" id="description" /></td>
 	</tr>
+<!-- product page info -->
+	<tr style="dummy" height="20px">
+		<th colspan="2">商品説明</th>
+	</tr>
 	<tr style="dummy">
-		<td colspan="2"><textarea id="description" cols="60" rows="20"/></td>
+		<td colspan="2"><textarea id="productDescription" cols="60" rows="20"/></td>
 	</tr>
+<!-- product content -->
+	<tr style="dummy" height="20px">
+		<th colspan="2">フリースペース１</th>
+	</tr>
+	<tr style="dummy">
+		<td colspan="2"><textarea id="content1" cols="60" rows="20"/></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th colspan="2">フリースペース２</th>
+	</tr>
+	<tr style="dummy">
+		<td colspan="2"><textarea id="content2" cols="60" rows="20"/></td>
+	</tr>
+	<tr style="dummy" height="20px">
+		<th colspan="2">フリースペース３</th>
+	</tr>
+	<tr style="dummy">
+		<td colspan="2"><textarea id="content3" cols="60" rows="20"/></td>
+	</tr>
 </table>
 <input type="submit" id="doUpdate" value="登録する" />
 <input type="button" id="jumpProductList" 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	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -29,8 +29,7 @@
 			<th><label>型番</label></th>
 			<th><label>価格</label></th>
 			<th><label>状態</label></th>
-			<th><label>メーカー</label></th>
-			<th><label>追加日</label></th>
+			<th><label>更新日</label></th>
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
@@ -42,8 +41,7 @@
 			<td><span id="model">MX-XXX</span></td>
 			<td><span id="price">30,000</span></td>
 			<td><span id="statusStr">取扱中</span></td>
-			<td><span id="manufacturerName">アディダス</span></td>
-			<td><span id="dateAdded">2007/07/12</span></td>
+			<td><span id="updatedDate">2007/07/12</span></td>
 			<td>
 				<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>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -74,7 +74,7 @@
                     <label>別</label>
                   </th>
                   <td align="center">
-                    <a id="goProductDelete" href="./productList.html?customerBasketId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか？')){return true;}else{return false;}">削除</a>
+                    <a id="goProductDelete" href="./productList.html?basketId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか？')){return true;}else{return false;}">削除</a>
                   </td>
                 </tr>
               </tbody>
@@ -97,9 +97,9 @@
             <br/>
             <br/>
             <div style="width: 100%;text-align: center;">
-              <strong><a id="orderLink" href=""><span style="font-size: 14pt;">購入手続きへ</span></a></strong>
+              <a id="orderLink" href=""><img id="buttonGoCheckout" src="" onmousedown="" onmouseover="" onmouseout="src='/pompei-core/images/buttons/productlist1.png'" alt="購入手続きへ" style="border:0px;" /></a>
               <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
-              <a id="productListLink" href="">お買物を続ける</a>
+              <a id="orderLink" href=""><img id="buttonContinueShopping" src="" onmousedown="" onmouseover="" onmouseout="" alt="お買物を続ける" style="border:0px;" /></a>
             </div>
           </div>
           <div id="isEmptyProducts" style="width: 80%;text-align: center;">
@@ -108,7 +108,7 @@
             </div>
             <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
             <div>
-              <a id="productListLinkOnEmpty" href="">お買物を続ける</a>
+              <a id="orderLink" href=""><img id="buttonContinueShopping" src="" onmousedown="" onmouseover="" onmouseout="" alt="お買物を続ける" style="border:0px;" /></a>
             </div>
           </div>
         </center>
@@ -122,7 +122,7 @@
     </label>
             <br />
             <br />
-            <a id="orderLink" href="">会員情報登録へ進む</a>
+            <a id="signupLink" href=""><img id="buttonSignupLink" src="" onmousedown="" onmouseover="" onmouseout="" alt="会員情報登録へ進む" style="border:0px;" /></a>
           </center>
         </div>
         <div id="isNotLogin" style="width: 100%;">
@@ -133,7 +133,7 @@
     </label>
             <br />
             <br />
-            <a id="signupLink" href="">ログインへ進む</a>
+              <a id="orderLink" href=""><img id="buttonGoLogin" src="" onmousedown="" onmouseover="" onmouseout="" alt="ログインへ進む" style="border:0px;" /></a>
           </center>
         </div>
       </div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -54,7 +54,7 @@
                   <br />
                   <br />
                   <div>
-                    <a id="productListLink" href="">お買い物に戻る</a>
+                    <a id="productListLink" href=""><img id="buttonBackShopping" src="" onmouseover="" onmousedown="" onmouseout=""  alt="お買い物に戻る" style="border:0px;" /></a>
                   </div>
                 </td>
               </tr>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -58,7 +58,7 @@
                         </th>
                       </tr>
                     </thead>
-                    <tbody id="customerBasketItems">
+                    <tbody id="basketItems">
                       <tr>
                         <td>
                           <span id="name">XXX 01MAX</span>
@@ -243,9 +243,9 @@
             <br />
             <br />
             <div style="width: 100%;text-align: center;">
-              <input id="doCancel" type="button" value="注文手続きを取り消す" onclick="location.href='./checkoutEdit.html'" />
-              <input id="moveProductList" type="button" value="お買い物に戻る" onclick="" />
-              <input id="doConfirm" type="button" value="注文を完了する" onclick="location.href='./checkoutComplete.html'" />
+              <input type="image" src="" id="doConfirm" onmouseover="" onmousedown="" onmouseout="" value="注文を完了する" alt="注文を完了する" onclick="location.href='./checkoutComplete.html'" />
+              <input type="image" src="" id="doCancel" onmouseover="" onmousedown="" onmouseout="" value="注文手続きを取り消す" alt="注文手続きを取り消す" onclick="location.href='./checkoutEdit.html'" />
+              <input type="image" src="" id="moveProductList" onmouseover="" onmousedown="" onmouseout="" value="お買い物に戻る" alt="お買い物に戻る" onclick="" />
             </div>
           </form>
         </div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -177,7 +177,7 @@
             </div>
             <br/>
             <div style="width:100%;text-align: center;">
-              <input id="doNext" type="button" value="ご注文内容の確認へ" onclick="location.href='./userAddressSelection.html'" />
+              <input type="image" src="" id="doNext" onmouseover="" onmousedown="" onmouseout="" value="ご注文内容の確認へ" alt="ご注文内容の確認へ" onclick="location.href='./userAddressSelection.html'" />
             </div>
           </form>
         </div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -49,11 +49,11 @@
             <br />
             <div style="width:100%;text-align: right;">
 <!-- TODO input id="doEdit" type="button" value="編集(TBD)" onclick="location.href='./userAddressSelection.html'" / -->
-              <input id="doDelete" type="button" value="選択したお届け先を削除する" onclick="location.href='./userAddressSelection.html'" />
+              <input type="image" src="" id="doDelete" onmouseover="" onmousedown="" onmouseout="" value="選択したお届け先を削除する" alt="選択したお届け先を削除する" onclick="location.href='./userAddressSelection.html'" />
             </div>
             <br />
             <div style="width:100%;text-align: center;">
-              <input id="doNext" type="button" value="支払方法とお届け方法の選択へ" onclick="location.href='./userAddressSelection.html'" />
+             <input type="image" src="" id="doNext" onmouseover="" onmousedown="" onmouseout="" value="支払方法とお届け方法の選択へ" alt="支払方法とお届け方法の選択へ" onclick="location.href='./userAddressSelection.html'" />
             </div>
           </form>
           <br />
@@ -200,7 +200,7 @@
             </table>
             <br />
             <div style="width: 100%;text-align: center;">
-              <input id="doAdd" type="button" value="上記の会員情報を追加する" onclick="location.href='./userAddressSelection.html'" />
+              <input type="image" src="" id="doAdd" onmouseover="" onmousedown="" onmouseout="" value="上記の会員情報を追加する" alt="上記の会員情報を追加する" onclick="location.href='./userAddressSelection.html'" />
             </div>
           </form>
         </div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -247,11 +247,12 @@
                 <br />
                 <br />
                 <div id="isNotUser" style="text-align: center;">
-                  <input id="doUpdate-create" type="button" value="上記の会員情報を登録する" onclick="location.href='./userInfoEdit.html'" />
+                  <input type="image" src="" id="doUpdate-create" onmouseover="" onmousedown="" onmouseout="" value="上記の会員情報を登録する" alt="上記の会員情報を登録する" onclick="location.href='./userInfoEdit.html'" />
                 </div>
+                <br />
                 <div id="isUser" style="text-align: center;">
-                  <input id="doUpdate-update" type="button" value="上記の会員情報で更新する" onclick="location.href='./userInfoEdit.html'" />
-                  <a id="goUserInfoEdit-update" href="./userInfoEdit.html?fixed_mode=none">会員情報の更新を取り消す</a>
+                  <input type="image" src="" id="doUpdate-update" onmouseover="" onmousedown="" onmouseout="" value="上記の会員情報で更新する" alt="上記の会員情報で更新する" onclick="location.href='./userInfoEdit.html'" />
+                  <a id="goUserInfoEdit-update" href="./userInfoEdit.html?fixed_mode=none"><img id="buttonCancelUpdate" src="" onmouseover="" onmousedown="" onmouseout="" alt="会員情報の更新を取り消す" style="border:0px;" /></a>
                 </div>
               </div>
               <div id="isNotEdit">
@@ -421,14 +422,14 @@
                 <br />
                 <input id="customerId-hidden" type="hidden" />
                 <div style="text-align: center;width: 100%;">
-                  <input id="doModify" type="button" value="上記の会員情報を修正する" onclick="location.href='./userInfoEdit.html'" />
+                  <input type="image" src="" id="doModify" onmouseover="" onmousedown="" onmouseout="" value="上記の会員情報を修正する" alt="上記の会員情報を修正する" onclick="location.href='./userInfoEdit.html'" />
                   <div id="isBasket" style="display: inline;">
-                    <input id="doNext" type="button" value="お届け先の選択へ" onclick="location.href='./userAddressSelect.html'" />
+                    <input type="image" src="" id="doNext" onmouseover="" onmousedown="" onmouseout="" value="お届け先の選択へ" alt="お届け先の選択へ" onclick="location.href='./userAddressSelect.html'" />
                   </div>
                   <div id="isNotBasket" style="margin: 10px;">
                     <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
                     <div>カートに商品が入っていません。<br/>
-                    <a id="productListLink" href="">お買物を続ける</a></div>
+                    <a id="productListLink" href=""><img id="buttonContinueShopping" src="" onmouseover="" onmousedown="" onmouseout="" alt="お買物を続ける" style="border:0px;" /></a>
                   </div>
                 </div>
               </div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja" xmlns:te="http://www.seasar.org/teeda/extension">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title id="title-head">商品詳細画面</title>
-</head>
-<body onload="try{parent.init()}catch(e){}">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja" xmlns:te="http://www.seasar.org/teeda/extension">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title id="title-head">商品詳細画面</title>
+</head>
+<body onload="try{parent.init()}catch(e){}">
 <form id="productDetailsForm"><input id="cartUrl" type="hidden"/>
 <div class="portlet-msg">
   <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span>
-</div>
+</div>
 <input id="productId" type="hidden" />
 <table style="width: 95%;">
   <tr>
@@ -57,19 +57,19 @@
               <label>数量</label>
               <input type="text" id="orderQuantity" size="2" />
             </div>
-            <input type="submit" id="doAddCart" value="カートに追加" />
+            <input type="image" src="" id="doAddCart" onmouseover="" onmousedown="" onmouseout="" value="カートに追加" alt="カートに追加" onclick="location.href='signupConfirm.html'" />
           </span>
         </div>
         <div id="isNotUser">
           <label>商品をカートに入れるには、本サービスにユーザー登録が必要になります。</label>
           <br/>
-          <a id="orderLink" href="">会員情報登録へ進む</a>
+          <a id="orderLink" href=""><img id="buttonGoRegister" src="" onmouseover="" onmousedown="" onmouseout="" alt="会員情報登録へ進む" style="border:0px;" /></a>
         </div>
       </div>
       <div id="isNotLogin">
         <label>商品をカートに入れるには、本サービスにログインしてください。</label>
           <br/>
-          <a id="signupLink" href="">会員登録はこちら</a>
+          <a id="orderLink" href=""><img id="buttonGoRegister2" src="" onmouseover="" onmousedown="" onmouseout="" alt="会員登録はこちら" style="border:0px;" /></a>
       </div>
     </td>
   </tr>
@@ -80,7 +80,7 @@
 <span id="description" te:escape="false">説明</span>
 </div>
 <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade"/>
-<input type="submit" id="jumpProductList" value="一覧に戻る" />
+<input type="image" src="" id="jumpProductList" onmouseover="" onmousedown="" onmouseout="" value="一覧に戻る" alt="一覧に戻る" onclick="location.href='signupConfirm.html'" />
   <span id="jumpToCart" te:omittag="true" te:escape="false"></span>
-</form>
+</form>
 </body></html>
\ No newline at end of file

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -42,7 +42,7 @@
                   <br/>
                   <br/>
                   <div>
-                    <a id="jumpSignupEdit" href="signupEdit.html">会員登録へ戻る</a>
+                    <a id="jumpSignupEdit" href="signupEdit.html"><img id="buttonBack" src="" onmouseover="" onmousedown="" onmouseout="" alt="会員登録へ戻る" style="border:0px;" /></a>
                   </div>
                 </td>
               </tr>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -219,8 +219,8 @@
           <br/>
           <br/>
           <div style="text-align:center;">
-            <input type="button" id="doOnceCreate" value="上記の情報を登録する" onclick="location.href='signupComplete.html'" />
-            <input type="button" id="doCancel" value="再編集する" onclick="location.href='signupComplete.html'" />
+            <input type="image" src="" id="doOnceCreate" onmouseover="" onmousedown="" onmouseout="" value="上記の情報を登録する" alt="上記の情報を登録する" onclick="location.href='signupComplete.html'" />
+            <input type="image" src="" id="doCancel" onmouseover="" onmousedown="" onmouseout="" value="再編集する" alt="再編集する" onclick="location.href='signupEdit.html'" />
           </div>
         </center>
       </div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html	2008-04-08 04:59:55 UTC (rev 879)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html	2008-04-08 05:03:44 UTC (rev 880)
@@ -286,10 +286,11 @@
               </tr>
             </table>
           </div>
-          <br/>
-          <br/>
+          <br />
+          <br />
           <div style="text-align:center;">
-            <input type="button" id="doConfirm" value="利用規約に同意して登録する" onclick="location.href='signupConfirm.html'" />
+<!--             [bra[input type="button" id="doConfirm" value="利用規約に同意して登録する" onclick="location.href='signupConfirm.html'" /]ket] -->
+            <input type="image" src="/pompei-core/images/buttons/signupedit.png" id="doConfirm" onmousedown="src='/pompei-core/images/buttons/signupedit_down.png'" onmouseover="src='/pompei-core/images/buttons/signupedit_over.png'" onmouseout="src='/pompei-core/images/buttons/signupedit.png'" value="利用規約に同意して登録する" alt="利用規約に同意して登録する" onclick="location.href='signupConfirm.html'" />
           </div>
         </center>
       </div>


Portal Application Laboratory

[pal-cvs 3144] [880] replaced with pompei-db.