[pal-cvs 2830] [575] updated db.

svnno****@sourc***** svnno****@sourc*****
2007年 9月 21日 (金) 17:49:52 JST


Revision: 575
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=575
Author:   shinsuke
Date:     2007-09-21 17:49:50 +0900 (Fri, 21 Sep 2007)

Log Message:
-----------
updated db. updated user's pages.

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/dbflute/build-pompei.properties
    pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
    pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCardTypeBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCardTypeDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCardTypeCB.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderCardInfoCB.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderFormCB.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCardTypeCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCardTypeCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CardTypeCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CardTypeNss.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderCardInfoNss.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderFormNss.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/exentity/PaymentMethodDescription.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.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/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/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/UserAddressSelectPage.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/checkout/UserInfoEditPage.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/ProductDetailsPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
    pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.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/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/product/productList.html

Added Paths:
-----------
    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/PaymentMethodDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CardTypeService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/PaymentMethodService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CardTypeServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/PaymentMethodServiceImpl.java


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/dbflute/build-pompei.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/dbflute/build-pompei.properties	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/dbflute/build-pompei.properties	2007-09-21 08:49:50 UTC (rev 575)
@@ -155,19 +155,17 @@
 #torque.sequenceReturnType		=	java.lang.Integer
 # [Additional ForeignKey]
 torque.additionalForeignKeyMap = map:{ \
- SQL070831021756810 = map:{ localTableName = ORDER_FORM; localColumnName = CUSTOMER_ID; foreignTableName = CUSTOMER; foreignColumnName = CUSTOMER_ID } \
+ ;SQL070831021756810 = map:{ localTableName = ORDER_FORM; localColumnName = CUSTOMER_ID; foreignTableName = CUSTOMER; foreignColumnName = CUSTOMER_ID } \
  ;SQL070831021756860 = map:{ localTableName = ORDER_FORM; localColumnName = ORDER_STATUS_ID; foreignTableName = ORDER_STATUS; foreignColumnName = ORDER_STATUS_ID } \
  ;FK_ORDERS_3 = map:{ localTableName = ORDER_FORM; localColumnName = PAYMENT_METHOD_ID; foreignTableName = PAYMENT_METHOD; foreignColumnName = PAYMENT_METHOD_ID } \
  ;FK_ORDERS_4 = map:{ localTableName = ORDER_FORM; localColumnName = DELIVERY_METHOD_ID; foreignTableName = DELIVERY_METHOD; foreignColumnName = DELIVERY_METHOD_ID } \
  ;FK_ORDERS_6 = map:{ localTableName = ORDER_FORM; localColumnName = CURRENCY_ID; foreignTableName = CURRENCY; foreignColumnName = CURRENCY_ID } \
- ;FK_ORDER_6 = map:{ localTableName = ORDER_FORM; localColumnName = ORDER_CARD_INFO_ID; foreignTableName = ORDER_CARD_INFO; foreignColumnName = ORDER_CARD_INFO_ID } \
  ;SQL070831021755391 = map:{ localTableName = PRODUCT; localColumnName = MANUFACTURER_ID; foreignTableName = MANUFACTURER; foreignColumnName = MANUFACTURER_ID } \
  ;FK_PRODUCTS_2 = map:{ localTableName = PRODUCT; localColumnName = TAX_CLASS_ID; foreignTableName = TAX_CLASS; foreignColumnName = TAX_CLASS_ID } \
  ;FK_CATEGORIES_1 = map:{ localTableName = CATEGORY; localColumnName = PARENT_ID; foreignTableName = CATEGORY; foreignColumnName = CATEGORY_ID } \
  ;FK_REVIEWS_1 = map:{ localTableName = REVIEW; localColumnName = PRODUCT_ID; foreignTableName = PRODUCT; foreignColumnName = PRODUCT_ID } \
  ;FK_REVIEWS_2 = map:{ localTableName = REVIEW; localColumnName = CUSTOMER_ID; foreignTableName = CUSTOMER; foreignColumnName = CUSTOMER_ID } \
  ;FK_ZONES_1 = map:{ localTableName = ZONE; localColumnName = COUNTRY_ID; foreignTableName = COUNTRY; foreignColumnName = COUNTRY_ID } \
- ;FK_ORDER_CARD_INFO_1 = map:{ localTableName = ORDER_CARD_INFO; localColumnName = CARD_TYPE_ID; foreignTableName = CARD_TYPE; foreignColumnName = CARD_TYPE_ID } \
  ;SQL070831021756760 = map:{ localTableName = PRODUCT_ATTRIBUTE; localColumnName = PRODUCT_ID; foreignTableName = PRODUCT; foreignColumnName = PRODUCT_ID } \
  ;FK_PRODUCTS_ATTRIBUTES_2 = map:{ localTableName = PRODUCT_ATTRIBUTE; localColumnName = PRODUCT_OPTION_ID; foreignTableName = PRODUCT_OPTION; foreignColumnName = PRODUCT_OPTION_ID } \
  ;FK_PRODUCTS_ATTRIBUTES_3 = map:{ localTableName = PRODUCT_ATTRIBUTE; localColumnName = PRODUCT_OPTION_VALUE_ID; foreignTableName = PRODUCT_OPTION_VALUE; foreignColumnName = PRODUCT_OPTION_VALUE_ID } \

Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml	2007-09-21 08:49:50 UTC (rev 575)
@@ -353,8 +353,8 @@
             required="true" size="255" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
             name="SHORT_DESCRIPTION" size="100" type="VARCHAR"/>
-        <column dbType="VARCHAR" javaType="String"
-            name="LONG_DESCRIPTION" size="1000" type="VARCHAR"/>
+        <column dbType="LONG VARCHAR" javaType="String"
+            name="LONG_DESCRIPTION" size="32700" type="LONGVARCHAR"/>
         <foreign-key foreignTable="LANGUAGE" name="FK_MANUFACTURERS_INFO_2">
             <reference foreign="LANGUAGE_ID" local="LANGUAGE_ID"/>
         </foreign-key>
@@ -363,28 +363,25 @@
         </foreign-key>
     </table>
     <table name="ORDER_CARD_INFO" schema="APP" type="TABLE">
-        <column dbType="BIGINT" javaType="java.math.BigDecimal"
-            name="ORDER_CARD_INFO_ID" primaryKey="true" required="true" type="BIGINT"/>
-        <column dbType="INTEGER" javaType="java.math.BigDecimal"
-            name="CARD_TYPE_ID" type="INTEGER"/>
+        <column autoIncrement="true" dbType="BIGINT"
+            default="GENERATED_BY_DEFAULT"
+            javaType="java.math.BigDecimal" name="ORDER_CARD_INFO_ID"
+            primaryKey="true" required="true" type="BIGINT"/>
         <column dbType="VARCHAR" javaType="String" name="CARD_CODE"
-            size="32" type="VARCHAR"/>
+            required="true" size="32" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="CARD_OWNER"
-            size="255" type="VARCHAR"/>
+            required="true" size="255" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="CARD_NUMBER"
-            size="255" type="VARCHAR"/>
+            required="true" size="255" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="CARD_EXPIRES"
-            size="255" type="VARCHAR"/>
-        <foreign-key foreignTable="CARD_TYPE" name="FK_ORDER_CARD_INFO_1">
-            <reference foreign="CARD_TYPE_ID" local="CARD_TYPE_ID"/>
-        </foreign-key>
+            required="true" size="255" type="VARCHAR"/>
     </table>
     <table name="ORDER_COMMENT" schema="APP" type="TABLE">
         <column dbType="BIGINT" javaType="java.math.BigDecimal"
             name="ORDER_FORM_ID" primaryKey="true" required="true" type="BIGINT"/>
         <column dbType="VARCHAR" javaType="String" name="TITLE"
             required="true" size="255" type="VARCHAR"/>
-        <column dbType="LONG VARCHAR" javaType="String" name="TEXT"
+        <column dbType="LONG VARCHAR" javaType="String" name="COMMENT"
             required="true" size="32700" type="LONGVARCHAR"/>
         <foreign-key foreignTable="ORDER_FORM" name="FK_ORDERS_TOTAL_1">
             <reference foreign="ORDER_FORM_ID" local="ORDER_FORM_ID"/>
@@ -512,9 +509,6 @@
         <foreign-key foreignTable="DELIVERY_METHOD" name="FK_ORDERS_4">
             <reference foreign="DELIVERY_METHOD_ID" local="DELIVERY_METHOD_ID"/>
         </foreign-key>
-        <foreign-key foreignTable="ORDER_CARD_INFO" name="FK_ORDER_6">
-            <reference foreign="ORDER_CARD_INFO_ID" local="ORDER_CARD_INFO_ID"/>
-        </foreign-key>
         <foreign-key foreignTable="ORDER_STATUS" name="SQL070831021756860">
             <reference foreign="ORDER_STATUS_ID" local="ORDER_STATUS_ID"/>
         </foreign-key>
@@ -643,7 +637,7 @@
             name="DATE_ADDED" required="true" type="TIMESTAMP"/>
         <column dbType="INTEGER" default="0"
             javaType="java.math.BigDecimal" name="CUSTOMER_NOTIFIED" type="INTEGER"/>
-        <column dbType="LONG VARCHAR" javaType="String" name="COMMENTS"
+        <column dbType="LONG VARCHAR" javaType="String" name="COMMENT"
             size="32700" type="LONGVARCHAR"/>
         <foreign-key foreignTable="ORDER_FORM" name="FK_ORDERS_STATUS_HISTORY_2">
             <reference foreign="ORDER_FORM_ID" local="ORDER_FORM_ID"/>
@@ -687,33 +681,35 @@
             default="GENERATED_BY_DEFAULT"
             javaType="java.math.BigDecimal" name="PRODUCT_ID"
             primaryKey="true" required="true" type="BIGINT"/>
-        <column dbType="INTEGER" javaType="java.math.BigDecimal"
-            name="QUANTITY" required="true" type="INTEGER"/>
         <column dbType="VARCHAR" javaType="String" name="MODEL"
             size="32" type="VARCHAR"/>
-        <column dbType="VARCHAR" javaType="String" name="THUMBNAIL"
-            size="64" type="VARCHAR"/>
-        <column dbType="VARCHAR" javaType="String" name="IMAGE"
-            size="64" type="VARCHAR"/>
+        <column dbType="INTEGER" javaType="java.math.BigDecimal"
+            name="QUANTITY" required="true" type="INTEGER"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
             name="PRICE" required="true" size="15" type="DECIMAL"/>
+        <column dbType="DECIMAL" javaType="java.math.BigDecimal"
+            name="WEIGHT" size="5" type="DECIMAL"/>
+        <column dbType="VARCHAR" javaType="String" name="IMAGE"
+            size="64" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String" name="THUMBNAIL"
+            size="64" type="VARCHAR"/>
+        <column dbType="INTEGER" javaType="java.math.BigDecimal"
+            name="STOCK" type="INTEGER"/>
+        <column dbType="INTEGER" default="0"
+            javaType="java.math.BigDecimal" name="ORDERED"
+            required="true" type="INTEGER"/>
+        <column dbType="INTEGER" javaType="java.math.BigDecimal"
+            name="STATUS" required="true" type="INTEGER"/>
         <column dbType="TIMESTAMP" javaType="java.sql.Timestamp"
             name="DATE_ADDED" required="true" type="TIMESTAMP"/>
         <column dbType="TIMESTAMP" javaType="java.sql.Timestamp"
             name="LAST_MODIFIED" type="TIMESTAMP"/>
         <column dbType="TIMESTAMP" javaType="java.sql.Timestamp"
             name="DATE_AVAILABLE" type="TIMESTAMP"/>
-        <column dbType="DECIMAL" javaType="java.math.BigDecimal"
-            name="WEIGHT" required="true" size="5" type="DECIMAL"/>
         <column dbType="INTEGER" javaType="java.math.BigDecimal"
-            name="STATUS" required="true" type="INTEGER"/>
-        <column dbType="INTEGER" javaType="java.math.BigDecimal"
             name="TAX_CLASS_ID" type="INTEGER"/>
         <column dbType="INTEGER" javaType="java.math.BigDecimal"
             name="MANUFACTURER_ID" type="INTEGER"/>
-        <column dbType="INTEGER" default="0"
-            javaType="java.math.BigDecimal" name="ORDERED"
-            required="true" type="INTEGER"/>
         <foreign-key foreignTable="MANUFACTURER" name="SQL070831021755391">
             <reference foreign="MANUFACTURER_ID" local="MANUFACTURER_ID"/>
         </foreign-key>
@@ -899,8 +895,8 @@
             name="REVIEW_ID" primaryKey="true" required="true" type="BIGINT"/>
         <column dbType="INTEGER" javaType="java.math.BigDecimal"
             name="LANGUAGE_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column dbType="LONG VARCHAR" javaType="String"
-            name="REVIEW_TEXT" required="true" size="32700" type="LONGVARCHAR"/>
+        <column dbType="LONG VARCHAR" javaType="String" name="COMMENT"
+            required="true" size="32700" type="LONGVARCHAR"/>
         <foreign-key foreignTable="LANGUAGE" name="FK_REVIEWS_DESCRIPTION_2">
             <reference foreign="LANGUAGE_ID" local="LANGUAGE_ID"/>
         </foreign-key>

Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-21 08:49:50 UTC (rev 575)
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<clay-model clay-version="1.2.0">
-<database-model alias="" author="" begin-script="" end-script="" name="pompei" remarks="" sql-dialect-id="jp.azzurri.clay.model.physical.dialect.MySQL_4_0_Dialect" version="1.0">
+<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="">
+<schema alias="" name="APP" remarks="" uid="1350e24:11525502e7d:-7fff">
 <schema-description></schema-description>
 <domain-list/>
 <table-list>
-<table alias="" name="ADDRESS_BOOK" remarks="">
+<table alias="" name="ADDRESS_BOOK" remarks="" uid="1350e24:11525502e7d:-7ffe">
 <table-description></table-description>
-<table-figure-bounds height="368" width="277" x="2226" y="364"/>
+<table-figure-bounds height="340" width="277" 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="">
+<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"/>
@@ -24,7 +24,7 @@
 <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="">
+<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"/>
@@ -37,89 +37,89 @@
 <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="">
+<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="">
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="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="LASTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" name="STREET_ADDRESS" remarks="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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"/>
@@ -132,47 +132,47 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -181,21 +181,21 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021754660" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -208,26 +208,26 @@
 <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="">
+<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="">
+<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"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="false" name="SORT_ORDER" remarks="">
+<column alias="" auto-increment="false" column-size="10" decimal-digits="0" default-value="" mandatory="false" 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"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" name="DATE_ADDED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -236,7 +236,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -246,13 +246,13 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021754850" remarks="">
+<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="">
+<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/>
@@ -261,17 +261,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021754850" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -284,20 +284,20 @@
 <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="">
+<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="">
+<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="">
+<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)"/>
@@ -305,21 +305,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021754880" remarks="">
+<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="">
+<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="">
+<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/>
@@ -328,22 +328,22 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021754880" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -356,14 +356,14 @@
 <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="">
+<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="">
+<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)"/>
@@ -371,7 +371,7 @@
 <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="">
+<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)"/>
@@ -380,24 +380,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755010" remarks="">
+<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="" unique="true">
+<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="">
+<table alias="" name="CUSTOMER" remarks="" uid="1350e24:11525502e7d:-7fd0">
 <table-description></table-description>
 <table-figure-bounds height="173" width="244" 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="">
+<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"/>
@@ -410,45 +410,45 @@
 <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="">
+<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="">
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="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="LASTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="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="false" name="NICKNAME" remarks="">
+<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="">
+<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="">
+<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)"/>
@@ -456,27 +456,27 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755080" remarks="">
+<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="" unique="true">
+<index alias="" name="SQL070831021755080" remarks="" uid="1350e24:11525502e7d:-7fc6" unique="true">
 <index-description></index-description>
 <index-column name="CUSTOMER_ID" sort="ASC"/>
 </index>
-<index alias="" name="SQL070831021756660" remarks="" unique="false">
+<index alias="" name="SQL070831021756660" remarks="" uid="1350e24:11525502e7d:-7fc5" unique="false">
 <index-description></index-description>
 </index>
 </index-list>
 </table>
-<table alias="" name="CUSTOMER_BASKET" remarks="">
+<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="">
+<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"/>
@@ -489,7 +489,7 @@
 <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="">
+<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"/>
@@ -502,7 +502,7 @@
 <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="">
+<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"/>
@@ -515,7 +515,7 @@
 <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="">
+<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"/>
@@ -528,7 +528,7 @@
 <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="">
+<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)"/>
@@ -536,7 +536,7 @@
 <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="">
+<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)"/>
@@ -544,20 +544,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755120" remarks="">
+<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="">
+<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="">
+<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/>
@@ -566,17 +566,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755120" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -589,7 +589,7 @@
 <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="">
+<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"/>
@@ -602,7 +602,7 @@
 <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="">
+<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"/>
@@ -615,7 +615,7 @@
 <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="">
+<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"/>
@@ -628,7 +628,7 @@
 <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="">
+<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"/>
@@ -641,7 +641,7 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="DATE_ADDED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" 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)"/>
@@ -649,34 +649,34 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755170" remarks="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -685,37 +685,37 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755170" remarks="" unique="true">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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"/>
@@ -728,7 +728,7 @@
 <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="">
+<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"/>
@@ -741,14 +741,14 @@
 <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="">
+<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="">
+<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)"/>
@@ -756,64 +756,64 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756200" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -822,22 +822,22 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756230" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -850,21 +850,21 @@
 <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="">
+<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="true" name="DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" 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="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -873,7 +873,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="">
+<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)"/>
@@ -883,24 +883,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756450" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -913,57 +913,57 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -976,21 +976,21 @@
 <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="">
+<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="">
+<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="6" default-value="" mandatory="false" name="DATE_ADDED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -999,7 +999,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -1009,24 +1009,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755280" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -1039,7 +1039,7 @@
 <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="">
+<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"/>
@@ -1052,42 +1052,42 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -1096,22 +1096,22 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755310" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<table alias="" name="ORDER_FORM" remarks="" uid="1350e24:11525502e7d:-7f7e">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" 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="">
+<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"/>
@@ -1124,7 +1124,7 @@
 <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="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" 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"/>
@@ -1137,7 +1137,7 @@
 <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="">
+<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)"/>
@@ -1145,264 +1145,264 @@
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_FIRSTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_LASTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" 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="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_DAY_OF_BIRTH" remarks="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_FIRSTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LASTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="255" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_STREET_ADDRESS" remarks="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_FIRSTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LASTNAME" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="255" decimal-digits="0" default-value="" mandatory="true" name="BILLING_STREET_ADDRESS" remarks="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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"/>
@@ -1415,7 +1415,7 @@
 <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="">
+<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)"/>
@@ -1423,7 +1423,7 @@
 <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="">
+<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"/>
@@ -1436,7 +1436,7 @@
 <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="">
+<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"/>
@@ -1449,14 +1449,14 @@
 <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="">
+<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="26" decimal-digits="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -1465,7 +1465,7 @@
 <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="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_STATUS_ID" remarks="">
+<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"/>
@@ -1478,21 +1478,21 @@
 <variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" name="PURCHASED_DATE" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" 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="">
+<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="">
+<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"/>
@@ -1505,7 +1505,7 @@
 <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="">
+<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)"/>
@@ -1513,7 +1513,7 @@
 <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="true" name="DELIVERY_PRICE" remarks="">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" 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)"/>
@@ -1526,7 +1526,7 @@
 <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="FINAL_PRICE" remarks="">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="FINAL_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)"/>
@@ -1539,7 +1539,7 @@
 <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="TAX" remarks="">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" 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)"/>
@@ -1553,75 +1553,68 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755840" remarks="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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 alias="" name="FK_ORDER_6" on-delete="" on-update="" referenced-key="PK_ORDER_CARD_INFO" referenced-table="ORDER_CARD_INFO" referenced-table-schema="APP" remarks="" source-entity-role="" source-multiplicity="0..*" source-relationship-type="" target-entity-role="" target-multiplicity="1" target-relationship-type="">
-<foreign-key-description></foreign-key-description>
-<foreign-key-figure>
-<fk-fig-bendpoint-list/>
-</foreign-key-figure>
-<foreign-key-column column-name="ORDER_CARD_INFO_ID" referenced-key-column-name="ORDER_CARD_INFO_ID"/>
-</foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755840" remarks="" unique="true">
+<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="" unique="false">
+<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="" unique="false">
+<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="">
+<table alias="" name="ORDER_PRODUCT" remarks="" uid="1350e24:11525502e7d:-7f42">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="441" y="1910"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_ID" remarks="">
+<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"/>
@@ -1634,7 +1627,7 @@
 <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="">
+<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"/>
@@ -1647,7 +1640,7 @@
 <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="">
+<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"/>
@@ -1660,21 +1653,21 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7f3c">
 <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="">
+<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)"/>
@@ -1687,7 +1680,7 @@
 <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="">
+<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)"/>
@@ -1695,7 +1688,7 @@
 <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="">
+<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)"/>
@@ -1708,7 +1701,7 @@
 <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="">
+<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"/>
@@ -1722,20 +1715,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755890" remarks="">
+<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="">
+<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="">
+<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/>
@@ -1744,25 +1737,25 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755890" remarks="" unique="true">
+<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="" unique="false">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -1775,7 +1768,7 @@
 <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="">
+<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"/>
@@ -1788,7 +1781,7 @@
 <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="">
+<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"/>
@@ -1801,20 +1794,20 @@
 <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="">
+<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="">
+<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="">
+<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)"/>
@@ -1822,7 +1815,7 @@
 <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="">
+<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)"/>
@@ -1830,20 +1823,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756080" remarks="">
+<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="">
+<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="">
+<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/>
@@ -1852,17 +1845,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756080" remarks="" unique="true">
+<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="">
+<table alias="" name="ORDER_PRODUCT_DOWNLOAD" remarks="" uid="1350e24:11525502e7d:-7f2a">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="795" y="1362"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_DOWNLOAD_ID" remarks="">
+<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"/>
@@ -1875,7 +1868,7 @@
 <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="">
+<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"/>
@@ -1888,7 +1881,7 @@
 <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="">
+<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"/>
@@ -1901,14 +1894,14 @@
 <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="">
+<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="">
+<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"/>
@@ -1921,7 +1914,7 @@
 <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="">
+<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"/>
@@ -1935,20 +1928,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756110" remarks="">
+<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="">
+<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="">
+<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/>
@@ -1957,17 +1950,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756110" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -1980,7 +1973,7 @@
 <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="">
+<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"/>
@@ -1993,14 +1986,14 @@
 <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="">
+<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="">
+<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)"/>
@@ -2008,24 +2001,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756000" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -2038,7 +2031,7 @@
 <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="">
+<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"/>
@@ -2051,7 +2044,7 @@
 <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="">
+<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"/>
@@ -2064,7 +2057,7 @@
 <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="">
+<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)"/>
@@ -2073,33 +2066,33 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -2108,21 +2101,21 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756030" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<table alias="" name="ORDER_COMMENT" remarks="" uid="1350e24:11525502e7d:-7f10">
 <table-description></table-description>
 <table-figure-bounds height="-1" width="-1" x="24" y="1998"/>
 <column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="">
+<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"/>
@@ -2135,26 +2128,26 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -2163,16 +2156,16 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756170" remarks="" unique="true">
+<index alias="" name="SQL070831021756170" remarks="" uid="1350e24:11525502e7d:-7f0b" unique="true">
 <index-description></index-description>
 </index>
 </index-list>
 </table>
-<table alias="" name="PRODUCT" remarks="">
+<table alias="" name="PRODUCT" remarks="" uid="1350e24:11525502e7d:-7f0a">
 <table-description></table-description>
 <table-figure-bounds height="286" 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="">
+<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"/>
@@ -2185,14 +2178,14 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="">
+<column alias="" auto-increment="false" column-size="32" 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="true" name="QUANTITY" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" 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"/>
@@ -2205,7 +2198,7 @@
 <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="">
+<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)"/>
@@ -2218,34 +2211,34 @@
 <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="">
+<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)"/>
 <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="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="IMAGE" 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="64" decimal-digits="0" default-value="" mandatory="false" name="THUMBNAIL" remarks="">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="THUMBNAIL" remarks="" uid="1350e24:11525502e7d:-7f02">
 <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="STOCK" remarks="">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="STOCK" remarks="" uid="1350e24:11525502e7d:-7f01">
 <column-description></column-description>
 <data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
 <variant type-name-pattern="INTEGER"/>
@@ -2258,7 +2251,7 @@
 <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="ORDERED" remarks="">
+<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"/>
@@ -2271,7 +2264,7 @@
 <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="">
+<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"/>
@@ -2284,28 +2277,28 @@
 <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="">
+<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="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" 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="">
+<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="">
+<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"/>
@@ -2318,7 +2311,7 @@
 <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="">
+<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"/>
@@ -2332,20 +2325,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755390" remarks="">
+<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="">
+<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="">
+<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/>
@@ -2354,21 +2347,21 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755390" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -2381,7 +2374,7 @@
 <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="">
+<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"/>
@@ -2394,7 +2387,7 @@
 <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="">
+<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"/>
@@ -2407,7 +2400,7 @@
 <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="">
+<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"/>
@@ -2420,7 +2413,7 @@
 <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="">
+<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)"/>
@@ -2433,7 +2426,7 @@
 <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="">
+<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)"/>
@@ -2441,27 +2434,27 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755500" remarks="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -2470,21 +2463,21 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755500" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -2497,14 +2490,14 @@
 <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="">
+<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="">
+<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"/>
@@ -2517,7 +2510,7 @@
 <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="">
+<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"/>
@@ -2531,13 +2524,13 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755560" remarks="">
+<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="">
+<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/>
@@ -2546,17 +2539,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755560" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -2569,33 +2562,33 @@
 <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="">
+<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="">
+<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="0" decimal-digits="0" default-value="" mandatory="false" name="DESCRIPTION" remarks="">
+<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="">
+<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="">
+<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"/>
@@ -2609,21 +2602,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755590" remarks="">
+<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="">
+<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="">
+<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/>
@@ -2632,22 +2625,22 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755590" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -2660,7 +2653,7 @@
 <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="">
+<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"/>
@@ -2673,7 +2666,7 @@
 <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="">
+<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)"/>
@@ -2683,21 +2676,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755670" remarks="">
+<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="">
+<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="">
+<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/>
@@ -2706,18 +2699,18 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755670" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -2731,24 +2724,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755700" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -2762,24 +2755,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755720" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -2792,7 +2785,7 @@
 <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="">
+<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"/>
@@ -2805,7 +2798,7 @@
 <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="">
+<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"/>
@@ -2819,20 +2812,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755750" remarks="">
+<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="">
+<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="">
+<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/>
@@ -2841,17 +2834,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755750" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -2864,7 +2857,7 @@
 <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="">
+<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"/>
@@ -2877,7 +2870,7 @@
 <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="">
+<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)"/>
@@ -2885,21 +2878,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021755770" remarks="">
+<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="">
+<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="">
+<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/>
@@ -2908,22 +2901,22 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021755770" remarks="" unique="true">
+<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="" unique="false">
+<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="">
+<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="">
+<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"/>
@@ -2936,7 +2929,7 @@
 <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="">
+<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"/>
@@ -2949,7 +2942,7 @@
 <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="">
+<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"/>
@@ -2962,14 +2955,14 @@
 <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="">
+<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="">
+<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"/>
@@ -2982,7 +2975,7 @@
 <variant type-name-pattern="INTEGER ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" name="DATE_ADDED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -2991,7 +2984,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -3001,20 +2994,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756260" remarks="">
+<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="">
+<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="">
+<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/>
@@ -3023,17 +3016,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756260" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -3046,7 +3039,7 @@
 <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="">
+<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"/>
@@ -3059,28 +3052,28 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -3089,18 +3082,18 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756290" remarks="" unique="true">
+<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="">
+<table alias="" name="BARGAIN" remarks="" uid="1350e24:11525502e7d:-7eb1">
 <table-description></table-description>
 <table-figure-bounds height="163" width="308" x="3027" y="3221"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="BARGAIN_ID" remarks="">
+<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"/>
@@ -3113,7 +3106,7 @@
 <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="">
+<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"/>
@@ -3126,7 +3119,7 @@
 <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="">
+<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)"/>
@@ -3139,48 +3132,48 @@
 <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="false" name="DATE_ADDED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" 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="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="false" 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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -3189,17 +3182,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756360" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -3212,21 +3205,21 @@
 <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="">
+<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="true" name="DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" 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="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -3235,7 +3228,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="">
+<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)"/>
@@ -3245,24 +3238,24 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756390" remarks="">
+<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="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -3275,7 +3268,7 @@
 <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="">
+<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"/>
@@ -3288,13 +3281,13 @@
 <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="">
+<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="">
+<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"/>
@@ -3307,7 +3300,7 @@
 <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="">
+<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)"/>
@@ -3320,14 +3313,14 @@
 <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="true" name="DESCRIPTION" remarks="">
+<column alias="" auto-increment="false" column-size="255" decimal-digits="0" default-value="" mandatory="true" 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="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -3336,7 +3329,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="">
+<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)"/>
@@ -3346,20 +3339,20 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756420" remarks="">
+<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="">
+<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="">
+<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/>
@@ -3368,17 +3361,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756420" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -3391,19 +3384,19 @@
 <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="">
+<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="">
+<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="">
+<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)"/>
@@ -3411,13 +3404,13 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756500" remarks="">
+<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="">
+<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/>
@@ -3426,17 +3419,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756500" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -3449,7 +3442,7 @@
 <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="">
+<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"/>
@@ -3462,19 +3455,19 @@
 <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="">
+<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="">
+<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="6" default-value="" mandatory="false" name="LAST_MODIFIED" remarks="">
+<column alias="" auto-increment="false" column-size="26" decimal-digits="6" default-value="" mandatory="false" 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(%p)">
 <variant precision-max="9" precision-min="1" precision-variable="%p" type-name-pattern="TIMESTAMP(%p)"/>
@@ -3483,7 +3476,7 @@
 <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="26" decimal-digits="6" default-value="" mandatory="true" name="DATE_ADDED" remarks="">
+<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)"/>
@@ -3493,27 +3486,27 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="SQL070831021756530" remarks="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -3522,17 +3515,17 @@
 </foreign-key>
 </foreign-key-list>
 <index-list>
-<index alias="" name="SQL070831021756530" remarks="" unique="true">
+<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="">
+<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="">
+<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"/>
@@ -3545,20 +3538,20 @@
 <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="">
+<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="">
+<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="">
+<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)"/>
@@ -3566,21 +3559,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_ORDER_STATUS_DESCRIPTION" remarks="">
+<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="">
+<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="">
+<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/>
@@ -3590,11 +3583,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="PRODUCT_OPTION_DESCRIPTION" remarks="">
+<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="">
+<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"/>
@@ -3607,20 +3600,20 @@
 <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="">
+<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="">
+<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="">
+<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)"/>
@@ -3628,21 +3621,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PRODUCT_OPTION_DESCRIPTION" remarks="">
+<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="">
+<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="">
+<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/>
@@ -3652,11 +3645,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="PRODUCT_OPTION_VALUE_DESCRIPTION" remarks="">
+<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="">
+<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"/>
@@ -3669,20 +3662,20 @@
 <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="">
+<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="">
+<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="">
+<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)"/>
@@ -3690,21 +3683,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PRODUCT_OPTION_VALUE_DESCRIPTION" remarks="">
+<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="">
+<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="">
+<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/>
@@ -3714,11 +3707,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="CURRENCY" remarks="">
+<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="">
+<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"/>
@@ -3731,7 +3724,7 @@
 <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="">
+<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)"/>
@@ -3739,35 +3732,35 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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)"/>
@@ -3775,7 +3768,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CURRENCY" remarks="">
+<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>
@@ -3783,11 +3776,11 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table alias="" name="CURRENCY_DESCRIPTION" remarks="">
+<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="">
+<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"/>
@@ -3800,7 +3793,7 @@
 <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="">
+<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"/>
@@ -3813,14 +3806,14 @@
 <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="">
+<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="">
+<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)"/>
@@ -3828,21 +3821,21 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CURRENCY_DESCRIPTION" remarks="">
+<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="">
+<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="">
+<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/>
@@ -3852,11 +3845,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="PAYMENT_METHOD" remarks="">
+<table alias="" name="PAYMENT_METHOD" remarks="" uid="1350e24:11525502e7d:-7e62">
 <table-description></table-description>
 <table-figure-bounds height="120" width="276" x="523" y="523"/>
 <column-list>
-<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_ID" remarks="">
+<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"/>
@@ -3869,14 +3862,14 @@
 <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="">
+<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="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="">
+<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"/>
@@ -3889,14 +3882,14 @@
 <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="">
+<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="">
+<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)"/>
@@ -3904,7 +3897,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_PAYMENT_METHOD" remarks="">
+<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>
@@ -3912,11 +3905,11 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table alias="" name="PAYMENT_METHOD_DESCRIPTION" remarks="">
+<table alias="" name="PAYMENT_METHOD_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e5b">
 <table-description></table-description>
 <table-figure-bounds height="98" width="330" x="1770" y="602"/>
 <column-list>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_ID" remarks="">
+<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"/>
@@ -3929,7 +3922,7 @@
 <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="">
+<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"/>
@@ -3942,35 +3935,35 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -3980,11 +3973,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="CARD_TYPE" remarks="">
+<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="">
+<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"/>
@@ -3997,14 +3990,14 @@
 <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="">
+<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="">
+<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"/>
@@ -4017,14 +4010,14 @@
 <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="">
+<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="">
+<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)"/>
@@ -4032,7 +4025,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_CARD_TYPE" remarks="">
+<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>
@@ -4040,11 +4033,11 @@
 <foreign-key-list/>
 <index-list/>
 </table>
-<table alias="" name="CARD_TYPE_DESCRIPTION" remarks="">
+<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="">
+<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"/>
@@ -4057,7 +4050,7 @@
 <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="">
+<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"/>
@@ -4070,35 +4063,35 @@
 <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="">
+<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="">
+<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="">
+<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="">
+<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="">
+<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/>
@@ -4108,11 +4101,11 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="ORDER_CARD_INFO" remarks="">
+<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="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_CARD_INFO_ID" remarks="">
+<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"/>
@@ -4125,41 +4118,28 @@
 <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="CARD_TYPE_ID" remarks="">
+<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="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="false" name="CARD_CODE" remarks="">
-<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="CARD_OWNER" remarks="">
+<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="false" name="CARD_NUMBER" remarks="">
+<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="false" name="CARD_EXPIRES" remarks="">
+<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)"/>
@@ -4167,20 +4147,12 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_ORDER_CARD_INFO" remarks="">
+<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>
-<foreign-key alias="" name="FK_ORDER_CARD_INFO_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="">
-<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-list>
+<foreign-key-list/>
 <index-list/>
 </table>
 </table-list>

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -41,12 +41,14 @@
 
     public static final String BANK_PAYMENT_METHOD = "BANK";
 
-    public static final String CARD_PAYMENT_METHOD = "CARD";
+    public static final String CARD_PAYMENT_METHOD = "CREDITCARD";
 
     public static final String DELIVERY_ADDRESS_BOOK_ID = "deliveryAddressBookId";
 
     public static final String PAYMENT_METHOD = "paymentMethod";
 
+    public static final String PAYMENT_METHOD_ID = "paymentMethodId";
+
     public static final String CARD_TYPE = "cardType";
 
     public static final String CARD_NUMBER = "cardNumber";
@@ -60,4 +62,8 @@
     public static final String CUSTOMERS_BASKET_ID_LIST = "customersBasketIdList";
 
     public static final BigDecimal ROOT_CATEGORY_ID = new BigDecimal(1);
+
+    public static final BigDecimal TRUE_BIGDECIMAL = new BigDecimal(1);
+
+    public static final BigDecimal FALSE_BIGDECIMAL = new BigDecimal(0);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCardTypeBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCardTypeBhv.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCardTypeBhv.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -36,7 +36,7 @@
  *     
  * 
  * [refferer-property]
- *     cardTypeDescriptionList, orderCardInfoList
+ *     cardTypeDescriptionList
  * 
  * [sequence]
  *     
@@ -618,156 +618,10 @@
         }
     }
       
-    // /* * * * * * * * * * * * * * * * * * * * * * *
-    //   RefererTable    = [ORDER_CARD_INFO]
-    //   RefererProperty = [orderCardInfoList]
-    // * * * * * * * * */
-    
-    /**
-     * Load referer of orderCardInfoList.
-     * <pre>
-     *   You can load referer.
-     * 
-     *   ex) {Client Example}
-     *     final CardTypeCB cb = new CardTypeCB();
-     *     cb.query().setXxx_Equal("xxx");
-     *     final List&lt;CardType&gt; cardTypeList = cardTypeBhv.selectList(cb);
-     *     cardTypeBhv.loadOrderCardInfoList(cardTypeList);
-     * 
-     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
-     * </pre>
-     * 
-     * @param cardTypeList Entity list of cardType. (NotNull)
-     */
-    public void loadOrderCardInfoList(java.util.List<CardType> cardTypeList) {
-        final ConditionBeanSetupper<OrderCardInfoCB> conditionBeanSetupper = new ConditionBeanSetupper<OrderCardInfoCB>() {
-            public void setup(OrderCardInfoCB cb) {
-            }
-        };
-        loadOrderCardInfoList(cardTypeList, conditionBeanSetupper);
-    }
-
-    /**
-     * Load referer of orderCardInfoList.
-     * <pre>
-     *   You can load referer with your original condition.
-     * 
-     *   ex) {Client Example}: Referer conditions are 'Xxx' is not null and order-by 'Yyy' desc
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     final CardTypeCB cb = new CardTypeCB();
-     *     cb.query().setXxx_Equal("xxx");
-     *     final List&lt;CardType&gt; cardTypeList = cardTypeBhv.selectList(cb);
-     *     final ConditionBeanSetupper&lt;OrderCardInfoCB&gt; conditionBeanSetupper = new ConditionBeanSetupper&lt;OrderCardInfoCB&gt;() {
-     *         public void setup(OrderCardInfoCB cb) {
-     *             cb.query().setXxx_IsNotNull();
-     *             cb.query().addOrderBy_Yyy_Desc();
-     *         }
-     *     };
-     *     cardTypeBhv.loadOrderCardInfoList(cardTypeList, conditionBeanSetupper);
-     *     - - - - - - - - - -/
-     * 
-     *   The condition-bean that the setupper provides have settings before you touch it. It is as follows:
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     cb.query().setCardTypeId_InScope(pkList);
-     *     cb.query().addOrderBy_CardTypeId_Asc();
-     *     - - - - - - - - - -/
-     * 
-     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
-     * </pre>
-     * 
-     * @param cardTypeList Entity list of cardType. (NotNull)
-     * @param conditionBeanSetupper Referer condition setupper instance for registering referer condition. (NotNull)
-     */
-    public void loadOrderCardInfoList(java.util.List<CardType> cardTypeList, ConditionBeanSetupper<OrderCardInfoCB> conditionBeanSetupper) {
-        assertObjectNotNull("cardTypeList<CardType>", cardTypeList);
-        assertObjectNotNull("conditionBeanSetupper<OrderCardInfoCB>", conditionBeanSetupper);
-        if (cardTypeList.isEmpty()) {
-            return;
-        }
-        loadOrderCardInfoList(cardTypeList, new jp.sf.pal.pompei.allcommon.bhv.load.LoadRefererOption<OrderCardInfoCB, OrderCardInfo>(conditionBeanSetupper));
-    }
-
-    /**
-     * Load referer of orderCardInfoList.
-     * <pre>
-     *   You can load referer with your original condition.
-     * 
-     *   ex) {Client Example}: Referer conditions are 'Xxx' is not null and order-by 'Yyy' desc
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     final CardTypeCB cb = new CardTypeCB();
-     *     cb.query().setXxx_Equal("xxx");
-     *     final List&lt;CardType&gt; cardTypeList = cardTypeBhv.selectList(cb);
-     *     final ConditionBeanSetupper&lt;OrderCardInfoCB&gt; cbSetupper = new ConditionBeanSetupper&lt;OrderCardInfoCB&gt;() {
-     *         public void setup(OrderCardInfoCB cb) {
-     *             cb.query().setXxx_IsNotNull();
-     *             cb.query().addOrderBy_Yyy_Desc();
-     *         }
-     *     };
-     *     cardTypeBhv.loadOrderCardInfoList(cardTypeList, new LoadRefererOption<OrderCardInfoCB, OrderCardInfo>(cbSetupper));
-     *     - - - - - - - - - -/
-     * 
-     *   The condition-bean that the setupper provides have settings before you touch it. It is as follows:
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     cb.query().setCardTypeId_InScope(pkList);
-     *     cb.query().addOrderBy_CardTypeId_Asc();
-     *     - - - - - - - - - -/
-     * 
-     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
-     * </pre>
-     * 
-     * @param cardTypeList Entity list of cardType. (NotNull)
-     * @param loadRefererOption Load-referer option. (NotNull)
-     */
-    public void loadOrderCardInfoList(java.util.List<CardType> cardTypeList, jp.sf.pal.pompei.allcommon.bhv.load.LoadRefererOption<OrderCardInfoCB, OrderCardInfo> loadRefererOption) {
-        assertObjectNotNull("cardTypeList<CardType>", cardTypeList);
-        assertObjectNotNull("loadRefererOption<OrderCardInfo, OrderCardInfoCB>", loadRefererOption);
-        if (cardTypeList.isEmpty()) {
-            return;
-        }
-
-        final java.util.Map<java.math.BigDecimal, CardType> pkMyEntityMap = new java.util.LinkedHashMap<java.math.BigDecimal, CardType>();
-        final java.util.List<java.math.BigDecimal> pkList = new java.util.ArrayList<java.math.BigDecimal>();
-        for (CardType cardType : cardTypeList) {
-            pkList.add(cardType.getCardTypeId());
-            pkMyEntityMap.put((java.math.BigDecimal)toLowerCaseIfString(cardType.getCardTypeId()), cardType);
-        }
-        final OrderCardInfoBhv refererBhv = getDaoSelector().getBehavior(OrderCardInfoBhv.class);
-        final OrderCardInfoCB cb = loadRefererOption.getRefererConditionBean() != null ? loadRefererOption.getRefererConditionBean() : refererBhv.newMyConditionBean();
-        cb.query().setCardTypeId_InScope(pkList);
-        loadRefererOption.delegateKeyConditionExchangingFirstWhereClauseForLastOne(cb);
-        if (!loadRefererOption.isStopOrderByKey()) {
-            cb.query().addOrderBy_CardTypeId_Asc();
-            cb.getSqlComponentOfOrderByClause().exchangeFirstOrderByElementForLastOne();
-        }
-        loadRefererOption.delegateConditionBeanSettingUp(cb);
-        final java.util.List<OrderCardInfo> reffererList = refererBhv.selectList(cb);
-        loadRefererOption.delegateEntitySettingUp(reffererList);
-
-        final java.util.Map<java.math.BigDecimal, java.util.List<OrderCardInfo>> pkReffererListMap = new java.util.LinkedHashMap<java.math.BigDecimal, java.util.List<OrderCardInfo>>();
-        for (OrderCardInfo reffererEntity : reffererList) {
-            if (!pkReffererListMap.containsKey(toLowerCaseIfString(reffererEntity.getCardTypeId()))) {
-                pkReffererListMap.put((java.math.BigDecimal)toLowerCaseIfString(reffererEntity.getCardTypeId()), new java.util.ArrayList<OrderCardInfo>());
-            }
-            (pkReffererListMap.get(toLowerCaseIfString(reffererEntity.getCardTypeId()))).add(reffererEntity);
-
-            // for Reverse Reference.
-            final CardType myEntity = pkMyEntityMap.get(toLowerCaseIfString(reffererEntity.getCardTypeId()));
-            reffererEntity.setCardType(myEntity);
-        }
-
-        for (CardType cardType : cardTypeList) {
-            if (pkReffererListMap.containsKey(toLowerCaseIfString(cardType.getCardTypeId()))) {
-                cardType.setOrderCardInfoList((java.util.List<OrderCardInfo>)pkReffererListMap.get(toLowerCaseIfString(cardType.getCardTypeId())));
-            } else {
-                cardType.setOrderCardInfoList(new java.util.ArrayList<OrderCardInfo>());
-            }
-        }
-    }
-      
     // ===================================================================================
     //                                                                    Pull Out Foreign
     //                                                                    ================
-    
+  
     // ===================================================================================
     //                                                                 Basic Entity Update
     //                                                                 ===================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -13,8 +13,6 @@
 import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean;
 import jp.sf.pal.pompei.allcommon.dbmeta.DBMeta;
   
-import jp.sf.pal.pompei.exbhv.*;
-  
 import jp.sf.pal.pompei.exdao.*;
 import jp.sf.pal.pompei.exentity.*;
 import jp.sf.pal.pompei.bsentity.dbmeta.*;
@@ -30,19 +28,19 @@
  *     ORDER_CARD_INFO_ID
  * 
  * [column-property]
- *     ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ *     ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
  * 
  * [foreign-property]
- *     cardType
+ *     
  * 
  * [refferer-property]
- *     orderFormList
+ *     
  * 
  * [sequence]
  *     
  * 
  * [identity]
- *     
+ *     orderCardInfoId
  * 
  * [update-date]
  *     
@@ -472,176 +470,10 @@
     //                                                                        Load Referer
     //                                                                        ============
   
-    // /* * * * * * * * * * * * * * * * * * * * * * *
-    //   RefererTable    = [ORDER_FORM]
-    //   RefererProperty = [orderFormList]
-    // * * * * * * * * */
-    
-    /**
-     * Load referer of orderFormList.
-     * <pre>
-     *   You can load referer.
-     * 
-     *   ex) {Client Example}
-     *     final OrderCardInfoCB cb = new OrderCardInfoCB();
-     *     cb.query().setXxx_Equal("xxx");
-     *     final List&lt;OrderCardInfo&gt; orderCardInfoList = orderCardInfoBhv.selectList(cb);
-     *     orderCardInfoBhv.loadOrderFormList(orderCardInfoList);
-     * 
-     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
-     * </pre>
-     * 
-     * @param orderCardInfoList Entity list of orderCardInfo. (NotNull)
-     */
-    public void loadOrderFormList(java.util.List<OrderCardInfo> orderCardInfoList) {
-        final ConditionBeanSetupper<OrderFormCB> conditionBeanSetupper = new ConditionBeanSetupper<OrderFormCB>() {
-            public void setup(OrderFormCB cb) {
-            }
-        };
-        loadOrderFormList(orderCardInfoList, conditionBeanSetupper);
-    }
-
-    /**
-     * Load referer of orderFormList.
-     * <pre>
-     *   You can load referer with your original condition.
-     * 
-     *   ex) {Client Example}: Referer conditions are 'Xxx' is not null and order-by 'Yyy' desc
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     final OrderCardInfoCB cb = new OrderCardInfoCB();
-     *     cb.query().setXxx_Equal("xxx");
-     *     final List&lt;OrderCardInfo&gt; orderCardInfoList = orderCardInfoBhv.selectList(cb);
-     *     final ConditionBeanSetupper&lt;OrderFormCB&gt; conditionBeanSetupper = new ConditionBeanSetupper&lt;OrderFormCB&gt;() {
-     *         public void setup(OrderFormCB cb) {
-     *             cb.query().setXxx_IsNotNull();
-     *             cb.query().addOrderBy_Yyy_Desc();
-     *         }
-     *     };
-     *     orderCardInfoBhv.loadOrderFormList(orderCardInfoList, conditionBeanSetupper);
-     *     - - - - - - - - - -/
-     * 
-     *   The condition-bean that the setupper provides have settings before you touch it. It is as follows:
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     cb.query().setOrderCardInfoId_InScope(pkList);
-     *     cb.query().addOrderBy_OrderCardInfoId_Asc();
-     *     - - - - - - - - - -/
-     * 
-     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
-     * </pre>
-     * 
-     * @param orderCardInfoList Entity list of orderCardInfo. (NotNull)
-     * @param conditionBeanSetupper Referer condition setupper instance for registering referer condition. (NotNull)
-     */
-    public void loadOrderFormList(java.util.List<OrderCardInfo> orderCardInfoList, ConditionBeanSetupper<OrderFormCB> conditionBeanSetupper) {
-        assertObjectNotNull("orderCardInfoList<OrderCardInfo>", orderCardInfoList);
-        assertObjectNotNull("conditionBeanSetupper<OrderFormCB>", conditionBeanSetupper);
-        if (orderCardInfoList.isEmpty()) {
-            return;
-        }
-        loadOrderFormList(orderCardInfoList, new jp.sf.pal.pompei.allcommon.bhv.load.LoadRefererOption<OrderFormCB, OrderForm>(conditionBeanSetupper));
-    }
-
-    /**
-     * Load referer of orderFormList.
-     * <pre>
-     *   You can load referer with your original condition.
-     * 
-     *   ex) {Client Example}: Referer conditions are 'Xxx' is not null and order-by 'Yyy' desc
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     final OrderCardInfoCB cb = new OrderCardInfoCB();
-     *     cb.query().setXxx_Equal("xxx");
-     *     final List&lt;OrderCardInfo&gt; orderCardInfoList = orderCardInfoBhv.selectList(cb);
-     *     final ConditionBeanSetupper&lt;OrderFormCB&gt; cbSetupper = new ConditionBeanSetupper&lt;OrderFormCB&gt;() {
-     *         public void setup(OrderFormCB cb) {
-     *             cb.query().setXxx_IsNotNull();
-     *             cb.query().addOrderBy_Yyy_Desc();
-     *         }
-     *     };
-     *     orderCardInfoBhv.loadOrderFormList(orderCardInfoList, new LoadRefererOption<OrderFormCB, OrderForm>(cbSetupper));
-     *     - - - - - - - - - -/
-     * 
-     *   The condition-bean that the setupper provides have settings before you touch it. It is as follows:
-     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-     *     cb.query().setOrderCardInfoId_InScope(pkList);
-     *     cb.query().addOrderBy_OrderCardInfoId_Asc();
-     *     - - - - - - - - - -/
-     * 
-     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
-     * </pre>
-     * 
-     * @param orderCardInfoList Entity list of orderCardInfo. (NotNull)
-     * @param loadRefererOption Load-referer option. (NotNull)
-     */
-    public void loadOrderFormList(java.util.List<OrderCardInfo> orderCardInfoList, jp.sf.pal.pompei.allcommon.bhv.load.LoadRefererOption<OrderFormCB, OrderForm> loadRefererOption) {
-        assertObjectNotNull("orderCardInfoList<OrderCardInfo>", orderCardInfoList);
-        assertObjectNotNull("loadRefererOption<OrderForm, OrderFormCB>", loadRefererOption);
-        if (orderCardInfoList.isEmpty()) {
-            return;
-        }
-
-        final java.util.Map<java.math.BigDecimal, OrderCardInfo> pkMyEntityMap = new java.util.LinkedHashMap<java.math.BigDecimal, OrderCardInfo>();
-        final java.util.List<java.math.BigDecimal> pkList = new java.util.ArrayList<java.math.BigDecimal>();
-        for (OrderCardInfo orderCardInfo : orderCardInfoList) {
-            pkList.add(orderCardInfo.getOrderCardInfoId());
-            pkMyEntityMap.put((java.math.BigDecimal)toLowerCaseIfString(orderCardInfo.getOrderCardInfoId()), orderCardInfo);
-        }
-        final OrderFormBhv refererBhv = getDaoSelector().getBehavior(OrderFormBhv.class);
-        final OrderFormCB cb = loadRefererOption.getRefererConditionBean() != null ? loadRefererOption.getRefererConditionBean() : refererBhv.newMyConditionBean();
-        cb.query().setOrderCardInfoId_InScope(pkList);
-        loadRefererOption.delegateKeyConditionExchangingFirstWhereClauseForLastOne(cb);
-        if (!loadRefererOption.isStopOrderByKey()) {
-            cb.query().addOrderBy_OrderCardInfoId_Asc();
-            cb.getSqlComponentOfOrderByClause().exchangeFirstOrderByElementForLastOne();
-        }
-        loadRefererOption.delegateConditionBeanSettingUp(cb);
-        final java.util.List<OrderForm> reffererList = refererBhv.selectList(cb);
-        loadRefererOption.delegateEntitySettingUp(reffererList);
-
-        final java.util.Map<java.math.BigDecimal, java.util.List<OrderForm>> pkReffererListMap = new java.util.LinkedHashMap<java.math.BigDecimal, java.util.List<OrderForm>>();
-        for (OrderForm reffererEntity : reffererList) {
-            if (!pkReffererListMap.containsKey(toLowerCaseIfString(reffererEntity.getOrderCardInfoId()))) {
-                pkReffererListMap.put((java.math.BigDecimal)toLowerCaseIfString(reffererEntity.getOrderCardInfoId()), new java.util.ArrayList<OrderForm>());
-            }
-            (pkReffererListMap.get(toLowerCaseIfString(reffererEntity.getOrderCardInfoId()))).add(reffererEntity);
-
-            // for Reverse Reference.
-            final OrderCardInfo myEntity = pkMyEntityMap.get(toLowerCaseIfString(reffererEntity.getOrderCardInfoId()));
-            reffererEntity.setOrderCardInfo(myEntity);
-        }
-
-        for (OrderCardInfo orderCardInfo : orderCardInfoList) {
-            if (pkReffererListMap.containsKey(toLowerCaseIfString(orderCardInfo.getOrderCardInfoId()))) {
-                orderCardInfo.setOrderFormList((java.util.List<OrderForm>)pkReffererListMap.get(toLowerCaseIfString(orderCardInfo.getOrderCardInfoId())));
-            } else {
-                orderCardInfo.setOrderFormList(new java.util.ArrayList<OrderForm>());
-            }
-        }
-    }
-      
     // ===================================================================================
     //                                                                    Pull Out Foreign
     //                                                                    ================
 
-    /**
-     * Pull out the list of foreign table 'CardType'.
-     * 
-     * @param orderCardInfoList The list of orderCardInfo. (NotNull)
-     * @return The list of foreign table. (NotNull)
-     */
-    public java.util.List<CardType> pulloutCardType(java.util.List<OrderCardInfo> orderCardInfoList) {
-        assertObjectNotNull("orderCardInfoList", orderCardInfoList);
-        final java.util.Set<CardType> foreignSet = new java.util.LinkedHashSet<CardType>();
-        for (java.util.Iterator ite = orderCardInfoList.iterator(); ite.hasNext(); ) {
-            final OrderCardInfo orderCardInfo = (OrderCardInfo)ite.next();
-            final CardType foreignEntity = orderCardInfo.getCardType();
-            if (foreignEntity == null || foreignSet.contains(foreignEntity)) {
-                continue;
-            }
-            foreignSet.add(foreignEntity);
-        }
-        return new java.util.ArrayList<CardType>(foreignSet);
-    }
-  
     // ===================================================================================
     //                                                                 Basic Entity Update
     //                                                                 ===================
@@ -807,7 +639,6 @@
         final java.util.Set<String> names = sourceMyEntity.getModifiedPropertyNames();
 
         if (names.contains("orderCardInfoId")) { destinationMyEntity.setOrderCardInfoId(sourceMyEntity.getOrderCardInfoId()); }
-        if (names.contains("cardTypeId")) { destinationMyEntity.setCardTypeId(sourceMyEntity.getCardTypeId()); }
         if (names.contains("cardCode")) { destinationMyEntity.setCardCode(sourceMyEntity.getCardCode()); }
         if (names.contains("cardOwner")) { destinationMyEntity.setCardOwner(sourceMyEntity.getCardOwner()); }
         if (names.contains("cardNumber")) { destinationMyEntity.setCardNumber(sourceMyEntity.getCardNumber()); }
@@ -900,6 +731,30 @@
     // ===================================================================================
     //                                                                      Various Insert
     //                                                                      ==============
+      
+    /* (non-javadoc) 
+     * Copy-insert.
+     * 
+     * @param primaryKey Primary-keys. (NotNull)
+     * @return Inserted count.
+     * @exception jp.sf.pal.pompei.allcommon.exception.RecordHasAlreadyBeenDeletedException
+     */
+    public int copyInsertByPKValueAfterSelect(java.math.BigDecimal orderCardInfoId) {
+        OrderCardInfo entity = new OrderCardInfo();
+        entity.setOrderCardInfoId(orderCardInfoId);
+        final OrderCardInfoCB cb = newMyConditionBean();
+        cb.acceptPrimaryKeyMapString(getDBMeta().extractPrimaryKeyMapString(entity));
+        final OrderCardInfo currentEntity = selectEntityWithDeletedCheck(cb);
+        return delegateInsert(currentEntity);
+    }
+    
+    /**
+     * Filter 'copy-insert' entity.
+     * 
+     * @param orderCardInfo Entity. (NotNull)
+     */
+    protected void filterCopyInsertEntity(OrderCardInfo orderCardInfo) {
+    }
   
     // ===================================================================================
     //                                                                           Hierarchy

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -33,7 +33,7 @@
  *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
  * 
  * [foreign-property]
- *     currency, customer, deliveryMethod, orderCardInfo, orderStatus, paymentMethod
+ *     currency, customer, deliveryMethod, orderStatus, paymentMethod
  * 
  * [refferer-property]
  *     orderCommentList, orderProductList, orderProductAttributeList, orderProductDownloadList, orderStatusHistoryList
@@ -1267,26 +1267,6 @@
     }
 
     /**
-     * Pull out the list of foreign table 'OrderCardInfo'.
-     * 
-     * @param orderFormList The list of orderForm. (NotNull)
-     * @return The list of foreign table. (NotNull)
-     */
-    public java.util.List<OrderCardInfo> pulloutOrderCardInfo(java.util.List<OrderForm> orderFormList) {
-        assertObjectNotNull("orderFormList", orderFormList);
-        final java.util.Set<OrderCardInfo> foreignSet = new java.util.LinkedHashSet<OrderCardInfo>();
-        for (java.util.Iterator ite = orderFormList.iterator(); ite.hasNext(); ) {
-            final OrderForm orderForm = (OrderForm)ite.next();
-            final OrderCardInfo foreignEntity = orderForm.getOrderCardInfo();
-            if (foreignEntity == null || foreignSet.contains(foreignEntity)) {
-                continue;
-            }
-            foreignSet.add(foreignEntity);
-        }
-        return new java.util.ArrayList<OrderCardInfo>(foreignSet);
-    }
-
-    /**
      * Pull out the list of foreign table 'OrderStatus'.
      * 
      * @param orderFormList The list of orderForm. (NotNull)

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCardTypeDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCardTypeDao.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCardTypeDao.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -17,7 +17,7 @@
  *     
  * 
  * [refferer-property]
- *     cardTypeDescriptionList, orderCardInfoList
+ *     cardTypeDescriptionList
  * 
  * [sequence]
  *     

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -11,19 +11,19 @@
  *     ORDER_CARD_INFO_ID
  * 
  * [column-property]
- *     ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ *     ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
  * 
  * [foreign-property]
- *     cardType
+ *     
  * 
  * [refferer-property]
- *     orderFormList
+ *     
  * 
  * [sequence]
  *     
  * 
  * [identity]
- *     
+ *     orderCardInfoId
  * 
  * [update-date]
  *     
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES from ORDER_CARD_INFO";
+    public static final String getListAll_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES from ORDER_CARD_INFO";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<OrderCardInfo> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES from ORDER_CARD_INFO where ORDER_CARD_INFO.ORDER_CARD_INFO_ID = /*orderCardInfoId*/null";
+    public static final String getEntity_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES from ORDER_CARD_INFO where ORDER_CARD_INFO.ORDER_CARD_INFO_ID = /*orderCardInfoId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "orderCardInfoId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -14,7 +14,7 @@
  *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
  * 
  * [foreign-property]
- *     currency, customer, deliveryMethod, orderCardInfo, orderStatus, paymentMethod
+ *     currency, customer, deliveryMethod, orderStatus, paymentMethod
  * 
  * [refferer-property]
  *     orderCommentList, orderProductList, orderProductAttributeList, orderProductDownloadList, orderStatusHistoryList

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -20,7 +20,7 @@
  *     
  * 
  * [refferer-property]
- *     cardTypeDescriptionList, orderCardInfoList
+ *     cardTypeDescriptionList
  * 
  * [sequence]
  *     
@@ -309,35 +309,6 @@
         this._childrenCardTypeDescriptionList = cardTypeDescriptionList;
     }
   
-  
-    // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-    //   RefererTable    = [ORDER_CARD_INFO(TABLE)]
-    //   RefererProperty = [orderCardInfoList]
-    // * * * * * * * * */
-
-      
-    /** The list of referer table. */
-    protected java.util.List<jp.sf.pal.pompei.exentity.OrderCardInfo> _childrenOrderCardInfoList;
-
-    /**
-     * Get the list of referer table. {without lazyload}
-     * If it's not loaded yet, returns null.
-     * 
-     * @return The list of referer table. (Nullable)
-     */
-    public java.util.List<jp.sf.pal.pompei.exentity.OrderCardInfo> getOrderCardInfoList() {
-        return _childrenOrderCardInfoList;
-    }
-
-    /**
-     * Set the list of referer table.
-     * 
-     * @param orderCardInfoList The list of refferer table. (Nullable)
-     */
-    public void setOrderCardInfoList(java.util.List<jp.sf.pal.pompei.exentity.OrderCardInfo> orderCardInfoList) {
-        this._childrenOrderCardInfoList = orderCardInfoList;
-    }
-  
     // ===================================================================================
     //                                                                       Determination
     //                                                                       =============

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -14,19 +14,19 @@
  *     ORDER_CARD_INFO_ID
  * 
  * [column-property]
- *     ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ *     ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
  * 
  * [foreign-property]
- *     cardType
+ *     
  * 
  * [refferer-property]
- *     orderFormList
+ *     
  * 
  * [sequence]
  *     
  * 
  * [identity]
- *     
+ *     orderCardInfoId
  * 
  * [update-date]
  *     
@@ -47,6 +47,9 @@
     /** TABLE-Annotation for S2Dao. The value is ORDER_CARD_INFO. */
     public static final String TABLE = "ORDER_CARD_INFO";
 
+    
+    /** ID-Annotation */
+    public static final String orderCardInfoId_ID = "identity";
 
     // ===================================================================================
     //                                                                           Attribute
@@ -54,22 +57,19 @@
     /** Entity modified properties. (for S2Dao) */
     protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties();
 
-    /** The value of orderCardInfoId. PK : BIGINT : NotNull */
+    /** The value of orderCardInfoId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     protected java.math.BigDecimal _orderCardInfoId;
 
-    /** The value of cardTypeId. INTEGER : FK to CARD_TYPE */
-    protected java.math.BigDecimal _cardTypeId;
-
-    /** The value of cardCode. VARCHAR(32) */
+    /** The value of cardCode. VARCHAR(32) : NotNull */
     protected String _cardCode;
 
-    /** The value of cardOwner. VARCHAR(255) */
+    /** The value of cardOwner. VARCHAR(255) : NotNull */
     protected String _cardOwner;
 
-    /** The value of cardNumber. VARCHAR(255) */
+    /** The value of cardNumber. VARCHAR(255) : NotNull */
     protected String _cardNumber;
 
-    /** The value of cardExpires. VARCHAR(255) */
+    /** The value of cardExpires. VARCHAR(255) : NotNull */
     protected String _cardExpires;
 
     // ===================================================================================
@@ -137,12 +137,12 @@
     //                                                                            Accessor
     //                                                                            ========
 
-    /** Column Annotation for S2Dao. PK : BIGINT : NotNull */
+    /** Column Annotation for S2Dao. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String orderCardInfoId_COLUMN = "ORDER_CARD_INFO_ID";
 
     /**
      * Get the value of orderCardInfoId. <br />
-     * {PK : BIGINT : NotNull}
+     * {PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT]}
      * 
      * @return The value of orderCardInfoId. (Nullable)
      */
@@ -152,7 +152,7 @@
 
     /**
      * Set the value of orderCardInfoId. <br />
-     * {PK : BIGINT : NotNull}
+     * {PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT]}
      * 
      * @param orderCardInfoId The value of orderCardInfoId. (Nullable)
      */
@@ -161,36 +161,12 @@
         this._orderCardInfoId = orderCardInfoId;
     }
 
-    /** Column Annotation for S2Dao. INTEGER : FK to CARD_TYPE */
-    public static final String cardTypeId_COLUMN = "CARD_TYPE_ID";
-
-    /**
-     * Get the value of cardTypeId. <br />
-     * {INTEGER : FK to CARD_TYPE}
-     * 
-     * @return The value of cardTypeId. (Nullable)
-     */
-    public java.math.BigDecimal getCardTypeId() {
-        return _cardTypeId;
-    }
-
-    /**
-     * Set the value of cardTypeId. <br />
-     * {INTEGER : FK to CARD_TYPE}
-     * 
-     * @param cardTypeId The value of cardTypeId. (Nullable)
-     */
-    public void setCardTypeId(java.math.BigDecimal cardTypeId) {
-        _modifiedProperties.addPropertyName("cardTypeId");
-        this._cardTypeId = cardTypeId;
-    }
-
-    /** Column Annotation for S2Dao. VARCHAR(32) */
+    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
     public static final String cardCode_COLUMN = "CARD_CODE";
 
     /**
      * Get the value of cardCode. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(32) : NotNull}
      * 
      * @return The value of cardCode. (Nullable)
      */
@@ -200,7 +176,7 @@
 
     /**
      * Set the value of cardCode. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(32) : NotNull}
      * 
      * @param cardCode The value of cardCode. (Nullable)
      */
@@ -209,12 +185,12 @@
         this._cardCode = cardCode;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(255) */
+    /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */
     public static final String cardOwner_COLUMN = "CARD_OWNER";
 
     /**
      * Get the value of cardOwner. <br />
-     * {VARCHAR(255)}
+     * {VARCHAR(255) : NotNull}
      * 
      * @return The value of cardOwner. (Nullable)
      */
@@ -224,7 +200,7 @@
 
     /**
      * Set the value of cardOwner. <br />
-     * {VARCHAR(255)}
+     * {VARCHAR(255) : NotNull}
      * 
      * @param cardOwner The value of cardOwner. (Nullable)
      */
@@ -233,12 +209,12 @@
         this._cardOwner = cardOwner;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(255) */
+    /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */
     public static final String cardNumber_COLUMN = "CARD_NUMBER";
 
     /**
      * Get the value of cardNumber. <br />
-     * {VARCHAR(255)}
+     * {VARCHAR(255) : NotNull}
      * 
      * @return The value of cardNumber. (Nullable)
      */
@@ -248,7 +224,7 @@
 
     /**
      * Set the value of cardNumber. <br />
-     * {VARCHAR(255)}
+     * {VARCHAR(255) : NotNull}
      * 
      * @param cardNumber The value of cardNumber. (Nullable)
      */
@@ -257,12 +233,12 @@
         this._cardNumber = cardNumber;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(255) */
+    /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */
     public static final String cardExpires_COLUMN = "CARD_EXPIRES";
 
     /**
      * Get the value of cardExpires. <br />
-     * {VARCHAR(255)}
+     * {VARCHAR(255) : NotNull}
      * 
      * @return The value of cardExpires. (Nullable)
      */
@@ -272,7 +248,7 @@
 
     /**
      * Set the value of cardExpires. <br />
-     * {VARCHAR(255)}
+     * {VARCHAR(255) : NotNull}
      * 
      * @param cardExpires The value of cardExpires. (Nullable)
      */
@@ -285,104 +261,25 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-            
+          
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-            
+          
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-            
+          
 
     // ===================================================================================
     //                                                                       Foreign Table
     //                                                                       =============
 
-    // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-    //   ForeignTable    = [CARD_TYPE(TABLE)]
-    //   ForeignProperty = [cardType]
-    // * * * * * * * * */
-
-    /** RELNO of foreign table for s2dao. */
-    public static final int cardType_RELNO = 0;
-
-    /** RELKEYS of foreign table for s2dao. */
-    public static final String cardType_RELKEYS = "CARD_TYPE_ID:CARD_TYPE_ID";
-
-    /** The entity of foreign table. */
-    protected jp.sf.pal.pompei.exentity.CardType _parentCardType;
-
-    /**
-     * Get the entity of foreign table of cardType. {without lazyload}
-     * 
-     * @return The entity of foreign table. (Nullable: If the foreign key does not have NotNull-constraint, please check null.)
-     */
-    public jp.sf.pal.pompei.exentity.CardType getCardType() {
-        return _parentCardType;
-    }
-
-    /**
-     * Set the entity of foreign table of cardType.
-     * 
-     * @param cardType The entity of foreign table. (Nullable)
-     */
-    public void setCardType(jp.sf.pal.pompei.exentity.CardType cardType) {
-        this._parentCardType = cardType;
-    }
-
-    /**
-     * Has relation object of cardType.
-     * 
-     * @return Determination.
-     */
-    public boolean hasRelationCardType() {
-        return _parentCardType != null && _parentCardType.hasPrimaryKeyValue();
-    }
-
-    /**
-     * Trace relation object (for read) of cardType.
-     * 
-     * @return The entity of foreign table. (NotNull: If the object is nul, it returns new empty entity as read-only.)
-     */
-    public jp.sf.pal.pompei.exentity.CardType traceCardType() {
-        return _parentCardType != null ? _parentCardType : new jp.sf.pal.pompei.exentity.CardType();
-    }
-  
     // ===================================================================================
     //                                                                       Referer Table
     //                                                                       =============
 
-  
-    // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-    //   RefererTable    = [ORDER_FORM(TABLE)]
-    //   RefererProperty = [orderFormList]
-    // * * * * * * * * */
-
-      
-    /** The list of referer table. */
-    protected java.util.List<jp.sf.pal.pompei.exentity.OrderForm> _childrenOrderFormList;
-
-    /**
-     * Get the list of referer table. {without lazyload}
-     * If it's not loaded yet, returns null.
-     * 
-     * @return The list of referer table. (Nullable)
-     */
-    public java.util.List<jp.sf.pal.pompei.exentity.OrderForm> getOrderFormList() {
-        return _childrenOrderFormList;
-    }
-
-    /**
-     * Set the list of referer table.
-     * 
-     * @param orderFormList The list of refferer table. (Nullable)
-     */
-    public void setOrderFormList(java.util.List<jp.sf.pal.pompei.exentity.OrderForm> orderFormList) {
-        this._childrenOrderFormList = orderFormList;
-    }
-  
     // ===================================================================================
     //                                                                       Determination
     //                                                                       =============
@@ -481,7 +378,6 @@
         final StringBuffer sb = new StringBuffer();
 
         sb.append(delimiter).append(getOrderCardInfoId());
-        sb.append(delimiter).append(getCardTypeId());
         sb.append(delimiter).append(getCardCode());
         sb.append(delimiter).append(getCardOwner());
         sb.append(delimiter).append(getCardNumber());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -17,7 +17,7 @@
  *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
  * 
  * [foreign-property]
- *     currency, customer, deliveryMethod, orderCardInfo, orderStatus, paymentMethod
+ *     currency, customer, deliveryMethod, orderStatus, paymentMethod
  * 
  * [refferer-property]
  *     orderCommentList, orderProductList, orderProductAttributeList, orderProductDownloadList, orderStatusHistoryList
@@ -186,7 +186,7 @@
     /** The value of paymentMethodCode. CHAR(16) : NotNull */
     protected String _paymentMethodCode;
 
-    /** The value of orderCardInfoId. BIGINT : FK to ORDER_CARD_INFO */
+    /** The value of orderCardInfoId. BIGINT */
     protected java.math.BigDecimal _orderCardInfoId;
 
     /** The value of deliveryMethodId. INTEGER : FK to DELIVERY_METHOD */
@@ -1319,12 +1319,12 @@
         this._paymentMethodCode = paymentMethodCode;
     }
 
-    /** Column Annotation for S2Dao. BIGINT : FK to ORDER_CARD_INFO */
+    /** Column Annotation for S2Dao. BIGINT */
     public static final String orderCardInfoId_COLUMN = "ORDER_CARD_INFO_ID";
 
     /**
      * Get the value of orderCardInfoId. <br />
-     * {BIGINT : FK to ORDER_CARD_INFO}
+     * {BIGINT}
      * 
      * @return The value of orderCardInfoId. (Nullable)
      */
@@ -1334,7 +1334,7 @@
 
     /**
      * Set the value of orderCardInfoId. <br />
-     * {BIGINT : FK to ORDER_CARD_INFO}
+     * {BIGINT}
      * 
      * @param orderCardInfoId The value of orderCardInfoId. (Nullable)
      */
@@ -1777,62 +1777,12 @@
     }
   
     // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-    //   ForeignTable    = [ORDER_CARD_INFO(TABLE)]
-    //   ForeignProperty = [orderCardInfo]
-    // * * * * * * * * */
-
-    /** RELNO of foreign table for s2dao. */
-    public static final int orderCardInfo_RELNO = 3;
-
-    /** RELKEYS of foreign table for s2dao. */
-    public static final String orderCardInfo_RELKEYS = "ORDER_CARD_INFO_ID:ORDER_CARD_INFO_ID";
-
-    /** The entity of foreign table. */
-    protected jp.sf.pal.pompei.exentity.OrderCardInfo _parentOrderCardInfo;
-
-    /**
-     * Get the entity of foreign table of orderCardInfo. {without lazyload}
-     * 
-     * @return The entity of foreign table. (Nullable: If the foreign key does not have NotNull-constraint, please check null.)
-     */
-    public jp.sf.pal.pompei.exentity.OrderCardInfo getOrderCardInfo() {
-        return _parentOrderCardInfo;
-    }
-
-    /**
-     * Set the entity of foreign table of orderCardInfo.
-     * 
-     * @param orderCardInfo The entity of foreign table. (Nullable)
-     */
-    public void setOrderCardInfo(jp.sf.pal.pompei.exentity.OrderCardInfo orderCardInfo) {
-        this._parentOrderCardInfo = orderCardInfo;
-    }
-
-    /**
-     * Has relation object of orderCardInfo.
-     * 
-     * @return Determination.
-     */
-    public boolean hasRelationOrderCardInfo() {
-        return _parentOrderCardInfo != null && _parentOrderCardInfo.hasPrimaryKeyValue();
-    }
-
-    /**
-     * Trace relation object (for read) of orderCardInfo.
-     * 
-     * @return The entity of foreign table. (NotNull: If the object is nul, it returns new empty entity as read-only.)
-     */
-    public jp.sf.pal.pompei.exentity.OrderCardInfo traceOrderCardInfo() {
-        return _parentOrderCardInfo != null ? _parentOrderCardInfo : new jp.sf.pal.pompei.exentity.OrderCardInfo();
-    }
-  
-    // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
     //   ForeignTable    = [ORDER_STATUS(TABLE)]
     //   ForeignProperty = [orderStatus]
     // * * * * * * * * */
 
     /** RELNO of foreign table for s2dao. */
-    public static final int orderStatus_RELNO = 4;
+    public static final int orderStatus_RELNO = 3;
 
     /** RELKEYS of foreign table for s2dao. */
     public static final String orderStatus_RELKEYS = "ORDER_STATUS_ID:ORDER_STATUS_ID";
@@ -1882,7 +1832,7 @@
     // * * * * * * * * */
 
     /** RELNO of foreign table for s2dao. */
-    public static final int paymentMethod_RELNO = 5;
+    public static final int paymentMethod_RELNO = 4;
 
     /** RELKEYS of foreign table for s2dao. */
     public static final String paymentMethod_RELKEYS = "PAYMENT_METHOD_ID:PAYMENT_METHOD_ID";
@@ -1937,7 +1887,7 @@
     // * * * * * * * * */
 
     /** RELNO of foreign table for s2dao. */
-    public static final int orderCommentAsOne_RELNO = 6;
+    public static final int orderCommentAsOne_RELNO = 5;
 
     /** RELKEYS of foreign table for s2dao. */
     public static final String orderCommentAsOne_RELKEYS = "ORDER_FORM_ID:ORDER_FORM_ID";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -22,7 +22,7 @@
  *     
  * 
  * [refferer-property]
- *     cardTypeDescriptionList, orderCardInfoList
+ *     cardTypeDescriptionList
  * 
  * [sequence]
  *     
@@ -189,17 +189,11 @@
     //                                          ------------
     /** The referer property name(JavaBeansRule) of cardTypeDescriptionList. */
     public static final String REFERER_PROPERTY_NAME_cardTypeDescriptionList = "cardTypeDescriptionList";
-    /** The referer property name(JavaBeansRule) of orderCardInfoList. */
-    public static final String REFERER_PROPERTY_NAME_orderCardInfoList = "orderCardInfoList";
     /** @deprecated Use REFERER_NAME_cardTypeDescriptionList */
     public static final String REFERER_CAP_PROP_NAME_CardTypeDescriptionList = "CardTypeDescriptionList";
-    /** @deprecated Use REFERER_NAME_orderCardInfoList */
-    public static final String REFERER_CAP_PROP_NAME_OrderCardInfoList = "OrderCardInfoList";
 
     /** @deprecated Use REFERER_NAME_cardTypeDescriptionList */
     public static final String REFERER_UNCAP_PROP_NAME_cardTypeDescriptionList = "cardTypeDescriptionList";
-    /** @deprecated Use REFERER_NAME_orderCardInfoList */
-    public static final String REFERER_UNCAP_PROP_NAME_orderCardInfoList = "orderCardInfoList";
 
     /** The map of {db-name : prop-name} key-to-lower. */
     private static java.util.Map<String, String> _dbNamePropertyNameKeyToLowerMap;
@@ -726,22 +720,6 @@
         refererInfo.setOneToOne(false);
         return refererInfo;
     }
-    /**
-     * Get referer information of orderCardInfoList.
-     * 
-     * @return Referer information. (NotNull)
-     */
-    public jp.sf.pal.pompei.allcommon.dbmeta.info.RefererInfo refererOrderCardInfoList() {
-        final jp.sf.pal.pompei.allcommon.dbmeta.info.RefererInfo refererInfo = new jp.sf.pal.pompei.allcommon.dbmeta.info.RefererInfo();
-        refererInfo.setRefererPropertyName("orderCardInfoList");
-        refererInfo.setLocalDBMeta(CardTypeDbm.getInstance());
-        refererInfo.setRefererDBMeta(OrderCardInfoDbm.getInstance());
-        final java.util.Map<ColumnInfo, ColumnInfo> map = new java.util.LinkedHashMap<ColumnInfo, ColumnInfo>();
-        map.put(columnCardTypeId(), OrderCardInfoDbm.getInstance().columnCardTypeId());
-        refererInfo.setLocalRefererColumnInfoMap(map);
-        refererInfo.setOneToOne(false);
-        return refererInfo;
-    }
 
     // -----------------------------------------------------
     //                                        Relation Trace
@@ -790,17 +768,12 @@
         public CardTypeRelationTrace(java.util.List<RelationInfo> relationList, java.util.List<AbstractRelationTrace> relationTraceList) {
             super(relationList, relationTraceList);
         }
-    
+  
         public CardTypeDescriptionDbm.CardTypeDescriptionRelationTrace refererCardTypeDescriptionList() {
             _relationList.add(CardTypeDbm.getInstance().refererCardTypeDescriptionList());
             return CardTypeDescriptionDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);
         }
 
-        public OrderCardInfoDbm.OrderCardInfoRelationTrace refererOrderCardInfoList() {
-            _relationList.add(CardTypeDbm.getInstance().refererOrderCardInfoList());
-            return OrderCardInfoDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);
-        }
-
         public RelationTrace columnCardTypeId() { return fixTrace(_relationList, CardTypeDbm.getInstance().columnCardTypeId()); }
         public RelationTrace columnCode() { return fixTrace(_relationList, CardTypeDbm.getInstance().columnCode()); }
         public RelationTrace columnSortOrder() { return fixTrace(_relationList, CardTypeDbm.getInstance().columnSortOrder()); }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -16,19 +16,19 @@
  *     ORDER_CARD_INFO_ID
  * 
  * [column-property]
- *     ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
+ *     ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES
  * 
  * [foreign-property]
- *     cardType
+ *     
  * 
  * [refferer-property]
- *     orderFormList
+ *     
  * 
  * [sequence]
  *     
  * 
  * [identity]
- *     
+ *     orderCardInfoId
  * 
  * [update-date]
  *     
@@ -93,23 +93,19 @@
     // -----------------------------------------------------
     //                                        Column DB-Name
     //                                        --------------
-    /** Db-name of ORDER_CARD_INFO_ID. PK : BIGINT : NotNull */
+    /** Db-name of ORDER_CARD_INFO_ID. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String DB_NAME_ORDER_CARD_INFO_ID = "ORDER_CARD_INFO_ID";
-    /** Db-name of CARD_TYPE_ID. INTEGER : FK to CARD_TYPE */
-    public static final String DB_NAME_CARD_TYPE_ID = "CARD_TYPE_ID";
-    /** Db-name of CARD_CODE. VARCHAR(32) */
+    /** Db-name of CARD_CODE. VARCHAR(32) : NotNull */
     public static final String DB_NAME_CARD_CODE = "CARD_CODE";
-    /** Db-name of CARD_OWNER. VARCHAR(255) */
+    /** Db-name of CARD_OWNER. VARCHAR(255) : NotNull */
     public static final String DB_NAME_CARD_OWNER = "CARD_OWNER";
-    /** Db-name of CARD_NUMBER. VARCHAR(255) */
+    /** Db-name of CARD_NUMBER. VARCHAR(255) : NotNull */
     public static final String DB_NAME_CARD_NUMBER = "CARD_NUMBER";
-    /** Db-name of CARD_EXPIRES. VARCHAR(255) */
+    /** Db-name of CARD_EXPIRES. VARCHAR(255) : NotNull */
     public static final String DB_NAME_CARD_EXPIRES = "CARD_EXPIRES";
 
     /** @deprecated Deprecated! So use DB_NAME_OrderCardInfoId. */
     public static final String COLUMN_DB_NAME_OF_OrderCardInfoId = "ORDER_CARD_INFO_ID";
-    /** @deprecated Deprecated! So use DB_NAME_CardTypeId. */
-    public static final String COLUMN_DB_NAME_OF_CardTypeId = "CARD_TYPE_ID";
     /** @deprecated Deprecated! So use DB_NAME_CardCode. */
     public static final String COLUMN_DB_NAME_OF_CardCode = "CARD_CODE";
     /** @deprecated Deprecated! So use DB_NAME_CardOwner. */
@@ -122,39 +118,33 @@
     // -----------------------------------------------------
     //                       Column Prop-Name(JavaBeansRule)
     //                       -------------------------------
-    /** Prop-name(JavaBeansRule) of orderCardInfoId. PK : BIGINT : NotNull */
+    /** Prop-name(JavaBeansRule) of orderCardInfoId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String PROPERTY_NAME_orderCardInfoId = "orderCardInfoId";
-    /** Prop-name(JavaBeansRule) of cardTypeId. INTEGER : FK to CARD_TYPE */
-    public static final String PROPERTY_NAME_cardTypeId = "cardTypeId";
-    /** Prop-name(JavaBeansRule) of cardCode. VARCHAR(32) */
+    /** Prop-name(JavaBeansRule) of cardCode. VARCHAR(32) : NotNull */
     public static final String PROPERTY_NAME_cardCode = "cardCode";
-    /** Prop-name(JavaBeansRule) of cardOwner. VARCHAR(255) */
+    /** Prop-name(JavaBeansRule) of cardOwner. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_cardOwner = "cardOwner";
-    /** Prop-name(JavaBeansRule) of cardNumber. VARCHAR(255) */
+    /** Prop-name(JavaBeansRule) of cardNumber. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_cardNumber = "cardNumber";
-    /** Prop-name(JavaBeansRule) of cardExpires. VARCHAR(255) */
+    /** Prop-name(JavaBeansRule) of cardExpires. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_cardExpires = "cardExpires";
 
     // -----------------------------------------------------
     //                                  Column Cap-Prop-Name
     //                                  --------------------
-    /** Cap-prop-name of orderCardInfoId. PK : BIGINT : NotNull */
+    /** Cap-prop-name of orderCardInfoId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String CAP_PROP_NAME_OrderCardInfoId = "OrderCardInfoId";
-    /** Cap-prop-name of cardTypeId. INTEGER : FK to CARD_TYPE */
-    public static final String CAP_PROP_NAME_CardTypeId = "CardTypeId";
-    /** Cap-prop-name of cardCode. VARCHAR(32) */
+    /** Cap-prop-name of cardCode. VARCHAR(32) : NotNull */
     public static final String CAP_PROP_NAME_CardCode = "CardCode";
-    /** Cap-prop-name of cardOwner. VARCHAR(255) */
+    /** Cap-prop-name of cardOwner. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_CardOwner = "CardOwner";
-    /** Cap-prop-name of cardNumber. VARCHAR(255) */
+    /** Cap-prop-name of cardNumber. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_CardNumber = "CardNumber";
-    /** Cap-prop-name of cardExpires. VARCHAR(255) */
+    /** Cap-prop-name of cardExpires. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_CardExpires = "CardExpires";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderCardInfoId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_OrderCardInfoId = "OrderCardInfoId";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_CardTypeId. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_CardTypeId = "CardTypeId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CardCode. */
     public static final String COLUMN_CAP_PROP_NAME_OF_CardCode = "CardCode";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CardOwner. */
@@ -167,23 +157,19 @@
     // -----------------------------------------------------
     //                                Column Uncap-Prop-Name
     //                                ----------------------
-    /** Uncap-prop-name of orderCardInfoId. PK : BIGINT : NotNull */
+    /** Uncap-prop-name of orderCardInfoId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String UNCAP_PROP_NAME_orderCardInfoId = "orderCardInfoId";
-    /** Uncap-prop-name of cardTypeId. INTEGER : FK to CARD_TYPE */
-    public static final String UNCAP_PROP_NAME_cardTypeId = "cardTypeId";
-    /** Uncap-prop-name of cardCode. VARCHAR(32) */
+    /** Uncap-prop-name of cardCode. VARCHAR(32) : NotNull */
     public static final String UNCAP_PROP_NAME_cardCode = "cardCode";
-    /** Uncap-prop-name of cardOwner. VARCHAR(255) */
+    /** Uncap-prop-name of cardOwner. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_cardOwner = "cardOwner";
-    /** Uncap-prop-name of cardNumber. VARCHAR(255) */
+    /** Uncap-prop-name of cardNumber. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_cardNumber = "cardNumber";
-    /** Uncap-prop-name of cardExpires. VARCHAR(255) */
+    /** Uncap-prop-name of cardExpires. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_cardExpires = "cardExpires";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderCardInfoId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderCardInfoId = "orderCardInfoId";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardTypeId. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_CardTypeId = "cardTypeId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardCode. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CardCode = "cardCode";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardOwner. */
@@ -196,24 +182,12 @@
     // -----------------------------------------------------
     //                                          Foreign Name
     //                                          ------------
-    /** The foreign property name(JavaBeansRule) of cardType. */
-    public static final String FOREIGN_PROPERTY_NAME_cardType = "cardType";
-    /** @deprecated Use FOREIGN_NAME_cardType. */
-    public static final String FOREIGN_CAP_PROP_NAME_CardType = "CardType";
 
-    /** @deprecated Use FOREIGN_NAME_cardType. */
-    public static final String FOREIGN_UNCAP_PROP_NAME_cardType = "cardType";
 
     // -----------------------------------------------------
     //                                          Referer Name
     //                                          ------------
-    /** The referer property name(JavaBeansRule) of orderFormList. */
-    public static final String REFERER_PROPERTY_NAME_orderFormList = "orderFormList";
-    /** @deprecated Use REFERER_NAME_orderFormList */
-    public static final String REFERER_CAP_PROP_NAME_OrderFormList = "OrderFormList";
 
-    /** @deprecated Use REFERER_NAME_orderFormList */
-    public static final String REFERER_UNCAP_PROP_NAME_orderFormList = "orderFormList";
 
     /** The map of {db-name : prop-name} key-to-lower. */
     private static java.util.Map<String, String> _dbNamePropertyNameKeyToLowerMap;
@@ -225,7 +199,6 @@
         map.put(TABLE_DB_NAME.toLowerCase(), TABLE_PROPERTY_NAME);
 
         map.put(DB_NAME_ORDER_CARD_INFO_ID.toLowerCase(), PROPERTY_NAME_orderCardInfoId);
-        map.put(DB_NAME_CARD_TYPE_ID.toLowerCase(), PROPERTY_NAME_cardTypeId);
         map.put(DB_NAME_CARD_CODE.toLowerCase(), PROPERTY_NAME_cardCode);
         map.put(DB_NAME_CARD_OWNER.toLowerCase(), PROPERTY_NAME_cardOwner);
         map.put(DB_NAME_CARD_NUMBER.toLowerCase(), PROPERTY_NAME_cardNumber);
@@ -245,7 +218,6 @@
         map.put(TABLE_PROPERTY_NAME.toLowerCase(), TABLE_DB_NAME);
 
         map.put(PROPERTY_NAME_orderCardInfoId.toLowerCase(), DB_NAME_ORDER_CARD_INFO_ID);
-        map.put(PROPERTY_NAME_cardTypeId.toLowerCase(), DB_NAME_CARD_TYPE_ID);
         map.put(PROPERTY_NAME_cardCode.toLowerCase(), DB_NAME_CARD_CODE);
         map.put(PROPERTY_NAME_cardOwner.toLowerCase(), DB_NAME_CARD_OWNER);
         map.put(PROPERTY_NAME_cardNumber.toLowerCase(), DB_NAME_CARD_NUMBER);
@@ -267,7 +239,6 @@
         map.put(TABLE_DB_NAME, TABLE_CAP_PROP_NAME);
 
         map.put(DB_NAME_ORDER_CARD_INFO_ID, CAP_PROP_NAME_OrderCardInfoId);
-        map.put(DB_NAME_CARD_TYPE_ID, CAP_PROP_NAME_CardTypeId);
         map.put(DB_NAME_CARD_CODE, CAP_PROP_NAME_CardCode);
         map.put(DB_NAME_CARD_OWNER, CAP_PROP_NAME_CardOwner);
         map.put(DB_NAME_CARD_NUMBER, CAP_PROP_NAME_CardNumber);
@@ -289,7 +260,6 @@
         map.put(TABLE_DB_NAME, TABLE_UNCAP_PROP_NAME);
 
         map.put(DB_NAME_ORDER_CARD_INFO_ID, UNCAP_PROP_NAME_orderCardInfoId);
-        map.put(DB_NAME_CARD_TYPE_ID, UNCAP_PROP_NAME_cardTypeId);
         map.put(DB_NAME_CARD_CODE, UNCAP_PROP_NAME_cardCode);
         map.put(DB_NAME_CARD_OWNER, UNCAP_PROP_NAME_cardOwner);
         map.put(DB_NAME_CARD_NUMBER, UNCAP_PROP_NAME_cardNumber);
@@ -311,7 +281,6 @@
         map.put(TABLE_CAP_PROP_NAME, TABLE_DB_NAME);
 
         map.put(CAP_PROP_NAME_OrderCardInfoId, DB_NAME_ORDER_CARD_INFO_ID);
-        map.put(CAP_PROP_NAME_CardTypeId, DB_NAME_CARD_TYPE_ID);
         map.put(CAP_PROP_NAME_CardCode, DB_NAME_CARD_CODE);
         map.put(CAP_PROP_NAME_CardOwner, DB_NAME_CARD_OWNER);
         map.put(CAP_PROP_NAME_CardNumber, DB_NAME_CARD_NUMBER);
@@ -333,7 +302,6 @@
         map.put(TABLE_CAP_PROP_NAME, TABLE_UNCAP_PROP_NAME);
 
         map.put(CAP_PROP_NAME_OrderCardInfoId, UNCAP_PROP_NAME_orderCardInfoId);
-        map.put(CAP_PROP_NAME_CardTypeId, UNCAP_PROP_NAME_cardTypeId);
         map.put(CAP_PROP_NAME_CardCode, UNCAP_PROP_NAME_cardCode);
         map.put(CAP_PROP_NAME_CardOwner, UNCAP_PROP_NAME_cardOwner);
         map.put(CAP_PROP_NAME_CardNumber, UNCAP_PROP_NAME_cardNumber);
@@ -355,7 +323,6 @@
         map.put(TABLE_UNCAP_PROP_NAME, TABLE_DB_NAME);
 
         map.put(UNCAP_PROP_NAME_orderCardInfoId, DB_NAME_ORDER_CARD_INFO_ID);
-        map.put(UNCAP_PROP_NAME_cardTypeId, DB_NAME_CARD_TYPE_ID);
         map.put(UNCAP_PROP_NAME_cardCode, DB_NAME_CARD_CODE);
         map.put(UNCAP_PROP_NAME_cardOwner, DB_NAME_CARD_OWNER);
         map.put(UNCAP_PROP_NAME_cardNumber, DB_NAME_CARD_NUMBER);
@@ -377,7 +344,6 @@
         map.put(TABLE_UNCAP_PROP_NAME, TABLE_CAP_PROP_NAME);
 
         map.put(UNCAP_PROP_NAME_orderCardInfoId, CAP_PROP_NAME_OrderCardInfoId);
-        map.put(UNCAP_PROP_NAME_cardTypeId, CAP_PROP_NAME_CardTypeId);
         map.put(UNCAP_PROP_NAME_cardCode, CAP_PROP_NAME_CardCode);
         map.put(UNCAP_PROP_NAME_cardOwner, CAP_PROP_NAME_CardOwner);
         map.put(UNCAP_PROP_NAME_cardNumber, CAP_PROP_NAME_CardNumber);
@@ -591,7 +557,6 @@
     public java.util.List<ColumnInfo> getColumnInfoList() {
         final java.util.List<ColumnInfo> columnInfoList = new java.util.ArrayList<ColumnInfo>();
         columnInfoList.add(columnOrderCardInfoId());
-        columnInfoList.add(columnCardTypeId());
         columnInfoList.add(columnCardCode());
         columnInfoList.add(columnCardOwner());
         columnInfoList.add(columnCardNumber());
@@ -651,7 +616,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES";
+        return "ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES";
     }
 
     /**
@@ -661,12 +626,6 @@
         return new ColumnInfo(this, "ORDER_CARD_INFO_ID", "orderCardInfoId", java.math.BigDecimal.class, true);
     }
     /**
-     * @return Column information of cardTypeId. (NotNull)
-     */
-    public ColumnInfo columnCardTypeId() {
-        return new ColumnInfo(this, "CARD_TYPE_ID", "cardTypeId", java.math.BigDecimal.class, false);
-    }
-    /**
      * @return Column information of cardCode. (NotNull)
      */
     public ColumnInfo columnCardCode() {
@@ -734,43 +693,11 @@
     // -----------------------------------------------------
     //                                       Foreign Element
     //                                       ---------------
-    /**
-     * Get foreign information of cardType.
-     * 
-     * @return Referer information. (NotNull)
-     */
-    public jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo foreignCardType() {
-        final jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo foreignInfo = new jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo();
-        foreignInfo.setForeignPropertyName("cardType");
-        foreignInfo.setLocalDBMeta(OrderCardInfoDbm.getInstance());
-        foreignInfo.setForeignDBMeta(CardTypeDbm.getInstance());
-        final java.util.Map<ColumnInfo, ColumnInfo> map = new java.util.LinkedHashMap<ColumnInfo, ColumnInfo>();
-        map.put(columnCardTypeId(), CardTypeDbm.getInstance().columnCardTypeId());
-        foreignInfo.setLocalForeignColumnInfoMap(map);
-        foreignInfo.setOneToOne(false);
-        return foreignInfo;
-    }
 
 
     // -----------------------------------------------------
     //                                       Referer Element
     //                                       ---------------
-    /**
-     * Get referer information of orderFormList.
-     * 
-     * @return Referer information. (NotNull)
-     */
-    public jp.sf.pal.pompei.allcommon.dbmeta.info.RefererInfo refererOrderFormList() {
-        final jp.sf.pal.pompei.allcommon.dbmeta.info.RefererInfo refererInfo = new jp.sf.pal.pompei.allcommon.dbmeta.info.RefererInfo();
-        refererInfo.setRefererPropertyName("orderFormList");
-        refererInfo.setLocalDBMeta(OrderCardInfoDbm.getInstance());
-        refererInfo.setRefererDBMeta(OrderFormDbm.getInstance());
-        final java.util.Map<ColumnInfo, ColumnInfo> map = new java.util.LinkedHashMap<ColumnInfo, ColumnInfo>();
-        map.put(columnOrderCardInfoId(), OrderFormDbm.getInstance().columnOrderCardInfoId());
-        refererInfo.setLocalRefererColumnInfoMap(map);
-        refererInfo.setOneToOne(false);
-        return refererInfo;
-    }
 
     // -----------------------------------------------------
     //                                        Relation Trace
@@ -820,18 +747,7 @@
             super(relationList, relationTraceList);
         }
 
-        public CardTypeDbm.CardTypeRelationTrace foreignCardType() {
-            _relationList.add(OrderCardInfoDbm.getInstance().foreignCardType());
-            return CardTypeDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);
-        }
-  
-        public OrderFormDbm.OrderFormRelationTrace refererOrderFormList() {
-            _relationList.add(OrderCardInfoDbm.getInstance().refererOrderFormList());
-            return OrderFormDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);
-        }
-
         public RelationTrace columnOrderCardInfoId() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnOrderCardInfoId()); }
-        public RelationTrace columnCardTypeId() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardTypeId()); }
         public RelationTrace columnCardCode() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardCode()); }
         public RelationTrace columnCardOwner() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardOwner()); }
         public RelationTrace columnCardNumber() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardNumber()); }
@@ -907,7 +823,6 @@
         final MapStringValueAnalyzer analyzer = new MapStringValueAnalyzer(columnValueMap, entity.getModifiedPropertyNames());
 
         if (analyzer.init("ORDER_CARD_INFO_ID", "orderCardInfoId", "orderCardInfoId")) { myEntity.setOrderCardInfoId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("CARD_TYPE_ID", "cardTypeId", "cardTypeId")) { myEntity.setCardTypeId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("CARD_CODE", "cardCode", "cardCode")) { myEntity.setCardCode(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CARD_OWNER", "cardOwner", "cardOwner")) { myEntity.setCardOwner(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CARD_NUMBER", "cardNumber", "cardNumber")) { myEntity.setCardNumber(analyzer.analyzeString(String.class)); };
@@ -985,7 +900,6 @@
         final String mapMarkAndStartBrace = MAP_STRING_MAP_MARK + startBrace;
         final StringBuffer sb = new StringBuffer();
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId());
-        helpAppendingColumnValueString(sb, delimiter, equal, "CARD_TYPE_ID", myEntity.getCardTypeId());
         helpAppendingColumnValueString(sb, delimiter, equal, "CARD_CODE", myEntity.getCardCode());
         helpAppendingColumnValueString(sb, delimiter, equal, "CARD_OWNER", myEntity.getCardOwner());
         helpAppendingColumnValueString(sb, delimiter, equal, "CARD_NUMBER", myEntity.getCardNumber());
@@ -1045,7 +959,6 @@
         final OrderCardInfo myEntity = downcast(entity);
         final java.util.Map<String, Object> valueMap = new java.util.LinkedHashMap<String, Object>();
         valueMap.put("ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId());
-        valueMap.put("CARD_TYPE_ID", myEntity.getCardTypeId());
         valueMap.put("CARD_CODE", myEntity.getCardCode());
         valueMap.put("CARD_OWNER", myEntity.getCardOwner());
         valueMap.put("CARD_NUMBER", myEntity.getCardNumber());
@@ -1073,7 +986,6 @@
         final OrderCardInfo myEntity = downcast(entity);
         final java.util.Map<String, String> valueMap = new java.util.LinkedHashMap<String, String>();
         valueMap.put("ORDER_CARD_INFO_ID", helpGettingColumnStringValue(myEntity.getOrderCardInfoId()));
-        valueMap.put("CARD_TYPE_ID", helpGettingColumnStringValue(myEntity.getCardTypeId()));
         valueMap.put("CARD_CODE", helpGettingColumnStringValue(myEntity.getCardCode()));
         valueMap.put("CARD_OWNER", helpGettingColumnStringValue(myEntity.getCardOwner()));
         valueMap.put("CARD_NUMBER", helpGettingColumnStringValue(myEntity.getCardNumber()));
@@ -1102,9 +1014,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES) values(? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES) values(? , ? , ? , ? , ? )";
         }
-        return "insert into ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_TYPE_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES) values(? , ? , ? , ? , ? , ? )";
+        return "insert into ORDER_CARD_INFO(ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES) values(? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -19,7 +19,7 @@
  *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
  * 
  * [foreign-property]
- *     currency, customer, deliveryMethod, orderCardInfo, orderStatus, paymentMethod
+ *     currency, customer, deliveryMethod, orderStatus, paymentMethod
  * 
  * [refferer-property]
  *     orderCommentList, orderProductList, orderProductAttributeList, orderProductDownloadList, orderStatusHistoryList
@@ -179,7 +179,7 @@
     public static final String DB_NAME_PAYMENT_METHOD_ID = "PAYMENT_METHOD_ID";
     /** Db-name of PAYMENT_METHOD_CODE. CHAR(16) : NotNull */
     public static final String DB_NAME_PAYMENT_METHOD_CODE = "PAYMENT_METHOD_CODE";
-    /** Db-name of ORDER_CARD_INFO_ID. BIGINT : FK to ORDER_CARD_INFO */
+    /** Db-name of ORDER_CARD_INFO_ID. BIGINT */
     public static final String DB_NAME_ORDER_CARD_INFO_ID = "ORDER_CARD_INFO_ID";
     /** Db-name of DELIVERY_METHOD_ID. INTEGER : FK to DELIVERY_METHOD */
     public static final String DB_NAME_DELIVERY_METHOD_ID = "DELIVERY_METHOD_ID";
@@ -404,7 +404,7 @@
     public static final String PROPERTY_NAME_paymentMethodId = "paymentMethodId";
     /** Prop-name(JavaBeansRule) of paymentMethodCode. CHAR(16) : NotNull */
     public static final String PROPERTY_NAME_paymentMethodCode = "paymentMethodCode";
-    /** Prop-name(JavaBeansRule) of orderCardInfoId. BIGINT : FK to ORDER_CARD_INFO */
+    /** Prop-name(JavaBeansRule) of orderCardInfoId. BIGINT */
     public static final String PROPERTY_NAME_orderCardInfoId = "orderCardInfoId";
     /** Prop-name(JavaBeansRule) of deliveryMethodId. INTEGER : FK to DELIVERY_METHOD */
     public static final String PROPERTY_NAME_deliveryMethodId = "deliveryMethodId";
@@ -518,7 +518,7 @@
     public static final String CAP_PROP_NAME_PaymentMethodId = "PaymentMethodId";
     /** Cap-prop-name of paymentMethodCode. CHAR(16) : NotNull */
     public static final String CAP_PROP_NAME_PaymentMethodCode = "PaymentMethodCode";
-    /** Cap-prop-name of orderCardInfoId. BIGINT : FK to ORDER_CARD_INFO */
+    /** Cap-prop-name of orderCardInfoId. BIGINT */
     public static final String CAP_PROP_NAME_OrderCardInfoId = "OrderCardInfoId";
     /** Cap-prop-name of deliveryMethodId. INTEGER : FK to DELIVERY_METHOD */
     public static final String CAP_PROP_NAME_DeliveryMethodId = "DeliveryMethodId";
@@ -743,7 +743,7 @@
     public static final String UNCAP_PROP_NAME_paymentMethodId = "paymentMethodId";
     /** Uncap-prop-name of paymentMethodCode. CHAR(16) : NotNull */
     public static final String UNCAP_PROP_NAME_paymentMethodCode = "paymentMethodCode";
-    /** Uncap-prop-name of orderCardInfoId. BIGINT : FK to ORDER_CARD_INFO */
+    /** Uncap-prop-name of orderCardInfoId. BIGINT */
     public static final String UNCAP_PROP_NAME_orderCardInfoId = "orderCardInfoId";
     /** Uncap-prop-name of deliveryMethodId. INTEGER : FK to DELIVERY_METHOD */
     public static final String UNCAP_PROP_NAME_deliveryMethodId = "deliveryMethodId";
@@ -888,8 +888,6 @@
     public static final String FOREIGN_PROPERTY_NAME_customer = "customer";
     /** The foreign property name(JavaBeansRule) of deliveryMethod. */
     public static final String FOREIGN_PROPERTY_NAME_deliveryMethod = "deliveryMethod";
-    /** The foreign property name(JavaBeansRule) of orderCardInfo. */
-    public static final String FOREIGN_PROPERTY_NAME_orderCardInfo = "orderCardInfo";
     /** The foreign property name(JavaBeansRule) of orderStatus. */
     public static final String FOREIGN_PROPERTY_NAME_orderStatus = "orderStatus";
     /** The foreign property name(JavaBeansRule) of paymentMethod. */
@@ -900,8 +898,6 @@
     public static final String FOREIGN_CAP_PROP_NAME_Customer = "Customer";
     /** @deprecated Use FOREIGN_NAME_deliveryMethod. */
     public static final String FOREIGN_CAP_PROP_NAME_DeliveryMethod = "DeliveryMethod";
-    /** @deprecated Use FOREIGN_NAME_orderCardInfo. */
-    public static final String FOREIGN_CAP_PROP_NAME_OrderCardInfo = "OrderCardInfo";
     /** @deprecated Use FOREIGN_NAME_orderStatus. */
     public static final String FOREIGN_CAP_PROP_NAME_OrderStatus = "OrderStatus";
     /** @deprecated Use FOREIGN_NAME_paymentMethod. */
@@ -913,8 +909,6 @@
     public static final String FOREIGN_UNCAP_PROP_NAME_customer = "customer";
     /** @deprecated Use FOREIGN_NAME_deliveryMethod. */
     public static final String FOREIGN_UNCAP_PROP_NAME_deliveryMethod = "deliveryMethod";
-    /** @deprecated Use FOREIGN_NAME_orderCardInfo. */
-    public static final String FOREIGN_UNCAP_PROP_NAME_orderCardInfo = "orderCardInfo";
     /** @deprecated Use FOREIGN_NAME_orderStatus. */
     public static final String FOREIGN_UNCAP_PROP_NAME_orderStatus = "orderStatus";
     /** @deprecated Use FOREIGN_NAME_paymentMethod. */
@@ -2258,22 +2252,6 @@
         return foreignInfo;
     }
     /**
-     * Get foreign information of orderCardInfo.
-     * 
-     * @return Referer information. (NotNull)
-     */
-    public jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo foreignOrderCardInfo() {
-        final jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo foreignInfo = new jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo();
-        foreignInfo.setForeignPropertyName("orderCardInfo");
-        foreignInfo.setLocalDBMeta(OrderFormDbm.getInstance());
-        foreignInfo.setForeignDBMeta(OrderCardInfoDbm.getInstance());
-        final java.util.Map<ColumnInfo, ColumnInfo> map = new java.util.LinkedHashMap<ColumnInfo, ColumnInfo>();
-        map.put(columnOrderCardInfoId(), OrderCardInfoDbm.getInstance().columnOrderCardInfoId());
-        foreignInfo.setLocalForeignColumnInfoMap(map);
-        foreignInfo.setOneToOne(false);
-        return foreignInfo;
-    }
-    /**
      * Get foreign information of orderStatus.
      * 
      * @return Referer information. (NotNull)
@@ -2470,11 +2448,6 @@
             return DeliveryMethodDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);
         }
 
-        public OrderCardInfoDbm.OrderCardInfoRelationTrace foreignOrderCardInfo() {
-            _relationList.add(OrderFormDbm.getInstance().foreignOrderCardInfo());
-            return OrderCardInfoDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);
-        }
-
         public OrderStatusDbm.OrderStatusRelationTrace foreignOrderStatus() {
             _relationList.add(OrderFormDbm.getInstance().foreignOrderStatus());
             return OrderStatusDbm.getInstance().createRelationTrace(_relationList, _relationTraceList);

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCardTypeCB.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCardTypeCB.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCardTypeCB.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -199,7 +199,7 @@
     // ===================================================================================
     //                                                                        Setup-Select
     //                                                                        ============
-                
+          
     // ===================================================================================
     //                                                                      Basic Override
     //                                                                      ==============

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderCardInfoCB.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderCardInfoCB.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderCardInfoCB.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -199,51 +199,7 @@
     // ===================================================================================
     //                                                                        Setup-Select
     //                                                                        ============
-  
-    // /* * * * * * * * * * * * * * * * * * * * * * *
-    //   ForeignTable    = [CARD_TYPE]
-    //   ForeignProperty = [cardType]
-    // * * * * * * * * */
-
-    /** Is select for cardType? */
-    protected boolean _isSelectCardType;
-    /** Nest select setupper for cardType. */
-    protected jp.sf.pal.pompei.cbean.nss.CardTypeNss _nssCardType;
-    /**
-     * Is select for cardType? {For Internal}
-     * 
-     * @return Determination.
-     */
-    public boolean isSelectCardType() {
-        return _isSelectCardType;
-    }
-    /**
-     * Get nest select setupper for cardType. {For Internal}
-     * 
-     * @return Nest select setupper. (NotNull)
-     */
-    public jp.sf.pal.pompei.cbean.nss.CardTypeNss getNssCardType() {
-        if (_nssCardType == null) {
-            _nssCardType = new jp.sf.pal.pompei.cbean.nss.CardTypeNss(null);// for Dummy
-        }
-        return _nssCardType;
-    }
-    /**
-     * Set up select for cardType.
-     * If you invoke this, this entity is target of select.
-     * 
-     * @return Nest select setupper for cardType. (NotNull)
-     */
-    public jp.sf.pal.pompei.cbean.nss.CardTypeNss setupSelect_CardType() {
-        query().queryCardType();// For setting outer join.
-        if (_nssCardType == null || !_nssCardType.hasConditionQuery()) {
-            _nssCardType = new jp.sf.pal.pompei.cbean.nss.CardTypeNss(query().queryCardType());
-        }
-        _isSelectCardType = true;
-        limitSelect_Off();
-        return _nssCardType;
-    }
-          
+    
     // ===================================================================================
     //                                                                      Basic Override
     //                                                                      ==============

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderFormCB.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderFormCB.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsOrderFormCB.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -333,50 +333,6 @@
     }
   
     // /* * * * * * * * * * * * * * * * * * * * * * *
-    //   ForeignTable    = [ORDER_CARD_INFO]
-    //   ForeignProperty = [orderCardInfo]
-    // * * * * * * * * */
-
-    /** Is select for orderCardInfo? */
-    protected boolean _isSelectOrderCardInfo;
-    /** Nest select setupper for orderCardInfo. */
-    protected jp.sf.pal.pompei.cbean.nss.OrderCardInfoNss _nssOrderCardInfo;
-    /**
-     * Is select for orderCardInfo? {For Internal}
-     * 
-     * @return Determination.
-     */
-    public boolean isSelectOrderCardInfo() {
-        return _isSelectOrderCardInfo;
-    }
-    /**
-     * Get nest select setupper for orderCardInfo. {For Internal}
-     * 
-     * @return Nest select setupper. (NotNull)
-     */
-    public jp.sf.pal.pompei.cbean.nss.OrderCardInfoNss getNssOrderCardInfo() {
-        if (_nssOrderCardInfo == null) {
-            _nssOrderCardInfo = new jp.sf.pal.pompei.cbean.nss.OrderCardInfoNss(null);// for Dummy
-        }
-        return _nssOrderCardInfo;
-    }
-    /**
-     * Set up select for orderCardInfo.
-     * If you invoke this, this entity is target of select.
-     * 
-     * @return Nest select setupper for orderCardInfo. (NotNull)
-     */
-    public jp.sf.pal.pompei.cbean.nss.OrderCardInfoNss setupSelect_OrderCardInfo() {
-        query().queryOrderCardInfo();// For setting outer join.
-        if (_nssOrderCardInfo == null || !_nssOrderCardInfo.hasConditionQuery()) {
-            _nssOrderCardInfo = new jp.sf.pal.pompei.cbean.nss.OrderCardInfoNss(query().queryOrderCardInfo());
-        }
-        _isSelectOrderCardInfo = true;
-        limitSelect_Off();
-        return _nssOrderCardInfo;
-    }
-  
-    // /* * * * * * * * * * * * * * * * * * * * * * *
     //   ForeignTable    = [ORDER_STATUS]
     //   ForeignProperty = [orderStatus]
     // * * * * * * * * */

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCardTypeCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCardTypeCQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCardTypeCQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -149,23 +149,6 @@
     }
 
     abstract public void keepCardTypeId_InScopeSubQuery_CardTypeDescriptionList(jp.sf.pal.pompei.cbean.cq.CardTypeDescriptionCQ subQuery);
-        
-    /**
-     * Set the sub-query of CardTypeId_InScopeSubQuery_OrderCardInfoList using inScopeSubQuery.
-     * { in (select xxx.CARD_TYPE_ID from ORDER_CARD_INFO where ...) }
-     * This method use from clause and where clause of the sub-query instance.
-     * this query keep the sub-query instance for query-value.
-     * After you invoke this, If you set query in the argument[subQuery], the query is ignored.
-     * 
-     * @param subQuery The sub-query of CardTypeId_InScopeSubQuery_OrderCardInfoList using inScopeSubQuery. (NotNull)
-     */
-    public void setCardTypeId_InScopeSubQuery_OrderCardInfoList(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery) {
-        assertObjectNotNull("subQuery", subQuery);
-        keepCardTypeId_InScopeSubQuery_OrderCardInfoList(subQuery);// for saving query-value.
-        registerInScopeSubQuery(subQuery, COL_CARD_TYPE_ID, "CARD_TYPE_ID", "cardTypeId_InScopeSubQuery_OrderCardInfoList");
-    }
-
-    abstract public void keepCardTypeId_InScopeSubQuery_OrderCardInfoList(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery);
                                       
     /**
      * Set the sub-query of CardTypeId_ExistsSubQuery_CardTypeDescriptionList using existsSubQuery.
@@ -183,23 +166,6 @@
     }
 
     abstract public void keepCardTypeId_ExistsSubQuery_CardTypeDescriptionList(jp.sf.pal.pompei.cbean.cq.CardTypeDescriptionCQ subQuery);
-                            
-    /**
-     * Set the sub-query of CardTypeId_ExistsSubQuery_OrderCardInfoList using existsSubQuery.
-     * { exists (select xxx.CARD_TYPE_ID from ORDER_CARD_INFO where ...) }
-     * This method use from clause and where clause of the sub-query instance.
-     * this query keep the sub-query instance for query-value.
-     * After you invoke this, If you set query in the argument[subQuery], the query is ignored.
-     * 
-     * @param subQuery The sub-query of CardTypeId_ExistsSubQuery_OrderCardInfoList using existsSubQuery. (NotNull)
-     */
-    public void setCardTypeId_ExistsSubQuery_OrderCardInfoList(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery) {
-        assertObjectNotNull("subQuery", subQuery);
-        keepCardTypeId_ExistsSubQuery_OrderCardInfoList(subQuery);// for saving query-value.
-        registerExistsSubQuery(subQuery, COL_CARD_TYPE_ID, "CARD_TYPE_ID", "cardTypeId_ExistsSubQuery_OrderCardInfoList");
-    }
-
-    abstract public void keepCardTypeId_ExistsSubQuery_OrderCardInfoList(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery);
                                                 
     /**
      * Register condition of cardTypeId.

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -132,40 +132,6 @@
     public void setOrderCardInfoId_NotInScope(java.util.List<java.math.BigDecimal> orderCardInfoIdList) {
         registerOrderCardInfoId(ConditionKey.CK_NOT_IN_SCOPE, orderCardInfoIdList);
     }
-                          
-    /**
-     * Set the sub-query of OrderCardInfoId_InScopeSubQuery_OrderFormList using inScopeSubQuery.
-     * { in (select xxx.ORDER_CARD_INFO_ID from ORDER_FORM where ...) }
-     * This method use from clause and where clause of the sub-query instance.
-     * this query keep the sub-query instance for query-value.
-     * After you invoke this, If you set query in the argument[subQuery], the query is ignored.
-     * 
-     * @param subQuery The sub-query of OrderCardInfoId_InScopeSubQuery_OrderFormList using inScopeSubQuery. (NotNull)
-     */
-    public void setOrderCardInfoId_InScopeSubQuery_OrderFormList(jp.sf.pal.pompei.cbean.cq.OrderFormCQ subQuery) {
-        assertObjectNotNull("subQuery", subQuery);
-        keepOrderCardInfoId_InScopeSubQuery_OrderFormList(subQuery);// for saving query-value.
-        registerInScopeSubQuery(subQuery, COL_ORDER_CARD_INFO_ID, "ORDER_CARD_INFO_ID", "orderCardInfoId_InScopeSubQuery_OrderFormList");
-    }
-
-    abstract public void keepOrderCardInfoId_InScopeSubQuery_OrderFormList(jp.sf.pal.pompei.cbean.cq.OrderFormCQ subQuery);
-                                      
-    /**
-     * Set the sub-query of OrderCardInfoId_ExistsSubQuery_OrderFormList using existsSubQuery.
-     * { exists (select xxx.ORDER_CARD_INFO_ID from ORDER_FORM where ...) }
-     * This method use from clause and where clause of the sub-query instance.
-     * this query keep the sub-query instance for query-value.
-     * After you invoke this, If you set query in the argument[subQuery], the query is ignored.
-     * 
-     * @param subQuery The sub-query of OrderCardInfoId_ExistsSubQuery_OrderFormList using existsSubQuery. (NotNull)
-     */
-    public void setOrderCardInfoId_ExistsSubQuery_OrderFormList(jp.sf.pal.pompei.cbean.cq.OrderFormCQ subQuery) {
-        assertObjectNotNull("subQuery", subQuery);
-        keepOrderCardInfoId_ExistsSubQuery_OrderFormList(subQuery);// for saving query-value.
-        registerExistsSubQuery(subQuery, COL_ORDER_CARD_INFO_ID, "ORDER_CARD_INFO_ID", "orderCardInfoId_ExistsSubQuery_OrderFormList");
-    }
-
-    abstract public void keepOrderCardInfoId_ExistsSubQuery_OrderFormList(jp.sf.pal.pompei.cbean.cq.OrderFormCQ subQuery);
                                                 
     /**
      * Register condition of orderCardInfoId.
@@ -189,142 +155,6 @@
 
     abstract protected ConditionValue getCValueOrderCardInfoId();
       
-    /** Column db name of cardTypeId. */
-    protected static final String COL_CARD_TYPE_ID = "CARD_TYPE_ID";
-
-    /** Column java name of cardTypeId. */
-    protected static final String J_CardTypeId = "CardTypeId";
-
-    /** Column uncapitalised java name of cardTypeId. */
-    protected static final String UJ_cardTypeId = "cardTypeId";
-            
-    /**
-     * Set the value of cardTypeId using equal. { = }
-     * 
-     * @param cardTypeId The value of cardTypeId as equal.
-     */
-    public void setCardTypeId_Equal(java.math.BigDecimal cardTypeId) {
-        registerCardTypeId(ConditionKey.CK_EQUAL, cardTypeId);
-    }
-            
-    /**
-     * Set the value of cardTypeId using notEqual. { != }
-     * 
-     * @param cardTypeId The value of cardTypeId as notEqual.
-     */
-    public void setCardTypeId_NotEqual(java.math.BigDecimal cardTypeId) {
-        registerCardTypeId(ConditionKey.CK_NOT_EQUAL, cardTypeId);
-    }
-            
-    /**
-     * Set the value of cardTypeId using greaterThan. { &gt; }
-     * 
-     * @param cardTypeId The value of cardTypeId as greaterThan.
-     */
-    public void setCardTypeId_GreaterThan(java.math.BigDecimal cardTypeId) {
-        registerCardTypeId(ConditionKey.CK_GREATER_THAN, cardTypeId);
-    }
-            
-    /**
-     * Set the value of cardTypeId using lessThan. { &lt; }
-     * 
-     * @param cardTypeId The value of cardTypeId as lessThan.
-     */
-    public void setCardTypeId_LessThan(java.math.BigDecimal cardTypeId) {
-        registerCardTypeId(ConditionKey.CK_LESS_THAN, cardTypeId);
-    }
-            
-    /**
-     * Set the value of cardTypeId using greaterEqual. { &gt;= }
-     * 
-     * @param cardTypeId The value of cardTypeId as greaterEqual.
-     */
-    public void setCardTypeId_GreaterEqual(java.math.BigDecimal cardTypeId) {
-        registerCardTypeId(ConditionKey.CK_GREATER_EQUAL, cardTypeId);
-    }
-            
-    /**
-     * Set the value of cardTypeId using lessEqual. { &lt;= }
-     * 
-     * @param cardTypeId The value of cardTypeId as lessEqual.
-     */
-    public void setCardTypeId_LessEqual(java.math.BigDecimal cardTypeId) {
-        registerCardTypeId(ConditionKey.CK_LESS_EQUAL, cardTypeId);
-    }
-                  
-    /**
-     * Set the value of cardTypeId using inScope. { in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param cardTypeIdList The value of cardTypeId as inScope.
-     */
-    public void setCardTypeId_InScope(java.util.List<java.math.BigDecimal> cardTypeIdList) {
-        registerCardTypeId(ConditionKey.CK_IN_SCOPE, cardTypeIdList);
-    }
-            
-    /**
-     * Set the value of cardTypeId using notInScope. { not in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param cardTypeIdList The value of cardTypeId as notInScope.
-     */
-    public void setCardTypeId_NotInScope(java.util.List<java.math.BigDecimal> cardTypeIdList) {
-        registerCardTypeId(ConditionKey.CK_NOT_IN_SCOPE, cardTypeIdList);
-    }
-            
-    /**
-     * Set the sub-query of CardTypeId_InScopeSubQuery_CardType using inScopeSubQuery.
-     * { in (select xxx.CARD_TYPE_ID from CARD_TYPE where ...) }
-     * This method use from clause and where clause of the sub-query instance.
-     * this query keep the sub-query instance for query-value.
-     * After you invoke this, If you set query in the argument[subQuery], the query is ignored.
-     * 
-     * @param subQuery The sub-query of CardTypeId_InScopeSubQuery_CardType using inScopeSubQuery. (NotNull)
-     */
-    public void setCardTypeId_InScopeSubQuery_CardType(jp.sf.pal.pompei.cbean.cq.CardTypeCQ subQuery) {
-        assertObjectNotNull("subQuery", subQuery);
-        keepCardTypeId_InScopeSubQuery_CardType(subQuery);// for saving query-value.
-        registerInScopeSubQuery(subQuery, COL_CARD_TYPE_ID, "CARD_TYPE_ID", "cardTypeId_InScopeSubQuery_CardType");
-    }
-
-    abstract public void keepCardTypeId_InScopeSubQuery_CardType(jp.sf.pal.pompei.cbean.cq.CardTypeCQ subQuery);
-                                      
-    /**
-     * Set the value of cardTypeId using isNull. { is null }
-     */
-    public void setCardTypeId_IsNull() {
-        registerCardTypeId(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of cardTypeId using isNotNull. { is not null }
-     */
-    public void setCardTypeId_IsNotNull() {
-        registerCardTypeId(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
-     * Register condition of cardTypeId.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of cardTypeId. (Nullable)
-     */
-    protected void registerCardTypeId(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueCardTypeId(), COL_CARD_TYPE_ID, J_CardTypeId, UJ_cardTypeId);
-    }
-
-    /**
-     * Register inline condition of cardTypeId.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of cardTypeId. (Nullable)
-     */
-    protected void registerInlineCardTypeId(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueCardTypeId(), COL_CARD_TYPE_ID, J_CardTypeId, UJ_cardTypeId);
-    }
-
-    abstract protected ConditionValue getCValueCardTypeId();
-      
     /** Column db name of cardCode. */
     protected static final String COL_CARD_CODE = "CARD_CODE";
 
@@ -446,22 +276,8 @@
     public void setCardCode_NotInScope(java.util.List<String> cardCodeList) {
         registerCardCode(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(cardCodeList));
     }
-                                                
+                                                    
     /**
-     * Set the value of cardCode using isNull. { is null }
-     */
-    public void setCardCode_IsNull() {
-        registerCardCode(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of cardCode using isNotNull. { is not null }
-     */
-    public void setCardCode_IsNotNull() {
-        registerCardCode(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
      * Register condition of cardCode.
      * 
      * @param key Condition key. (NotNull)
@@ -604,22 +420,8 @@
     public void setCardOwner_NotInScope(java.util.List<String> cardOwnerList) {
         registerCardOwner(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(cardOwnerList));
     }
-                                                
+                                                    
     /**
-     * Set the value of cardOwner using isNull. { is null }
-     */
-    public void setCardOwner_IsNull() {
-        registerCardOwner(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of cardOwner using isNotNull. { is not null }
-     */
-    public void setCardOwner_IsNotNull() {
-        registerCardOwner(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
      * Register condition of cardOwner.
      * 
      * @param key Condition key. (NotNull)
@@ -762,22 +564,8 @@
     public void setCardNumber_NotInScope(java.util.List<String> cardNumberList) {
         registerCardNumber(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(cardNumberList));
     }
-                                                
+                                                    
     /**
-     * Set the value of cardNumber using isNull. { is null }
-     */
-    public void setCardNumber_IsNull() {
-        registerCardNumber(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of cardNumber using isNotNull. { is not null }
-     */
-    public void setCardNumber_IsNotNull() {
-        registerCardNumber(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
      * Register condition of cardNumber.
      * 
      * @param key Condition key. (NotNull)
@@ -920,22 +708,8 @@
     public void setCardExpires_NotInScope(java.util.List<String> cardExpiresList) {
         registerCardExpires(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(cardExpiresList));
     }
-                                                
+                                                    
     /**
-     * Set the value of cardExpires using isNull. { is null }
-     */
-    public void setCardExpires_IsNull() {
-        registerCardExpires(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of cardExpires using isNotNull. { is not null }
-     */
-    public void setCardExpires_IsNotNull() {
-        registerCardExpires(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
      * Register condition of cardExpires.
      * 
      * @param key Condition key. (NotNull)

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -6601,25 +6601,8 @@
     public void setOrderCardInfoId_NotInScope(java.util.List<java.math.BigDecimal> orderCardInfoIdList) {
         registerOrderCardInfoId(ConditionKey.CK_NOT_IN_SCOPE, orderCardInfoIdList);
     }
-            
+                                            
     /**
-     * Set the sub-query of OrderCardInfoId_InScopeSubQuery_OrderCardInfo using inScopeSubQuery.
-     * { in (select xxx.ORDER_CARD_INFO_ID from ORDER_CARD_INFO where ...) }
-     * This method use from clause and where clause of the sub-query instance.
-     * this query keep the sub-query instance for query-value.
-     * After you invoke this, If you set query in the argument[subQuery], the query is ignored.
-     * 
-     * @param subQuery The sub-query of OrderCardInfoId_InScopeSubQuery_OrderCardInfo using inScopeSubQuery. (NotNull)
-     */
-    public void setOrderCardInfoId_InScopeSubQuery_OrderCardInfo(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery) {
-        assertObjectNotNull("subQuery", subQuery);
-        keepOrderCardInfoId_InScopeSubQuery_OrderCardInfo(subQuery);// for saving query-value.
-        registerInScopeSubQuery(subQuery, COL_ORDER_CARD_INFO_ID, "ORDER_CARD_INFO_ID", "orderCardInfoId_InScopeSubQuery_OrderCardInfo");
-    }
-
-    abstract public void keepOrderCardInfoId_InScopeSubQuery_OrderCardInfo(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery);
-                                      
-    /**
      * Set the value of orderCardInfoId using isNull. { is null }
      */
     public void setOrderCardInfoId_IsNull() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCardTypeCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCardTypeCQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCardTypeCQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -190,22 +190,6 @@
     public void keepCardTypeId_InScopeSubQuery_CardTypeDescriptionList(CardTypeDescriptionCQ subQuery) {
         _cardTypeId_InScopeSubQuery_CardTypeDescriptionList = subQuery;
     }
-        
-    /** The sub-query of CardTypeId_InScopeSubQuery_OrderCardInfoList using inScopeSubQuery. */
-    protected OrderCardInfoCQ _cardTypeId_InScopeSubQuery_OrderCardInfoList;
-
-    /**
-     * Get the sub-query of CardTypeId_InScopeSubQuery_OrderCardInfoList using inScopeSubQuery.
-     * 
-     * @return The sub-query of CardTypeId_InScopeSubQuery_OrderCardInfoList using inScopeSubQuery. (Nullable)
-     */
-    public OrderCardInfoCQ getCardTypeId_InScopeSubQuery_OrderCardInfoList() {
-        return _cardTypeId_InScopeSubQuery_OrderCardInfoList;
-    }
-
-    public void keepCardTypeId_InScopeSubQuery_OrderCardInfoList(OrderCardInfoCQ subQuery) {
-        _cardTypeId_InScopeSubQuery_OrderCardInfoList = subQuery;
-    }
                                       
     /** The sub-query of CardTypeId_ExistsSubQuery_CardTypeDescriptionList using existsSubQuery. */
     protected CardTypeDescriptionCQ _cardTypeId_ExistsSubQuery_CardTypeDescriptionList;
@@ -222,22 +206,6 @@
     public void keepCardTypeId_ExistsSubQuery_CardTypeDescriptionList(CardTypeDescriptionCQ subQuery) {
         _cardTypeId_ExistsSubQuery_CardTypeDescriptionList = subQuery;
     }
-                            
-    /** The sub-query of CardTypeId_ExistsSubQuery_OrderCardInfoList using existsSubQuery. */
-    protected OrderCardInfoCQ _cardTypeId_ExistsSubQuery_OrderCardInfoList;
-
-    /**
-     * Get the sub-query of CardTypeId_ExistsSubQuery_OrderCardInfoList using existsSubQuery.
-     * 
-     * @return The sub-query of CardTypeId_ExistsSubQuery_OrderCardInfoList using existsSubQuery. (Nullable)
-     */
-    public OrderCardInfoCQ getCardTypeId_ExistsSubQuery_OrderCardInfoList() {
-        return _cardTypeId_ExistsSubQuery_OrderCardInfoList;
-    }
-
-    public void keepCardTypeId_ExistsSubQuery_OrderCardInfoList(OrderCardInfoCQ subQuery) {
-        _cardTypeId_ExistsSubQuery_OrderCardInfoList = subQuery;
-    }
                                                 
     /**
      * Add order-by of cardTypeId as ASC.
@@ -436,5 +404,5 @@
     //                                                                       Foreign Query
     //                                                                       =============
   
-              
+        
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -1,6 +1,5 @@
 package jp.sf.pal.pompei.cbean.cq.bs;
 
-import jp.sf.pal.pompei.cbean.cq.*;
 
 import jp.sf.pal.pompei.allcommon.cbean.*;
 import jp.sf.pal.pompei.allcommon.cbean.cvalue.ConditionValue;
@@ -73,24 +72,6 @@
     }
   
     /**
-     * Include select-column of cardTypeId as mine.
-     * Alias name is java-name of this column.
-     * Be careful to whether your table have the same column.
-     */
-    public void includeAsMine_CardTypeId() {
-        registerIncludedSelectColumn("CardTypeId", getRealColumnName("CARD_TYPE_ID"));
-    }
-
-    /**
-     * Include select-column of cardTypeId as mine.
-     * 
-     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
-     */
-    public void includeAsMine_CardTypeId(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("CARD_TYPE_ID"));
-    }
-  
-    /**
      * Include select-column of cardCode as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -192,40 +173,8 @@
         return getOrderCardInfoId();
     }
 
-                            
-    /** The sub-query of OrderCardInfoId_InScopeSubQuery_OrderFormList using inScopeSubQuery. */
-    protected OrderFormCQ _orderCardInfoId_InScopeSubQuery_OrderFormList;
-
+                                                  
     /**
-     * Get the sub-query of OrderCardInfoId_InScopeSubQuery_OrderFormList using inScopeSubQuery.
-     * 
-     * @return The sub-query of OrderCardInfoId_InScopeSubQuery_OrderFormList using inScopeSubQuery. (Nullable)
-     */
-    public OrderFormCQ getOrderCardInfoId_InScopeSubQuery_OrderFormList() {
-        return _orderCardInfoId_InScopeSubQuery_OrderFormList;
-    }
-
-    public void keepOrderCardInfoId_InScopeSubQuery_OrderFormList(OrderFormCQ subQuery) {
-        _orderCardInfoId_InScopeSubQuery_OrderFormList = subQuery;
-    }
-                                      
-    /** The sub-query of OrderCardInfoId_ExistsSubQuery_OrderFormList using existsSubQuery. */
-    protected OrderFormCQ _orderCardInfoId_ExistsSubQuery_OrderFormList;
-
-    /**
-     * Get the sub-query of OrderCardInfoId_ExistsSubQuery_OrderFormList using existsSubQuery.
-     * 
-     * @return The sub-query of OrderCardInfoId_ExistsSubQuery_OrderFormList using existsSubQuery. (Nullable)
-     */
-    public OrderFormCQ getOrderCardInfoId_ExistsSubQuery_OrderFormList() {
-        return _orderCardInfoId_ExistsSubQuery_OrderFormList;
-    }
-
-    public void keepOrderCardInfoId_ExistsSubQuery_OrderFormList(OrderFormCQ subQuery) {
-        _orderCardInfoId_ExistsSubQuery_OrderFormList = subQuery;
-    }
-                                                
-    /**
      * Add order-by of orderCardInfoId as ASC.
      * 
      * @return this. (NotNull)
@@ -244,64 +193,6 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [CARD_TYPE_ID]
-    // - - - - - - - - -/
-
-    /** The attribute of cardTypeId. */
-    protected ConditionValue _cardTypeId;
-
-    /**
-     * Get the value of cardTypeId.
-     * 
-     * @return The value of cardTypeId.
-     */
-    public ConditionValue getCardTypeId() {
-        if (_cardTypeId == null) {
-            _cardTypeId = new ConditionValue();
-        }
-        return _cardTypeId;
-    }
-
-    protected ConditionValue getCValueCardTypeId() {
-        return getCardTypeId();
-    }
-
-              
-    /** The sub-query of CardTypeId_InScopeSubQuery_CardType using inScopeSubQuery. */
-    protected CardTypeCQ _cardTypeId_InScopeSubQuery_CardType;
-
-    /**
-     * Get the sub-query of CardTypeId_InScopeSubQuery_CardType using inScopeSubQuery.
-     * 
-     * @return The sub-query of CardTypeId_InScopeSubQuery_CardType using inScopeSubQuery. (Nullable)
-     */
-    public CardTypeCQ getCardTypeId_InScopeSubQuery_CardType() {
-        return _cardTypeId_InScopeSubQuery_CardType;
-    }
-
-    public void keepCardTypeId_InScopeSubQuery_CardType(CardTypeCQ subQuery) {
-        _cardTypeId_InScopeSubQuery_CardType = subQuery;
-    }
-                                              
-    /**
-     * Add order-by of cardTypeId as ASC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsOrderCardInfoCQ addOrderBy_CardTypeId_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_TYPE_ID), null, true);return this;
-    }
-
-    /**
-     * Add order-by of cardTypeId as DESC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsOrderCardInfoCQ addOrderBy_CardTypeId_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_TYPE_ID), null, false);return this;
-    }
-      
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CARD_CODE]
     // - - - - - - - - -/
 
@@ -324,7 +215,7 @@
         return getCardCode();
     }
 
-                                                      
+                                                  
     /**
      * Add order-by of cardCode as ASC.
      * 
@@ -366,7 +257,7 @@
         return getCardOwner();
     }
 
-                                                      
+                                                  
     /**
      * Add order-by of cardOwner as ASC.
      * 
@@ -408,7 +299,7 @@
         return getCardNumber();
     }
 
-                                                      
+                                                  
     /**
      * Add order-by of cardNumber as ASC.
      * 
@@ -450,7 +341,7 @@
         return getCardExpires();
     }
 
-                                                      
+                                                  
     /**
      * Add order-by of cardExpires as ASC.
      * 
@@ -473,82 +364,12 @@
     //                                                                         Union Query
     //                                                                         ===========
     protected void reflectRelationOnUnionQuery(ConditionQuery baseQueryAsSuper, ConditionQuery unionQueryAsSuper) {
-        final OrderCardInfoCQ baseQuery = (OrderCardInfoCQ)baseQueryAsSuper;
-        final OrderCardInfoCQ unionQuery = (OrderCardInfoCQ)unionQueryAsSuper;
-        if (baseQuery.hasConditionQueryCardType()) {
-            unionQuery.queryCardType().reflectRelationOnUnionQuery(baseQuery.queryCardType(), unionQuery.queryCardType());
-        }
 
     }
 
     // ===================================================================================
     //                                                                       Foreign Query
     //                                                                       =============
-      
-    // /* * * * * * * * * * * * * * * * * * * * * * *
-    //   ForeignTable    = [CARD_TYPE]
-    //   ForeignProperty = [cardType]
-    // * * * * * * * * */
-
-    /**
-     * Query for cardType.
-     * 
-     * @return Instance of CardTypeCQ as cardType. (NotNull)
-     */
-    public CardTypeCQ queryCardType() {
-        return getConditionQueryCardType();
-    }
-
-    /** Condition-query for cardType. */
-    protected CardTypeCQ _conditionQueryCardType;
-
-    /**
-     * Get condition-query for cardType.
-     * 
-     * @return Instance of CardTypeCQ as cardType. (NotNull)
-     */
-    public CardTypeCQ getConditionQueryCardType() {
-        if (_conditionQueryCardType == null) {
-            _conditionQueryCardType = newQueryCardType();
-            setupOuterJoin_CardType();
-        }
-        return _conditionQueryCardType;
-    }
-
-    /**
-     * Setup outer join for ${foreignPropertyName}.
-     */
-    protected void setupOuterJoin_CardType() {
-        final java.util.Map<String, String> joinOnMap = new java.util.LinkedHashMap<String, String>();
-        String key = null;
-        String value = null;
-    
-        key = getRealColumnName("CARD_TYPE_ID");
-        value = getConditionQueryCardType().getRealColumnName("CARD_TYPE_ID");
-        joinOnMap.put(key, value);
-    
-        final String joinTableName = "CARD_TYPE";
-        final String aliasName = getConditionQueryCardType().getRealAliasName();
-        getSqlClause().registerOuterJoin(joinTableName, aliasName, joinOnMap);
-    }
-
-    /**
-     * New query for cardType.
-     * 
-     * @return Query for cardType. (NotNull)
-     */
-    protected CardTypeCQ newQueryCardType() {
-        return new CardTypeCQ(this, getSqlClause(), "CardType", getNextNestLevel());
-    }
-
-    /**
-     * Has condition query?
-     * 
-     * @return Determination.
-     */
-    public boolean hasConditionQueryCardType() {
-        return _conditionQueryCardType != null;
-    }
   
-        
+  
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -3072,24 +3072,8 @@
         return getOrderCardInfoId();
     }
 
-              
-    /** The sub-query of OrderCardInfoId_InScopeSubQuery_OrderCardInfo using inScopeSubQuery. */
-    protected OrderCardInfoCQ _orderCardInfoId_InScopeSubQuery_OrderCardInfo;
-
+                                                      
     /**
-     * Get the sub-query of OrderCardInfoId_InScopeSubQuery_OrderCardInfo using inScopeSubQuery.
-     * 
-     * @return The sub-query of OrderCardInfoId_InScopeSubQuery_OrderCardInfo using inScopeSubQuery. (Nullable)
-     */
-    public OrderCardInfoCQ getOrderCardInfoId_InScopeSubQuery_OrderCardInfo() {
-        return _orderCardInfoId_InScopeSubQuery_OrderCardInfo;
-    }
-
-    public void keepOrderCardInfoId_InScopeSubQuery_OrderCardInfo(OrderCardInfoCQ subQuery) {
-        _orderCardInfoId_InScopeSubQuery_OrderCardInfo = subQuery;
-    }
-                                              
-    /**
      * Add order-by of orderCardInfoId as ASC.
      * 
      * @return this. (NotNull)
@@ -3632,9 +3616,6 @@
         if (baseQuery.hasConditionQueryDeliveryMethod()) {
             unionQuery.queryDeliveryMethod().reflectRelationOnUnionQuery(baseQuery.queryDeliveryMethod(), unionQuery.queryDeliveryMethod());
         }
-        if (baseQuery.hasConditionQueryOrderCardInfo()) {
-            unionQuery.queryOrderCardInfo().reflectRelationOnUnionQuery(baseQuery.queryOrderCardInfo(), unionQuery.queryOrderCardInfo());
-        }
         if (baseQuery.hasConditionQueryOrderStatus()) {
             unionQuery.queryOrderStatus().reflectRelationOnUnionQuery(baseQuery.queryOrderStatus(), unionQuery.queryOrderStatus());
         }
@@ -3847,71 +3828,6 @@
     }
       
     // /* * * * * * * * * * * * * * * * * * * * * * *
-    //   ForeignTable    = [ORDER_CARD_INFO]
-    //   ForeignProperty = [orderCardInfo]
-    // * * * * * * * * */
-
-    /**
-     * Query for orderCardInfo.
-     * 
-     * @return Instance of OrderCardInfoCQ as orderCardInfo. (NotNull)
-     */
-    public OrderCardInfoCQ queryOrderCardInfo() {
-        return getConditionQueryOrderCardInfo();
-    }
-
-    /** Condition-query for orderCardInfo. */
-    protected OrderCardInfoCQ _conditionQueryOrderCardInfo;
-
-    /**
-     * Get condition-query for orderCardInfo.
-     * 
-     * @return Instance of OrderCardInfoCQ as orderCardInfo. (NotNull)
-     */
-    public OrderCardInfoCQ getConditionQueryOrderCardInfo() {
-        if (_conditionQueryOrderCardInfo == null) {
-            _conditionQueryOrderCardInfo = newQueryOrderCardInfo();
-            setupOuterJoin_OrderCardInfo();
-        }
-        return _conditionQueryOrderCardInfo;
-    }
-
-    /**
-     * Setup outer join for ${foreignPropertyName}.
-     */
-    protected void setupOuterJoin_OrderCardInfo() {
-        final java.util.Map<String, String> joinOnMap = new java.util.LinkedHashMap<String, String>();
-        String key = null;
-        String value = null;
-    
-        key = getRealColumnName("ORDER_CARD_INFO_ID");
-        value = getConditionQueryOrderCardInfo().getRealColumnName("ORDER_CARD_INFO_ID");
-        joinOnMap.put(key, value);
-    
-        final String joinTableName = "ORDER_CARD_INFO";
-        final String aliasName = getConditionQueryOrderCardInfo().getRealAliasName();
-        getSqlClause().registerOuterJoin(joinTableName, aliasName, joinOnMap);
-    }
-
-    /**
-     * New query for orderCardInfo.
-     * 
-     * @return Query for orderCardInfo. (NotNull)
-     */
-    protected OrderCardInfoCQ newQueryOrderCardInfo() {
-        return new OrderCardInfoCQ(this, getSqlClause(), "OrderCardInfo", getNextNestLevel());
-    }
-
-    /**
-     * Has condition query?
-     * 
-     * @return Determination.
-     */
-    public boolean hasConditionQueryOrderCardInfo() {
-        return _conditionQueryOrderCardInfo != null;
-    }
-      
-    // /* * * * * * * * * * * * * * * * * * * * * * *
     //   ForeignTable    = [ORDER_STATUS]
     //   ForeignProperty = [orderStatus]
     // * * * * * * * * */

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CardTypeCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CardTypeCIQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CardTypeCIQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -87,20 +87,11 @@
     public void keepCardTypeId_InScopeSubQuery_CardTypeDescriptionList(jp.sf.pal.pompei.cbean.cq.CardTypeDescriptionCQ subQuery) {
         _myCQ.keepCardTypeId_InScopeSubQuery_CardTypeDescriptionList(subQuery);
     }
-        
-    public void keepCardTypeId_InScopeSubQuery_OrderCardInfoList(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery) {
-        _myCQ.keepCardTypeId_InScopeSubQuery_OrderCardInfoList(subQuery);
-    }
                                       
     public void keepCardTypeId_ExistsSubQuery_CardTypeDescriptionList(jp.sf.pal.pompei.cbean.cq.CardTypeDescriptionCQ subQuery) {
         throw new UnsupportedOperationException("ExistsSubQuery at inline() is unsupported! Sorry!");
         // _myCQ.keepCardTypeId_ExistsSubQuery_CardTypeDescriptionList(subQuery);
     }
-                            
-    public void keepCardTypeId_ExistsSubQuery_OrderCardInfoList(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery) {
-        throw new UnsupportedOperationException("ExistsSubQuery at inline() is unsupported! Sorry!");
-        // _myCQ.keepCardTypeId_ExistsSubQuery_OrderCardInfoList(subQuery);
-    }
                                                       
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CODE]

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -83,36 +83,15 @@
         return _myCQ.getOrderCardInfoId();
     }
 
-                            
-    public void keepOrderCardInfoId_InScopeSubQuery_OrderFormList(jp.sf.pal.pompei.cbean.cq.OrderFormCQ subQuery) {
-        _myCQ.keepOrderCardInfoId_InScopeSubQuery_OrderFormList(subQuery);
-    }
-                                      
-    public void keepOrderCardInfoId_ExistsSubQuery_OrderFormList(jp.sf.pal.pompei.cbean.cq.OrderFormCQ subQuery) {
-        throw new UnsupportedOperationException("ExistsSubQuery at inline() is unsupported! Sorry!");
-        // _myCQ.keepOrderCardInfoId_ExistsSubQuery_OrderFormList(subQuery);
-    }
-                                                      
+                                                        
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [CARD_TYPE_ID]
-    // - - - - - - - - -/
-    protected ConditionValue getCValueCardTypeId() {
-        return _myCQ.getCardTypeId();
-    }
-
-              
-    public void keepCardTypeId_InScopeSubQuery_CardType(jp.sf.pal.pompei.cbean.cq.CardTypeCQ subQuery) {
-        _myCQ.keepCardTypeId_InScopeSubQuery_CardType(subQuery);
-    }
-                                                    
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CARD_CODE]
     // - - - - - - - - -/
     protected ConditionValue getCValueCardCode() {
         return _myCQ.getCardCode();
     }
 
-                                                            
+                                                        
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CARD_OWNER]
     // - - - - - - - - -/
@@ -120,7 +99,7 @@
         return _myCQ.getCardOwner();
     }
 
-                                                            
+                                                        
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CARD_NUMBER]
     // - - - - - - - - -/
@@ -128,7 +107,7 @@
         return _myCQ.getCardNumber();
     }
 
-                                                            
+                                                        
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CARD_EXPIRES]
     // - - - - - - - - -/
@@ -136,5 +115,5 @@
         return _myCQ.getCardExpires();
     }
 
-                                                            
+                                                        
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -480,11 +480,7 @@
         return _myCQ.getOrderCardInfoId();
     }
 
-              
-    public void keepOrderCardInfoId_InScopeSubQuery_OrderCardInfo(jp.sf.pal.pompei.cbean.cq.OrderCardInfoCQ subQuery) {
-        _myCQ.keepOrderCardInfoId_InScopeSubQuery_OrderCardInfo(subQuery);
-    }
-                                                    
+                                                            
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [DELIVERY_METHOD_ID]
     // - - - - - - - - -/

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CardTypeNss.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CardTypeNss.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CardTypeNss.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -45,7 +45,7 @@
     // ===================================================================================
     //                                                                             With...
     //                                                                             =======
-    
+  
     // ===================================================================================
     //                                                                              Helper
     //                                                                              ======

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderCardInfoNss.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderCardInfoNss.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderCardInfoNss.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -46,27 +46,6 @@
     //                                                                             With...
     //                                                                             =======
 
-    /** Is select cardType? */
-    protected boolean _isSelectCardType;
-
-    /**
-     * Is select cardType?
-     * 
-     * @return Determination.
-     */
-    public boolean isSelectCardType() {
-        return _isSelectCardType;
-    }
-
-    /**
-     * Set up select with cardType.
-     */
-    public void withCardType() {
-        assertConditionQuery();
-        _query.queryCardType();
-        _isSelectCardType = true;
-    }
-  
     // ===================================================================================
     //                                                                              Helper
     //                                                                              ======

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderFormNss.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderFormNss.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/OrderFormNss.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -109,27 +109,6 @@
         _isSelectDeliveryMethod = true;
     }
 
-    /** Is select orderCardInfo? */
-    protected boolean _isSelectOrderCardInfo;
-
-    /**
-     * Is select orderCardInfo?
-     * 
-     * @return Determination.
-     */
-    public boolean isSelectOrderCardInfo() {
-        return _isSelectOrderCardInfo;
-    }
-
-    /**
-     * Set up select with orderCardInfo.
-     */
-    public void withOrderCardInfo() {
-        assertConditionQuery();
-        _query.queryOrderCardInfo();
-        _isSelectOrderCardInfo = true;
-    }
-
     /** Is select orderStatus? */
     protected boolean _isSelectOrderStatus;
 

Added: 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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -0,0 +1,15 @@
+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);
+}


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

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -18,8 +18,8 @@
             List<DeliveryMethodDescription> deliveryMethodDescriptionList,
             List<Map<String, Object>> list);
 
-    @ConversionRule("label : name" + ", value : deliveryMethodId")
-    public List<Map<String, String>> convert(List<DeliveryMethodDescription> dmd);
+    //    @ConversionRule("label : name" + ", value : deliveryMethodId")
+    public List<Map<String, Object>> convert(List<DeliveryMethodDescription> dmd);
 
     public void convert(DeliveryMethodDescription dmd,
             DeliveryMethodEditPage page);

Added: 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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -0,0 +1,14 @@
+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);
+}


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

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethodDescription.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethodDescription.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethodDescription.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -1,13 +1,17 @@
 package jp.sf.pal.pompei.exentity;
 
-
 /**
  * The entity of PAYMENT_METHOD_DESCRIPTION.
  * 
  * @author DBFlute(AutoGenerator)
  */
-public class PaymentMethodDescription extends jp.sf.pal.pompei.bsentity.BsPaymentMethodDescription {
+public class PaymentMethodDescription extends
+        jp.sf.pal.pompei.bsentity.BsPaymentMethodDescription {
 
     /** Serial version UID. (Default) */
     private static final long serialVersionUID = 1L;
+
+    public String getDisplayMessage() {
+        return getName() + "<div>" + getDescription() + "</div>";
+    }
 }

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CardTypeService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CardTypeService.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CardTypeService.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -0,0 +1,12 @@
+package jp.sf.pal.pompei.service;
+
+import java.io.Serializable;
+import java.util.List;
+
+import jp.sf.pal.pompei.exentity.CardTypeDescription;
+
+public interface CardTypeService extends Serializable {
+
+    public abstract List<CardTypeDescription> getCardTypeDescriptionList();
+
+}
\ No newline at end of file


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

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -19,6 +19,8 @@
     //TODO above methods might not be needed..
     public AddressBook getAddressBook(BigDecimal addressBookId);
 
+    public AddressBook getDefaultAddressBook(BigDecimal customerId);
+
     public void addAddressBook(AddressBook addressBook);
 
     public void deleteAddressBook(AddressBook addressBook);

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/PaymentMethodService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/PaymentMethodService.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/PaymentMethodService.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -0,0 +1,15 @@
+package jp.sf.pal.pompei.service;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+import jp.sf.pal.pompei.exentity.PaymentMethodDescription;
+
+public interface PaymentMethodService extends Serializable {
+
+    public abstract List<PaymentMethodDescription> getPaymentMethodDescriptionList();
+
+    public abstract PaymentMethodDescription getPaymentMethodDescription(
+            BigDecimal paymentMethodId);
+}
\ No newline at end of file


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

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CardTypeServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CardTypeServiceImpl.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CardTypeServiceImpl.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -0,0 +1,43 @@
+package jp.sf.pal.pompei.service.impl;
+
+import java.util.List;
+
+import jp.sf.pal.pompei.cbean.CardTypeDescriptionCB;
+import jp.sf.pal.pompei.exbhv.CardTypeDescriptionBhv;
+import jp.sf.pal.pompei.exentity.CardTypeDescription;
+import jp.sf.pal.pompei.service.CardTypeService;
+
+public class CardTypeServiceImpl implements CardTypeService {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -5687055982449308486L;
+
+    private CardTypeDescriptionBhv cardTypeDescriptionBhv;
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.pompei.service.impl.CardTypeService#getCardTypeDescriptionList()
+     */
+    public List<CardTypeDescription> getCardTypeDescriptionList() {
+        CardTypeDescriptionCB cb = new CardTypeDescriptionCB();
+        cb.setupSelect_CardType();
+        //TODO needed?
+        // cb.setupSelect_Language();
+        return getCardTypeDescriptionBhv().selectList(cb);
+    }
+
+    /**
+     * @return cardTypeDescriptionBhv
+     */
+    public CardTypeDescriptionBhv getCardTypeDescriptionBhv() {
+        return cardTypeDescriptionBhv;
+    }
+
+    /**
+     * @param cardTypeDescriptionBhv 設定する cardTypeDescriptionBhv
+     */
+    public void setCardTypeDescriptionBhv(
+            CardTypeDescriptionBhv cardTypeDescriptionBhv) {
+        this.cardTypeDescriptionBhv = cardTypeDescriptionBhv;
+    }
+}


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

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.cbean.AddressBookCB;
 import jp.sf.pal.pompei.cbean.CustomerCB;
 import jp.sf.pal.pompei.cbean.ZoneCB;
@@ -117,6 +118,27 @@
         return getAddressBookBhv().selectEntity(cb);
     }
 
+    public AddressBook getDefaultAddressBook(BigDecimal customerId) {
+        AddressBookCB cb = new AddressBookCB();
+        //TODO needed?
+        cb.setupSelect_Customer();
+        //TODO needed?
+        cb.setupSelect_Country();
+        // needed(for tax)
+        cb.setupSelect_Zone();
+        //TODO needed?
+        cb.setupSelect_Language();
+
+        cb.query().setCustomerId_Equal(customerId);
+        for (AddressBook ab : getAddressBookBhv().selectList(cb)) {
+            if (PompeiConstants.TRUE_BIGDECIMAL.equals(ab.getDefaultAddress())) {
+                return ab;
+            }
+        }
+        return null;
+
+    }
+
     public void addCustomer(Customer customers) {
         getCustomerBhv().insert(customers);
     }

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/PaymentMethodServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/PaymentMethodServiceImpl.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/PaymentMethodServiceImpl.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -0,0 +1,72 @@
+package jp.sf.pal.pompei.service.impl;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import jp.sf.pal.pompei.cbean.PaymentMethodDescriptionCB;
+import jp.sf.pal.pompei.exbhv.PaymentMethodBhv;
+import jp.sf.pal.pompei.exbhv.PaymentMethodDescriptionBhv;
+import jp.sf.pal.pompei.exentity.PaymentMethodDescription;
+import jp.sf.pal.pompei.service.PaymentMethodService;
+
+public class PaymentMethodServiceImpl implements PaymentMethodService {
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 8750885593336801203L;
+
+    private PaymentMethodBhv paymentMethodBhv;
+
+    private PaymentMethodDescriptionBhv paymentMethodDescriptionBhv;
+
+    /* (non-Javadoc)
+     * @see jp.sf.pal.pompei.service.impl.PaymentMethodService#getPaymentMethodDescriptionList()
+     */
+    public List<PaymentMethodDescription> getPaymentMethodDescriptionList() {
+        PaymentMethodDescriptionCB cb = new PaymentMethodDescriptionCB();
+        cb.setupSelect_PaymentMethod();
+        //TODO needed?
+        //cb.setupSelect_Language();
+        return getPaymentMethodDescriptionBhv().selectList(cb);
+    }
+
+    public PaymentMethodDescription getPaymentMethodDescription(
+            BigDecimal paymentMethodId) {
+        PaymentMethodDescriptionCB cb = new PaymentMethodDescriptionCB();
+        cb.setupSelect_PaymentMethod();
+        //TODO needed?
+        //cb.setupSelect_Language();
+        cb.query().setPaymentMethodId_Equal(paymentMethodId);
+        return getPaymentMethodDescriptionBhv().selectEntity(cb);
+    }
+
+    /**
+     * @return paymentMethodBhv
+     */
+    public PaymentMethodBhv getPaymentMethodBhv() {
+        return paymentMethodBhv;
+    }
+
+    /**
+     * @param paymentMethodBhv 設定する paymentMethodBhv
+     */
+    public void setPaymentMethodBhv(PaymentMethodBhv paymentMethodBhv) {
+        this.paymentMethodBhv = paymentMethodBhv;
+    }
+
+    /**
+     * @return paymentMethodDescriptionBhv
+     */
+    public PaymentMethodDescriptionBhv getPaymentMethodDescriptionBhv() {
+        return paymentMethodDescriptionBhv;
+    }
+
+    /**
+     * @param paymentMethodDescriptionBhv 設定する paymentMethodDescriptionBhv
+     */
+    public void setPaymentMethodDescriptionBhv(
+            PaymentMethodDescriptionBhv paymentMethodDescriptionBhv) {
+        this.paymentMethodDescriptionBhv = paymentMethodDescriptionBhv;
+    }
+
+}


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

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -86,7 +86,9 @@
         if (isUpdate()) {
             // update
             ProductDescription description = productService
-                    .getProdcutsDescription(productEditPage.getProductId());
+                    .getProdcutsDescription(productEditPage.getProductId(),
+                            getLanguageService().getDefaultLanguage()
+                                    .getLanguageId());
             productDxo.convert(description, productEditPage);
         } else {
             //insert

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -117,7 +117,7 @@
 
     public Class<?> doDelete() {
         getCartService().deleteCustomerBasket(
-                getProductListPage().getCustomersBasketId());
+                getProductListPage().getCustomerBasketId());
         //TODO put message
         return null;
     }
@@ -163,18 +163,18 @@
                     .getManufactureDescription(
                             basket.getProduct().getManufacturerId());
             Map<String, Object> map = new HashMap<String, Object>();
-            map.put("customersBasketId", basket.getCustomerBasketId());
-            map.put("productsName", pd.getName());
-            map.put("productsUrl", pd.getUrl());
-            map.put("productsModel", basket.getProduct().getModel());
-            map.put("manufacturersName", mi.getManufacturer().getName());
+            map.put("customerBasketId", basket.getCustomerBasketId());
+            map.put("productName", pd.getName());
+            map.put("productUrl", pd.getUrl());
+            map.put("productModel", basket.getProduct().getModel());
+            map.put("manufacturerName", mi.getManufacturer().getName());
             map.put("quantity", basket.getQuantity());
             map.put("productsPrice", basket.getProduct().getPrice());
             map.put("finalPrice", basket.getFinalPrice());
             products.add(map);
         }
         getProductListPage().setTotalPrice(totalPrice);
-        getProductListPage().setProductsItems(products);
+        getProductListPage().setProductItems(products);
 
         // render FacesMessages
         FacesMessageUtil.renderMessages();

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -16,22 +16,20 @@
 
     private BigDecimal quantity;
 
-    private BigDecimal customersBasketId;
+    private BigDecimal customerBasketId;
 
-    private String manufacturersName;
+    private String manufacturerName;
 
-    private int productsIndex;
+    private int productIndex;
 
-    private List<Map<String, Object>> productsItems;
+    private List<Map<String, Object>> productItems;
 
-    private String productsModel;
+    private String productModel;
 
-    private String productsName;
+    private String productName;
 
-    private BigDecimal productsPrice;
+    private BigDecimal productPrice;
 
-    private String title;
-
     private BigDecimal finalPrice;
 
     private BigDecimal totalPrice;
@@ -41,15 +39,15 @@
     /**
      * @return customersBasketId
      */
-    public BigDecimal getCustomersBasketId() {
-        return customersBasketId;
+    public BigDecimal getCustomerBasketId() {
+        return customerBasketId;
     }
 
     /**
      * @param customersBasketId 設定する customersBasketId
      */
-    public void setCustomersBasketId(BigDecimal customersBasketId) {
-        this.customersBasketId = customersBasketId;
+    public void setCustomerBasketId(BigDecimal customersBasketId) {
+        this.customerBasketId = customersBasketId;
     }
 
     public BigDecimal getQuantity() {
@@ -60,62 +58,54 @@
         this.quantity = quantity;
     }
 
-    public String getManufacturersName() {
-        return manufacturersName;
+    public String getManufacturerName() {
+        return manufacturerName;
     }
 
-    public void setManufacturersName(String manufacturersId) {
-        this.manufacturersName = manufacturersId;
+    public void setManufacturerName(String manufacturersId) {
+        this.manufacturerName = manufacturersId;
     }
 
-    public int getProductsIndex() {
-        return productsIndex;
+    public int getProductIndex() {
+        return productIndex;
     }
 
-    public void setProductsIndex(int productsIndex) {
-        this.productsIndex = productsIndex;
+    public void setProductIndex(int productsIndex) {
+        this.productIndex = productsIndex;
     }
 
-    public List<Map<String, Object>> getProductsItems() {
-        return productsItems;
+    public List<Map<String, Object>> getProductItems() {
+        return productItems;
     }
 
-    public void setProductsItems(List<Map<String, Object>> productsItems) {
-        this.productsItems = productsItems;
+    public void setProductItems(List<Map<String, Object>> productsItems) {
+        this.productItems = productsItems;
     }
 
-    public String getProductsModel() {
-        return productsModel;
+    public String getProductModel() {
+        return productModel;
     }
 
-    public void setProductsModel(String productsModel) {
-        this.productsModel = productsModel;
+    public void setProductModel(String productsModel) {
+        this.productModel = productsModel;
     }
 
-    public String getProductsName() {
-        return productsName;
+    public String getProductName() {
+        return productName;
     }
 
-    public void setProductsName(String productsName) {
-        this.productsName = productsName;
+    public void setProductName(String productsName) {
+        this.productName = productsName;
     }
 
-    public BigDecimal getProductsPrice() {
-        return productsPrice;
+    public BigDecimal getProductPrice() {
+        return productPrice;
     }
 
-    public void setProductsPrice(BigDecimal productsPrice) {
-        this.productsPrice = productsPrice;
+    public void setProductPrice(BigDecimal productsPrice) {
+        this.productPrice = productsPrice;
     }
 
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
     public BigDecimal getFinalPrice() {
         return finalPrice;
     }
@@ -125,7 +115,7 @@
     }
 
     public int getProductsCount() {
-        return getProductsIndex() + 1;
+        return getProductIndex() + 1;
     }
 
     /**

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -17,6 +17,7 @@
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
 import jp.sf.pal.pompei.exentity.ManufacturerDescription;
+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.fee.DeliveryMethodCalculator;
@@ -24,6 +25,7 @@
 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.PaymentMethodService;
 import jp.sf.pal.pompei.service.ProductService;
 import jp.sf.pal.pompei.service.TaxService;
 import jp.sf.pal.pompei.util.SessionUtil;
@@ -57,6 +59,8 @@
 
     private DeliveryMethodSerivce deliveryMethodSerivce;
 
+    private PaymentMethodService paymentMethodService;
+
     private TaxService taxService;
 
     private CustomerDxo customerDxo;
@@ -111,18 +115,18 @@
                     .getManufactureDescription(
                             basket.getProduct().getManufacturerId());
             Map<String, Object> map = new HashMap<String, Object>();
-            map.put("customersBasketId", basket.getCustomerBasketId());
-            map.put("productsName", pd.getName());
-            map.put("productsUrl", pd.getUrl());
-            map.put("productsModel", basket.getProduct().getModel());
-            map.put("manufacturersName", mi.getManufacturer().getName());
+            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("productsPrice", basket.getProduct().getPrice());
+            map.put("price", basket.getProduct().getPrice());
             map.put("finalPrice", basket.getFinalPrice());
             products.add(map);
         }
         getCheckoutConfirmPage().setSubTotalPrice(subTotalPrice);
-        getCheckoutConfirmPage().setCustomersBasketItems(products);
+        getCheckoutConfirmPage().setCustomerBasketItems(products);
 
         orderProcessMap.put(PompeiConstants.CUSTOMERS_BASKET_ID_LIST,
                 customersBasketIdList);
@@ -163,38 +167,40 @@
         getCheckoutConfirmPage().setTotalPrice(subTotalPrice.add(tax));
 
         // payment
-        String paymentMethod = (String) orderProcessMap
-                .get(PompeiConstants.PAYMENT_METHOD);
-        if (paymentMethod == null) {
+        BigDecimal paymentMethodId = (BigDecimal) orderProcessMap
+                .get(PompeiConstants.PAYMENT_METHOD_ID);
+        if (paymentMethodId == null) {
             //TODO put message
             return UserInfoEditPage.class;
         }
-        getCheckoutConfirmPage().setPaymentMethodName(
-                getCheckoutConfirmPage().getLabelHelper().getLabelValue(
-                        paymentMethod));
+        PaymentMethodDescription pmd = getPaymentMethodService()
+                .getPaymentMethodDescription(paymentMethodId);
+        if (pmd == null) {
+            //TODO put message
+            return UserInfoEditPage.class;
+        }
+        getCheckoutConfirmPage().setPaymentMethodName(pmd.getName());
 
         // deliveryMethod
-        String deliveryMethodId = (String) orderProcessMap
+        BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap
                 .get(PompeiConstants.DELIVERY_METHOD_ID);
         if (deliveryMethodId == null) {
             //TODO put message
             return UserInfoEditPage.class;
         }
-        DeliveryMethodDescription dmd;
-        try {
-            dmd = getDeliveryMethodSerivce().getDeliveryMethodDescription(
-                    new BigDecimal(deliveryMethodId));
-            getCheckoutConfirmPage().setDeliveryMethodName(dmd.getName());
-        } catch (NumberFormatException e) {
-            //TODO put message(IllegalState..)
+        DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
+                .getDeliveryMethodDescription(deliveryMethodId);
+        if (dmd == null) {
+            //TODO put message
             return UserInfoEditPage.class;
         }
+        getCheckoutConfirmPage().setDeliveryMethodName(dmd.getName());
 
         // delivery fee
-        String deliveryMethodClass = dmd.getDeliveryMethod().getObjectName();
+        String deliveryMethodObjectName = dmd.getDeliveryMethod().getObjectName();
         try {
             DeliveryMethodCalculator dmc = (DeliveryMethodCalculator) getContainer()
-                    .getComponent(deliveryMethodClass);
+                    .getComponent(deliveryMethodObjectName);
             getCheckoutConfirmPage().setDeliveryPrice(
                     dmc.calculate(baskets, deliveryAddressBook));
         } catch (ComponentNotFoundRuntimeException e) {
@@ -359,4 +365,19 @@
         this.container = container;
     }
 
+    /**
+     * @return paymentMethodService
+     */
+    public PaymentMethodService getPaymentMethodService() {
+        return paymentMethodService;
+    }
+
+    /**
+     * @param paymentMethodService 設定する paymentMethodService
+     */
+    public void setPaymentMethodService(
+            PaymentMethodService paymentMethodService) {
+        this.paymentMethodService = paymentMethodService;
+    }
+
 }

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -16,45 +16,45 @@
 
     private LabelHelper labelHelper;
 
-    private List<Map<String, Object>> customersBasketItems;
+    private List<Map<String, Object>> customerBasketItems;
 
     private String deliveryMethodName;
 
     private BigDecimal deliveryPrice;
 
-    private String entryCellphone;
+    private String cellphone;
 
-    private String entryCity;
+    private String city;
 
-    private String entryCompany;
+    private String company;
 
-    private String entryFax;
+    private String fax;
 
-    private String entryFirstname;
+    private String firstname;
 
-    private String entryGender;
+    private String gender;
 
-    private String entryLastname;
+    private String lastname;
 
-    private String entryPostcode;
+    private String postcode;
 
-    private String entryState;
+    private String state;
 
-    private String entryStreetAddress;
+    private String streetAddress;
 
-    private String entryTelephone;
+    private String telephone;
 
     private BigDecimal finalPrice;
 
-    private String manufacturersName;
+    private String manufacturerName;
 
     private String orderProcessId;
 
     private String paymentMethodName;
 
-    private String productsModel;
+    private String model;
 
-    private String productsName;
+    private String name;
 
     private BigDecimal quantity;
 
@@ -81,16 +81,16 @@
     /**
      * @return customersBasketItems
      */
-    public List<Map<String, Object>> getCustomersBasketItems() {
-        return customersBasketItems;
+    public List<Map<String, Object>> getCustomerBasketItems() {
+        return customerBasketItems;
     }
 
     /**
      * @param customersBasketItems 設定する customersBasketItems
      */
-    public void setCustomersBasketItems(
+    public void setCustomerBasketItems(
             List<Map<String, Object>> customersBasketItems) {
-        this.customersBasketItems = customersBasketItems;
+        this.customerBasketItems = customersBasketItems;
     }
 
     public String getDeliveryMethodName() {
@@ -109,92 +109,92 @@
         this.deliveryPrice = deliveryPrice;
     }
 
-    public String getEntryCellphone() {
-        return entryCellphone;
+    public String getCellphone() {
+        return cellphone;
     }
 
-    public void setEntryCellphone(String entryCellphone) {
-        this.entryCellphone = entryCellphone;
+    public void setCellphone(String entryCellphone) {
+        this.cellphone = entryCellphone;
     }
 
-    public String getEntryCity() {
-        return entryCity;
+    public String getCity() {
+        return city;
     }
 
-    public void setEntryCity(String entryCity) {
-        this.entryCity = entryCity;
+    public void setCity(String entryCity) {
+        this.city = entryCity;
     }
 
-    public String getEntryCompany() {
-        return entryCompany;
+    public String getCompany() {
+        return company;
     }
 
-    public void setEntryCompany(String entryCompany) {
-        this.entryCompany = entryCompany;
+    public void setCompany(String entryCompany) {
+        this.company = entryCompany;
     }
 
-    public String getEntryFax() {
-        return entryFax;
+    public String getFax() {
+        return fax;
     }
 
-    public void setEntryFax(String entryFax) {
-        this.entryFax = entryFax;
+    public void setFax(String entryFax) {
+        this.fax = entryFax;
     }
 
-    public String getEntryFirstname() {
-        return entryFirstname;
+    public String getFirstname() {
+        return firstname;
     }
 
-    public void setEntryFirstname(String entryFirstname) {
-        this.entryFirstname = entryFirstname;
+    public void setFirstname(String entryFirstname) {
+        this.firstname = entryFirstname;
     }
 
-    public String getEntryGender() {
-        return entryGender;
+    public String getGender() {
+        return gender;
     }
 
-    public void setEntryGender(String entryGenderString) {
-        this.entryGender = entryGenderString;
+    public void setGender(String entryGenderString) {
+        this.gender = entryGenderString;
     }
 
-    public String getEntryLastname() {
-        return entryLastname;
+    public String getLastname() {
+        return lastname;
     }
 
-    public void setEntryLastname(String entryLastname) {
-        this.entryLastname = entryLastname;
+    public void setLastname(String entryLastname) {
+        this.lastname = entryLastname;
     }
 
-    public String getEntryPostcode() {
-        return entryPostcode;
+    public String getPostcode() {
+        return postcode;
     }
 
-    public void setEntryPostcode(String entryPostcode) {
-        this.entryPostcode = entryPostcode;
+    public void setPostcode(String entryPostcode) {
+        this.postcode = entryPostcode;
     }
 
-    public String getEntryState() {
-        return entryState;
+    public String getState() {
+        return state;
     }
 
-    public void setEntryState(String entryState) {
-        this.entryState = entryState;
+    public void setState(String entryState) {
+        this.state = entryState;
     }
 
-    public String getEntryStreetAddress() {
-        return entryStreetAddress;
+    public String getStreetAddress() {
+        return streetAddress;
     }
 
-    public void setEntryStreetAddress(String entryStreetAddress) {
-        this.entryStreetAddress = entryStreetAddress;
+    public void setStreetAddress(String entryStreetAddress) {
+        this.streetAddress = entryStreetAddress;
     }
 
-    public String getEntryTelephone() {
-        return entryTelephone;
+    public String getTelephone() {
+        return telephone;
     }
 
-    public void setEntryTelephone(String entryTelephone) {
-        this.entryTelephone = entryTelephone;
+    public void setTelephone(String entryTelephone) {
+        this.telephone = entryTelephone;
     }
 
     public BigDecimal getFinalPrice() {
@@ -205,12 +205,12 @@
         this.finalPrice = finalPrice;
     }
 
-    public String getManufacturersName() {
-        return manufacturersName;
+    public String getManufacturerName() {
+        return manufacturerName;
     }
 
-    public void setManufacturersName(String manufacturersName) {
-        this.manufacturersName = manufacturersName;
+    public void setManufacturerName(String manufacturersName) {
+        this.manufacturerName = manufacturersName;
     }
 
     public String getOrderProcessId() {
@@ -229,20 +229,20 @@
         this.paymentMethodName = paymentMethodName;
     }
 
-    public String getProductsModel() {
-        return productsModel;
+    public String getModel() {
+        return model;
     }
 
-    public void setProductsModel(String productsModel) {
-        this.productsModel = productsModel;
+    public void setModel(String productsModel) {
+        this.model = productsModel;
     }
 
-    public String getProductsName() {
-        return productsName;
+    public String getName() {
+        return name;
     }
 
-    public void setProductsName(String productsName) {
-        this.productsName = productsName;
+    public void setName(String productsName) {
+        this.name = productsName;
     }
 
     public BigDecimal getQuantity() {
@@ -277,7 +277,7 @@
         this.totalPrice = totalPrice;
     }
 
-    public String getEntryGenderString() {
-        return getLabelHelper().getLabelValue(entryGender);
+    public String getGenderString() {
+        return getLabelHelper().getLabelValue(gender);
     }
 }

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -1,6 +1,7 @@
 package jp.sf.pal.pompei.web.user.checkout;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -8,11 +9,17 @@
 
 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.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.service.CustomerService;
 import jp.sf.pal.pompei.service.DeliveryMethodSerivce;
+import jp.sf.pal.pompei.service.PaymentMethodService;
 import jp.sf.pal.pompei.util.SessionUtil;
 
 import org.seasar.framework.util.StringUtil;
@@ -35,8 +42,16 @@
 
     private DeliveryMethodSerivce deliveryMethodSerivce;
 
+    private PaymentMethodService paymentMethodService;
+
+    private CardTypeService cardTypeService;
+
     private DeliveryMethodDxo deliveryMethodDxo;
 
+    private PaymentMethodDxo paymentMethodDxo;
+
+    private CardTypeDxo cardTypeDxo;
+
     public Class<?> initialize() {
         return null;
     }
@@ -56,11 +71,23 @@
             return UserInfoEditPage.class;
         }
 
+        // set delivery method
         List<DeliveryMethodDescription> dmd = getDeliveryMethodSerivce()
                 .getDeliveryMethodDescriptionList();
-        getPaymentSelectPage().setDeliveryMethodIdItems(
+        getPaymentSelectPage().setDeliveryMethodItems(
                 getDeliveryMethodDxo().convert(dmd));
 
+        // set payment method
+        List<PaymentMethodDescription> pmd = getPaymentMethodService()
+                .getPaymentMethodDescriptionList();
+        getPaymentSelectPage().setPaymentMethodItems(
+                getPaymentMethodDxo().convert(pmd));
+
+        // set card type
+        List<CardTypeDescription> ctd = getCardTypeService()
+                .getCardTypeDescriptionList();
+        getPaymentSelectPage().setCardCodeItems(getCardTypeDxo().convert(ctd));
+
         // render FacesMessage
         FacesMessageUtil.renderMessages();
         return null;
@@ -77,29 +104,30 @@
             return UserInfoEditPage.class;
         }
 
-        String paymentMethod = getPaymentSelectPage().getPaymentMethod();
-        if (StringUtil.isEmpty(paymentMethod)) {
+        BigDecimal paymentMethodId = getPaymentSelectPage()
+                .getTargetPaymentMethodId();
+        if (paymentMethodId == null) {
             // TODO clear session info for card
             // TODO put message
             return null;
         }
-        if (PompeiConstants.COD_PAYMENT_METHOD.equals(paymentMethod)
-                || PompeiConstants.BANK_PAYMENT_METHOD.equals(paymentMethod)
-                || PompeiConstants.CARD_PAYMENT_METHOD.equals(paymentMethod)) {
-            map.put(PompeiConstants.PAYMENT_METHOD, paymentMethod);
-        } else {
+        PaymentMethodDescription pmd = getPaymentMethodService()
+                .getPaymentMethodDescription(paymentMethodId);
+        if (pmd == null) {
             // invalid payment string
             // TODO clear session info for card
             // TODO put message
             return null;
         }
+        map.put(PompeiConstants.PAYMENT_METHOD_ID, pmd.getPaymentMethodId());
 
         // card
-        if (PompeiConstants.CARD_PAYMENT_METHOD.equals(paymentMethod)) {
+        if (PompeiConstants.CARD_PAYMENT_METHOD.equals(pmd.getPaymentMethod()
+                .getCode())) {
             // card type
             if (!StringUtil.isEmpty(getPaymentSelectPage().getCcOwner())) {
                 map.put(PompeiConstants.CARD_TYPE, getPaymentSelectPage()
-                        .getCcType());
+                        .getCardCode());
             } else {
                 // invalid card owner
                 // TODO clear session info for card
@@ -149,10 +177,12 @@
                 return null;
             }
         }
+
         // delivery method
-        if (!StringUtil.isEmpty(getPaymentSelectPage().getDeliveryMethodId())) {
-            map.put(PompeiConstants.DELIVERY_METHOD_ID, getPaymentSelectPage()
-                    .getDeliveryMethodId());
+        BigDecimal deliveryMethodId = getPaymentSelectPage()
+                .getTargetDeliveryMethodId();
+        if (deliveryMethodId != null) {
+            map.put(PompeiConstants.DELIVERY_METHOD_ID, deliveryMethodId);
         } else {
             // invalid card number
             // TODO clear session info for card
@@ -221,4 +251,61 @@
         this.deliveryMethodDxo = deliveryMethodDxo;
     }
 
+    /**
+     * @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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -1,6 +1,7 @@
 package jp.sf.pal.pompei.web.user.checkout;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -27,16 +28,32 @@
 
     private String ccOwner;
 
-    private String ccType;
+    private int cardCodeIndex;
 
-    private int deliveryMethodIdIndex;
+    private List<Map<String, String>> cardCodeItems;
 
-    private List<Map<String, String>> deliveryMethodIdItems;
+    private String cardCode;
 
-    private String deliveryMethodId;
+    private int deliveryMethodIndex;
 
-    private String paymentMethod;
+    private List<Map<String, Object>> deliveryMethodItems;
 
+    private BigDecimal deliveryMethodId;
+
+    private BigDecimal targetDeliveryMethodId;
+
+    private int paymentMethodIndex;
+
+    private List<Map<String, Object>> paymentMethodItems;
+
+    private BigDecimal paymentMethodId;
+
+    private BigDecimal targetPaymentMethodId;
+
+    private String name;
+
+    private String description;
+
     /**
      * @return orderProcessId
      */
@@ -107,56 +124,170 @@
         this.ccOwner = ccOwner;
     }
 
-    public String getCcType() {
-        return ccType;
+    public String getCardCode() {
+        return cardCode;
     }
 
-    public void setCcType(String ccType) {
-        this.ccType = ccType;
+    public void setCardCode(String ccType) {
+        this.cardCode = ccType;
     }
 
-    public String getDeliveryMethodId() {
+    public BigDecimal getDeliveryMethodId() {
         return deliveryMethodId;
     }
 
-    public void setDeliveryMethodId(String deliveryMethod) {
+    public void setDeliveryMethodId(BigDecimal deliveryMethod) {
         this.deliveryMethodId = deliveryMethod;
     }
 
-    public String getPaymentMethod() {
-        return paymentMethod;
+    public BigDecimal getPaymentMethodId() {
+        return paymentMethodId;
     }
 
-    public void setPaymentMethod(String paymentMethod) {
-        this.paymentMethod = paymentMethod;
+    public void setPaymentMethodId(BigDecimal paymentMethod) {
+        this.paymentMethodId = paymentMethod;
     }
 
     /**
      * @return deliveryMethodIndex
      */
-    public int getDeliveryMethodIdIndex() {
-        return deliveryMethodIdIndex;
+    public int getDeliveryMethodIndex() {
+        return deliveryMethodIndex;
     }
 
     /**
      * @param deliveryMethodIndex 設定する deliveryMethodIndex
      */
-    public void setDeliveryMethodIdIndex(int deliveryMethodIndex) {
-        this.deliveryMethodIdIndex = deliveryMethodIndex;
+    public void setDeliveryMethodIndex(int deliveryMethodIndex) {
+        this.deliveryMethodIndex = deliveryMethodIndex;
     }
 
     /**
      * @return deliveryMethodItems
      */
-    public List<Map<String, String>> getDeliveryMethodIdItems() {
-        return deliveryMethodIdItems;
+    public List<Map<String, Object>> getDeliveryMethodItems() {
+        return deliveryMethodItems;
     }
 
     /**
      * @param deliveryMethodItems 設定する deliveryMethodItems
      */
-    public void setDeliveryMethodIdItems(List<Map<String, String>> deliveryMethodItems) {
-        this.deliveryMethodIdItems = deliveryMethodItems;
+    public void setDeliveryMethodItems(
+            List<Map<String, Object>> deliveryMethodItems) {
+        this.deliveryMethodItems = deliveryMethodItems;
     }
 
+    /**
+     * @return paymentMethodIdndex
+     */
+    public int getPaymentMethodIndex() {
+        return paymentMethodIndex;
+    }
+
+    /**
+     * @param paymentMethodIdndex 設定する paymentMethodIdndex
+     */
+    public void setPaymentMethodIndex(int paymentMethodIdndex) {
+        this.paymentMethodIndex = paymentMethodIdndex;
+    }
+
+    /**
+     * @return paymentMethodIdItems
+     */
+    public List<Map<String, Object>> getPaymentMethodItems() {
+        return paymentMethodItems;
+    }
+
+    /**
+     * @param paymentMethodIdItems 設定する paymentMethodIdItems
+     */
+    public void setPaymentMethodItems(
+            List<Map<String, Object>> paymentMethodIdItems) {
+        this.paymentMethodItems = paymentMethodIdItems;
+    }
+
+    /**
+     * @return cardCodeIndex
+     */
+    public int getCardCodeIndex() {
+        return cardCodeIndex;
+    }
+
+    /**
+     * @param cardCodeIndex 設定する cardCodeIndex
+     */
+    public void setCardCodeIndex(int cardCodeIndex) {
+        this.cardCodeIndex = cardCodeIndex;
+    }
+
+    /**
+     * @return cardCodeItems
+     */
+    public List<Map<String, String>> getCardCodeItems() {
+        return cardCodeItems;
+    }
+
+    /**
+     * @param cardCodeItems 設定する cardCodeItems
+     */
+    public void setCardCodeItems(List<Map<String, String>> cardCodeItems) {
+        this.cardCodeItems = cardCodeItems;
+    }
+
+    /**
+     * @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 targetDeliveryMethodId
+     */
+    public BigDecimal getTargetDeliveryMethodId() {
+        return targetDeliveryMethodId;
+    }
+
+    /**
+     * @param targetDeliveryMethodId 設定する targetDeliveryMethodId
+     */
+    public void setTargetDeliveryMethodId(BigDecimal targetDeliveryMethodId) {
+        this.targetDeliveryMethodId = targetDeliveryMethodId;
+    }
+
+    /**
+     * @return targetPaymentMethodId
+     */
+    public BigDecimal getTargetPaymentMethodId() {
+        return targetPaymentMethodId;
+    }
+
+    /**
+     * @param targetPaymentMethodId 設定する targetPaymentMethodId
+     */
+    public void setTargetPaymentMethodId(BigDecimal targetPaymentMethodId) {
+        this.targetPaymentMethodId = targetPaymentMethodId;
+    }
+
 }

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -16,6 +16,7 @@
 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 org.seasar.teeda.extension.annotation.takeover.TakeOver;
@@ -35,6 +36,8 @@
 
     private CustomerService customerService;
 
+    private LanguageService languageService;
+
     private CustomerDxo customerDxo;
 
     public Class<?> initialize() {
@@ -50,21 +53,23 @@
         }
 
         // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(remoteUser);
-        if (customers == null) {
+        Customer customer = getCustomerService().getCustomerByPortalId(
+                remoteUser);
+        if (customer == null) {
             return UserInfoEditPage.class;
         }
 
         // set default address book
-        //TODO
-        //        if (customers.getCustomerDefaultAddressId() != null) {
-        //            getUserAddressSelectPage().setAddressBookId(
-        //                    customers.getCustomerDefaultAddressId().toString());
-        //        }
+        AddressBook defaultAddressBook = getCustomerService()
+                .getDefaultAddressBook(customer.getCustomerId());
+        if (defaultAddressBook != null) {
+            getUserAddressSelectPage().setAddressBookId(
+                    defaultAddressBook.getAddressBookId().toString());
+        }
 
         List<Map<String, String>> list = new ArrayList<Map<String, String>>();
         List<AddressBook> addressBookList = getCustomerService()
-                .getAddressBookList(customers.getCustomerId());
+                .getAddressBookList(customer.getCustomerId());
         //TODO Dxo??
         for (AddressBook addressBook : addressBookList) {
             Map<String, String> map = new HashMap<String, String>();
@@ -98,20 +103,26 @@
         }
 
         // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(remoteUser);
-        if (customers == null) {
+        Customer customer = getCustomerService().getCustomerByPortalId(
+                remoteUser);
+        if (customer == null) {
             return UserInfoEditPage.class;
         }
 
         AddressBook addressBook = new AddressBook();
         getCustomerDxo().convert(getUserAddressSelectPage(), addressBook);
         addressBook.setAddressBookId(null);
-        addressBook.setCustomerId(customers.getCustomerId());
+        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);
 
         // TODO put message
@@ -127,7 +138,8 @@
         }
 
         // check user info
-        Customer customers = getCustomerService().getCustomerByPortalId(remoteUser);
+        Customer customers = getCustomerService().getCustomerByPortalId(
+                remoteUser);
         if (customers == null) {
             return UserInfoEditPage.class;
         }
@@ -147,11 +159,13 @@
         }
 
         // check if address book is default
-        //TODO
-        //        if (addressBookId.equals(customers.getCustomerDefaultAddressId())) {
-        //            //TODO put message (can not deletea a default value)
-        //            return UserAddressSelectPage.class;
-        //        }
+        AddressBook defaultAddressBook = getCustomerService()
+                .getDefaultAddressBook(customers.getCustomerId());
+        if (defaultAddressBook != null
+                && addressBookId.equals(defaultAddressBook.getAddressBookId())) {
+            //TODO put message (can not delete a default value)
+            return UserAddressSelectPage.class;
+        }
 
         AddressBook addressBook = getCustomerService().getAddressBook(
                 addressBookId);
@@ -224,4 +238,18 @@
         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/UserAddressSelectPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -19,27 +19,27 @@
 
     private String addressBookId;
 
-    private String entryCellphone;
+    private String cellphone;
 
-    private String entryCity;
+    private String city;
 
-    private String entryCompany;
+    private String company;
 
-    private String entryFax;
+    private String fax;
 
-    private String entryFirstname;
+    private String firstname;
 
-    private String entryLastname;
+    private String lastname;
 
-    private String entryPostcode;
+    private String postcode;
 
-    private String entryState;
+    private String state;
 
-    private String entryStreetAddress;
+    private String streetAddress;
 
-    private String entryTelephone;
+    private String telephone;
 
-    private String entryGender;
+    private String department;
 
     /**
      * @return orderProcessId
@@ -92,98 +92,98 @@
         this.addressBookId = addressBookId;
     }
 
-    public String getEntryCellphone() {
-        return entryCellphone;
+    public String getCellphone() {
+        return cellphone;
     }
 
-    public void setEntryCellphone(String entryCellphone) {
-        this.entryCellphone = entryCellphone;
+    public void setCellphone(String entryCellphone) {
+        this.cellphone = entryCellphone;
     }
 
-    public String getEntryCity() {
-        return entryCity;
+    public String getCity() {
+        return city;
     }
 
-    public void setEntryCity(String entryCity) {
-        this.entryCity = entryCity;
+    public void setCity(String entryCity) {
+        this.city = entryCity;
     }
 
-    public String getEntryCompany() {
-        return entryCompany;
+    public String getCompany() {
+        return company;
     }
 
-    public void setEntryCompany(String entryCompany) {
-        this.entryCompany = entryCompany;
+    public void setCompany(String entryCompany) {
+        this.company = entryCompany;
     }
 
-    public String getEntryFax() {
-        return entryFax;
+    public String getFax() {
+        return fax;
     }
 
-    public void setEntryFax(String entryFax) {
-        this.entryFax = entryFax;
+    public void setFax(String entryFax) {
+        this.fax = entryFax;
     }
 
-    public String getEntryFirstname() {
-        return entryFirstname;
+    public String getFirstname() {
+        return firstname;
     }
 
-    public void setEntryFirstname(String entryFirstname) {
-        this.entryFirstname = entryFirstname;
+    public void setFirstname(String entryFirstname) {
+        this.firstname = entryFirstname;
     }
 
-    public String getEntryLastname() {
-        return entryLastname;
+    public String getLastname() {
+        return lastname;
     }
 
-    public void setEntryLastname(String entryLastname) {
-        this.entryLastname = entryLastname;
+    public void setLastname(String entryLastname) {
+        this.lastname = entryLastname;
     }
 
-    public String getEntryPostcode() {
-        return entryPostcode;
+    public String getPostcode() {
+        return postcode;
     }
 
-    public void setEntryPostcode(String entryPostcode) {
-        this.entryPostcode = entryPostcode;
+    public void setPostcode(String entryPostcode) {
+        this.postcode = entryPostcode;
     }
 
-    public String getEntryState() {
-        return entryState;
+    public String getState() {
+        return state;
     }
 
-    public void setEntryState(String entryState) {
-        this.entryState = entryState;
+    public void setState(String entryState) {
+        this.state = entryState;
     }
 
-    public String getEntryStreetAddress() {
-        return entryStreetAddress;
+    public String getStreetAddress() {
+        return streetAddress;
     }
 
-    public void setEntryStreetAddress(String entryStreetAddress) {
-        this.entryStreetAddress = entryStreetAddress;
+    public void setStreetAddress(String entryStreetAddress) {
+        this.streetAddress = entryStreetAddress;
     }
 
-    public String getEntryTelephone() {
-        return entryTelephone;
+    public String getTelephone() {
+        return telephone;
     }
 
-    public void setEntryTelephone(String entryTelephone) {
-        this.entryTelephone = entryTelephone;
+    public void setTelephone(String entryTelephone) {
+        this.telephone = entryTelephone;
     }
 
     /**
-     * @return entryGender
+     * @return department
      */
-    public String getEntryGender() {
-        return entryGender;
+    public String getDepartment() {
+        return department;
     }
 
     /**
-     * @param entryGender 設定する entryGender
+     * @param department 設定する department
      */
-    public void setEntryGender(String entryGender) {
-        this.entryGender = entryGender;
+    public void setDepartment(String department) {
+        this.department = department;
     }
 
 }

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -2,18 +2,19 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.HashMap;
 
 import javax.faces.context.FacesContext;
 
 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.exentity.Zone;
 import jp.sf.pal.pompei.service.CustomerService;
+import jp.sf.pal.pompei.service.LanguageService;
 import jp.sf.pal.pompei.util.SessionUtil;
 
 import org.seasar.teeda.extension.annotation.takeover.TakeOver;
@@ -33,6 +34,8 @@
 
     private CustomerService customerService;
 
+    private LanguageService languageService;
+
     private CustomerDxo customerDxo;
 
     public Class<?> initialize() {
@@ -49,23 +52,23 @@
             return null;
         }
         getUserInfoEditPage().setIsLogin(true);
-        getUserInfoEditPage().setCustomersPortalId(remoteUser);
+        getUserInfoEditPage().setPortalId(remoteUser);
 
-        Customer customers = getCustomerService().getCustomerByPortalId(
+        Customer customer = getCustomerService().getCustomerByPortalId(
                 remoteUser);
-        if (customers == null) {
+        if (customer == null) {
             getUserInfoEditPage().setIsUser(false);
             return null;
         }
         getUserInfoEditPage().setIsUser(true);
 
-        getCustomerDxo().convert(customers, getUserInfoEditPage());
-        //TODO
-        //        AddressBook defaultAddressBook = getCustomerService().getAddressBook(
-        //                customers.getCustomerDefaultAddressId());
-        //        if (defaultAddressBook != null) {
-        //            getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage());
-        //        }
+        getCustomerDxo().convert(customer, getUserInfoEditPage());
+        // set default address
+        AddressBook defaultAddressBook = getCustomerService()
+                .getDefaultAddressBook(customer.getCustomerId());
+        if (defaultAddressBook != null) {
+            getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage());
+        }
 
         // render FacesMessages
         FacesMessageUtil.renderMessages();
@@ -73,27 +76,27 @@
     }
 
     public Class<?> doRegister() {
-        Customer customers = new Customer();
+        Customer customer = new Customer();
         AddressBook addressBook = new AddressBook();
-        getCustomerDxo().convert(getUserInfoEditPage(), customers);
+        getCustomerDxo().convert(getUserInfoEditPage(), customer);
         getCustomerDxo().convert(getUserInfoEditPage(), addressBook);
 
-        //TODO enable date of birth
-        customers.setDayOfBirth(new Timestamp(new Date().getTime()));
-        getCustomerService().addCustomer(customers);
+        getCustomerService().addCustomer(customer);
 
-        addressBook.setCustomerId(customers.getCustomerId());
+        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 address
+        addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL);
+
         getCustomerService().addAddressBook(addressBook);
 
-        //TODO
-        //        customers.setCustomerDefaultAddressId(addressBook.getAddressBookId());
-        getCustomerService().updateCustomer(customers);
-
         //TODO put message
         return UserInfoEditPage.class;
     }
@@ -101,12 +104,12 @@
     @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId")
     public Class<?> doNext() {
         // start order process
-        if (getUserInfoEditPage().getCustomersId() == null) {
+        if (getUserInfoEditPage().getCustomerId() == null) {
             //TODO put message
             return UserInfoEditAction.class;
         }
         getUserInfoEditPage().setOrderProcessId(
-                getUserInfoEditPage().getCustomersId()
+                getUserInfoEditPage().getCustomerId()
                         + String.valueOf(new Date().getTime()));
         // set info to session
         SessionUtil.removeFromLocalScope(getUserInfoEditPage()
@@ -163,4 +166,18 @@
         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/UserInfoEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -2,7 +2,9 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
+import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
 import org.seasar.teeda.extension.util.LabelHelper;
 
 public class UserInfoEditPage implements Serializable {
@@ -16,36 +18,39 @@
 
     private String orderProcessId;
 
-    private String customersCellphone;
+    private String cellphone;
 
-    private String customersEmailAddress;
+    private String emailAddress;
 
-    private String customersFax;
+    private String fax;
 
-    private String customersFirstname;
+    private String firstname;
 
-    private String customersGender;
+    private String gender;
 
-    private String customersLastname;
+    private String lastname;
 
-    private String customersTelephone;
+    private String telephone;
 
-    private String entryCity;
+    private String city;
 
-    private String entryCompany;
+    private String company;
 
-    private String entryDepartment;
+    private String department;
 
-    private String entryPostcode;
+    private String postcode;
 
-    private String entryState;
+    private String state;
 
-    private String entryStreetAddress;
+    private String streetAddress;
 
-    private String customersPortalId;
+    private String portalId;
 
-    private BigDecimal customersId;
+    private BigDecimal customerId;
 
+    @DateTimeConverter(pattern = "yyyy/MM/dd")
+    private Date dayOfBirth;
+
     private boolean isUser;
 
     private boolean isLogin;
@@ -81,133 +86,133 @@
     /**
      * @return portalId
      */
-    public String getCustomersPortalId() {
-        return customersPortalId;
+    public String getPortalId() {
+        return portalId;
     }
 
     /**
      * @param portalId 設定する portalId
      */
-    public void setCustomersPortalId(String portalId) {
-        this.customersPortalId = portalId;
+    public void setPortalId(String portalId) {
+        this.portalId = portalId;
     }
 
-    public String getCustomersCellphone() {
-        return customersCellphone;
+    public String getCellphone() {
+        return cellphone;
     }
 
-    public void setCustomersCellphone(String customersCellphone) {
-        this.customersCellphone = customersCellphone;
+    public void setCellphone(String customersCellphone) {
+        this.cellphone = customersCellphone;
     }
 
-    public String getCustomersEmailAddress() {
-        return customersEmailAddress;
+    public String getEmailAddress() {
+        return emailAddress;
     }
 
-    public void setCustomersEmailAddress(String customersEmailAddress) {
-        this.customersEmailAddress = customersEmailAddress;
+    public void setEmailAddress(String customersEmailAddress) {
+        this.emailAddress = customersEmailAddress;
     }
 
-    public String getCustomersFax() {
-        return customersFax;
+    public String getFax() {
+        return fax;
     }
 
-    public void setCustomersFax(String customersFax) {
-        this.customersFax = customersFax;
+    public void setFax(String customersFax) {
+        this.fax = customersFax;
     }
 
-    public String getCustomersFirstname() {
-        return customersFirstname;
+    public String getFirstname() {
+        return firstname;
     }
 
-    public void setCustomersFirstname(String customersFirstname) {
-        this.customersFirstname = customersFirstname;
+    public void setFirstname(String customersFirstname) {
+        this.firstname = customersFirstname;
     }
 
-    public String getCustomersGender() {
-        return customersGender;
+    public String getGender() {
+        return gender;
     }
 
-    public void setCustomersGender(String customersGender) {
-        this.customersGender = customersGender;
+    public void setGender(String customersGender) {
+        this.gender = customersGender;
     }
 
-    public String getCustomersLastname() {
-        return customersLastname;
+    public String getLastname() {
+        return lastname;
     }
 
-    public void setCustomersLastname(String customersLastname) {
-        this.customersLastname = customersLastname;
+    public void setLastname(String customersLastname) {
+        this.lastname = customersLastname;
     }
 
-    public String getCustomersTelephone() {
-        return customersTelephone;
+    public String getTelephone() {
+        return telephone;
     }
 
-    public void setCustomersTelephone(String customersTelephone) {
-        this.customersTelephone = customersTelephone;
+    public void setTelephone(String customersTelephone) {
+        this.telephone = customersTelephone;
     }
 
     /**
      * @return customersId
      */
-    public BigDecimal getCustomersId() {
-        return customersId;
+    public BigDecimal getCustomerId() {
+        return customerId;
     }
 
     /**
      * @param customersId 設定する customersId
      */
-    public void setCustomersId(BigDecimal customersId) {
-        this.customersId = customersId;
+    public void setCustomerId(BigDecimal customersId) {
+        this.customerId = customersId;
     }
 
-    public String getEntryCity() {
-        return entryCity;
+    public String getCity() {
+        return city;
     }
 
-    public void setEntryCity(String entryCity) {
-        this.entryCity = entryCity;
+    public void setCity(String entryCity) {
+        this.city = entryCity;
     }
 
-    public String getEntryCompany() {
-        return entryCompany;
+    public String getCompany() {
+        return company;
     }
 
-    public void setEntryCompany(String entryCompany) {
-        this.entryCompany = entryCompany;
+    public void setCompany(String entryCompany) {
+        this.company = entryCompany;
     }
 
-    public String getEntryDepartment() {
-        return entryDepartment;
+    public String getDepartment() {
+        return department;
     }
 
-    public void setEntryDepartment(String entryDepartment) {
-        this.entryDepartment = entryDepartment;
+    public void setDepartment(String entryDepartment) {
+        this.department = entryDepartment;
     }
 
-    public String getEntryPostcode() {
-        return entryPostcode;
+    public String getPostcode() {
+        return postcode;
     }
 
-    public void setEntryPostcode(String entryPostcode) {
-        this.entryPostcode = entryPostcode;
+    public void setPostcode(String entryPostcode) {
+        this.postcode = entryPostcode;
     }
 
-    public String getEntryState() {
-        return entryState;
+    public String getState() {
+        return state;
     }
 
-    public void setEntryState(String entryState) {
-        this.entryState = entryState;
+    public void setState(String entryState) {
+        this.state = entryState;
     }
 
-    public String getEntryStreetAddress() {
-        return entryStreetAddress;
+    public String getStreetAddress() {
+        return streetAddress;
     }
 
-    public void setEntryStreetAddress(String entryStreetAddress) {
-        this.entryStreetAddress = entryStreetAddress;
+    public void setStreetAddress(String entryStreetAddress) {
+        this.streetAddress = entryStreetAddress;
     }
 
     public boolean isUser() {
@@ -219,23 +224,23 @@
     }
 
     public String getEntryFax() {
-        return customersFax;
+        return fax;
     }
 
     public String getEntryFirstname() {
-        return customersFirstname;
+        return firstname;
     }
 
     public String getEntryGender() {
-        return customersGender;
+        return gender;
     }
 
     public String getEntryLastname() {
-        return customersLastname;
+        return lastname;
     }
 
     public String getEntryTelephone() {
-        return customersTelephone;
+        return telephone;
     }
 
     public boolean isLogin() {
@@ -246,7 +251,21 @@
         isLogin = flag;
     }
 
-    public String getCustomersGenderString() {
-        return getLabelHelper().getLabelValue(getCustomersGender());
+    public String getGenderString() {
+        return getLabelHelper().getLabelValue(getGender());
     }
+
+    /**
+     * @return dayOfBirth
+     */
+    public Date getDayOfBirth() {
+        return dayOfBirth;
+    }
+
+    /**
+     * @param dayOfBirth 設定する dayOfBirth
+     */
+    public void setDayOfBirth(Date dayOfBirth) {
+        this.dayOfBirth = dayOfBirth;
+    }
 }

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -44,7 +44,7 @@
 
     public Class<?> prerender() {
         ProductDescription description = productService
-                .getProdcutsDescription(productDetailsPage.getProductsId());
+                .getProdcutsDescription(productDetailsPage.getProductId());
         productDxo.convert(description, productDetailsPage);
 
         Manufacturer manufacturers = productService.getManufacturer(description
@@ -77,7 +77,7 @@
         }
 
         Product products = productService.getProdcut(productDetailsPage
-                .getProductsId());
+                .getProductId());
         if (products == null) {
             //TODO put message
             return null;

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -3,8 +3,6 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-import org.seasar.teeda.extension.annotation.scope.SubapplicationScope;
-
 public class ProductDetailsPage implements Serializable {
 
     /**
@@ -14,17 +12,14 @@
 
     private String manufacturersName;
 
-    @SubapplicationScope
-    private BigDecimal productsId;
+    private BigDecimal productId;
 
-    private String productsModel;
+    private String model;
 
-    private String productsName;
+    private String name;
 
-    private String productsPrice;
+    private String price;
 
-    private String title;
-
     public String getManufacturersName() {
         return manufacturersName;
     }
@@ -33,44 +28,36 @@
         this.manufacturersName = manufacturersName;
     }
 
-    public BigDecimal getProductsId() {
-        return productsId;
+    public BigDecimal getProductId() {
+        return productId;
     }
 
-    public void setProductsId(BigDecimal productsId) {
-        this.productsId = productsId;
+    public void setProductId(BigDecimal productsId) {
+        this.productId = productsId;
     }
 
-    public String getProductsModel() {
-        return productsModel;
+    public String getModel() {
+        return model;
     }
 
-    public void setProductsModel(String productsModel) {
-        this.productsModel = productsModel;
+    public void setModel(String productsModel) {
+        this.model = productsModel;
     }
 
-    public String getProductsName() {
-        return productsName;
+    public String getName() {
+        return name;
     }
 
-    public void setProductsName(String productsName) {
-        this.productsName = productsName;
+    public void setName(String productsName) {
+        this.name = productsName;
     }
 
-    public String getProductsPrice() {
-        return productsPrice;
+    public String getPrice() {
+        return price;
     }
 
-    public void setProductsPrice(String productsPrice) {
-        this.productsPrice = productsPrice;
+    public void setPrice(String productsPrice) {
+        this.price = productsPrice;
     }
 
-    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/product/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -39,47 +39,35 @@
     private CategoryService categoryService;
 
     /**	 */
-    private CategoryDxo categoriesDxo;
+    private CategoryDxo categoryDxo;
 
     private LabelHelper labelHelper;
 
-    /**
-    * @return labelHelper
-    */
-    public LabelHelper getLabelHelper() {
-        return labelHelper;
-    }
-
-    /**
-     * @param labelHelper 設定する labelHelper
-     */
-    public void setLabelHelper(LabelHelper labelHelper) {
-        this.labelHelper = labelHelper;
-    }
-
     public Class<?> initialize() {
         return null;
     }
 
     public Class<?> prerender() {
         if (productListPage.getParentId() == null) {
-            productListPage.setParentId(new BigDecimal("0"));
+            productListPage.setParentId(PompeiConstants.ROOT_CATEGORY_ID);
         }
 
         if (productListPage.getBreadcrumbItems() == null) {
-            productListPage.setCategoriesId(new BigDecimal("0"));
+            productListPage.setCategoryId(PompeiConstants.ROOT_CATEGORY_ID);
 
             List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
             Map<String, Object> m = new HashMap<String, Object>();
-            m.put(PompeiConstants.CATEGORY_ID, new BigDecimal("0"));
+            m
+                    .put(PompeiConstants.CATEGORY_ID,
+                            PompeiConstants.ROOT_CATEGORY_ID);
             m.put(PompeiConstants.BREADCRUMB, getLabelHelper().getLabelValue(
                     PompeiConstants.TOP_CATEGORY));
             list.add(m);
             productListPage.setBreadcrumbItems(list);
 
         } else {
-            if (productListPage.getCategoriesId() != null) {
-                productListPage.setParentId(productListPage.getCategoriesId());
+            if (productListPage.getCategoryId() != null) {
+                productListPage.setParentId(productListPage.getCategoryId());
             }
 
             //パンくずリストを再セット
@@ -117,12 +105,16 @@
                 return list;
             }
         }
-        CategoryDescription d = categoryService
-                .getCategoryDescription(productListPage.getCategoriesId());
+        CategoryDescription cd = categoryService
+                .getCategoryDescription(productListPage.getCategoryId());
 
+        if (cd == 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, cd.getName());
         list.add(m);
         return list;
     }
@@ -131,7 +123,7 @@
         List<CategoryDescription> list = categoryService
                 .getSubCategoryDescriptionList(productListPage.getParentId());
         List<Map<String, Object>> cList = new ArrayList<Map<String, Object>>();
-        categoriesDxo.convert(list, cList);
+        categoryDxo.convert(list, cList);
         return cList;
     }
 
@@ -149,12 +141,12 @@
         this.productListPage = productListPage;
     }
 
-    public CategoryDxo getCategoriesDxo() {
-        return categoriesDxo;
+    public CategoryDxo getCategoryDxo() {
+        return categoryDxo;
     }
 
-    public void setCategoriesDxo(CategoryDxo categoriesDxo) {
-        this.categoriesDxo = categoriesDxo;
+    public void setCategoryDxo(CategoryDxo categoriesDxo) {
+        this.categoryDxo = categoriesDxo;
     }
 
     public CategoryService getCategoryService() {
@@ -186,4 +178,18 @@
         return "../cart/productList";
     }
 
+    /**
+     * @return labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper 設定する labelHelper
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java	2007-09-21 08:49:50 UTC (rev 575)
@@ -19,7 +19,7 @@
      */
     private static final long serialVersionUID = -2356477849446203183L;
 
-    private BigDecimal categoriesId;
+    private BigDecimal categoryId;
 
     private String breadcrumb;
 
@@ -27,10 +27,11 @@
 
     /** 改行ポイント*/
     //	private boolean breakPoint;
+    
     @SubapplicationScope
     private List<Map<String, Object>> breadcrumbItems;
 
-    private String categoriesName;
+    private String name;
 
     private int categoryIndex;
 
@@ -44,12 +45,10 @@
 
     private List<Map<String, Object>> productItems;
 
-    private BigDecimal productsId;
+    private BigDecimal productId;
 
-    private BigDecimal productsPrice;
+    private BigDecimal price;
 
-    private String title;
-
     private LanguageService languageService;
 
     public String getBreadcrumb() {
@@ -76,12 +75,12 @@
         this.breadcrumbItems = breadcrumbItems;
     }
 
-    public String getCategoriesName() {
-        return categoriesName;
+    public String getName() {
+        return name;
     }
 
-    public void setCategoriesName(String categoriesName) {
-        this.categoriesName = categoriesName;
+    public void setName(String categoriesName) {
+        this.name = categoriesName;
     }
 
     public int getCategoryIndex() {
@@ -124,30 +123,22 @@
         this.productItems = productItems;
     }
 
-    public BigDecimal getProductsPrice() {
-        return productsPrice;
+    public BigDecimal getPrice() {
+        return price;
     }
 
-    public void setProductsPrice(BigDecimal productsPrice) {
-        this.productsPrice = productsPrice;
+    public void setPrice(BigDecimal productsPrice) {
+        this.price = productsPrice;
     }
 
-    public String getTitle() {
-        return title;
+    public BigDecimal getCategoryId() {
+        return categoryId;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
+    public void setCategoryId(BigDecimal categoriesId) {
+        this.categoryId = categoriesId;
     }
 
-    public BigDecimal getCategoriesId() {
-        return categoriesId;
-    }
-
-    public void setCategoriesId(BigDecimal categoriesId) {
-        this.categoriesId = categoriesId;
-    }
-
     //    public void setDescriptionList(List list) {
     //        if (list != null && list.size() > 0) {
     //            this.productsName = ((ProductDescription) list.get(0))
@@ -164,12 +155,12 @@
         return false;
     }
 
-    public BigDecimal getProductsId() {
-        return productsId;
+    public BigDecimal getProductId() {
+        return productId;
     }
 
-    public void setProductsId(BigDecimal productsId) {
-        this.productsId = productsId;
+    public void setProductId(BigDecimal productsId) {
+        this.productId = productsId;
     }
 
     public String getCartLinkHref() {
@@ -194,7 +185,7 @@
         this.languageService = languageService;
     }
 
-    public String getProductsName() {
+    public String getProductName() {
         //TODO
         if (productItems != null && productIndex < productItems.size()) {
             List<ProductDescription> list = (List<ProductDescription>) productItems

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-09-21 08:49:50 UTC (rev 575)
@@ -105,6 +105,15 @@
      , PRIMARY KEY (CARD_TYPE_ID)
 );
 
+CREATE TABLE ORDER_CARD_INFO (
+       ORDER_CARD_INFO_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
+     , CARD_CODE VARCHAR(32) NOT NULL
+     , CARD_OWNER VARCHAR(255) NOT NULL
+     , CARD_NUMBER VARCHAR(255) NOT NULL
+     , CARD_EXPIRES VARCHAR(255) NOT NULL
+     , PRIMARY KEY (ORDER_CARD_INFO_ID)
+);
+
 CREATE TABLE COUNTRY (
        COUNTRY_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , NAME VARCHAR(64) NOT NULL
@@ -220,16 +229,6 @@
      , PRIMARY KEY (ZONE_ID)
 );
 
-CREATE TABLE ORDER_CARD_INFO (
-       ORDER_CARD_INFO_ID BIGINT NOT NULL
-     , CARD_TYPE_ID INTEGER
-     , CARD_CODE VARCHAR(32)
-     , CARD_OWNER VARCHAR(255)
-     , CARD_NUMBER VARCHAR(255)
-     , CARD_EXPIRES VARCHAR(255)
-     , PRIMARY KEY (ORDER_CARD_INFO_ID)
-);
-
 CREATE TABLE PRODUCT_ATTRIBUTE (
        PRODUCT_ATTRIBUTE_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PRODUCT_ID BIGINT NOT NULL
@@ -511,11 +510,6 @@
       FOREIGN KEY (CURRENCY_ID)
       REFERENCES CURRENCY (CURRENCY_ID);
 
-ALTER TABLE ORDER_FORM
-  ADD CONSTRAINT FK_ORDER_6
-      FOREIGN KEY (ORDER_CARD_INFO_ID)
-      REFERENCES ORDER_CARD_INFO (ORDER_CARD_INFO_ID);
-
 ALTER TABLE PRODUCT
   ADD CONSTRAINT SQL070831021755391
       FOREIGN KEY (MANUFACTURER_ID)
@@ -546,11 +540,6 @@
       FOREIGN KEY (COUNTRY_ID)
       REFERENCES COUNTRY (COUNTRY_ID);
 
-ALTER TABLE ORDER_CARD_INFO
-  ADD CONSTRAINT FK_ORDER_CARD_INFO_1
-      FOREIGN KEY (CARD_TYPE_ID)
-      REFERENCES CARD_TYPE (CARD_TYPE_ID);
-
 ALTER TABLE PRODUCT_ATTRIBUTE
   ADD CONSTRAINT SQL070831021756760
       FOREIGN KEY (PRODUCT_ID)

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -4,8 +4,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title id="title-head">メーカー一覧</title>
-<script language="javascript">
-<!--
+</head>
+<body>
+<script language="javascript">
+<!--
 function setTargetId(form, id){
 	children = form.childNodes;
 	children[1].value = id;
@@ -13,11 +15,9 @@
 function setMode(form, mode){
 	children = form.childNodes;
 	children[0].value = mode;
-}
- -->
-</script>
-</head>
-<body>
+}
+ -->
+</script>
 <form id="form" method="post"><input type="hidden" id="mode" /><input type="hidden" id="targetId" />
 
 <table border="1">

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -19,16 +19,16 @@
 			<th>&nbsp;</th>
 		</tr>
 	</thead>
-	<tbody id="productsItems">
+	<tbody id="productItems">
 		<tr style="dummy">
-			<td><span id="productsCount">1</span></td>
-			<td><span id="productsName">XXX 01MAX</span></td>
-			<td><span id="productsModel">MX-XXX</span></td>
-			<td><span id="manufacturersName">アディダス</span></td>
+			<td><span id="productCount">1</span></td>
+			<td><span id="productName">XXX 01MAX</span></td>
+			<td><span id="productModel">MX-XXX</span></td>
+			<td><span id="manufacturerName">アディダス</span></td>
 			<td><span id="quantity">1</span></td>
 			<td><span id="finalPrice">30,000</span></td>
 			<td>
-				<a id="goProductDelete" href="./productList.html?customersBasketId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか?')){return true;}else{return false;}">削除</a>
+				<a id="goProductDelete" href="./productList.html?customerBasketId=0&fixed_mode=delete" onclick="if(confirm('削除します。よろしいですか?')){return true;}else{return false;}">削除</a>
 			</td>
 		</tr>
 	</tbody>

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -37,16 +37,16 @@
                   </th>
                 </tr>
               </thead>
-              <tbody id="customersBasketItems">
+              <tbody id="customerBasketItems">
                 <tr style="dummy">
                   <td>
-                    <span id="productsName">XXX 01MAX</span>
+                    <span id="name">XXX 01MAX</span>
                   </td>
                   <td>
-                    <span id="productsModel">MX-XXX</span>
+                    <span id="model">MX-XXX</span>
                   </td>
                   <td>
-                    <span id="manufacturersName">アディダス</span>
+                    <span id="manufacturerName">アディダス</span>
                   </td>
                   <td>
                     <span id="quantity">1</span>
@@ -88,7 +88,7 @@
                   <label>氏名(姓)</label>
                 </th>
                 <td>
-                  <span id="entryLastname">VALUE</span>
+                  <span id="lastname">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -96,7 +96,7 @@
                   <label>氏名(名)</label>
                 </th>
                 <td>
-                  <span id="entryFirstname">VALUE</span>
+                  <span id="firstname">VALUE</span>
                 </td>
               </tr>
               <tr>
@@ -104,7 +104,7 @@
                   <label>性別:</label>
                 </th>
                 <td>
-                  <span id="entryGenderString">男性</span>
+                  <span id="genderString">男性</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -112,7 +112,7 @@
                   <label>郵便番号</label>
                 </th>
                 <td>
-                  <span id="entryPostcode">VALUE</span>
+                  <span id="postcode">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -120,7 +120,7 @@
                   <label>都道府県</label>
                 </th>
                 <td>
-                  <span id="entryState">VALUE</span>
+                  <span id="state">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -128,13 +128,13 @@
                   <label>郡市区 (島、国)</label>
                 </th>
                 <td>
-                  <span id="entryCity">VALUE</span>
+                  <span id="city">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
                 <th>それ以降の住所</th>
                 <td>
-                  <span id="entryStreetAddress">VALUE</span>
+                  <span id="streetAddress">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -142,7 +142,7 @@
                   <label>会社名・団体名</label>
                 </th>
                 <td>
-                  <span id="entryCompany">VALUE</span>
+                  <span id="company">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -150,7 +150,7 @@
                   <label>電話番号</label>
                 </th>
                 <td>
-                  <span id="entryTelephone">VALUE</span>
+                  <span id="telephone">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -158,7 +158,7 @@
                   <label>FAX番号</label>
                 </th>
                 <td>
-                  <span id="entryFax">VALUE</span>
+                  <span id="fax">VALUE</span>
                 </td>
               </tr>
               <tr style="dummy" height="20px">
@@ -166,7 +166,7 @@
                   <label>携帯電話番号</label>
                 </th>
                 <td>
-                  <span id="entryCellphone">VALUE</span>
+                  <span id="cellphone">VALUE</span>
                 </td>
               </tr>
             </table>

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -1,12 +1,24 @@
 <?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">
+<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>
-    <form id="Form">
+<script language="javascript">
+<!--
+function setPaymentMethodId(form, id){
+	children = form.childNodes;
+	children[0].value = id;
+}
+function setDeliveryMethodId(form, id){
+	children = form.childNodes;
+	children[1].value = id;
+}
+ -->
+</script>
+    <form id="paymentSelectForm"><input type="hidden" id="targetPaymentMethodId-hidden"/><input type="hidden" id="targetDeliveryMethodId-hidden"/>
       <input id="orderProcessId" type="hidden"/>
       <div>
         <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
@@ -15,22 +27,19 @@
       <h3 class="portlet-section-header">
         <label>お支払い方法の選択</label>
       </h3>
-      <span id="paymentMethod">
         <table>
+          <tbody id="paymentMethodItems">
           <tr>
-            <td><input type="radio" name="paymentMethod" value="COD" />代金引換え</td>
-            <td>※ここに代金引換に関する説明を表示</td>
+            <td><label><input type="radio" name="paymentMethodId" onclick="setPaymentMethodId(this.form,this.nextSibling.value);"/><input type="hidden" id="paymentMethodId-hidden"/><span id="name">名前</span></label></td>
           </tr>
           <tr>
-            <td><input type="radio" name="paymentMethod" value="BANK" />銀行振込み</td>
-            <td>※ここに銀行振り込みに関する説明を表示</td>
+            <td><span id="description" te:escape="false">説明</span></td>
           </tr>
-          <tr>
-            <td><input type="radio" name="paymentMethod" value="CARD" />クレジットカード</td>
-            <td>※ここにクレジットに関する説明を表示</td>
-          </tr>
+          </tbody>
         </table>
-      </span>
+      <h3 class="portlet-section-header">
+        <label>カード情報の入力</label>
+      </h3>
         <table>
           <tr>
             <td></td>
@@ -41,7 +50,9 @@
                     <label>カード会社</label>
                   </th>
                   <td>
-                    <input type="text" id="ccType" />
+                    <select id="cardCode" >
+                      <option value="bbb">hoge</option>
+                    </select> 
                   </td>
                 </tr>
                 <tr>
@@ -75,10 +86,16 @@
       <h3 class="portlet-section-header">
         <label>配送方法の選択</label>
       </h3>
-      <span id="deliveryMethodId"><input type="radio" name="deliveryMethodId" value="0" checked="checked" />aaa
-  <input type="radio" name="deliveryMethodId" value="1" />bbb
-  <input type="radio" name="deliveryMethodId" value="2" />ccc
-</span>
+        <table>
+          <tbody id="deliveryMethodItems">
+          <tr>
+            <td><label><input type="radio" name="deliveryMethodId" onclick="setDeliveryMethodId(this.form,this.nextSibling.value);"/><input type="hidden" id="deliveryMethodId-hidden"/><span id="name">名前</span></label></td>
+          </tr>
+          <tr>
+            <td><span id="description" te:escape="false">説明</span></td>
+          </tr>
+          </tbody>
+        </table>
       <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelection.html'" />
     </form>
   </body>

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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -19,7 +19,7 @@
         <label>登録した届け先から選択</label>
       </h4>
       <div>
-        <span id="addressBookId">
+        <span id="addressBookId" style="pageDirection">
           <input type="radio" name="addressBookId" value="0" checked="checked" />会員住所<br/>
           <input type="radio" name="addressBookId" value="1" />届け先1<br/>
           <input type="radio" name="addressBookId" value="2" />届け先2<br/>
@@ -42,7 +42,7 @@
               <label>氏名(姓)</label>
             </th>
             <td>
-              <input type="text" id="entryLastname" />
+              <input type="text" id="lastname"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
@@ -50,26 +50,15 @@
               <label>氏名(名)</label>
             </th>
             <td>
-              <input type="text" id="entryFirstname" />
+              <input type="text" id="firstname"  class="portlet-form-input-field"/>
             </td>
           </tr>
-          <tr>
-            <th>
-              <label>性別:</label>
-            </th>
-            <td>
-              <span id="entryGender">
-                <input type="radio" name="entryGender" value="M" class="portlet-form-field-label" />男性
-                <input type="radio" name="entryGender" value="F" class="portlet-form-field-label" />女性
-              </span>
-            </td>
-          </tr>
           <tr style="dummy" height="20px">
             <th>
               <label>郵便番号</label>
             </th>
             <td>
-              <input type="text" id="entryPostcode" size="8" maxlength="8" />
+              <input type="text" id="postcode" size="8" maxlength="8"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
@@ -77,7 +66,7 @@
               <label>都道府県</label>
             </th>
             <td>
-              <input type="text" id="entryState" />
+              <input type="text" id="state"  class="portlet-form-input-field"/>
 <!-- TODO pulldown -->
             </td>
           </tr>
@@ -86,47 +75,55 @@
               <label>郡市区 (島、国)</label>
             </th>
             <td>
-              <input type="text" id="entryCity" />
+              <input type="text" id="city"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
             <th>それ以降の住所</th>
             <td>
-              <input type="text" id="entryStreetAddress" />
+              <input type="text" id="streetAddress"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
             <th>
-              <label>会社名・団体名</label>
+              <label>電話番号</label>
             </th>
             <td>
-              <input type="text" id="entryCompany" />
+              <input type="text" id="telephone"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
             <th>
-              <label>電話番号</label>
+              <label>FAX番号</label>
             </th>
             <td>
-              <input type="text" id="entryTelephone" />
+              <input type="text" id="fax"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
             <th>
-              <label>FAX番号</label>
+              <label>携帯電話番号</label>
             </th>
             <td>
-              <input type="text" id="entryFax" />
+              <input type="text" id="cellphone"  class="portlet-form-input-field"/>
             </td>
           </tr>
           <tr style="dummy" height="20px">
             <th>
-              <label>携帯電話番号</label>
+              <label>会社名・団体名</label>
             </th>
             <td>
-              <input type="text" id="entryCellphone" />
+              <input type="text" id="company"  class="portlet-form-input-field"/>
             </td>
           </tr>
+          <tr>
+            <th>
+              <label>部署名・役職:</label>
+            </th>
+            <td>
+              <input id="department" type="text" class="portlet-form-input-field" />
+            </td>
+          </tr>
         </table>
         <input id="doAdd" type="button" value="追加" onclick="location.href='./userAddressSelection.html'" />
       </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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -7,7 +7,7 @@
   </head>
   <body>
     <form id="Form">
-      <input id="customersPortalId-hidden" type="hidden"/>
+      <input id="portalId-hidden" type="hidden"/>
       <div>
         <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
       </div>
@@ -27,7 +27,7 @@
                 <label>氏名(姓):</label>
               </th>
               <td>
-                <input id="customersLastname" type="text" class="portlet-form-input-field" />
+                <input id="lastname" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -35,7 +35,7 @@
                 <label>氏名(名):</label>
               </th>
               <td>
-                <input id="customersFirstname" type="text" class="portlet-form-input-field" />
+                <input id="firstname" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -43,9 +43,9 @@
                 <label>性別:</label>
               </th>
               <td>
-                <span id="customersGender">
-                  <input type="radio" name="customersGender" value="M" class="portlet-form-field-label" />男性
-                  <input type="radio" name="customersGender" value="F" class="portlet-form-field-label" />女性
+                <span id="gender">
+                  <input type="radio" name="gender" value="M" class="portlet-form-field-label" />男性
+                  <input type="radio" name="gender" value="F" class="portlet-form-field-label" />女性
                 </span>
               </td>
             </tr>
@@ -55,15 +55,23 @@
                 <label>メールアドレス:</label>
               </th>
               <td>
-                <input id="customersEmailAddress" type="text" class="portlet-form-input-field" />
+                <input id="emailAddress" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
               <th>
+                <label>生年月日:</label>
+              </th>
+              <td>
+                <input id="dayOfBirth" type="text" class="portlet-form-input-field" />
+              </td>
+            </tr>
+            <tr>
+              <th>
                 <label>電話番号:</label>
               </th>
               <td>
-                <input id="customersTelephone" type="text" class="portlet-form-input-field" />
+                <input id="telephone" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -71,7 +79,7 @@
                 <label>FAX:</label>
               </th>
               <td>
-                <input id="customersFax" type="text" class="portlet-form-input-field" />
+                <input id="fax" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -79,7 +87,7 @@
                 <label>携帯電話番号:</label>
               </th>
               <td>
-                <input id="customersCellphone" type="text" class="portlet-form-input-field" />
+                <input id="cellphone" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -87,7 +95,7 @@
                 <label>郵便番号:</label>
               </th>
               <td>
-                <input id="entryPostcode" type="text" class="portlet-form-input-field" />
+                <input id="postcode" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -95,7 +103,7 @@
                 <label>都道府県:</label>
               </th>
               <td>
-                <input id="entryState" type="text" class="portlet-form-input-field" />
+                <input id="state" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -103,7 +111,7 @@
                 <label>郡市区 (島、国):</label>
               </th>
               <td>
-                <input id="entryCity" type="text" class="portlet-form-input-field" />
+                <input id="city" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -111,7 +119,7 @@
                 <label>それ以降の住所:</label>
               </th>
               <td>
-                <input id="entryStreetAddress" type="text" class="portlet-form-input-field" />
+                <input id="streetAddress" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -119,7 +127,7 @@
                 <label>会社名・団体名:</label>
               </th>
               <td>
-                <input id="entryCompany" type="text" class="portlet-form-input-field" />
+                <input id="company" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
             <tr>
@@ -127,7 +135,7 @@
                 <label>部署名・役職:</label>
               </th>
               <td>
-                <input id="entryDepartment" type="text" class="portlet-form-input-field" />
+                <input id="department" type="text" class="portlet-form-input-field" />
               </td>
             </tr>
 <!-- TODO: entry_country_id -->
@@ -145,7 +153,7 @@
                 <label>氏名(姓):</label>
               </th>
               <td>
-                <span id="customersLastname-display">VALUE</span>
+                <span id="lastname-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -153,7 +161,7 @@
                 <label>氏名(名):</label>
               </th>
               <td>
-                <span id="customersFirstname-display">VALUE</span>
+                <span id="firstname-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -161,24 +169,31 @@
                 <label>性別:</label>
               </th>
               <td>
-                <span id="customersGenderString">性別</span>
+                <span id="genderString">性別</span>
               </td>
             </tr>
-<!-- TODO: customers_dob -->
             <tr>
               <th>
                 <label>メールアドレス:</label>
               </th>
               <td>
-                <span id="customersEmailAddress-display">VALUE</span>
+                <span id="emailAddress-display">VALUE</span>
               </td>
             </tr>
             <tr>
               <th>
+                <label>生年月日:</label>
+              </th>
+              <td>
+                <span id="dayOfBirth-display">VALUE</span>
+              </td>
+            </tr>
+            <tr>
+              <th>
                 <label>電話番号:</label>
               </th>
               <td>
-                <span id="customersTelephone-display">VALUE</span>
+                <span id="telephone-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -186,7 +201,7 @@
                 <label>FAX:</label>
               </th>
               <td>
-                <span id="customersFax-display">VALUE</span>
+                <span id="fax-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -194,7 +209,7 @@
                 <label>携帯電話番号:</label>
               </th>
               <td>
-                <span id="customersCellphone-display">VALUE</span>
+                <span id="cellphone-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -202,7 +217,7 @@
                 <label>郵便番号:</label>
               </th>
               <td>
-                <span id="entryPostcode-display">VALUE</span>
+                <span id="postcode-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -210,7 +225,7 @@
                 <label>都道府県:</label>
               </th>
               <td>
-                <span id="entryState-display">VALUE</span>
+                <span id="state-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -218,7 +233,7 @@
                 <label>郡市区 (島、国):</label>
               </th>
               <td>
-                <span id="entryCity-display">VALUE</span>
+                <span id="city-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -226,7 +241,7 @@
                 <label>それ以降の住所:</label>
               </th>
               <td>
-                <span id="entryStreetAddress-display">VALUE</span>
+                <span id="streetAddress-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -234,7 +249,7 @@
                 <label>会社名・団体名:</label>
               </th>
               <td>
-                <span id="entryCompany-display">VALUE</span>
+                <span id="company-display">VALUE</span>
               </td>
             </tr>
             <tr>
@@ -242,14 +257,14 @@
                 <label>部署名・役職:</label>
               </th>
               <td>
-                <span id="entryDepartment-display">VALUE</span>
+                <span id="department-display">VALUE</span>
               </td>
             </tr>
 <!-- TODO: entry_country_id -->
           </tbody>
         </table>
 <!-- Term of Licence -->
-        <input id="customersId-hidden" type="hidden"/>
+        <input id="customerId-hidden" type="hidden"/>
         <input id="doModify" type="button" value="登録情報の修正(TBD)" onclick="location.href='./userInfoEdit.html'" />
         <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelect.html'" />
       </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	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -6,7 +6,7 @@
 <title id="title-head">商品詳細画面</title>
 </head>
 <body>
-<form id="Form">
+<form id="productDetailsForm">
 <div><span id="messages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span></div>
 <table border="1">
 <tr>
@@ -14,15 +14,15 @@
 </tr>
 <tr>
 <th><label id="productsid">ID</label></th>
-<td><span id="productsId">000012</span></td>
+<td><span id="productId">000012</span><input type="hidden" id="productId-hidden"/></td>
 </tr>
 <tr>
 <th><label id="productsname">名前</label></th>
-<td><span id="productsName">AAAAAAA</span></td>
+<td><span id="name">AAAAAAA</span></td>
 </tr>
 <tr>
 <th><label id="productsmodel">型番</label></th>
-<td><span id="productsModel">&nbsp;</span></td>
+<td><span id="model">&nbsp;</span></td>
 </tr>
 <tr>
 <th><label id="manufacturersname">メーカー</label></th>
@@ -30,7 +30,7 @@
 </tr>
 <tr>
 <th><label id="productsprice">価格</label></th>
-<td><span id="productsPrice">&nbsp;</span></td>
+<td><span id="price">&nbsp;</span></td>
 </tr>
 </table>
 <br/>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html	2007-09-20 09:06:59 UTC (rev 574)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html	2007-09-21 08:49:50 UTC (rev 575)
@@ -13,12 +13,12 @@
 <form id="Form">
 <input type="hidden" id="parentId" />
 <div id="breadcrumbItems">
-	&gt;&nbsp;<a id="goSubCategory-a" href="./productList.html?categoriesId=0"><span id="breadcrumb"></span></a>
+	&gt;&nbsp;<a id="goSubCategory-a" href="./productList.html?categoryId=0"><span id="breadcrumb"></span></a>
 </div>
 <br/>
 <br/>
 <div id="categoryItems">
-<a id="goSubCategory" href="./productList.html?categoriesId=1"><span id="categoriesName">スニーカー</span></a>&amp;nbsp;&amp;nbsp;
+<a id="goSubCategory" href="./productList.html?categoryId=1"><span id="name">スニーカー</span></a>&amp;nbsp;&amp;nbsp;
 </div>
 <hr/>
 <div><span id="messages"></span></div>
@@ -28,9 +28,10 @@
 <div style="width:100%;text-align:center;">
 	<div id="productItems" style="width:800px;">
 		<div style="float:left;width:240px">
-			<img src="" style="width:60px;height:80px;" alt="画像" /><br/>
-			<a id="goDetails" href="../product/productDetails.html?&productsId=1"><span id="productsName">AAAAAAA</span></a><br/>
-			<span id="productsPrice">価格</span>
+			<a id="goDetails" href="productDetails.html?&productId=1">
+			<img src="" style="width:60px;height:80px;" alt="画像" border="0"/><br/>
+			<span id="productName">AAAAAAA</span></a><br/>
+			<span id="price">価格</span>
 		</div>
 	</div>
 </div>


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