From svnnotify @ sourceforge.jp Mon Oct 1 22:00:16 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 01 Oct 2007 22:00:16 +0900 Subject: [pal-cvs 2854] [599] updated db(added yomi and code). Message-ID: <1191243616.590258.32530.nullmailer@users.sourceforge.jp> Revision: 599 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=599 Author: shinsuke Date: 2007-10-01 22:00:14 +0900 (Mon, 01 Oct 2007) Log Message: ----------- updated db(added yomi and code). updated page for editing user info. Modified Paths: -------------- 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/bsbhv/BsAddressBookBhv.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.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/bsbhv/BsOrderProductBhv.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.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/bsdao/BsOrderProductDao.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.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/BsOrderProduct.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.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/bsentity/dbmeta/OrderProductDbm.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.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/AbstractBsOrderProductCQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.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/bs/BsOrderProductCQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.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/cq/ciq/OrderProductCIQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/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/resources/appMessages.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html -------------- next part -------------- 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-01 13:00:14 UTC (rev 599) @@ -14,9 +14,13 @@ + required="true" size="40" type="VARCHAR"/> + required="true" size="40" type="VARCHAR"/> + + + required="true" size="40" type="VARCHAR"/> + required="true" size="40" type="VARCHAR"/> + + + name="CUSTOMER_FIRSTNAME" required="true" size="40" type="VARCHAR"/> + name="CUSTOMER_LASTNAME" required="true" size="40" type="VARCHAR"/> + + + name="DELIVERY_FIRSTNAME" required="true" size="40" type="VARCHAR"/> + name="DELIVERY_LASTNAME" required="true" size="40" type="VARCHAR"/> + + @@ -459,10 +475,14 @@ + name="BILLING_FIRSTNAME" required="true" size="40" type="VARCHAR"/> + name="BILLING_LASTNAME" required="true" size="40" type="VARCHAR"/> + + @@ -549,6 +569,7 @@ name="ORDER_FORM_ID" required="true" type="BIGINT"/> + - + @@ -50,18 +50,34 @@ - + - + + - + - + + + + + + + + + + + + + + + + @@ -405,7 +421,7 @@
- + @@ -433,18 +449,34 @@ - + - + + - + - + + + + + + + + + + + + + + + + @@ -1127,7 +1159,7 @@
- + @@ -1170,20 +1202,34 @@ - + - + + + + + + + + + + + + + + + @@ -1281,20 +1327,34 @@ - + - + + + + + + + + + + + + + + + @@ -1361,20 +1421,34 @@ - + - + + + + + + + + + + + + + + + @@ -1652,7 +1726,7 @@
- + @@ -1693,6 +1767,13 @@ + + + + + + + @@ -1886,7 +1967,7 @@
- + @@ -2146,7 +2227,7 @@
- + Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsAddressBookBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsAddressBookBhv.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsAddressBookBhv.java 2007-10-01 13:00:14 UTC (rev 599) @@ -28,7 +28,7 @@ * ADDRESS_BOOK_ID * * [column-property] - * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID + * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID * * [foreign-property] * country, customer, language, zone @@ -724,6 +724,8 @@ if (names.contains("department")) { destinationMyEntity.setDepartment(sourceMyEntity.getDepartment()); } if (names.contains("firstname")) { destinationMyEntity.setFirstname(sourceMyEntity.getFirstname()); } if (names.contains("lastname")) { destinationMyEntity.setLastname(sourceMyEntity.getLastname()); } + if (names.contains("firstnameDescription")) { destinationMyEntity.setFirstnameDescription(sourceMyEntity.getFirstnameDescription()); } + if (names.contains("lastnameDescription")) { destinationMyEntity.setLastnameDescription(sourceMyEntity.getLastnameDescription()); } if (names.contains("streetAddress")) { destinationMyEntity.setStreetAddress(sourceMyEntity.getStreetAddress()); } if (names.contains("suburb")) { destinationMyEntity.setSuburb(sourceMyEntity.getSuburb()); } if (names.contains("city")) { destinationMyEntity.setCity(sourceMyEntity.getCity()); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.java 2007-10-01 13:00:14 UTC (rev 599) @@ -30,7 +30,7 @@ * CUSTOMER_ID * * [column-property] - * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED + * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED * * [foreign-property] * @@ -1521,6 +1521,8 @@ if (names.contains("gender")) { destinationMyEntity.setGender(sourceMyEntity.getGender()); } if (names.contains("firstname")) { destinationMyEntity.setFirstname(sourceMyEntity.getFirstname()); } if (names.contains("lastname")) { destinationMyEntity.setLastname(sourceMyEntity.getLastname()); } + if (names.contains("firstnameDescription")) { destinationMyEntity.setFirstnameDescription(sourceMyEntity.getFirstnameDescription()); } + if (names.contains("lastnameDescription")) { destinationMyEntity.setLastnameDescription(sourceMyEntity.getLastnameDescription()); } if (names.contains("nickname")) { destinationMyEntity.setNickname(sourceMyEntity.getNickname()); } if (names.contains("dayOfBirth")) { destinationMyEntity.setDayOfBirth(sourceMyEntity.getDayOfBirth()); } if (names.contains("emailAddress")) { destinationMyEntity.setEmailAddress(sourceMyEntity.getEmailAddress()); } 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2007-10-01 13:00:14 UTC (rev 599) @@ -30,7 +30,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -1495,6 +1495,8 @@ if (names.contains("customerGender")) { destinationMyEntity.setCustomerGender(sourceMyEntity.getCustomerGender()); } if (names.contains("customerFirstname")) { destinationMyEntity.setCustomerFirstname(sourceMyEntity.getCustomerFirstname()); } if (names.contains("customerLastname")) { destinationMyEntity.setCustomerLastname(sourceMyEntity.getCustomerLastname()); } + if (names.contains("customerFirstnameDescription")) { destinationMyEntity.setCustomerFirstnameDescription(sourceMyEntity.getCustomerFirstnameDescription()); } + if (names.contains("customerLastnameDescription")) { destinationMyEntity.setCustomerLastnameDescription(sourceMyEntity.getCustomerLastnameDescription()); } if (names.contains("customerDayOfBirth")) { destinationMyEntity.setCustomerDayOfBirth(sourceMyEntity.getCustomerDayOfBirth()); } if (names.contains("customerEmailAddress")) { destinationMyEntity.setCustomerEmailAddress(sourceMyEntity.getCustomerEmailAddress()); } if (names.contains("customerCompany")) { destinationMyEntity.setCustomerCompany(sourceMyEntity.getCustomerCompany()); } @@ -1511,6 +1513,8 @@ if (names.contains("deliveryDepartment")) { destinationMyEntity.setDeliveryDepartment(sourceMyEntity.getDeliveryDepartment()); } if (names.contains("deliveryFirstname")) { destinationMyEntity.setDeliveryFirstname(sourceMyEntity.getDeliveryFirstname()); } if (names.contains("deliveryLastname")) { destinationMyEntity.setDeliveryLastname(sourceMyEntity.getDeliveryLastname()); } + if (names.contains("deliveryFirstnameDescription")) { destinationMyEntity.setDeliveryFirstnameDescription(sourceMyEntity.getDeliveryFirstnameDescription()); } + if (names.contains("deliveryLastDescription")) { destinationMyEntity.setDeliveryLastDescription(sourceMyEntity.getDeliveryLastDescription()); } if (names.contains("deliveryStreetAddress")) { destinationMyEntity.setDeliveryStreetAddress(sourceMyEntity.getDeliveryStreetAddress()); } if (names.contains("deliverySuburb")) { destinationMyEntity.setDeliverySuburb(sourceMyEntity.getDeliverySuburb()); } if (names.contains("deliveryCity")) { destinationMyEntity.setDeliveryCity(sourceMyEntity.getDeliveryCity()); } @@ -1523,6 +1527,8 @@ if (names.contains("billingDepartment")) { destinationMyEntity.setBillingDepartment(sourceMyEntity.getBillingDepartment()); } if (names.contains("billingFirstname")) { destinationMyEntity.setBillingFirstname(sourceMyEntity.getBillingFirstname()); } if (names.contains("billingLastname")) { destinationMyEntity.setBillingLastname(sourceMyEntity.getBillingLastname()); } + if (names.contains("billingFirstnameDescription")) { destinationMyEntity.setBillingFirstnameDescription(sourceMyEntity.getBillingFirstnameDescription()); } + if (names.contains("billingLastnameDescription")) { destinationMyEntity.setBillingLastnameDescription(sourceMyEntity.getBillingLastnameDescription()); } if (names.contains("billingStreetAddress")) { destinationMyEntity.setBillingStreetAddress(sourceMyEntity.getBillingStreetAddress()); } if (names.contains("billingSuburb")) { destinationMyEntity.setBillingSuburb(sourceMyEntity.getBillingSuburb()); } if (names.contains("billingCity")) { destinationMyEntity.setBillingCity(sourceMyEntity.getBillingCity()); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java 2007-10-01 13:00:14 UTC (rev 599) @@ -28,7 +28,7 @@ * ORDER_PRODUCT_ID * * [column-property] - * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY + * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY * * [foreign-property] * orderForm, product @@ -681,6 +681,7 @@ if (names.contains("orderProductId")) { destinationMyEntity.setOrderProductId(sourceMyEntity.getOrderProductId()); } if (names.contains("orderFormId")) { destinationMyEntity.setOrderFormId(sourceMyEntity.getOrderFormId()); } if (names.contains("productId")) { destinationMyEntity.setProductId(sourceMyEntity.getProductId()); } + if (names.contains("code")) { destinationMyEntity.setCode(sourceMyEntity.getCode()); } if (names.contains("model")) { destinationMyEntity.setModel(sourceMyEntity.getModel()); } if (names.contains("price")) { destinationMyEntity.setPrice(sourceMyEntity.getPrice()); } if (names.contains("finalPrice")) { destinationMyEntity.setFinalPrice(sourceMyEntity.getFinalPrice()); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java 2007-10-01 13:00:14 UTC (rev 599) @@ -11,7 +11,7 @@ * ADDRESS_BOOK_ID * * [column-property] - * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID + * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID * * [foreign-property] * country, customer, language, zone @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK"; + public static final String getListAll_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK where ADDRESS_BOOK.ADDRESS_BOOK_ID = /*addressBookId*/null"; + public static final String getEntity_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK where ADDRESS_BOOK.ADDRESS_BOOK_ID = /*addressBookId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "addressBookId"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.java 2007-10-01 13:00:14 UTC (rev 599) @@ -11,7 +11,7 @@ * CUSTOMER_ID * * [column-property] - * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED + * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED * * [foreign-property] * @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER"; + public static final String getListAll_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER where CUSTOMER.CUSTOMER_ID = /*customerId*/null"; + public static final String getEntity_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER where CUSTOMER.CUSTOMER_ID = /*customerId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "customerId"; 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2007-10-01 13:00:14 UTC (rev 599) @@ -11,7 +11,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM"; + public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; + public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderFormId"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java 2007-10-01 13:00:14 UTC (rev 599) @@ -11,7 +11,7 @@ * ORDER_PRODUCT_ID * * [column-property] - * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY + * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY * * [foreign-property] * orderForm, product @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT"; + public static final String getListAll_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT where ORDER_PRODUCT.ORDER_PRODUCT_ID = /*orderProductId*/null"; + public static final String getEntity_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT where ORDER_PRODUCT.ORDER_PRODUCT_ID = /*orderProductId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderProductId"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java 2007-10-01 13:00:14 UTC (rev 599) @@ -14,7 +14,7 @@ * ADDRESS_BOOK_ID * * [column-property] - * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID + * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID * * [foreign-property] * country, customer, language, zone @@ -69,12 +69,18 @@ /** The value of department. VARCHAR(64) */ protected String _department; - /** The value of firstname. VARCHAR(32) : NotNull */ + /** The value of firstname. VARCHAR(40) : NotNull */ protected String _firstname; - /** The value of lastname. VARCHAR(32) : NotNull */ + /** The value of lastname. VARCHAR(40) : NotNull */ protected String _lastname; + /** The value of firstnameDescription. VARCHAR(40) */ + protected String _firstnameDescription; + + /** The value of lastnameDescription. VARCHAR(40) */ + protected String _lastnameDescription; + /** The value of streetAddress. VARCHAR(255) : NotNull */ protected String _streetAddress; @@ -272,12 +278,12 @@ this._department = department; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String firstname_COLUMN = "FIRSTNAME"; /** * Get the value of firstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of firstname. (Nullable) */ @@ -287,7 +293,7 @@ /** * Set the value of firstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param firstname The value of firstname. (Nullable) */ @@ -296,12 +302,12 @@ this._firstname = firstname; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String lastname_COLUMN = "LASTNAME"; /** * Get the value of lastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of lastname. (Nullable) */ @@ -311,7 +317,7 @@ /** * Set the value of lastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param lastname The value of lastname. (Nullable) */ @@ -320,6 +326,54 @@ this._lastname = lastname; } + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String firstnameDescription_COLUMN = "FIRSTNAME_DESCRIPTION"; + + /** + * Get the value of firstnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of firstnameDescription. (Nullable) + */ + public String getFirstnameDescription() { + return _firstnameDescription; + } + + /** + * Set the value of firstnameDescription.
+ * {VARCHAR(40)} + * + * @param firstnameDescription The value of firstnameDescription. (Nullable) + */ + public void setFirstnameDescription(String firstnameDescription) { + _modifiedProperties.addPropertyName("firstnameDescription"); + this._firstnameDescription = firstnameDescription; + } + + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String lastnameDescription_COLUMN = "LASTNAME_DESCRIPTION"; + + /** + * Get the value of lastnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of lastnameDescription. (Nullable) + */ + public String getLastnameDescription() { + return _lastnameDescription; + } + + /** + * Set the value of lastnameDescription.
+ * {VARCHAR(40)} + * + * @param lastnameDescription The value of lastnameDescription. (Nullable) + */ + public void setLastnameDescription(String lastnameDescription) { + _modifiedProperties.addPropertyName("lastnameDescription"); + this._lastnameDescription = lastnameDescription; + } + /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */ public static final String streetAddress_COLUMN = "STREET_ADDRESS"; @@ -612,16 +666,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -934,6 +988,8 @@ sb.append(delimiter).append(getDepartment()); sb.append(delimiter).append(getFirstname()); sb.append(delimiter).append(getLastname()); + sb.append(delimiter).append(getFirstnameDescription()); + sb.append(delimiter).append(getLastnameDescription()); sb.append(delimiter).append(getStreetAddress()); sb.append(delimiter).append(getSuburb()); sb.append(delimiter).append(getCity()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java 2007-10-01 13:00:14 UTC (rev 599) @@ -14,7 +14,7 @@ * CUSTOMER_ID * * [column-property] - * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED + * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED * * [foreign-property] * @@ -66,12 +66,18 @@ /** The value of gender. CHAR(1) : NotNull */ protected String _gender; - /** The value of firstname. VARCHAR(32) : NotNull */ + /** The value of firstname. VARCHAR(40) : NotNull */ protected String _firstname; - /** The value of lastname. VARCHAR(32) : NotNull */ + /** The value of lastname. VARCHAR(40) : NotNull */ protected String _lastname; + /** The value of firstnameDescription. VARCHAR(40) */ + protected String _firstnameDescription; + + /** The value of lastnameDescription. VARCHAR(40) */ + protected String _lastnameDescription; + /** The value of nickname. VARCHAR(64) */ protected String _nickname; @@ -224,12 +230,12 @@ this._gender = gender; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String firstname_COLUMN = "FIRSTNAME"; /** * Get the value of firstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of firstname. (Nullable) */ @@ -239,7 +245,7 @@ /** * Set the value of firstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param firstname The value of firstname. (Nullable) */ @@ -248,12 +254,12 @@ this._firstname = firstname; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String lastname_COLUMN = "LASTNAME"; /** * Get the value of lastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of lastname. (Nullable) */ @@ -263,7 +269,7 @@ /** * Set the value of lastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param lastname The value of lastname. (Nullable) */ @@ -272,6 +278,54 @@ this._lastname = lastname; } + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String firstnameDescription_COLUMN = "FIRSTNAME_DESCRIPTION"; + + /** + * Get the value of firstnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of firstnameDescription. (Nullable) + */ + public String getFirstnameDescription() { + return _firstnameDescription; + } + + /** + * Set the value of firstnameDescription.
+ * {VARCHAR(40)} + * + * @param firstnameDescription The value of firstnameDescription. (Nullable) + */ + public void setFirstnameDescription(String firstnameDescription) { + _modifiedProperties.addPropertyName("firstnameDescription"); + this._firstnameDescription = firstnameDescription; + } + + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String lastnameDescription_COLUMN = "LASTNAME_DESCRIPTION"; + + /** + * Get the value of lastnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of lastnameDescription. (Nullable) + */ + public String getLastnameDescription() { + return _lastnameDescription; + } + + /** + * Set the value of lastnameDescription.
+ * {VARCHAR(40)} + * + * @param lastnameDescription The value of lastnameDescription. (Nullable) + */ + public void setLastnameDescription(String lastnameDescription) { + _modifiedProperties.addPropertyName("lastnameDescription"); + this._lastnameDescription = lastnameDescription; + } + /** Column Annotation for S2Dao. VARCHAR(64) */ public static final String nickname_COLUMN = "NICKNAME"; @@ -396,16 +450,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -691,6 +745,8 @@ sb.append(delimiter).append(getGender()); sb.append(delimiter).append(getFirstname()); sb.append(delimiter).append(getLastname()); + sb.append(delimiter).append(getFirstnameDescription()); + sb.append(delimiter).append(getLastnameDescription()); sb.append(delimiter).append(getNickname()); sb.append(delimiter).append(getDayOfBirth()); sb.append(delimiter).append(getEmailAddress()); 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2007-10-01 13:00:14 UTC (rev 599) @@ -14,7 +14,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -69,12 +69,18 @@ /** The value of customerGender. CHAR(1) : NotNull */ protected String _customerGender; - /** The value of customerFirstname. VARCHAR(32) : NotNull */ + /** The value of customerFirstname. VARCHAR(40) : NotNull */ protected String _customerFirstname; - /** The value of customerLastname. VARCHAR(32) : NotNull */ + /** The value of customerLastname. VARCHAR(40) : NotNull */ protected String _customerLastname; + /** The value of customerFirstnameDescription. VARCHAR(40) */ + protected String _customerFirstnameDescription; + + /** The value of customerLastnameDescription. VARCHAR(40) */ + protected String _customerLastnameDescription; + /** The value of customerDayOfBirth. DATE : NotNull */ protected java.util.Date _customerDayOfBirth; @@ -117,12 +123,18 @@ /** The value of deliveryDepartment. VARCHAR(64) */ protected String _deliveryDepartment; - /** The value of deliveryFirstname. VARCHAR(32) : NotNull */ + /** The value of deliveryFirstname. VARCHAR(40) : NotNull */ protected String _deliveryFirstname; - /** The value of deliveryLastname. VARCHAR(32) : NotNull */ + /** The value of deliveryLastname. VARCHAR(40) : NotNull */ protected String _deliveryLastname; + /** The value of deliveryFirstnameDescription. VARCHAR(40) */ + protected String _deliveryFirstnameDescription; + + /** The value of deliveryLastDescription. VARCHAR(40) */ + protected String _deliveryLastDescription; + /** The value of deliveryStreetAddress. VARCHAR(255) : NotNull */ protected String _deliveryStreetAddress; @@ -153,12 +165,18 @@ /** The value of billingDepartment. VARCHAR(64) */ protected String _billingDepartment; - /** The value of billingFirstname. VARCHAR(32) : NotNull */ + /** The value of billingFirstname. VARCHAR(40) : NotNull */ protected String _billingFirstname; - /** The value of billingLastname. VARCHAR(32) : NotNull */ + /** The value of billingLastname. VARCHAR(40) : NotNull */ protected String _billingLastname; + /** The value of billingFirstnameDescription. VARCHAR(40) */ + protected String _billingFirstnameDescription; + + /** The value of billingLastnameDescription. VARCHAR(40) */ + protected String _billingLastnameDescription; + /** The value of billingStreetAddress. VARCHAR(255) : NotNull */ protected String _billingStreetAddress; @@ -389,12 +407,12 @@ this._customerGender = customerGender; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String customerFirstname_COLUMN = "CUSTOMER_FIRSTNAME"; /** * Get the value of customerFirstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of customerFirstname. (Nullable) */ @@ -404,7 +422,7 @@ /** * Set the value of customerFirstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param customerFirstname The value of customerFirstname. (Nullable) */ @@ -413,12 +431,12 @@ this._customerFirstname = customerFirstname; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String customerLastname_COLUMN = "CUSTOMER_LASTNAME"; /** * Get the value of customerLastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of customerLastname. (Nullable) */ @@ -428,7 +446,7 @@ /** * Set the value of customerLastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param customerLastname The value of customerLastname. (Nullable) */ @@ -437,6 +455,54 @@ this._customerLastname = customerLastname; } + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String customerFirstnameDescription_COLUMN = "CUSTOMER_FIRSTNAME_DESCRIPTION"; + + /** + * Get the value of customerFirstnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of customerFirstnameDescription. (Nullable) + */ + public String getCustomerFirstnameDescription() { + return _customerFirstnameDescription; + } + + /** + * Set the value of customerFirstnameDescription.
+ * {VARCHAR(40)} + * + * @param customerFirstnameDescription The value of customerFirstnameDescription. (Nullable) + */ + public void setCustomerFirstnameDescription(String customerFirstnameDescription) { + _modifiedProperties.addPropertyName("customerFirstnameDescription"); + this._customerFirstnameDescription = customerFirstnameDescription; + } + + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String customerLastnameDescription_COLUMN = "CUSTOMER_LASTNAME_DESCRIPTION"; + + /** + * Get the value of customerLastnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of customerLastnameDescription. (Nullable) + */ + public String getCustomerLastnameDescription() { + return _customerLastnameDescription; + } + + /** + * Set the value of customerLastnameDescription.
+ * {VARCHAR(40)} + * + * @param customerLastnameDescription The value of customerLastnameDescription. (Nullable) + */ + public void setCustomerLastnameDescription(String customerLastnameDescription) { + _modifiedProperties.addPropertyName("customerLastnameDescription"); + this._customerLastnameDescription = customerLastnameDescription; + } + /** Column Annotation for S2Dao. DATE : NotNull */ public static final String customerDayOfBirth_COLUMN = "CUSTOMER_DAY_OF_BIRTH"; @@ -773,12 +839,12 @@ this._deliveryDepartment = deliveryDepartment; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String deliveryFirstname_COLUMN = "DELIVERY_FIRSTNAME"; /** * Get the value of deliveryFirstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of deliveryFirstname. (Nullable) */ @@ -788,7 +854,7 @@ /** * Set the value of deliveryFirstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param deliveryFirstname The value of deliveryFirstname. (Nullable) */ @@ -797,12 +863,12 @@ this._deliveryFirstname = deliveryFirstname; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String deliveryLastname_COLUMN = "DELIVERY_LASTNAME"; /** * Get the value of deliveryLastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of deliveryLastname. (Nullable) */ @@ -812,7 +878,7 @@ /** * Set the value of deliveryLastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param deliveryLastname The value of deliveryLastname. (Nullable) */ @@ -821,6 +887,54 @@ this._deliveryLastname = deliveryLastname; } + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String deliveryFirstnameDescription_COLUMN = "DELIVERY_FIRSTNAME_DESCRIPTION"; + + /** + * Get the value of deliveryFirstnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of deliveryFirstnameDescription. (Nullable) + */ + public String getDeliveryFirstnameDescription() { + return _deliveryFirstnameDescription; + } + + /** + * Set the value of deliveryFirstnameDescription.
+ * {VARCHAR(40)} + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription. (Nullable) + */ + public void setDeliveryFirstnameDescription(String deliveryFirstnameDescription) { + _modifiedProperties.addPropertyName("deliveryFirstnameDescription"); + this._deliveryFirstnameDescription = deliveryFirstnameDescription; + } + + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String deliveryLastDescription_COLUMN = "DELIVERY_LAST_DESCRIPTION"; + + /** + * Get the value of deliveryLastDescription.
+ * {VARCHAR(40)} + * + * @return The value of deliveryLastDescription. (Nullable) + */ + public String getDeliveryLastDescription() { + return _deliveryLastDescription; + } + + /** + * Set the value of deliveryLastDescription.
+ * {VARCHAR(40)} + * + * @param deliveryLastDescription The value of deliveryLastDescription. (Nullable) + */ + public void setDeliveryLastDescription(String deliveryLastDescription) { + _modifiedProperties.addPropertyName("deliveryLastDescription"); + this._deliveryLastDescription = deliveryLastDescription; + } + /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */ public static final String deliveryStreetAddress_COLUMN = "DELIVERY_STREET_ADDRESS"; @@ -1061,12 +1175,12 @@ this._billingDepartment = billingDepartment; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String billingFirstname_COLUMN = "BILLING_FIRSTNAME"; /** * Get the value of billingFirstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of billingFirstname. (Nullable) */ @@ -1076,7 +1190,7 @@ /** * Set the value of billingFirstname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param billingFirstname The value of billingFirstname. (Nullable) */ @@ -1085,12 +1199,12 @@ this._billingFirstname = billingFirstname; } - /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */ + /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */ public static final String billingLastname_COLUMN = "BILLING_LASTNAME"; /** * Get the value of billingLastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @return The value of billingLastname. (Nullable) */ @@ -1100,7 +1214,7 @@ /** * Set the value of billingLastname.
- * {VARCHAR(32) : NotNull} + * {VARCHAR(40) : NotNull} * * @param billingLastname The value of billingLastname. (Nullable) */ @@ -1109,6 +1223,54 @@ this._billingLastname = billingLastname; } + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String billingFirstnameDescription_COLUMN = "BILLING_FIRSTNAME_DESCRIPTION"; + + /** + * Get the value of billingFirstnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of billingFirstnameDescription. (Nullable) + */ + public String getBillingFirstnameDescription() { + return _billingFirstnameDescription; + } + + /** + * Set the value of billingFirstnameDescription.
+ * {VARCHAR(40)} + * + * @param billingFirstnameDescription The value of billingFirstnameDescription. (Nullable) + */ + public void setBillingFirstnameDescription(String billingFirstnameDescription) { + _modifiedProperties.addPropertyName("billingFirstnameDescription"); + this._billingFirstnameDescription = billingFirstnameDescription; + } + + /** Column Annotation for S2Dao. VARCHAR(40) */ + public static final String billingLastnameDescription_COLUMN = "BILLING_LASTNAME_DESCRIPTION"; + + /** + * Get the value of billingLastnameDescription.
+ * {VARCHAR(40)} + * + * @return The value of billingLastnameDescription. (Nullable) + */ + public String getBillingLastnameDescription() { + return _billingLastnameDescription; + } + + /** + * Set the value of billingLastnameDescription.
+ * {VARCHAR(40)} + * + * @param billingLastnameDescription The value of billingLastnameDescription. (Nullable) + */ + public void setBillingLastnameDescription(String billingLastnameDescription) { + _modifiedProperties.addPropertyName("billingLastnameDescription"); + this._billingLastnameDescription = billingLastnameDescription; + } + /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */ public static final String billingStreetAddress_COLUMN = "BILLING_STREET_ADDRESS"; @@ -1665,16 +1827,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -2240,6 +2402,8 @@ sb.append(delimiter).append(getCustomerGender()); sb.append(delimiter).append(getCustomerFirstname()); sb.append(delimiter).append(getCustomerLastname()); + sb.append(delimiter).append(getCustomerFirstnameDescription()); + sb.append(delimiter).append(getCustomerLastnameDescription()); sb.append(delimiter).append(getCustomerDayOfBirth()); sb.append(delimiter).append(getCustomerEmailAddress()); sb.append(delimiter).append(getCustomerCompany()); @@ -2256,6 +2420,8 @@ sb.append(delimiter).append(getDeliveryDepartment()); sb.append(delimiter).append(getDeliveryFirstname()); sb.append(delimiter).append(getDeliveryLastname()); + sb.append(delimiter).append(getDeliveryFirstnameDescription()); + sb.append(delimiter).append(getDeliveryLastDescription()); sb.append(delimiter).append(getDeliveryStreetAddress()); sb.append(delimiter).append(getDeliverySuburb()); sb.append(delimiter).append(getDeliveryCity()); @@ -2268,6 +2434,8 @@ sb.append(delimiter).append(getBillingDepartment()); sb.append(delimiter).append(getBillingFirstname()); sb.append(delimiter).append(getBillingLastname()); + sb.append(delimiter).append(getBillingFirstnameDescription()); + sb.append(delimiter).append(getBillingLastnameDescription()); sb.append(delimiter).append(getBillingStreetAddress()); sb.append(delimiter).append(getBillingSuburb()); sb.append(delimiter).append(getBillingCity()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java 2007-10-01 13:00:14 UTC (rev 599) @@ -14,7 +14,7 @@ * ORDER_PRODUCT_ID * * [column-property] - * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY + * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY * * [foreign-property] * orderForm, product @@ -66,6 +66,9 @@ /** The value of productId. BIGINT : NotNull : FK to PRODUCT */ protected java.math.BigDecimal _productId; + /** The value of code. VARCHAR(64) */ + protected String _code; + /** The value of model. VARCHAR(64) */ protected String _model; @@ -219,6 +222,30 @@ } /** Column Annotation for S2Dao. VARCHAR(64) */ + public static final String code_COLUMN = "CODE"; + + /** + * Get the value of code.
+ * {VARCHAR(64)} + * + * @return The value of code. (Nullable) + */ + public String getCode() { + return _code; + } + + /** + * Set the value of code.
+ * {VARCHAR(64)} + * + * @param code The value of code. (Nullable) + */ + public void setCode(String code) { + _modifiedProperties.addPropertyName("code"); + this._code = code; + } + + /** Column Annotation for S2Dao. VARCHAR(64) */ public static final String model_COLUMN = "MODEL"; /** @@ -342,16 +369,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -561,6 +588,7 @@ sb.append(delimiter).append(getOrderProductId()); sb.append(delimiter).append(getOrderFormId()); sb.append(delimiter).append(getProductId()); + sb.append(delimiter).append(getCode()); sb.append(delimiter).append(getModel()); sb.append(delimiter).append(getPrice()); sb.append(delimiter).append(getFinalPrice()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java 2007-10-01 13:00:14 UTC (rev 599) @@ -16,7 +16,7 @@ * ADDRESS_BOOK_ID * * [column-property] - * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID + * ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID * * [foreign-property] * country, customer, language, zone @@ -101,10 +101,14 @@ public static final String DB_NAME_COMPANY = "COMPANY"; /** Db-name of DEPARTMENT. VARCHAR(64) */ public static final String DB_NAME_DEPARTMENT = "DEPARTMENT"; - /** Db-name of FIRSTNAME. VARCHAR(32) : NotNull */ + /** Db-name of FIRSTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_FIRSTNAME = "FIRSTNAME"; - /** Db-name of LASTNAME. VARCHAR(32) : NotNull */ + /** Db-name of LASTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_LASTNAME = "LASTNAME"; + /** Db-name of FIRSTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION"; + /** Db-name of LASTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION"; /** Db-name of STREET_ADDRESS. VARCHAR(255) : NotNull */ public static final String DB_NAME_STREET_ADDRESS = "STREET_ADDRESS"; /** Db-name of SUBURB. VARCHAR(32) */ @@ -142,6 +146,10 @@ public static final String COLUMN_DB_NAME_OF_Firstname = "FIRSTNAME"; /** @deprecated Deprecated! So use DB_NAME_Lastname. */ public static final String COLUMN_DB_NAME_OF_Lastname = "LASTNAME"; + /** @deprecated Deprecated! So use DB_NAME_FirstnameDescription. */ + public static final String COLUMN_DB_NAME_OF_FirstnameDescription = "FIRSTNAME_DESCRIPTION"; + /** @deprecated Deprecated! So use DB_NAME_LastnameDescription. */ + public static final String COLUMN_DB_NAME_OF_LastnameDescription = "LASTNAME_DESCRIPTION"; /** @deprecated Deprecated! So use DB_NAME_StreetAddress. */ public static final String COLUMN_DB_NAME_OF_StreetAddress = "STREET_ADDRESS"; /** @deprecated Deprecated! So use DB_NAME_Suburb. */ @@ -178,10 +186,14 @@ public static final String PROPERTY_NAME_company = "company"; /** Prop-name(JavaBeansRule) of department. VARCHAR(64) */ public static final String PROPERTY_NAME_department = "department"; - /** Prop-name(JavaBeansRule) of firstname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of firstname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_firstname = "firstname"; - /** Prop-name(JavaBeansRule) of lastname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of lastname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_lastname = "lastname"; + /** Prop-name(JavaBeansRule) of firstnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_firstnameDescription = "firstnameDescription"; + /** Prop-name(JavaBeansRule) of lastnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_lastnameDescription = "lastnameDescription"; /** Prop-name(JavaBeansRule) of streetAddress. VARCHAR(255) : NotNull */ public static final String PROPERTY_NAME_streetAddress = "streetAddress"; /** Prop-name(JavaBeansRule) of suburb. VARCHAR(32) */ @@ -218,10 +230,14 @@ public static final String CAP_PROP_NAME_Company = "Company"; /** Cap-prop-name of department. VARCHAR(64) */ public static final String CAP_PROP_NAME_Department = "Department"; - /** Cap-prop-name of firstname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of firstname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_Firstname = "Firstname"; - /** Cap-prop-name of lastname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of lastname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_Lastname = "Lastname"; + /** Cap-prop-name of firstnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_FirstnameDescription = "FirstnameDescription"; + /** Cap-prop-name of lastnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_LastnameDescription = "LastnameDescription"; /** Cap-prop-name of streetAddress. VARCHAR(255) : NotNull */ public static final String CAP_PROP_NAME_StreetAddress = "StreetAddress"; /** Cap-prop-name of suburb. VARCHAR(32) */ @@ -259,6 +275,10 @@ public static final String COLUMN_CAP_PROP_NAME_OF_Firstname = "Firstname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Lastname. */ public static final String COLUMN_CAP_PROP_NAME_OF_Lastname = "Lastname"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_FirstnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_FirstnameDescription = "FirstnameDescription"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_LastnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_LastnameDescription = "LastnameDescription"; /** @deprecated Deprecated! So use CAP_PROP_NAME_StreetAddress. */ public static final String COLUMN_CAP_PROP_NAME_OF_StreetAddress = "StreetAddress"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Suburb. */ @@ -295,10 +315,14 @@ public static final String UNCAP_PROP_NAME_company = "company"; /** Uncap-prop-name of department. VARCHAR(64) */ public static final String UNCAP_PROP_NAME_department = "department"; - /** Uncap-prop-name of firstname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of firstname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_firstname = "firstname"; - /** Uncap-prop-name of lastname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of lastname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_lastname = "lastname"; + /** Uncap-prop-name of firstnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_firstnameDescription = "firstnameDescription"; + /** Uncap-prop-name of lastnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_lastnameDescription = "lastnameDescription"; /** Uncap-prop-name of streetAddress. VARCHAR(255) : NotNull */ public static final String UNCAP_PROP_NAME_streetAddress = "streetAddress"; /** Uncap-prop-name of suburb. VARCHAR(32) */ @@ -336,6 +360,10 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_Firstname = "firstname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Lastname. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Lastname = "lastname"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_FirstnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_FirstnameDescription = "firstnameDescription"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_LastnameDescription = "lastnameDescription"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_StreetAddress. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_StreetAddress = "streetAddress"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Suburb. */ @@ -410,6 +438,8 @@ map.put(DB_NAME_DEPARTMENT.toLowerCase(), PROPERTY_NAME_department); map.put(DB_NAME_FIRSTNAME.toLowerCase(), PROPERTY_NAME_firstname); map.put(DB_NAME_LASTNAME.toLowerCase(), PROPERTY_NAME_lastname); + map.put(DB_NAME_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_firstnameDescription); + map.put(DB_NAME_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_lastnameDescription); map.put(DB_NAME_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_streetAddress); map.put(DB_NAME_SUBURB.toLowerCase(), PROPERTY_NAME_suburb); map.put(DB_NAME_CITY.toLowerCase(), PROPERTY_NAME_city); @@ -442,6 +472,8 @@ map.put(PROPERTY_NAME_department.toLowerCase(), DB_NAME_DEPARTMENT); map.put(PROPERTY_NAME_firstname.toLowerCase(), DB_NAME_FIRSTNAME); map.put(PROPERTY_NAME_lastname.toLowerCase(), DB_NAME_LASTNAME); + map.put(PROPERTY_NAME_firstnameDescription.toLowerCase(), DB_NAME_FIRSTNAME_DESCRIPTION); + map.put(PROPERTY_NAME_lastnameDescription.toLowerCase(), DB_NAME_LASTNAME_DESCRIPTION); map.put(PROPERTY_NAME_streetAddress.toLowerCase(), DB_NAME_STREET_ADDRESS); map.put(PROPERTY_NAME_suburb.toLowerCase(), DB_NAME_SUBURB); map.put(PROPERTY_NAME_city.toLowerCase(), DB_NAME_CITY); @@ -476,6 +508,8 @@ map.put(DB_NAME_DEPARTMENT, CAP_PROP_NAME_Department); map.put(DB_NAME_FIRSTNAME, CAP_PROP_NAME_Firstname); map.put(DB_NAME_LASTNAME, CAP_PROP_NAME_Lastname); + map.put(DB_NAME_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_FirstnameDescription); + map.put(DB_NAME_LASTNAME_DESCRIPTION, CAP_PROP_NAME_LastnameDescription); map.put(DB_NAME_STREET_ADDRESS, CAP_PROP_NAME_StreetAddress); map.put(DB_NAME_SUBURB, CAP_PROP_NAME_Suburb); map.put(DB_NAME_CITY, CAP_PROP_NAME_City); @@ -510,6 +544,8 @@ map.put(DB_NAME_DEPARTMENT, UNCAP_PROP_NAME_department); map.put(DB_NAME_FIRSTNAME, UNCAP_PROP_NAME_firstname); map.put(DB_NAME_LASTNAME, UNCAP_PROP_NAME_lastname); + map.put(DB_NAME_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_firstnameDescription); + map.put(DB_NAME_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_lastnameDescription); map.put(DB_NAME_STREET_ADDRESS, UNCAP_PROP_NAME_streetAddress); map.put(DB_NAME_SUBURB, UNCAP_PROP_NAME_suburb); map.put(DB_NAME_CITY, UNCAP_PROP_NAME_city); @@ -544,6 +580,8 @@ map.put(CAP_PROP_NAME_Department, DB_NAME_DEPARTMENT); map.put(CAP_PROP_NAME_Firstname, DB_NAME_FIRSTNAME); map.put(CAP_PROP_NAME_Lastname, DB_NAME_LASTNAME); + map.put(CAP_PROP_NAME_FirstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION); + map.put(CAP_PROP_NAME_LastnameDescription, DB_NAME_LASTNAME_DESCRIPTION); map.put(CAP_PROP_NAME_StreetAddress, DB_NAME_STREET_ADDRESS); map.put(CAP_PROP_NAME_Suburb, DB_NAME_SUBURB); map.put(CAP_PROP_NAME_City, DB_NAME_CITY); @@ -578,6 +616,8 @@ map.put(CAP_PROP_NAME_Department, UNCAP_PROP_NAME_department); map.put(CAP_PROP_NAME_Firstname, UNCAP_PROP_NAME_firstname); map.put(CAP_PROP_NAME_Lastname, UNCAP_PROP_NAME_lastname); + map.put(CAP_PROP_NAME_FirstnameDescription, UNCAP_PROP_NAME_firstnameDescription); + map.put(CAP_PROP_NAME_LastnameDescription, UNCAP_PROP_NAME_lastnameDescription); map.put(CAP_PROP_NAME_StreetAddress, UNCAP_PROP_NAME_streetAddress); map.put(CAP_PROP_NAME_Suburb, UNCAP_PROP_NAME_suburb); map.put(CAP_PROP_NAME_City, UNCAP_PROP_NAME_city); @@ -612,6 +652,8 @@ map.put(UNCAP_PROP_NAME_department, DB_NAME_DEPARTMENT); map.put(UNCAP_PROP_NAME_firstname, DB_NAME_FIRSTNAME); map.put(UNCAP_PROP_NAME_lastname, DB_NAME_LASTNAME); + map.put(UNCAP_PROP_NAME_firstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION); + map.put(UNCAP_PROP_NAME_lastnameDescription, DB_NAME_LASTNAME_DESCRIPTION); map.put(UNCAP_PROP_NAME_streetAddress, DB_NAME_STREET_ADDRESS); map.put(UNCAP_PROP_NAME_suburb, DB_NAME_SUBURB); map.put(UNCAP_PROP_NAME_city, DB_NAME_CITY); @@ -646,6 +688,8 @@ map.put(UNCAP_PROP_NAME_department, CAP_PROP_NAME_Department); map.put(UNCAP_PROP_NAME_firstname, CAP_PROP_NAME_Firstname); map.put(UNCAP_PROP_NAME_lastname, CAP_PROP_NAME_Lastname); + map.put(UNCAP_PROP_NAME_firstnameDescription, CAP_PROP_NAME_FirstnameDescription); + map.put(UNCAP_PROP_NAME_lastnameDescription, CAP_PROP_NAME_LastnameDescription); map.put(UNCAP_PROP_NAME_streetAddress, CAP_PROP_NAME_StreetAddress); map.put(UNCAP_PROP_NAME_suburb, CAP_PROP_NAME_Suburb); map.put(UNCAP_PROP_NAME_city, CAP_PROP_NAME_City); @@ -872,6 +916,8 @@ columnInfoList.add(columnDepartment()); columnInfoList.add(columnFirstname()); columnInfoList.add(columnLastname()); + columnInfoList.add(columnFirstnameDescription()); + columnInfoList.add(columnLastnameDescription()); columnInfoList.add(columnStreetAddress()); columnInfoList.add(columnSuburb()); columnInfoList.add(columnCity()); @@ -939,7 +985,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID"; + return "ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID"; } /** @@ -979,6 +1025,18 @@ return new ColumnInfo(this, "LASTNAME", "lastname", String.class, false); } /** + * @return Column information of firstnameDescription. (NotNull) + */ + public ColumnInfo columnFirstnameDescription() { + return new ColumnInfo(this, "FIRSTNAME_DESCRIPTION", "firstnameDescription", String.class, false); + } + /** + * @return Column information of lastnameDescription. (NotNull) + */ + public ColumnInfo columnLastnameDescription() { + return new ColumnInfo(this, "LASTNAME_DESCRIPTION", "lastnameDescription", String.class, false); + } + /** * @return Column information of streetAddress. (NotNull) */ public ColumnInfo columnStreetAddress() { @@ -1238,6 +1296,8 @@ public RelationTrace columnDepartment() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnDepartment()); } public RelationTrace columnFirstname() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnFirstname()); } public RelationTrace columnLastname() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnLastname()); } + public RelationTrace columnFirstnameDescription() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnFirstnameDescription()); } + public RelationTrace columnLastnameDescription() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnLastnameDescription()); } public RelationTrace columnStreetAddress() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnStreetAddress()); } public RelationTrace columnSuburb() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnSuburb()); } public RelationTrace columnCity() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnCity()); } @@ -1326,6 +1386,8 @@ if (analyzer.init("DEPARTMENT", "department", "department")) { myEntity.setDepartment(analyzer.analyzeString(String.class)); }; if (analyzer.init("FIRSTNAME", "firstname", "firstname")) { myEntity.setFirstname(analyzer.analyzeString(String.class)); }; if (analyzer.init("LASTNAME", "lastname", "lastname")) { myEntity.setLastname(analyzer.analyzeString(String.class)); }; + if (analyzer.init("FIRSTNAME_DESCRIPTION", "firstnameDescription", "firstnameDescription")) { myEntity.setFirstnameDescription(analyzer.analyzeString(String.class)); }; + if (analyzer.init("LASTNAME_DESCRIPTION", "lastnameDescription", "lastnameDescription")) { myEntity.setLastnameDescription(analyzer.analyzeString(String.class)); }; if (analyzer.init("STREET_ADDRESS", "streetAddress", "streetAddress")) { myEntity.setStreetAddress(analyzer.analyzeString(String.class)); }; if (analyzer.init("SUBURB", "suburb", "suburb")) { myEntity.setSuburb(analyzer.analyzeString(String.class)); }; if (analyzer.init("CITY", "city", "city")) { myEntity.setCity(analyzer.analyzeString(String.class)); }; @@ -1416,6 +1478,8 @@ helpAppendingColumnValueString(sb, delimiter, equal, "DEPARTMENT", myEntity.getDepartment()); helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME", myEntity.getFirstname()); helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME", myEntity.getLastname()); + helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription()); + helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME_DESCRIPTION", myEntity.getLastnameDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "STREET_ADDRESS", myEntity.getStreetAddress()); helpAppendingColumnValueString(sb, delimiter, equal, "SUBURB", myEntity.getSuburb()); helpAppendingColumnValueString(sb, delimiter, equal, "CITY", myEntity.getCity()); @@ -1488,6 +1552,8 @@ valueMap.put("DEPARTMENT", myEntity.getDepartment()); valueMap.put("FIRSTNAME", myEntity.getFirstname()); valueMap.put("LASTNAME", myEntity.getLastname()); + valueMap.put("FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription()); + valueMap.put("LASTNAME_DESCRIPTION", myEntity.getLastnameDescription()); valueMap.put("STREET_ADDRESS", myEntity.getStreetAddress()); valueMap.put("SUBURB", myEntity.getSuburb()); valueMap.put("CITY", myEntity.getCity()); @@ -1528,6 +1594,8 @@ valueMap.put("DEPARTMENT", helpGettingColumnStringValue(myEntity.getDepartment())); valueMap.put("FIRSTNAME", helpGettingColumnStringValue(myEntity.getFirstname())); valueMap.put("LASTNAME", helpGettingColumnStringValue(myEntity.getLastname())); + valueMap.put("FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getFirstnameDescription())); + valueMap.put("LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getLastnameDescription())); valueMap.put("STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getStreetAddress())); valueMap.put("SUBURB", helpGettingColumnStringValue(myEntity.getSuburb())); valueMap.put("CITY", helpGettingColumnStringValue(myEntity.getCity())); @@ -1564,9 +1632,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java 2007-10-01 13:00:14 UTC (rev 599) @@ -16,7 +16,7 @@ * CUSTOMER_ID * * [column-property] - * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED + * CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED * * [foreign-property] * @@ -99,10 +99,14 @@ public static final String DB_NAME_PORTAL_ID = "PORTAL_ID"; /** Db-name of GENDER. CHAR(1) : NotNull */ public static final String DB_NAME_GENDER = "GENDER"; - /** Db-name of FIRSTNAME. VARCHAR(32) : NotNull */ + /** Db-name of FIRSTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_FIRSTNAME = "FIRSTNAME"; - /** Db-name of LASTNAME. VARCHAR(32) : NotNull */ + /** Db-name of LASTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_LASTNAME = "LASTNAME"; + /** Db-name of FIRSTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION"; + /** Db-name of LASTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION"; /** Db-name of NICKNAME. VARCHAR(64) */ public static final String DB_NAME_NICKNAME = "NICKNAME"; /** Db-name of DAY_OF_BIRTH. DATE : NotNull : Default=[0000-00-00 00:00:00] */ @@ -124,6 +128,10 @@ public static final String COLUMN_DB_NAME_OF_Firstname = "FIRSTNAME"; /** @deprecated Deprecated! So use DB_NAME_Lastname. */ public static final String COLUMN_DB_NAME_OF_Lastname = "LASTNAME"; + /** @deprecated Deprecated! So use DB_NAME_FirstnameDescription. */ + public static final String COLUMN_DB_NAME_OF_FirstnameDescription = "FIRSTNAME_DESCRIPTION"; + /** @deprecated Deprecated! So use DB_NAME_LastnameDescription. */ + public static final String COLUMN_DB_NAME_OF_LastnameDescription = "LASTNAME_DESCRIPTION"; /** @deprecated Deprecated! So use DB_NAME_Nickname. */ public static final String COLUMN_DB_NAME_OF_Nickname = "NICKNAME"; /** @deprecated Deprecated! So use DB_NAME_DayOfBirth. */ @@ -144,10 +152,14 @@ public static final String PROPERTY_NAME_portalId = "portalId"; /** Prop-name(JavaBeansRule) of gender. CHAR(1) : NotNull */ public static final String PROPERTY_NAME_gender = "gender"; - /** Prop-name(JavaBeansRule) of firstname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of firstname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_firstname = "firstname"; - /** Prop-name(JavaBeansRule) of lastname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of lastname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_lastname = "lastname"; + /** Prop-name(JavaBeansRule) of firstnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_firstnameDescription = "firstnameDescription"; + /** Prop-name(JavaBeansRule) of lastnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_lastnameDescription = "lastnameDescription"; /** Prop-name(JavaBeansRule) of nickname. VARCHAR(64) */ public static final String PROPERTY_NAME_nickname = "nickname"; /** Prop-name(JavaBeansRule) of dayOfBirth. DATE : NotNull : Default=[0000-00-00 00:00:00] */ @@ -168,10 +180,14 @@ public static final String CAP_PROP_NAME_PortalId = "PortalId"; /** Cap-prop-name of gender. CHAR(1) : NotNull */ public static final String CAP_PROP_NAME_Gender = "Gender"; - /** Cap-prop-name of firstname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of firstname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_Firstname = "Firstname"; - /** Cap-prop-name of lastname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of lastname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_Lastname = "Lastname"; + /** Cap-prop-name of firstnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_FirstnameDescription = "FirstnameDescription"; + /** Cap-prop-name of lastnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_LastnameDescription = "LastnameDescription"; /** Cap-prop-name of nickname. VARCHAR(64) */ public static final String CAP_PROP_NAME_Nickname = "Nickname"; /** Cap-prop-name of dayOfBirth. DATE : NotNull : Default=[0000-00-00 00:00:00] */ @@ -193,6 +209,10 @@ public static final String COLUMN_CAP_PROP_NAME_OF_Firstname = "Firstname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Lastname. */ public static final String COLUMN_CAP_PROP_NAME_OF_Lastname = "Lastname"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_FirstnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_FirstnameDescription = "FirstnameDescription"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_LastnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_LastnameDescription = "LastnameDescription"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Nickname. */ public static final String COLUMN_CAP_PROP_NAME_OF_Nickname = "Nickname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DayOfBirth. */ @@ -213,10 +233,14 @@ public static final String UNCAP_PROP_NAME_portalId = "portalId"; /** Uncap-prop-name of gender. CHAR(1) : NotNull */ public static final String UNCAP_PROP_NAME_gender = "gender"; - /** Uncap-prop-name of firstname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of firstname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_firstname = "firstname"; - /** Uncap-prop-name of lastname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of lastname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_lastname = "lastname"; + /** Uncap-prop-name of firstnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_firstnameDescription = "firstnameDescription"; + /** Uncap-prop-name of lastnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_lastnameDescription = "lastnameDescription"; /** Uncap-prop-name of nickname. VARCHAR(64) */ public static final String UNCAP_PROP_NAME_nickname = "nickname"; /** Uncap-prop-name of dayOfBirth. DATE : NotNull : Default=[0000-00-00 00:00:00] */ @@ -238,6 +262,10 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_Firstname = "firstname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Lastname. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Lastname = "lastname"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_FirstnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_FirstnameDescription = "firstnameDescription"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_LastnameDescription = "lastnameDescription"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Nickname. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Nickname = "nickname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DayOfBirth. */ @@ -309,6 +337,8 @@ map.put(DB_NAME_GENDER.toLowerCase(), PROPERTY_NAME_gender); map.put(DB_NAME_FIRSTNAME.toLowerCase(), PROPERTY_NAME_firstname); map.put(DB_NAME_LASTNAME.toLowerCase(), PROPERTY_NAME_lastname); + map.put(DB_NAME_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_firstnameDescription); + map.put(DB_NAME_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_lastnameDescription); map.put(DB_NAME_NICKNAME.toLowerCase(), PROPERTY_NAME_nickname); map.put(DB_NAME_DAY_OF_BIRTH.toLowerCase(), PROPERTY_NAME_dayOfBirth); map.put(DB_NAME_EMAIL_ADDRESS.toLowerCase(), PROPERTY_NAME_emailAddress); @@ -333,6 +363,8 @@ map.put(PROPERTY_NAME_gender.toLowerCase(), DB_NAME_GENDER); map.put(PROPERTY_NAME_firstname.toLowerCase(), DB_NAME_FIRSTNAME); map.put(PROPERTY_NAME_lastname.toLowerCase(), DB_NAME_LASTNAME); + map.put(PROPERTY_NAME_firstnameDescription.toLowerCase(), DB_NAME_FIRSTNAME_DESCRIPTION); + map.put(PROPERTY_NAME_lastnameDescription.toLowerCase(), DB_NAME_LASTNAME_DESCRIPTION); map.put(PROPERTY_NAME_nickname.toLowerCase(), DB_NAME_NICKNAME); map.put(PROPERTY_NAME_dayOfBirth.toLowerCase(), DB_NAME_DAY_OF_BIRTH); map.put(PROPERTY_NAME_emailAddress.toLowerCase(), DB_NAME_EMAIL_ADDRESS); @@ -359,6 +391,8 @@ map.put(DB_NAME_GENDER, CAP_PROP_NAME_Gender); map.put(DB_NAME_FIRSTNAME, CAP_PROP_NAME_Firstname); map.put(DB_NAME_LASTNAME, CAP_PROP_NAME_Lastname); + map.put(DB_NAME_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_FirstnameDescription); + map.put(DB_NAME_LASTNAME_DESCRIPTION, CAP_PROP_NAME_LastnameDescription); map.put(DB_NAME_NICKNAME, CAP_PROP_NAME_Nickname); map.put(DB_NAME_DAY_OF_BIRTH, CAP_PROP_NAME_DayOfBirth); map.put(DB_NAME_EMAIL_ADDRESS, CAP_PROP_NAME_EmailAddress); @@ -385,6 +419,8 @@ map.put(DB_NAME_GENDER, UNCAP_PROP_NAME_gender); map.put(DB_NAME_FIRSTNAME, UNCAP_PROP_NAME_firstname); map.put(DB_NAME_LASTNAME, UNCAP_PROP_NAME_lastname); + map.put(DB_NAME_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_firstnameDescription); + map.put(DB_NAME_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_lastnameDescription); map.put(DB_NAME_NICKNAME, UNCAP_PROP_NAME_nickname); map.put(DB_NAME_DAY_OF_BIRTH, UNCAP_PROP_NAME_dayOfBirth); map.put(DB_NAME_EMAIL_ADDRESS, UNCAP_PROP_NAME_emailAddress); @@ -411,6 +447,8 @@ map.put(CAP_PROP_NAME_Gender, DB_NAME_GENDER); map.put(CAP_PROP_NAME_Firstname, DB_NAME_FIRSTNAME); map.put(CAP_PROP_NAME_Lastname, DB_NAME_LASTNAME); + map.put(CAP_PROP_NAME_FirstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION); + map.put(CAP_PROP_NAME_LastnameDescription, DB_NAME_LASTNAME_DESCRIPTION); map.put(CAP_PROP_NAME_Nickname, DB_NAME_NICKNAME); map.put(CAP_PROP_NAME_DayOfBirth, DB_NAME_DAY_OF_BIRTH); map.put(CAP_PROP_NAME_EmailAddress, DB_NAME_EMAIL_ADDRESS); @@ -437,6 +475,8 @@ map.put(CAP_PROP_NAME_Gender, UNCAP_PROP_NAME_gender); map.put(CAP_PROP_NAME_Firstname, UNCAP_PROP_NAME_firstname); map.put(CAP_PROP_NAME_Lastname, UNCAP_PROP_NAME_lastname); + map.put(CAP_PROP_NAME_FirstnameDescription, UNCAP_PROP_NAME_firstnameDescription); + map.put(CAP_PROP_NAME_LastnameDescription, UNCAP_PROP_NAME_lastnameDescription); map.put(CAP_PROP_NAME_Nickname, UNCAP_PROP_NAME_nickname); map.put(CAP_PROP_NAME_DayOfBirth, UNCAP_PROP_NAME_dayOfBirth); map.put(CAP_PROP_NAME_EmailAddress, UNCAP_PROP_NAME_emailAddress); @@ -463,6 +503,8 @@ map.put(UNCAP_PROP_NAME_gender, DB_NAME_GENDER); map.put(UNCAP_PROP_NAME_firstname, DB_NAME_FIRSTNAME); map.put(UNCAP_PROP_NAME_lastname, DB_NAME_LASTNAME); + map.put(UNCAP_PROP_NAME_firstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION); + map.put(UNCAP_PROP_NAME_lastnameDescription, DB_NAME_LASTNAME_DESCRIPTION); map.put(UNCAP_PROP_NAME_nickname, DB_NAME_NICKNAME); map.put(UNCAP_PROP_NAME_dayOfBirth, DB_NAME_DAY_OF_BIRTH); map.put(UNCAP_PROP_NAME_emailAddress, DB_NAME_EMAIL_ADDRESS); @@ -489,6 +531,8 @@ map.put(UNCAP_PROP_NAME_gender, CAP_PROP_NAME_Gender); map.put(UNCAP_PROP_NAME_firstname, CAP_PROP_NAME_Firstname); map.put(UNCAP_PROP_NAME_lastname, CAP_PROP_NAME_Lastname); + map.put(UNCAP_PROP_NAME_firstnameDescription, CAP_PROP_NAME_FirstnameDescription); + map.put(UNCAP_PROP_NAME_lastnameDescription, CAP_PROP_NAME_LastnameDescription); map.put(UNCAP_PROP_NAME_nickname, CAP_PROP_NAME_Nickname); map.put(UNCAP_PROP_NAME_dayOfBirth, CAP_PROP_NAME_DayOfBirth); map.put(UNCAP_PROP_NAME_emailAddress, CAP_PROP_NAME_EmailAddress); @@ -707,6 +751,8 @@ columnInfoList.add(columnGender()); columnInfoList.add(columnFirstname()); columnInfoList.add(columnLastname()); + columnInfoList.add(columnFirstnameDescription()); + columnInfoList.add(columnLastnameDescription()); columnInfoList.add(columnNickname()); columnInfoList.add(columnDayOfBirth()); columnInfoList.add(columnEmailAddress()); @@ -767,7 +813,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED"; + return "CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED"; } /** @@ -801,6 +847,18 @@ return new ColumnInfo(this, "LASTNAME", "lastname", String.class, false); } /** + * @return Column information of firstnameDescription. (NotNull) + */ + public ColumnInfo columnFirstnameDescription() { + return new ColumnInfo(this, "FIRSTNAME_DESCRIPTION", "firstnameDescription", String.class, false); + } + /** + * @return Column information of lastnameDescription. (NotNull) + */ + public ColumnInfo columnLastnameDescription() { + return new ColumnInfo(this, "LASTNAME_DESCRIPTION", "lastnameDescription", String.class, false); + } + /** * @return Column information of nickname. (NotNull) */ public ColumnInfo columnNickname() { @@ -1059,6 +1117,8 @@ public RelationTrace columnGender() { return fixTrace(_relationList, CustomerDbm.getInstance().columnGender()); } public RelationTrace columnFirstname() { return fixTrace(_relationList, CustomerDbm.getInstance().columnFirstname()); } public RelationTrace columnLastname() { return fixTrace(_relationList, CustomerDbm.getInstance().columnLastname()); } + public RelationTrace columnFirstnameDescription() { return fixTrace(_relationList, CustomerDbm.getInstance().columnFirstnameDescription()); } + public RelationTrace columnLastnameDescription() { return fixTrace(_relationList, CustomerDbm.getInstance().columnLastnameDescription()); } public RelationTrace columnNickname() { return fixTrace(_relationList, CustomerDbm.getInstance().columnNickname()); } public RelationTrace columnDayOfBirth() { return fixTrace(_relationList, CustomerDbm.getInstance().columnDayOfBirth()); } public RelationTrace columnEmailAddress() { return fixTrace(_relationList, CustomerDbm.getInstance().columnEmailAddress()); } @@ -1139,6 +1199,8 @@ if (analyzer.init("GENDER", "gender", "gender")) { myEntity.setGender(analyzer.analyzeString(String.class)); }; if (analyzer.init("FIRSTNAME", "firstname", "firstname")) { myEntity.setFirstname(analyzer.analyzeString(String.class)); }; if (analyzer.init("LASTNAME", "lastname", "lastname")) { myEntity.setLastname(analyzer.analyzeString(String.class)); }; + if (analyzer.init("FIRSTNAME_DESCRIPTION", "firstnameDescription", "firstnameDescription")) { myEntity.setFirstnameDescription(analyzer.analyzeString(String.class)); }; + if (analyzer.init("LASTNAME_DESCRIPTION", "lastnameDescription", "lastnameDescription")) { myEntity.setLastnameDescription(analyzer.analyzeString(String.class)); }; if (analyzer.init("NICKNAME", "nickname", "nickname")) { myEntity.setNickname(analyzer.analyzeString(String.class)); }; if (analyzer.init("DAY_OF_BIRTH", "dayOfBirth", "dayOfBirth")) { myEntity.setDayOfBirth(analyzer.analyzeDate(java.util.Date.class)); }; if (analyzer.init("EMAIL_ADDRESS", "emailAddress", "emailAddress")) { myEntity.setEmailAddress(analyzer.analyzeString(String.class)); }; @@ -1221,6 +1283,8 @@ helpAppendingColumnValueString(sb, delimiter, equal, "GENDER", myEntity.getGender()); helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME", myEntity.getFirstname()); helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME", myEntity.getLastname()); + helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription()); + helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME_DESCRIPTION", myEntity.getLastnameDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "NICKNAME", myEntity.getNickname()); helpAppendingColumnValueString(sb, delimiter, equal, "DAY_OF_BIRTH", myEntity.getDayOfBirth()); helpAppendingColumnValueString(sb, delimiter, equal, "EMAIL_ADDRESS", myEntity.getEmailAddress()); @@ -1285,6 +1349,8 @@ valueMap.put("GENDER", myEntity.getGender()); valueMap.put("FIRSTNAME", myEntity.getFirstname()); valueMap.put("LASTNAME", myEntity.getLastname()); + valueMap.put("FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription()); + valueMap.put("LASTNAME_DESCRIPTION", myEntity.getLastnameDescription()); valueMap.put("NICKNAME", myEntity.getNickname()); valueMap.put("DAY_OF_BIRTH", myEntity.getDayOfBirth()); valueMap.put("EMAIL_ADDRESS", myEntity.getEmailAddress()); @@ -1317,6 +1383,8 @@ valueMap.put("GENDER", helpGettingColumnStringValue(myEntity.getGender())); valueMap.put("FIRSTNAME", helpGettingColumnStringValue(myEntity.getFirstname())); valueMap.put("LASTNAME", helpGettingColumnStringValue(myEntity.getLastname())); + valueMap.put("FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getFirstnameDescription())); + valueMap.put("LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getLastnameDescription())); valueMap.put("NICKNAME", helpGettingColumnStringValue(myEntity.getNickname())); valueMap.put("DAY_OF_BIRTH", helpGettingColumnStringValue(myEntity.getDayOfBirth())); valueMap.put("EMAIL_ADDRESS", helpGettingColumnStringValue(myEntity.getEmailAddress())); @@ -1346,9 +1414,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2007-10-01 13:00:14 UTC (rev 599) @@ -16,7 +16,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -101,10 +101,14 @@ public static final String DB_NAME_CUSTOMER_ID = "CUSTOMER_ID"; /** Db-name of CUSTOMER_GENDER. CHAR(1) : NotNull */ public static final String DB_NAME_CUSTOMER_GENDER = "CUSTOMER_GENDER"; - /** Db-name of CUSTOMER_FIRSTNAME. VARCHAR(32) : NotNull */ + /** Db-name of CUSTOMER_FIRSTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_CUSTOMER_FIRSTNAME = "CUSTOMER_FIRSTNAME"; - /** Db-name of CUSTOMER_LASTNAME. VARCHAR(32) : NotNull */ + /** Db-name of CUSTOMER_LASTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_CUSTOMER_LASTNAME = "CUSTOMER_LASTNAME"; + /** Db-name of CUSTOMER_FIRSTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION = "CUSTOMER_FIRSTNAME_DESCRIPTION"; + /** Db-name of CUSTOMER_LASTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION = "CUSTOMER_LASTNAME_DESCRIPTION"; /** Db-name of CUSTOMER_DAY_OF_BIRTH. DATE : NotNull */ public static final String DB_NAME_CUSTOMER_DAY_OF_BIRTH = "CUSTOMER_DAY_OF_BIRTH"; /** Db-name of CUSTOMER_EMAIL_ADDRESS. VARCHAR(128) : NotNull */ @@ -133,10 +137,14 @@ public static final String DB_NAME_DELIVERY_COMPANY = "DELIVERY_COMPANY"; /** Db-name of DELIVERY_DEPARTMENT. VARCHAR(64) */ public static final String DB_NAME_DELIVERY_DEPARTMENT = "DELIVERY_DEPARTMENT"; - /** Db-name of DELIVERY_FIRSTNAME. VARCHAR(32) : NotNull */ + /** Db-name of DELIVERY_FIRSTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_DELIVERY_FIRSTNAME = "DELIVERY_FIRSTNAME"; - /** Db-name of DELIVERY_LASTNAME. VARCHAR(32) : NotNull */ + /** Db-name of DELIVERY_LASTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_DELIVERY_LASTNAME = "DELIVERY_LASTNAME"; + /** Db-name of DELIVERY_FIRSTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION = "DELIVERY_FIRSTNAME_DESCRIPTION"; + /** Db-name of DELIVERY_LAST_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_DELIVERY_LAST_DESCRIPTION = "DELIVERY_LAST_DESCRIPTION"; /** Db-name of DELIVERY_STREET_ADDRESS. VARCHAR(255) : NotNull */ public static final String DB_NAME_DELIVERY_STREET_ADDRESS = "DELIVERY_STREET_ADDRESS"; /** Db-name of DELIVERY_SUBURB. VARCHAR(32) */ @@ -157,10 +165,14 @@ public static final String DB_NAME_BILLING_COMPANY = "BILLING_COMPANY"; /** Db-name of BILLING_DEPARTMENT. VARCHAR(64) */ public static final String DB_NAME_BILLING_DEPARTMENT = "BILLING_DEPARTMENT"; - /** Db-name of BILLING_FIRSTNAME. VARCHAR(32) : NotNull */ + /** Db-name of BILLING_FIRSTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_BILLING_FIRSTNAME = "BILLING_FIRSTNAME"; - /** Db-name of BILLING_LASTNAME. VARCHAR(32) : NotNull */ + /** Db-name of BILLING_LASTNAME. VARCHAR(40) : NotNull */ public static final String DB_NAME_BILLING_LASTNAME = "BILLING_LASTNAME"; + /** Db-name of BILLING_FIRSTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_BILLING_FIRSTNAME_DESCRIPTION = "BILLING_FIRSTNAME_DESCRIPTION"; + /** Db-name of BILLING_LASTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_BILLING_LASTNAME_DESCRIPTION = "BILLING_LASTNAME_DESCRIPTION"; /** Db-name of BILLING_STREET_ADDRESS. VARCHAR(255) : NotNull */ public static final String DB_NAME_BILLING_STREET_ADDRESS = "BILLING_STREET_ADDRESS"; /** Db-name of BILLING_SUBURB. VARCHAR(32) */ @@ -220,6 +232,10 @@ public static final String COLUMN_DB_NAME_OF_CustomerFirstname = "CUSTOMER_FIRSTNAME"; /** @deprecated Deprecated! So use DB_NAME_CustomerLastname. */ public static final String COLUMN_DB_NAME_OF_CustomerLastname = "CUSTOMER_LASTNAME"; + /** @deprecated Deprecated! So use DB_NAME_CustomerFirstnameDescription. */ + public static final String COLUMN_DB_NAME_OF_CustomerFirstnameDescription = "CUSTOMER_FIRSTNAME_DESCRIPTION"; + /** @deprecated Deprecated! So use DB_NAME_CustomerLastnameDescription. */ + public static final String COLUMN_DB_NAME_OF_CustomerLastnameDescription = "CUSTOMER_LASTNAME_DESCRIPTION"; /** @deprecated Deprecated! So use DB_NAME_CustomerDayOfBirth. */ public static final String COLUMN_DB_NAME_OF_CustomerDayOfBirth = "CUSTOMER_DAY_OF_BIRTH"; /** @deprecated Deprecated! So use DB_NAME_CustomerEmailAddress. */ @@ -252,6 +268,10 @@ public static final String COLUMN_DB_NAME_OF_DeliveryFirstname = "DELIVERY_FIRSTNAME"; /** @deprecated Deprecated! So use DB_NAME_DeliveryLastname. */ public static final String COLUMN_DB_NAME_OF_DeliveryLastname = "DELIVERY_LASTNAME"; + /** @deprecated Deprecated! So use DB_NAME_DeliveryFirstnameDescription. */ + public static final String COLUMN_DB_NAME_OF_DeliveryFirstnameDescription = "DELIVERY_FIRSTNAME_DESCRIPTION"; + /** @deprecated Deprecated! So use DB_NAME_DeliveryLastDescription. */ + public static final String COLUMN_DB_NAME_OF_DeliveryLastDescription = "DELIVERY_LAST_DESCRIPTION"; /** @deprecated Deprecated! So use DB_NAME_DeliveryStreetAddress. */ public static final String COLUMN_DB_NAME_OF_DeliveryStreetAddress = "DELIVERY_STREET_ADDRESS"; /** @deprecated Deprecated! So use DB_NAME_DeliverySuburb. */ @@ -276,6 +296,10 @@ public static final String COLUMN_DB_NAME_OF_BillingFirstname = "BILLING_FIRSTNAME"; /** @deprecated Deprecated! So use DB_NAME_BillingLastname. */ public static final String COLUMN_DB_NAME_OF_BillingLastname = "BILLING_LASTNAME"; + /** @deprecated Deprecated! So use DB_NAME_BillingFirstnameDescription. */ + public static final String COLUMN_DB_NAME_OF_BillingFirstnameDescription = "BILLING_FIRSTNAME_DESCRIPTION"; + /** @deprecated Deprecated! So use DB_NAME_BillingLastnameDescription. */ + public static final String COLUMN_DB_NAME_OF_BillingLastnameDescription = "BILLING_LASTNAME_DESCRIPTION"; /** @deprecated Deprecated! So use DB_NAME_BillingStreetAddress. */ public static final String COLUMN_DB_NAME_OF_BillingStreetAddress = "BILLING_STREET_ADDRESS"; /** @deprecated Deprecated! So use DB_NAME_BillingSuburb. */ @@ -334,10 +358,14 @@ public static final String PROPERTY_NAME_customerId = "customerId"; /** Prop-name(JavaBeansRule) of customerGender. CHAR(1) : NotNull */ public static final String PROPERTY_NAME_customerGender = "customerGender"; - /** Prop-name(JavaBeansRule) of customerFirstname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of customerFirstname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_customerFirstname = "customerFirstname"; - /** Prop-name(JavaBeansRule) of customerLastname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of customerLastname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_customerLastname = "customerLastname"; + /** Prop-name(JavaBeansRule) of customerFirstnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_customerFirstnameDescription = "customerFirstnameDescription"; + /** Prop-name(JavaBeansRule) of customerLastnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_customerLastnameDescription = "customerLastnameDescription"; /** Prop-name(JavaBeansRule) of customerDayOfBirth. DATE : NotNull */ public static final String PROPERTY_NAME_customerDayOfBirth = "customerDayOfBirth"; /** Prop-name(JavaBeansRule) of customerEmailAddress. VARCHAR(128) : NotNull */ @@ -366,10 +394,14 @@ public static final String PROPERTY_NAME_deliveryCompany = "deliveryCompany"; /** Prop-name(JavaBeansRule) of deliveryDepartment. VARCHAR(64) */ public static final String PROPERTY_NAME_deliveryDepartment = "deliveryDepartment"; - /** Prop-name(JavaBeansRule) of deliveryFirstname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of deliveryFirstname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_deliveryFirstname = "deliveryFirstname"; - /** Prop-name(JavaBeansRule) of deliveryLastname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of deliveryLastname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_deliveryLastname = "deliveryLastname"; + /** Prop-name(JavaBeansRule) of deliveryFirstnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_deliveryFirstnameDescription = "deliveryFirstnameDescription"; + /** Prop-name(JavaBeansRule) of deliveryLastDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_deliveryLastDescription = "deliveryLastDescription"; /** Prop-name(JavaBeansRule) of deliveryStreetAddress. VARCHAR(255) : NotNull */ public static final String PROPERTY_NAME_deliveryStreetAddress = "deliveryStreetAddress"; /** Prop-name(JavaBeansRule) of deliverySuburb. VARCHAR(32) */ @@ -390,10 +422,14 @@ public static final String PROPERTY_NAME_billingCompany = "billingCompany"; /** Prop-name(JavaBeansRule) of billingDepartment. VARCHAR(64) */ public static final String PROPERTY_NAME_billingDepartment = "billingDepartment"; - /** Prop-name(JavaBeansRule) of billingFirstname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of billingFirstname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_billingFirstname = "billingFirstname"; - /** Prop-name(JavaBeansRule) of billingLastname. VARCHAR(32) : NotNull */ + /** Prop-name(JavaBeansRule) of billingLastname. VARCHAR(40) : NotNull */ public static final String PROPERTY_NAME_billingLastname = "billingLastname"; + /** Prop-name(JavaBeansRule) of billingFirstnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_billingFirstnameDescription = "billingFirstnameDescription"; + /** Prop-name(JavaBeansRule) of billingLastnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_billingLastnameDescription = "billingLastnameDescription"; /** Prop-name(JavaBeansRule) of billingStreetAddress. VARCHAR(255) : NotNull */ public static final String PROPERTY_NAME_billingStreetAddress = "billingStreetAddress"; /** Prop-name(JavaBeansRule) of billingSuburb. VARCHAR(32) */ @@ -452,10 +488,14 @@ public static final String CAP_PROP_NAME_CustomerId = "CustomerId"; /** Cap-prop-name of customerGender. CHAR(1) : NotNull */ public static final String CAP_PROP_NAME_CustomerGender = "CustomerGender"; - /** Cap-prop-name of customerFirstname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of customerFirstname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_CustomerFirstname = "CustomerFirstname"; - /** Cap-prop-name of customerLastname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of customerLastname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_CustomerLastname = "CustomerLastname"; + /** Cap-prop-name of customerFirstnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_CustomerFirstnameDescription = "CustomerFirstnameDescription"; + /** Cap-prop-name of customerLastnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_CustomerLastnameDescription = "CustomerLastnameDescription"; /** Cap-prop-name of customerDayOfBirth. DATE : NotNull */ public static final String CAP_PROP_NAME_CustomerDayOfBirth = "CustomerDayOfBirth"; /** Cap-prop-name of customerEmailAddress. VARCHAR(128) : NotNull */ @@ -484,10 +524,14 @@ public static final String CAP_PROP_NAME_DeliveryCompany = "DeliveryCompany"; /** Cap-prop-name of deliveryDepartment. VARCHAR(64) */ public static final String CAP_PROP_NAME_DeliveryDepartment = "DeliveryDepartment"; - /** Cap-prop-name of deliveryFirstname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of deliveryFirstname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_DeliveryFirstname = "DeliveryFirstname"; - /** Cap-prop-name of deliveryLastname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of deliveryLastname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_DeliveryLastname = "DeliveryLastname"; + /** Cap-prop-name of deliveryFirstnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_DeliveryFirstnameDescription = "DeliveryFirstnameDescription"; + /** Cap-prop-name of deliveryLastDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_DeliveryLastDescription = "DeliveryLastDescription"; /** Cap-prop-name of deliveryStreetAddress. VARCHAR(255) : NotNull */ public static final String CAP_PROP_NAME_DeliveryStreetAddress = "DeliveryStreetAddress"; /** Cap-prop-name of deliverySuburb. VARCHAR(32) */ @@ -508,10 +552,14 @@ public static final String CAP_PROP_NAME_BillingCompany = "BillingCompany"; /** Cap-prop-name of billingDepartment. VARCHAR(64) */ public static final String CAP_PROP_NAME_BillingDepartment = "BillingDepartment"; - /** Cap-prop-name of billingFirstname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of billingFirstname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_BillingFirstname = "BillingFirstname"; - /** Cap-prop-name of billingLastname. VARCHAR(32) : NotNull */ + /** Cap-prop-name of billingLastname. VARCHAR(40) : NotNull */ public static final String CAP_PROP_NAME_BillingLastname = "BillingLastname"; + /** Cap-prop-name of billingFirstnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_BillingFirstnameDescription = "BillingFirstnameDescription"; + /** Cap-prop-name of billingLastnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_BillingLastnameDescription = "BillingLastnameDescription"; /** Cap-prop-name of billingStreetAddress. VARCHAR(255) : NotNull */ public static final String CAP_PROP_NAME_BillingStreetAddress = "BillingStreetAddress"; /** Cap-prop-name of billingSuburb. VARCHAR(32) */ @@ -571,6 +619,10 @@ public static final String COLUMN_CAP_PROP_NAME_OF_CustomerFirstname = "CustomerFirstname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerLastname. */ public static final String COLUMN_CAP_PROP_NAME_OF_CustomerLastname = "CustomerLastname"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerFirstnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_CustomerFirstnameDescription = "CustomerFirstnameDescription"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerLastnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_CustomerLastnameDescription = "CustomerLastnameDescription"; /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerDayOfBirth. */ public static final String COLUMN_CAP_PROP_NAME_OF_CustomerDayOfBirth = "CustomerDayOfBirth"; /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerEmailAddress. */ @@ -603,6 +655,10 @@ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryFirstname = "DeliveryFirstname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryLastname. */ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastname = "DeliveryLastname"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryFirstnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryFirstnameDescription = "DeliveryFirstnameDescription"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryLastDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastDescription = "DeliveryLastDescription"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryStreetAddress. */ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryStreetAddress = "DeliveryStreetAddress"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliverySuburb. */ @@ -627,6 +683,10 @@ public static final String COLUMN_CAP_PROP_NAME_OF_BillingFirstname = "BillingFirstname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingLastname. */ public static final String COLUMN_CAP_PROP_NAME_OF_BillingLastname = "BillingLastname"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingFirstnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_BillingFirstnameDescription = "BillingFirstnameDescription"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingLastnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_BillingLastnameDescription = "BillingLastnameDescription"; /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingStreetAddress. */ public static final String COLUMN_CAP_PROP_NAME_OF_BillingStreetAddress = "BillingStreetAddress"; /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingSuburb. */ @@ -685,10 +745,14 @@ public static final String UNCAP_PROP_NAME_customerId = "customerId"; /** Uncap-prop-name of customerGender. CHAR(1) : NotNull */ public static final String UNCAP_PROP_NAME_customerGender = "customerGender"; - /** Uncap-prop-name of customerFirstname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of customerFirstname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_customerFirstname = "customerFirstname"; - /** Uncap-prop-name of customerLastname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of customerLastname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_customerLastname = "customerLastname"; + /** Uncap-prop-name of customerFirstnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_customerFirstnameDescription = "customerFirstnameDescription"; + /** Uncap-prop-name of customerLastnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_customerLastnameDescription = "customerLastnameDescription"; /** Uncap-prop-name of customerDayOfBirth. DATE : NotNull */ public static final String UNCAP_PROP_NAME_customerDayOfBirth = "customerDayOfBirth"; /** Uncap-prop-name of customerEmailAddress. VARCHAR(128) : NotNull */ @@ -717,10 +781,14 @@ public static final String UNCAP_PROP_NAME_deliveryCompany = "deliveryCompany"; /** Uncap-prop-name of deliveryDepartment. VARCHAR(64) */ public static final String UNCAP_PROP_NAME_deliveryDepartment = "deliveryDepartment"; - /** Uncap-prop-name of deliveryFirstname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of deliveryFirstname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_deliveryFirstname = "deliveryFirstname"; - /** Uncap-prop-name of deliveryLastname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of deliveryLastname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_deliveryLastname = "deliveryLastname"; + /** Uncap-prop-name of deliveryFirstnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_deliveryFirstnameDescription = "deliveryFirstnameDescription"; + /** Uncap-prop-name of deliveryLastDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_deliveryLastDescription = "deliveryLastDescription"; /** Uncap-prop-name of deliveryStreetAddress. VARCHAR(255) : NotNull */ public static final String UNCAP_PROP_NAME_deliveryStreetAddress = "deliveryStreetAddress"; /** Uncap-prop-name of deliverySuburb. VARCHAR(32) */ @@ -741,10 +809,14 @@ public static final String UNCAP_PROP_NAME_billingCompany = "billingCompany"; /** Uncap-prop-name of billingDepartment. VARCHAR(64) */ public static final String UNCAP_PROP_NAME_billingDepartment = "billingDepartment"; - /** Uncap-prop-name of billingFirstname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of billingFirstname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_billingFirstname = "billingFirstname"; - /** Uncap-prop-name of billingLastname. VARCHAR(32) : NotNull */ + /** Uncap-prop-name of billingLastname. VARCHAR(40) : NotNull */ public static final String UNCAP_PROP_NAME_billingLastname = "billingLastname"; + /** Uncap-prop-name of billingFirstnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_billingFirstnameDescription = "billingFirstnameDescription"; + /** Uncap-prop-name of billingLastnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_billingLastnameDescription = "billingLastnameDescription"; /** Uncap-prop-name of billingStreetAddress. VARCHAR(255) : NotNull */ public static final String UNCAP_PROP_NAME_billingStreetAddress = "billingStreetAddress"; /** Uncap-prop-name of billingSuburb. VARCHAR(32) */ @@ -804,6 +876,10 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerFirstname = "customerFirstname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerLastname. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerLastname = "customerLastname"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerFirstnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerFirstnameDescription = "customerFirstnameDescription"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerLastnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerLastnameDescription = "customerLastnameDescription"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerDayOfBirth. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerDayOfBirth = "customerDayOfBirth"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerEmailAddress. */ @@ -836,6 +912,10 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryFirstname = "deliveryFirstname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryLastname. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastname = "deliveryLastname"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryFirstnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryFirstnameDescription = "deliveryFirstnameDescription"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryLastDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastDescription = "deliveryLastDescription"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryStreetAddress. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryStreetAddress = "deliveryStreetAddress"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliverySuburb. */ @@ -860,6 +940,10 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingFirstname = "billingFirstname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingLastname. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingLastname = "billingLastname"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingFirstnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingFirstnameDescription = "billingFirstnameDescription"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingLastnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingLastnameDescription = "billingLastnameDescription"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingStreetAddress. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingStreetAddress = "billingStreetAddress"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingSuburb. */ @@ -992,6 +1076,8 @@ map.put(DB_NAME_CUSTOMER_GENDER.toLowerCase(), PROPERTY_NAME_customerGender); map.put(DB_NAME_CUSTOMER_FIRSTNAME.toLowerCase(), PROPERTY_NAME_customerFirstname); map.put(DB_NAME_CUSTOMER_LASTNAME.toLowerCase(), PROPERTY_NAME_customerLastname); + map.put(DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_customerFirstnameDescription); + map.put(DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_customerLastnameDescription); map.put(DB_NAME_CUSTOMER_DAY_OF_BIRTH.toLowerCase(), PROPERTY_NAME_customerDayOfBirth); map.put(DB_NAME_CUSTOMER_EMAIL_ADDRESS.toLowerCase(), PROPERTY_NAME_customerEmailAddress); map.put(DB_NAME_CUSTOMER_COMPANY.toLowerCase(), PROPERTY_NAME_customerCompany); @@ -1008,6 +1094,8 @@ map.put(DB_NAME_DELIVERY_DEPARTMENT.toLowerCase(), PROPERTY_NAME_deliveryDepartment); map.put(DB_NAME_DELIVERY_FIRSTNAME.toLowerCase(), PROPERTY_NAME_deliveryFirstname); map.put(DB_NAME_DELIVERY_LASTNAME.toLowerCase(), PROPERTY_NAME_deliveryLastname); + map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryFirstnameDescription); + map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryLastDescription); map.put(DB_NAME_DELIVERY_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_deliveryStreetAddress); map.put(DB_NAME_DELIVERY_SUBURB.toLowerCase(), PROPERTY_NAME_deliverySuburb); map.put(DB_NAME_DELIVERY_CITY.toLowerCase(), PROPERTY_NAME_deliveryCity); @@ -1020,6 +1108,8 @@ map.put(DB_NAME_BILLING_DEPARTMENT.toLowerCase(), PROPERTY_NAME_billingDepartment); map.put(DB_NAME_BILLING_FIRSTNAME.toLowerCase(), PROPERTY_NAME_billingFirstname); map.put(DB_NAME_BILLING_LASTNAME.toLowerCase(), PROPERTY_NAME_billingLastname); + map.put(DB_NAME_BILLING_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_billingFirstnameDescription); + map.put(DB_NAME_BILLING_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_billingLastnameDescription); map.put(DB_NAME_BILLING_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_billingStreetAddress); map.put(DB_NAME_BILLING_SUBURB.toLowerCase(), PROPERTY_NAME_billingSuburb); map.put(DB_NAME_BILLING_CITY.toLowerCase(), PROPERTY_NAME_billingCity); @@ -1063,6 +1153,8 @@ map.put(PROPERTY_NAME_customerGender.toLowerCase(), DB_NAME_CUSTOMER_GENDER); map.put(PROPERTY_NAME_customerFirstname.toLowerCase(), DB_NAME_CUSTOMER_FIRSTNAME); map.put(PROPERTY_NAME_customerLastname.toLowerCase(), DB_NAME_CUSTOMER_LASTNAME); + map.put(PROPERTY_NAME_customerFirstnameDescription.toLowerCase(), DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION); + map.put(PROPERTY_NAME_customerLastnameDescription.toLowerCase(), DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION); map.put(PROPERTY_NAME_customerDayOfBirth.toLowerCase(), DB_NAME_CUSTOMER_DAY_OF_BIRTH); map.put(PROPERTY_NAME_customerEmailAddress.toLowerCase(), DB_NAME_CUSTOMER_EMAIL_ADDRESS); map.put(PROPERTY_NAME_customerCompany.toLowerCase(), DB_NAME_CUSTOMER_COMPANY); @@ -1079,6 +1171,8 @@ map.put(PROPERTY_NAME_deliveryDepartment.toLowerCase(), DB_NAME_DELIVERY_DEPARTMENT); map.put(PROPERTY_NAME_deliveryFirstname.toLowerCase(), DB_NAME_DELIVERY_FIRSTNAME); map.put(PROPERTY_NAME_deliveryLastname.toLowerCase(), DB_NAME_DELIVERY_LASTNAME); + map.put(PROPERTY_NAME_deliveryFirstnameDescription.toLowerCase(), DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION); + map.put(PROPERTY_NAME_deliveryLastDescription.toLowerCase(), DB_NAME_DELIVERY_LAST_DESCRIPTION); map.put(PROPERTY_NAME_deliveryStreetAddress.toLowerCase(), DB_NAME_DELIVERY_STREET_ADDRESS); map.put(PROPERTY_NAME_deliverySuburb.toLowerCase(), DB_NAME_DELIVERY_SUBURB); map.put(PROPERTY_NAME_deliveryCity.toLowerCase(), DB_NAME_DELIVERY_CITY); @@ -1091,6 +1185,8 @@ map.put(PROPERTY_NAME_billingDepartment.toLowerCase(), DB_NAME_BILLING_DEPARTMENT); map.put(PROPERTY_NAME_billingFirstname.toLowerCase(), DB_NAME_BILLING_FIRSTNAME); map.put(PROPERTY_NAME_billingLastname.toLowerCase(), DB_NAME_BILLING_LASTNAME); + map.put(PROPERTY_NAME_billingFirstnameDescription.toLowerCase(), DB_NAME_BILLING_FIRSTNAME_DESCRIPTION); + map.put(PROPERTY_NAME_billingLastnameDescription.toLowerCase(), DB_NAME_BILLING_LASTNAME_DESCRIPTION); map.put(PROPERTY_NAME_billingStreetAddress.toLowerCase(), DB_NAME_BILLING_STREET_ADDRESS); map.put(PROPERTY_NAME_billingSuburb.toLowerCase(), DB_NAME_BILLING_SUBURB); map.put(PROPERTY_NAME_billingCity.toLowerCase(), DB_NAME_BILLING_CITY); @@ -1136,6 +1232,8 @@ map.put(DB_NAME_CUSTOMER_GENDER, CAP_PROP_NAME_CustomerGender); map.put(DB_NAME_CUSTOMER_FIRSTNAME, CAP_PROP_NAME_CustomerFirstname); map.put(DB_NAME_CUSTOMER_LASTNAME, CAP_PROP_NAME_CustomerLastname); + map.put(DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_CustomerFirstnameDescription); + map.put(DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION, CAP_PROP_NAME_CustomerLastnameDescription); map.put(DB_NAME_CUSTOMER_DAY_OF_BIRTH, CAP_PROP_NAME_CustomerDayOfBirth); map.put(DB_NAME_CUSTOMER_EMAIL_ADDRESS, CAP_PROP_NAME_CustomerEmailAddress); map.put(DB_NAME_CUSTOMER_COMPANY, CAP_PROP_NAME_CustomerCompany); @@ -1152,6 +1250,8 @@ map.put(DB_NAME_DELIVERY_DEPARTMENT, CAP_PROP_NAME_DeliveryDepartment); map.put(DB_NAME_DELIVERY_FIRSTNAME, CAP_PROP_NAME_DeliveryFirstname); map.put(DB_NAME_DELIVERY_LASTNAME, CAP_PROP_NAME_DeliveryLastname); + map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_DeliveryFirstnameDescription); + map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION, CAP_PROP_NAME_DeliveryLastDescription); map.put(DB_NAME_DELIVERY_STREET_ADDRESS, CAP_PROP_NAME_DeliveryStreetAddress); map.put(DB_NAME_DELIVERY_SUBURB, CAP_PROP_NAME_DeliverySuburb); map.put(DB_NAME_DELIVERY_CITY, CAP_PROP_NAME_DeliveryCity); @@ -1164,6 +1264,8 @@ map.put(DB_NAME_BILLING_DEPARTMENT, CAP_PROP_NAME_BillingDepartment); map.put(DB_NAME_BILLING_FIRSTNAME, CAP_PROP_NAME_BillingFirstname); map.put(DB_NAME_BILLING_LASTNAME, CAP_PROP_NAME_BillingLastname); + map.put(DB_NAME_BILLING_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_BillingFirstnameDescription); + map.put(DB_NAME_BILLING_LASTNAME_DESCRIPTION, CAP_PROP_NAME_BillingLastnameDescription); map.put(DB_NAME_BILLING_STREET_ADDRESS, CAP_PROP_NAME_BillingStreetAddress); map.put(DB_NAME_BILLING_SUBURB, CAP_PROP_NAME_BillingSuburb); map.put(DB_NAME_BILLING_CITY, CAP_PROP_NAME_BillingCity); @@ -1209,6 +1311,8 @@ map.put(DB_NAME_CUSTOMER_GENDER, UNCAP_PROP_NAME_customerGender); map.put(DB_NAME_CUSTOMER_FIRSTNAME, UNCAP_PROP_NAME_customerFirstname); map.put(DB_NAME_CUSTOMER_LASTNAME, UNCAP_PROP_NAME_customerLastname); + map.put(DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_customerFirstnameDescription); + map.put(DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_customerLastnameDescription); map.put(DB_NAME_CUSTOMER_DAY_OF_BIRTH, UNCAP_PROP_NAME_customerDayOfBirth); map.put(DB_NAME_CUSTOMER_EMAIL_ADDRESS, UNCAP_PROP_NAME_customerEmailAddress); map.put(DB_NAME_CUSTOMER_COMPANY, UNCAP_PROP_NAME_customerCompany); @@ -1225,6 +1329,8 @@ map.put(DB_NAME_DELIVERY_DEPARTMENT, UNCAP_PROP_NAME_deliveryDepartment); map.put(DB_NAME_DELIVERY_FIRSTNAME, UNCAP_PROP_NAME_deliveryFirstname); map.put(DB_NAME_DELIVERY_LASTNAME, UNCAP_PROP_NAME_deliveryLastname); + map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_deliveryFirstnameDescription); + map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION, UNCAP_PROP_NAME_deliveryLastDescription); map.put(DB_NAME_DELIVERY_STREET_ADDRESS, UNCAP_PROP_NAME_deliveryStreetAddress); map.put(DB_NAME_DELIVERY_SUBURB, UNCAP_PROP_NAME_deliverySuburb); map.put(DB_NAME_DELIVERY_CITY, UNCAP_PROP_NAME_deliveryCity); @@ -1237,6 +1343,8 @@ map.put(DB_NAME_BILLING_DEPARTMENT, UNCAP_PROP_NAME_billingDepartment); map.put(DB_NAME_BILLING_FIRSTNAME, UNCAP_PROP_NAME_billingFirstname); map.put(DB_NAME_BILLING_LASTNAME, UNCAP_PROP_NAME_billingLastname); + map.put(DB_NAME_BILLING_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_billingFirstnameDescription); + map.put(DB_NAME_BILLING_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_billingLastnameDescription); map.put(DB_NAME_BILLING_STREET_ADDRESS, UNCAP_PROP_NAME_billingStreetAddress); map.put(DB_NAME_BILLING_SUBURB, UNCAP_PROP_NAME_billingSuburb); map.put(DB_NAME_BILLING_CITY, UNCAP_PROP_NAME_billingCity); @@ -1282,6 +1390,8 @@ map.put(CAP_PROP_NAME_CustomerGender, DB_NAME_CUSTOMER_GENDER); map.put(CAP_PROP_NAME_CustomerFirstname, DB_NAME_CUSTOMER_FIRSTNAME); map.put(CAP_PROP_NAME_CustomerLastname, DB_NAME_CUSTOMER_LASTNAME); + map.put(CAP_PROP_NAME_CustomerFirstnameDescription, DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION); + map.put(CAP_PROP_NAME_CustomerLastnameDescription, DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION); map.put(CAP_PROP_NAME_CustomerDayOfBirth, DB_NAME_CUSTOMER_DAY_OF_BIRTH); map.put(CAP_PROP_NAME_CustomerEmailAddress, DB_NAME_CUSTOMER_EMAIL_ADDRESS); map.put(CAP_PROP_NAME_CustomerCompany, DB_NAME_CUSTOMER_COMPANY); @@ -1298,6 +1408,8 @@ map.put(CAP_PROP_NAME_DeliveryDepartment, DB_NAME_DELIVERY_DEPARTMENT); map.put(CAP_PROP_NAME_DeliveryFirstname, DB_NAME_DELIVERY_FIRSTNAME); map.put(CAP_PROP_NAME_DeliveryLastname, DB_NAME_DELIVERY_LASTNAME); + map.put(CAP_PROP_NAME_DeliveryFirstnameDescription, DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION); + map.put(CAP_PROP_NAME_DeliveryLastDescription, DB_NAME_DELIVERY_LAST_DESCRIPTION); map.put(CAP_PROP_NAME_DeliveryStreetAddress, DB_NAME_DELIVERY_STREET_ADDRESS); map.put(CAP_PROP_NAME_DeliverySuburb, DB_NAME_DELIVERY_SUBURB); map.put(CAP_PROP_NAME_DeliveryCity, DB_NAME_DELIVERY_CITY); @@ -1310,6 +1422,8 @@ map.put(CAP_PROP_NAME_BillingDepartment, DB_NAME_BILLING_DEPARTMENT); map.put(CAP_PROP_NAME_BillingFirstname, DB_NAME_BILLING_FIRSTNAME); map.put(CAP_PROP_NAME_BillingLastname, DB_NAME_BILLING_LASTNAME); + map.put(CAP_PROP_NAME_BillingFirstnameDescription, DB_NAME_BILLING_FIRSTNAME_DESCRIPTION); + map.put(CAP_PROP_NAME_BillingLastnameDescription, DB_NAME_BILLING_LASTNAME_DESCRIPTION); map.put(CAP_PROP_NAME_BillingStreetAddress, DB_NAME_BILLING_STREET_ADDRESS); map.put(CAP_PROP_NAME_BillingSuburb, DB_NAME_BILLING_SUBURB); map.put(CAP_PROP_NAME_BillingCity, DB_NAME_BILLING_CITY); @@ -1355,6 +1469,8 @@ map.put(CAP_PROP_NAME_CustomerGender, UNCAP_PROP_NAME_customerGender); map.put(CAP_PROP_NAME_CustomerFirstname, UNCAP_PROP_NAME_customerFirstname); map.put(CAP_PROP_NAME_CustomerLastname, UNCAP_PROP_NAME_customerLastname); + map.put(CAP_PROP_NAME_CustomerFirstnameDescription, UNCAP_PROP_NAME_customerFirstnameDescription); + map.put(CAP_PROP_NAME_CustomerLastnameDescription, UNCAP_PROP_NAME_customerLastnameDescription); map.put(CAP_PROP_NAME_CustomerDayOfBirth, UNCAP_PROP_NAME_customerDayOfBirth); map.put(CAP_PROP_NAME_CustomerEmailAddress, UNCAP_PROP_NAME_customerEmailAddress); map.put(CAP_PROP_NAME_CustomerCompany, UNCAP_PROP_NAME_customerCompany); @@ -1371,6 +1487,8 @@ map.put(CAP_PROP_NAME_DeliveryDepartment, UNCAP_PROP_NAME_deliveryDepartment); map.put(CAP_PROP_NAME_DeliveryFirstname, UNCAP_PROP_NAME_deliveryFirstname); map.put(CAP_PROP_NAME_DeliveryLastname, UNCAP_PROP_NAME_deliveryLastname); + map.put(CAP_PROP_NAME_DeliveryFirstnameDescription, UNCAP_PROP_NAME_deliveryFirstnameDescription); + map.put(CAP_PROP_NAME_DeliveryLastDescription, UNCAP_PROP_NAME_deliveryLastDescription); map.put(CAP_PROP_NAME_DeliveryStreetAddress, UNCAP_PROP_NAME_deliveryStreetAddress); map.put(CAP_PROP_NAME_DeliverySuburb, UNCAP_PROP_NAME_deliverySuburb); map.put(CAP_PROP_NAME_DeliveryCity, UNCAP_PROP_NAME_deliveryCity); @@ -1383,6 +1501,8 @@ map.put(CAP_PROP_NAME_BillingDepartment, UNCAP_PROP_NAME_billingDepartment); map.put(CAP_PROP_NAME_BillingFirstname, UNCAP_PROP_NAME_billingFirstname); map.put(CAP_PROP_NAME_BillingLastname, UNCAP_PROP_NAME_billingLastname); + map.put(CAP_PROP_NAME_BillingFirstnameDescription, UNCAP_PROP_NAME_billingFirstnameDescription); + map.put(CAP_PROP_NAME_BillingLastnameDescription, UNCAP_PROP_NAME_billingLastnameDescription); map.put(CAP_PROP_NAME_BillingStreetAddress, UNCAP_PROP_NAME_billingStreetAddress); map.put(CAP_PROP_NAME_BillingSuburb, UNCAP_PROP_NAME_billingSuburb); map.put(CAP_PROP_NAME_BillingCity, UNCAP_PROP_NAME_billingCity); @@ -1428,6 +1548,8 @@ map.put(UNCAP_PROP_NAME_customerGender, DB_NAME_CUSTOMER_GENDER); map.put(UNCAP_PROP_NAME_customerFirstname, DB_NAME_CUSTOMER_FIRSTNAME); map.put(UNCAP_PROP_NAME_customerLastname, DB_NAME_CUSTOMER_LASTNAME); + map.put(UNCAP_PROP_NAME_customerFirstnameDescription, DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION); + map.put(UNCAP_PROP_NAME_customerLastnameDescription, DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION); map.put(UNCAP_PROP_NAME_customerDayOfBirth, DB_NAME_CUSTOMER_DAY_OF_BIRTH); map.put(UNCAP_PROP_NAME_customerEmailAddress, DB_NAME_CUSTOMER_EMAIL_ADDRESS); map.put(UNCAP_PROP_NAME_customerCompany, DB_NAME_CUSTOMER_COMPANY); @@ -1444,6 +1566,8 @@ map.put(UNCAP_PROP_NAME_deliveryDepartment, DB_NAME_DELIVERY_DEPARTMENT); map.put(UNCAP_PROP_NAME_deliveryFirstname, DB_NAME_DELIVERY_FIRSTNAME); map.put(UNCAP_PROP_NAME_deliveryLastname, DB_NAME_DELIVERY_LASTNAME); + map.put(UNCAP_PROP_NAME_deliveryFirstnameDescription, DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION); + map.put(UNCAP_PROP_NAME_deliveryLastDescription, DB_NAME_DELIVERY_LAST_DESCRIPTION); map.put(UNCAP_PROP_NAME_deliveryStreetAddress, DB_NAME_DELIVERY_STREET_ADDRESS); map.put(UNCAP_PROP_NAME_deliverySuburb, DB_NAME_DELIVERY_SUBURB); map.put(UNCAP_PROP_NAME_deliveryCity, DB_NAME_DELIVERY_CITY); @@ -1456,6 +1580,8 @@ map.put(UNCAP_PROP_NAME_billingDepartment, DB_NAME_BILLING_DEPARTMENT); map.put(UNCAP_PROP_NAME_billingFirstname, DB_NAME_BILLING_FIRSTNAME); map.put(UNCAP_PROP_NAME_billingLastname, DB_NAME_BILLING_LASTNAME); + map.put(UNCAP_PROP_NAME_billingFirstnameDescription, DB_NAME_BILLING_FIRSTNAME_DESCRIPTION); + map.put(UNCAP_PROP_NAME_billingLastnameDescription, DB_NAME_BILLING_LASTNAME_DESCRIPTION); map.put(UNCAP_PROP_NAME_billingStreetAddress, DB_NAME_BILLING_STREET_ADDRESS); map.put(UNCAP_PROP_NAME_billingSuburb, DB_NAME_BILLING_SUBURB); map.put(UNCAP_PROP_NAME_billingCity, DB_NAME_BILLING_CITY); @@ -1501,6 +1627,8 @@ map.put(UNCAP_PROP_NAME_customerGender, CAP_PROP_NAME_CustomerGender); map.put(UNCAP_PROP_NAME_customerFirstname, CAP_PROP_NAME_CustomerFirstname); map.put(UNCAP_PROP_NAME_customerLastname, CAP_PROP_NAME_CustomerLastname); + map.put(UNCAP_PROP_NAME_customerFirstnameDescription, CAP_PROP_NAME_CustomerFirstnameDescription); + map.put(UNCAP_PROP_NAME_customerLastnameDescription, CAP_PROP_NAME_CustomerLastnameDescription); map.put(UNCAP_PROP_NAME_customerDayOfBirth, CAP_PROP_NAME_CustomerDayOfBirth); map.put(UNCAP_PROP_NAME_customerEmailAddress, CAP_PROP_NAME_CustomerEmailAddress); map.put(UNCAP_PROP_NAME_customerCompany, CAP_PROP_NAME_CustomerCompany); @@ -1517,6 +1645,8 @@ map.put(UNCAP_PROP_NAME_deliveryDepartment, CAP_PROP_NAME_DeliveryDepartment); map.put(UNCAP_PROP_NAME_deliveryFirstname, CAP_PROP_NAME_DeliveryFirstname); map.put(UNCAP_PROP_NAME_deliveryLastname, CAP_PROP_NAME_DeliveryLastname); + map.put(UNCAP_PROP_NAME_deliveryFirstnameDescription, CAP_PROP_NAME_DeliveryFirstnameDescription); + map.put(UNCAP_PROP_NAME_deliveryLastDescription, CAP_PROP_NAME_DeliveryLastDescription); map.put(UNCAP_PROP_NAME_deliveryStreetAddress, CAP_PROP_NAME_DeliveryStreetAddress); map.put(UNCAP_PROP_NAME_deliverySuburb, CAP_PROP_NAME_DeliverySuburb); map.put(UNCAP_PROP_NAME_deliveryCity, CAP_PROP_NAME_DeliveryCity); @@ -1529,6 +1659,8 @@ map.put(UNCAP_PROP_NAME_billingDepartment, CAP_PROP_NAME_BillingDepartment); map.put(UNCAP_PROP_NAME_billingFirstname, CAP_PROP_NAME_BillingFirstname); map.put(UNCAP_PROP_NAME_billingLastname, CAP_PROP_NAME_BillingLastname); + map.put(UNCAP_PROP_NAME_billingFirstnameDescription, CAP_PROP_NAME_BillingFirstnameDescription); + map.put(UNCAP_PROP_NAME_billingLastnameDescription, CAP_PROP_NAME_BillingLastnameDescription); map.put(UNCAP_PROP_NAME_billingStreetAddress, CAP_PROP_NAME_BillingStreetAddress); map.put(UNCAP_PROP_NAME_billingSuburb, CAP_PROP_NAME_BillingSuburb); map.put(UNCAP_PROP_NAME_billingCity, CAP_PROP_NAME_BillingCity); @@ -1766,6 +1898,8 @@ columnInfoList.add(columnCustomerGender()); columnInfoList.add(columnCustomerFirstname()); columnInfoList.add(columnCustomerLastname()); + columnInfoList.add(columnCustomerFirstnameDescription()); + columnInfoList.add(columnCustomerLastnameDescription()); columnInfoList.add(columnCustomerDayOfBirth()); columnInfoList.add(columnCustomerEmailAddress()); columnInfoList.add(columnCustomerCompany()); @@ -1782,6 +1916,8 @@ columnInfoList.add(columnDeliveryDepartment()); columnInfoList.add(columnDeliveryFirstname()); columnInfoList.add(columnDeliveryLastname()); + columnInfoList.add(columnDeliveryFirstnameDescription()); + columnInfoList.add(columnDeliveryLastDescription()); columnInfoList.add(columnDeliveryStreetAddress()); columnInfoList.add(columnDeliverySuburb()); columnInfoList.add(columnDeliveryCity()); @@ -1794,6 +1930,8 @@ columnInfoList.add(columnBillingDepartment()); columnInfoList.add(columnBillingFirstname()); columnInfoList.add(columnBillingLastname()); + columnInfoList.add(columnBillingFirstnameDescription()); + columnInfoList.add(columnBillingLastnameDescription()); columnInfoList.add(columnBillingStreetAddress()); columnInfoList.add(columnBillingSuburb()); columnInfoList.add(columnBillingCity()); @@ -1872,7 +2010,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE"; + return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE"; } /** @@ -1912,6 +2050,18 @@ return new ColumnInfo(this, "CUSTOMER_LASTNAME", "customerLastname", String.class, false); } /** + * @return Column information of customerFirstnameDescription. (NotNull) + */ + public ColumnInfo columnCustomerFirstnameDescription() { + return new ColumnInfo(this, "CUSTOMER_FIRSTNAME_DESCRIPTION", "customerFirstnameDescription", String.class, false); + } + /** + * @return Column information of customerLastnameDescription. (NotNull) + */ + public ColumnInfo columnCustomerLastnameDescription() { + return new ColumnInfo(this, "CUSTOMER_LASTNAME_DESCRIPTION", "customerLastnameDescription", String.class, false); + } + /** * @return Column information of customerDayOfBirth. (NotNull) */ public ColumnInfo columnCustomerDayOfBirth() { @@ -2008,6 +2158,18 @@ return new ColumnInfo(this, "DELIVERY_LASTNAME", "deliveryLastname", String.class, false); } /** + * @return Column information of deliveryFirstnameDescription. (NotNull) + */ + public ColumnInfo columnDeliveryFirstnameDescription() { + return new ColumnInfo(this, "DELIVERY_FIRSTNAME_DESCRIPTION", "deliveryFirstnameDescription", String.class, false); + } + /** + * @return Column information of deliveryLastDescription. (NotNull) + */ + public ColumnInfo columnDeliveryLastDescription() { + return new ColumnInfo(this, "DELIVERY_LAST_DESCRIPTION", "deliveryLastDescription", String.class, false); + } + /** * @return Column information of deliveryStreetAddress. (NotNull) */ public ColumnInfo columnDeliveryStreetAddress() { @@ -2080,6 +2242,18 @@ return new ColumnInfo(this, "BILLING_LASTNAME", "billingLastname", String.class, false); } /** + * @return Column information of billingFirstnameDescription. (NotNull) + */ + public ColumnInfo columnBillingFirstnameDescription() { + return new ColumnInfo(this, "BILLING_FIRSTNAME_DESCRIPTION", "billingFirstnameDescription", String.class, false); + } + /** + * @return Column information of billingLastnameDescription. (NotNull) + */ + public ColumnInfo columnBillingLastnameDescription() { + return new ColumnInfo(this, "BILLING_LASTNAME_DESCRIPTION", "billingLastnameDescription", String.class, false); + } + /** * @return Column information of billingStreetAddress. (NotNull) */ public ColumnInfo columnBillingStreetAddress() { @@ -2552,6 +2726,8 @@ public RelationTrace columnCustomerGender() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerGender()); } public RelationTrace columnCustomerFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerFirstname()); } public RelationTrace columnCustomerLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerLastname()); } + public RelationTrace columnCustomerFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerFirstnameDescription()); } + public RelationTrace columnCustomerLastnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerLastnameDescription()); } public RelationTrace columnCustomerDayOfBirth() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerDayOfBirth()); } public RelationTrace columnCustomerEmailAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerEmailAddress()); } public RelationTrace columnCustomerCompany() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerCompany()); } @@ -2568,6 +2744,8 @@ public RelationTrace columnDeliveryDepartment() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryDepartment()); } public RelationTrace columnDeliveryFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryFirstname()); } public RelationTrace columnDeliveryLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastname()); } + public RelationTrace columnDeliveryFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryFirstnameDescription()); } + public RelationTrace columnDeliveryLastDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastDescription()); } public RelationTrace columnDeliveryStreetAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryStreetAddress()); } public RelationTrace columnDeliverySuburb() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliverySuburb()); } public RelationTrace columnDeliveryCity() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryCity()); } @@ -2580,6 +2758,8 @@ public RelationTrace columnBillingDepartment() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingDepartment()); } public RelationTrace columnBillingFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingFirstname()); } public RelationTrace columnBillingLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingLastname()); } + public RelationTrace columnBillingFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingFirstnameDescription()); } + public RelationTrace columnBillingLastnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingLastnameDescription()); } public RelationTrace columnBillingStreetAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingStreetAddress()); } public RelationTrace columnBillingSuburb() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingSuburb()); } public RelationTrace columnBillingCity() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingCity()); } @@ -2679,6 +2859,8 @@ if (analyzer.init("CUSTOMER_GENDER", "customerGender", "customerGender")) { myEntity.setCustomerGender(analyzer.analyzeString(String.class)); }; if (analyzer.init("CUSTOMER_FIRSTNAME", "customerFirstname", "customerFirstname")) { myEntity.setCustomerFirstname(analyzer.analyzeString(String.class)); }; if (analyzer.init("CUSTOMER_LASTNAME", "customerLastname", "customerLastname")) { myEntity.setCustomerLastname(analyzer.analyzeString(String.class)); }; + if (analyzer.init("CUSTOMER_FIRSTNAME_DESCRIPTION", "customerFirstnameDescription", "customerFirstnameDescription")) { myEntity.setCustomerFirstnameDescription(analyzer.analyzeString(String.class)); }; + if (analyzer.init("CUSTOMER_LASTNAME_DESCRIPTION", "customerLastnameDescription", "customerLastnameDescription")) { myEntity.setCustomerLastnameDescription(analyzer.analyzeString(String.class)); }; if (analyzer.init("CUSTOMER_DAY_OF_BIRTH", "customerDayOfBirth", "customerDayOfBirth")) { myEntity.setCustomerDayOfBirth(analyzer.analyzeDate(java.util.Date.class)); }; if (analyzer.init("CUSTOMER_EMAIL_ADDRESS", "customerEmailAddress", "customerEmailAddress")) { myEntity.setCustomerEmailAddress(analyzer.analyzeString(String.class)); }; if (analyzer.init("CUSTOMER_COMPANY", "customerCompany", "customerCompany")) { myEntity.setCustomerCompany(analyzer.analyzeString(String.class)); }; @@ -2695,6 +2877,8 @@ if (analyzer.init("DELIVERY_DEPARTMENT", "deliveryDepartment", "deliveryDepartment")) { myEntity.setDeliveryDepartment(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_FIRSTNAME", "deliveryFirstname", "deliveryFirstname")) { myEntity.setDeliveryFirstname(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_LASTNAME", "deliveryLastname", "deliveryLastname")) { myEntity.setDeliveryLastname(analyzer.analyzeString(String.class)); }; + if (analyzer.init("DELIVERY_FIRSTNAME_DESCRIPTION", "deliveryFirstnameDescription", "deliveryFirstnameDescription")) { myEntity.setDeliveryFirstnameDescription(analyzer.analyzeString(String.class)); }; + if (analyzer.init("DELIVERY_LAST_DESCRIPTION", "deliveryLastDescription", "deliveryLastDescription")) { myEntity.setDeliveryLastDescription(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_STREET_ADDRESS", "deliveryStreetAddress", "deliveryStreetAddress")) { myEntity.setDeliveryStreetAddress(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_SUBURB", "deliverySuburb", "deliverySuburb")) { myEntity.setDeliverySuburb(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_CITY", "deliveryCity", "deliveryCity")) { myEntity.setDeliveryCity(analyzer.analyzeString(String.class)); }; @@ -2707,6 +2891,8 @@ if (analyzer.init("BILLING_DEPARTMENT", "billingDepartment", "billingDepartment")) { myEntity.setBillingDepartment(analyzer.analyzeString(String.class)); }; if (analyzer.init("BILLING_FIRSTNAME", "billingFirstname", "billingFirstname")) { myEntity.setBillingFirstname(analyzer.analyzeString(String.class)); }; if (analyzer.init("BILLING_LASTNAME", "billingLastname", "billingLastname")) { myEntity.setBillingLastname(analyzer.analyzeString(String.class)); }; + if (analyzer.init("BILLING_FIRSTNAME_DESCRIPTION", "billingFirstnameDescription", "billingFirstnameDescription")) { myEntity.setBillingFirstnameDescription(analyzer.analyzeString(String.class)); }; + if (analyzer.init("BILLING_LASTNAME_DESCRIPTION", "billingLastnameDescription", "billingLastnameDescription")) { myEntity.setBillingLastnameDescription(analyzer.analyzeString(String.class)); }; if (analyzer.init("BILLING_STREET_ADDRESS", "billingStreetAddress", "billingStreetAddress")) { myEntity.setBillingStreetAddress(analyzer.analyzeString(String.class)); }; if (analyzer.init("BILLING_SUBURB", "billingSuburb", "billingSuburb")) { myEntity.setBillingSuburb(analyzer.analyzeString(String.class)); }; if (analyzer.init("BILLING_CITY", "billingCity", "billingCity")) { myEntity.setBillingCity(analyzer.analyzeString(String.class)); }; @@ -2808,6 +2994,8 @@ helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_GENDER", myEntity.getCustomerGender()); helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_FIRSTNAME", myEntity.getCustomerFirstname()); helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_LASTNAME", myEntity.getCustomerLastname()); + helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_FIRSTNAME_DESCRIPTION", myEntity.getCustomerFirstnameDescription()); + helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_LASTNAME_DESCRIPTION", myEntity.getCustomerLastnameDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_DAY_OF_BIRTH", myEntity.getCustomerDayOfBirth()); helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_EMAIL_ADDRESS", myEntity.getCustomerEmailAddress()); helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_COMPANY", myEntity.getCustomerCompany()); @@ -2824,6 +3012,8 @@ helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_DEPARTMENT", myEntity.getDeliveryDepartment()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_FIRSTNAME", myEntity.getDeliveryFirstname()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LASTNAME", myEntity.getDeliveryLastname()); + helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_FIRSTNAME_DESCRIPTION", myEntity.getDeliveryFirstnameDescription()); + helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LAST_DESCRIPTION", myEntity.getDeliveryLastDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_STREET_ADDRESS", myEntity.getDeliveryStreetAddress()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_SUBURB", myEntity.getDeliverySuburb()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_CITY", myEntity.getDeliveryCity()); @@ -2836,6 +3026,8 @@ helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_DEPARTMENT", myEntity.getBillingDepartment()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_FIRSTNAME", myEntity.getBillingFirstname()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_LASTNAME", myEntity.getBillingLastname()); + helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_FIRSTNAME_DESCRIPTION", myEntity.getBillingFirstnameDescription()); + helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_LASTNAME_DESCRIPTION", myEntity.getBillingLastnameDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_STREET_ADDRESS", myEntity.getBillingStreetAddress()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_SUBURB", myEntity.getBillingSuburb()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_CITY", myEntity.getBillingCity()); @@ -2919,6 +3111,8 @@ valueMap.put("CUSTOMER_GENDER", myEntity.getCustomerGender()); valueMap.put("CUSTOMER_FIRSTNAME", myEntity.getCustomerFirstname()); valueMap.put("CUSTOMER_LASTNAME", myEntity.getCustomerLastname()); + valueMap.put("CUSTOMER_FIRSTNAME_DESCRIPTION", myEntity.getCustomerFirstnameDescription()); + valueMap.put("CUSTOMER_LASTNAME_DESCRIPTION", myEntity.getCustomerLastnameDescription()); valueMap.put("CUSTOMER_DAY_OF_BIRTH", myEntity.getCustomerDayOfBirth()); valueMap.put("CUSTOMER_EMAIL_ADDRESS", myEntity.getCustomerEmailAddress()); valueMap.put("CUSTOMER_COMPANY", myEntity.getCustomerCompany()); @@ -2935,6 +3129,8 @@ valueMap.put("DELIVERY_DEPARTMENT", myEntity.getDeliveryDepartment()); valueMap.put("DELIVERY_FIRSTNAME", myEntity.getDeliveryFirstname()); valueMap.put("DELIVERY_LASTNAME", myEntity.getDeliveryLastname()); + valueMap.put("DELIVERY_FIRSTNAME_DESCRIPTION", myEntity.getDeliveryFirstnameDescription()); + valueMap.put("DELIVERY_LAST_DESCRIPTION", myEntity.getDeliveryLastDescription()); valueMap.put("DELIVERY_STREET_ADDRESS", myEntity.getDeliveryStreetAddress()); valueMap.put("DELIVERY_SUBURB", myEntity.getDeliverySuburb()); valueMap.put("DELIVERY_CITY", myEntity.getDeliveryCity()); @@ -2947,6 +3143,8 @@ valueMap.put("BILLING_DEPARTMENT", myEntity.getBillingDepartment()); valueMap.put("BILLING_FIRSTNAME", myEntity.getBillingFirstname()); valueMap.put("BILLING_LASTNAME", myEntity.getBillingLastname()); + valueMap.put("BILLING_FIRSTNAME_DESCRIPTION", myEntity.getBillingFirstnameDescription()); + valueMap.put("BILLING_LASTNAME_DESCRIPTION", myEntity.getBillingLastnameDescription()); valueMap.put("BILLING_STREET_ADDRESS", myEntity.getBillingStreetAddress()); valueMap.put("BILLING_SUBURB", myEntity.getBillingSuburb()); valueMap.put("BILLING_CITY", myEntity.getBillingCity()); @@ -2998,6 +3196,8 @@ valueMap.put("CUSTOMER_GENDER", helpGettingColumnStringValue(myEntity.getCustomerGender())); valueMap.put("CUSTOMER_FIRSTNAME", helpGettingColumnStringValue(myEntity.getCustomerFirstname())); valueMap.put("CUSTOMER_LASTNAME", helpGettingColumnStringValue(myEntity.getCustomerLastname())); + valueMap.put("CUSTOMER_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getCustomerFirstnameDescription())); + valueMap.put("CUSTOMER_LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getCustomerLastnameDescription())); valueMap.put("CUSTOMER_DAY_OF_BIRTH", helpGettingColumnStringValue(myEntity.getCustomerDayOfBirth())); valueMap.put("CUSTOMER_EMAIL_ADDRESS", helpGettingColumnStringValue(myEntity.getCustomerEmailAddress())); valueMap.put("CUSTOMER_COMPANY", helpGettingColumnStringValue(myEntity.getCustomerCompany())); @@ -3014,6 +3214,8 @@ valueMap.put("DELIVERY_DEPARTMENT", helpGettingColumnStringValue(myEntity.getDeliveryDepartment())); valueMap.put("DELIVERY_FIRSTNAME", helpGettingColumnStringValue(myEntity.getDeliveryFirstname())); valueMap.put("DELIVERY_LASTNAME", helpGettingColumnStringValue(myEntity.getDeliveryLastname())); + valueMap.put("DELIVERY_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryFirstnameDescription())); + valueMap.put("DELIVERY_LAST_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryLastDescription())); valueMap.put("DELIVERY_STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getDeliveryStreetAddress())); valueMap.put("DELIVERY_SUBURB", helpGettingColumnStringValue(myEntity.getDeliverySuburb())); valueMap.put("DELIVERY_CITY", helpGettingColumnStringValue(myEntity.getDeliveryCity())); @@ -3026,6 +3228,8 @@ valueMap.put("BILLING_DEPARTMENT", helpGettingColumnStringValue(myEntity.getBillingDepartment())); valueMap.put("BILLING_FIRSTNAME", helpGettingColumnStringValue(myEntity.getBillingFirstname())); valueMap.put("BILLING_LASTNAME", helpGettingColumnStringValue(myEntity.getBillingLastname())); + valueMap.put("BILLING_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getBillingFirstnameDescription())); + valueMap.put("BILLING_LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getBillingLastnameDescription())); valueMap.put("BILLING_STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getBillingStreetAddress())); valueMap.put("BILLING_SUBURB", helpGettingColumnStringValue(myEntity.getBillingSuburb())); valueMap.put("BILLING_CITY", helpGettingColumnStringValue(myEntity.getBillingCity())); @@ -3073,9 +3277,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java 2007-10-01 13:00:14 UTC (rev 599) @@ -16,7 +16,7 @@ * ORDER_PRODUCT_ID * * [column-property] - * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY + * ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY * * [foreign-property] * orderForm, product @@ -99,6 +99,8 @@ public static final String DB_NAME_ORDER_FORM_ID = "ORDER_FORM_ID"; /** Db-name of PRODUCT_ID. BIGINT : NotNull : FK to PRODUCT */ public static final String DB_NAME_PRODUCT_ID = "PRODUCT_ID"; + /** Db-name of CODE. VARCHAR(64) */ + public static final String DB_NAME_CODE = "CODE"; /** Db-name of MODEL. VARCHAR(64) */ public static final String DB_NAME_MODEL = "MODEL"; /** Db-name of PRICE. DECIMAL(15) : NotNull */ @@ -116,6 +118,8 @@ public static final String COLUMN_DB_NAME_OF_OrderFormId = "ORDER_FORM_ID"; /** @deprecated Deprecated! So use DB_NAME_ProductId. */ public static final String COLUMN_DB_NAME_OF_ProductId = "PRODUCT_ID"; + /** @deprecated Deprecated! So use DB_NAME_Code. */ + public static final String COLUMN_DB_NAME_OF_Code = "CODE"; /** @deprecated Deprecated! So use DB_NAME_Model. */ public static final String COLUMN_DB_NAME_OF_Model = "MODEL"; /** @deprecated Deprecated! So use DB_NAME_Price. */ @@ -136,6 +140,8 @@ public static final String PROPERTY_NAME_orderFormId = "orderFormId"; /** Prop-name(JavaBeansRule) of productId. BIGINT : NotNull : FK to PRODUCT */ public static final String PROPERTY_NAME_productId = "productId"; + /** Prop-name(JavaBeansRule) of code. VARCHAR(64) */ + public static final String PROPERTY_NAME_code = "code"; /** Prop-name(JavaBeansRule) of model. VARCHAR(64) */ public static final String PROPERTY_NAME_model = "model"; /** Prop-name(JavaBeansRule) of price. DECIMAL(15) : NotNull */ @@ -156,6 +162,8 @@ public static final String CAP_PROP_NAME_OrderFormId = "OrderFormId"; /** Cap-prop-name of productId. BIGINT : NotNull : FK to PRODUCT */ public static final String CAP_PROP_NAME_ProductId = "ProductId"; + /** Cap-prop-name of code. VARCHAR(64) */ + public static final String CAP_PROP_NAME_Code = "Code"; /** Cap-prop-name of model. VARCHAR(64) */ public static final String CAP_PROP_NAME_Model = "Model"; /** Cap-prop-name of price. DECIMAL(15) : NotNull */ @@ -173,6 +181,8 @@ public static final String COLUMN_CAP_PROP_NAME_OF_OrderFormId = "OrderFormId"; /** @deprecated Deprecated! So use CAP_PROP_NAME_ProductId. */ public static final String COLUMN_CAP_PROP_NAME_OF_ProductId = "ProductId"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_Code. */ + public static final String COLUMN_CAP_PROP_NAME_OF_Code = "Code"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Model. */ public static final String COLUMN_CAP_PROP_NAME_OF_Model = "Model"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Price. */ @@ -193,6 +203,8 @@ public static final String UNCAP_PROP_NAME_orderFormId = "orderFormId"; /** Uncap-prop-name of productId. BIGINT : NotNull : FK to PRODUCT */ public static final String UNCAP_PROP_NAME_productId = "productId"; + /** Uncap-prop-name of code. VARCHAR(64) */ + public static final String UNCAP_PROP_NAME_code = "code"; /** Uncap-prop-name of model. VARCHAR(64) */ public static final String UNCAP_PROP_NAME_model = "model"; /** Uncap-prop-name of price. DECIMAL(15) : NotNull */ @@ -210,6 +222,8 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderFormId = "orderFormId"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ProductId. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_ProductId = "productId"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Code. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_Code = "code"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Model. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Model = "model"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Price. */ @@ -255,6 +269,7 @@ map.put(DB_NAME_ORDER_PRODUCT_ID.toLowerCase(), PROPERTY_NAME_orderProductId); map.put(DB_NAME_ORDER_FORM_ID.toLowerCase(), PROPERTY_NAME_orderFormId); map.put(DB_NAME_PRODUCT_ID.toLowerCase(), PROPERTY_NAME_productId); + map.put(DB_NAME_CODE.toLowerCase(), PROPERTY_NAME_code); map.put(DB_NAME_MODEL.toLowerCase(), PROPERTY_NAME_model); map.put(DB_NAME_PRICE.toLowerCase(), PROPERTY_NAME_price); map.put(DB_NAME_FINAL_PRICE.toLowerCase(), PROPERTY_NAME_finalPrice); @@ -277,6 +292,7 @@ map.put(PROPERTY_NAME_orderProductId.toLowerCase(), DB_NAME_ORDER_PRODUCT_ID); map.put(PROPERTY_NAME_orderFormId.toLowerCase(), DB_NAME_ORDER_FORM_ID); map.put(PROPERTY_NAME_productId.toLowerCase(), DB_NAME_PRODUCT_ID); + map.put(PROPERTY_NAME_code.toLowerCase(), DB_NAME_CODE); map.put(PROPERTY_NAME_model.toLowerCase(), DB_NAME_MODEL); map.put(PROPERTY_NAME_price.toLowerCase(), DB_NAME_PRICE); map.put(PROPERTY_NAME_finalPrice.toLowerCase(), DB_NAME_FINAL_PRICE); @@ -301,6 +317,7 @@ map.put(DB_NAME_ORDER_PRODUCT_ID, CAP_PROP_NAME_OrderProductId); map.put(DB_NAME_ORDER_FORM_ID, CAP_PROP_NAME_OrderFormId); map.put(DB_NAME_PRODUCT_ID, CAP_PROP_NAME_ProductId); + map.put(DB_NAME_CODE, CAP_PROP_NAME_Code); map.put(DB_NAME_MODEL, CAP_PROP_NAME_Model); map.put(DB_NAME_PRICE, CAP_PROP_NAME_Price); map.put(DB_NAME_FINAL_PRICE, CAP_PROP_NAME_FinalPrice); @@ -325,6 +342,7 @@ map.put(DB_NAME_ORDER_PRODUCT_ID, UNCAP_PROP_NAME_orderProductId); map.put(DB_NAME_ORDER_FORM_ID, UNCAP_PROP_NAME_orderFormId); map.put(DB_NAME_PRODUCT_ID, UNCAP_PROP_NAME_productId); + map.put(DB_NAME_CODE, UNCAP_PROP_NAME_code); map.put(DB_NAME_MODEL, UNCAP_PROP_NAME_model); map.put(DB_NAME_PRICE, UNCAP_PROP_NAME_price); map.put(DB_NAME_FINAL_PRICE, UNCAP_PROP_NAME_finalPrice); @@ -349,6 +367,7 @@ map.put(CAP_PROP_NAME_OrderProductId, DB_NAME_ORDER_PRODUCT_ID); map.put(CAP_PROP_NAME_OrderFormId, DB_NAME_ORDER_FORM_ID); map.put(CAP_PROP_NAME_ProductId, DB_NAME_PRODUCT_ID); + map.put(CAP_PROP_NAME_Code, DB_NAME_CODE); map.put(CAP_PROP_NAME_Model, DB_NAME_MODEL); map.put(CAP_PROP_NAME_Price, DB_NAME_PRICE); map.put(CAP_PROP_NAME_FinalPrice, DB_NAME_FINAL_PRICE); @@ -373,6 +392,7 @@ map.put(CAP_PROP_NAME_OrderProductId, UNCAP_PROP_NAME_orderProductId); map.put(CAP_PROP_NAME_OrderFormId, UNCAP_PROP_NAME_orderFormId); map.put(CAP_PROP_NAME_ProductId, UNCAP_PROP_NAME_productId); + map.put(CAP_PROP_NAME_Code, UNCAP_PROP_NAME_code); map.put(CAP_PROP_NAME_Model, UNCAP_PROP_NAME_model); map.put(CAP_PROP_NAME_Price, UNCAP_PROP_NAME_price); map.put(CAP_PROP_NAME_FinalPrice, UNCAP_PROP_NAME_finalPrice); @@ -397,6 +417,7 @@ map.put(UNCAP_PROP_NAME_orderProductId, DB_NAME_ORDER_PRODUCT_ID); map.put(UNCAP_PROP_NAME_orderFormId, DB_NAME_ORDER_FORM_ID); map.put(UNCAP_PROP_NAME_productId, DB_NAME_PRODUCT_ID); + map.put(UNCAP_PROP_NAME_code, DB_NAME_CODE); map.put(UNCAP_PROP_NAME_model, DB_NAME_MODEL); map.put(UNCAP_PROP_NAME_price, DB_NAME_PRICE); map.put(UNCAP_PROP_NAME_finalPrice, DB_NAME_FINAL_PRICE); @@ -421,6 +442,7 @@ map.put(UNCAP_PROP_NAME_orderProductId, CAP_PROP_NAME_OrderProductId); map.put(UNCAP_PROP_NAME_orderFormId, CAP_PROP_NAME_OrderFormId); map.put(UNCAP_PROP_NAME_productId, CAP_PROP_NAME_ProductId); + map.put(UNCAP_PROP_NAME_code, CAP_PROP_NAME_Code); map.put(UNCAP_PROP_NAME_model, CAP_PROP_NAME_Model); map.put(UNCAP_PROP_NAME_price, CAP_PROP_NAME_Price); map.put(UNCAP_PROP_NAME_finalPrice, CAP_PROP_NAME_FinalPrice); @@ -637,6 +659,7 @@ columnInfoList.add(columnOrderProductId()); columnInfoList.add(columnOrderFormId()); columnInfoList.add(columnProductId()); + columnInfoList.add(columnCode()); columnInfoList.add(columnModel()); columnInfoList.add(columnPrice()); columnInfoList.add(columnFinalPrice()); @@ -697,7 +720,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY"; + return "ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY"; } /** @@ -719,6 +742,12 @@ return new ColumnInfo(this, "PRODUCT_ID", "productId", java.math.BigDecimal.class, false); } /** + * @return Column information of code. (NotNull) + */ + public ColumnInfo columnCode() { + return new ColumnInfo(this, "CODE", "code", String.class, false); + } + /** * @return Column information of model. (NotNull) */ public ColumnInfo columnModel() { @@ -891,6 +920,7 @@ public RelationTrace columnOrderProductId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnOrderProductId()); } public RelationTrace columnOrderFormId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnOrderFormId()); } public RelationTrace columnProductId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnProductId()); } + public RelationTrace columnCode() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnCode()); } public RelationTrace columnModel() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnModel()); } public RelationTrace columnPrice() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnPrice()); } public RelationTrace columnFinalPrice() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnFinalPrice()); } @@ -969,6 +999,7 @@ if (analyzer.init("ORDER_PRODUCT_ID", "orderProductId", "orderProductId")) { myEntity.setOrderProductId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("ORDER_FORM_ID", "orderFormId", "orderFormId")) { myEntity.setOrderFormId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("PRODUCT_ID", "productId", "productId")) { myEntity.setProductId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; + if (analyzer.init("CODE", "code", "code")) { myEntity.setCode(analyzer.analyzeString(String.class)); }; if (analyzer.init("MODEL", "model", "model")) { myEntity.setModel(analyzer.analyzeString(String.class)); }; if (analyzer.init("PRICE", "price", "price")) { myEntity.setPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("FINAL_PRICE", "finalPrice", "finalPrice")) { myEntity.setFinalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; @@ -1049,6 +1080,7 @@ helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_PRODUCT_ID", myEntity.getOrderProductId()); helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_FORM_ID", myEntity.getOrderFormId()); helpAppendingColumnValueString(sb, delimiter, equal, "PRODUCT_ID", myEntity.getProductId()); + helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode()); helpAppendingColumnValueString(sb, delimiter, equal, "MODEL", myEntity.getModel()); helpAppendingColumnValueString(sb, delimiter, equal, "PRICE", myEntity.getPrice()); helpAppendingColumnValueString(sb, delimiter, equal, "FINAL_PRICE", myEntity.getFinalPrice()); @@ -1111,6 +1143,7 @@ valueMap.put("ORDER_PRODUCT_ID", myEntity.getOrderProductId()); valueMap.put("ORDER_FORM_ID", myEntity.getOrderFormId()); valueMap.put("PRODUCT_ID", myEntity.getProductId()); + valueMap.put("CODE", myEntity.getCode()); valueMap.put("MODEL", myEntity.getModel()); valueMap.put("PRICE", myEntity.getPrice()); valueMap.put("FINAL_PRICE", myEntity.getFinalPrice()); @@ -1141,6 +1174,7 @@ valueMap.put("ORDER_PRODUCT_ID", helpGettingColumnStringValue(myEntity.getOrderProductId())); valueMap.put("ORDER_FORM_ID", helpGettingColumnStringValue(myEntity.getOrderFormId())); valueMap.put("PRODUCT_ID", helpGettingColumnStringValue(myEntity.getProductId())); + valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode())); valueMap.put("MODEL", helpGettingColumnStringValue(myEntity.getModel())); valueMap.put("PRICE", helpGettingColumnStringValue(myEntity.getPrice())); valueMap.put("FINAL_PRICE", helpGettingColumnStringValue(myEntity.getFinalPrice())); @@ -1170,9 +1204,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -881,6 +881,322 @@ abstract protected ConditionValue getCValueLastname(); + /** Column db name of firstnameDescription. */ + protected static final String COL_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION"; + + /** Column java name of firstnameDescription. */ + protected static final String J_FirstnameDescription = "FirstnameDescription"; + + /** Column uncapitalised java name of firstnameDescription. */ + protected static final String UJ_firstnameDescription = "firstnameDescription"; + + /** + * Set the value of firstnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as equal. + */ + public void setFirstnameDescription_Equal(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as notEqual. + */ + public void setFirstnameDescription_NotEqual(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as greaterThan. + */ + public void setFirstnameDescription_GreaterThan(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as lessThan. + */ + public void setFirstnameDescription_LessThan(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as greaterEqual. + */ + public void setFirstnameDescription_GreaterEqual(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as lessEqual. + */ + public void setFirstnameDescription_LessEqual(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as prefixSearch. + */ + public void setFirstnameDescription_PrefixSearch(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param firstnameDescription The value of firstnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setFirstnameDescription_LikeSearch(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, likeSearchOption); + } + + /** + * Set the value of firstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param firstnameDescriptionList The value of firstnameDescription as inScope. + */ + public void setFirstnameDescription_InScope(java.util.List firstnameDescriptionList) { + registerFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList)); + } + + /** + * Set the value of firstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param firstnameDescription The value of firstnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setFirstnameDescription_InScope(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, inScopeOption); + } + + /** + * Set the value of firstnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param firstnameDescriptionList The value of firstnameDescription as notInScope. + */ + public void setFirstnameDescription_NotInScope(java.util.List firstnameDescriptionList) { + registerFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList)); + } + + /** + * Set the value of firstnameDescription using isNull. { is null } + */ + public void setFirstnameDescription_IsNull() { + registerFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of firstnameDescription using isNotNull. { is not null } + */ + public void setFirstnameDescription_IsNotNull() { + registerFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of firstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of firstnameDescription. (Nullable) + */ + protected void registerFirstnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription); + } + + /** + * Register inline condition of firstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of firstnameDescription. (Nullable) + */ + protected void registerInlineFirstnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription); + } + + abstract protected ConditionValue getCValueFirstnameDescription(); + + /** Column db name of lastnameDescription. */ + protected static final String COL_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION"; + + /** Column java name of lastnameDescription. */ + protected static final String J_LastnameDescription = "LastnameDescription"; + + /** Column uncapitalised java name of lastnameDescription. */ + protected static final String UJ_lastnameDescription = "lastnameDescription"; + + /** + * Set the value of lastnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as equal. + */ + public void setLastnameDescription_Equal(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as notEqual. + */ + public void setLastnameDescription_NotEqual(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as greaterThan. + */ + public void setLastnameDescription_GreaterThan(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as lessThan. + */ + public void setLastnameDescription_LessThan(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as greaterEqual. + */ + public void setLastnameDescription_GreaterEqual(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as lessEqual. + */ + public void setLastnameDescription_LessEqual(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as prefixSearch. + */ + public void setLastnameDescription_PrefixSearch(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param lastnameDescription The value of lastnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setLastnameDescription_LikeSearch(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, likeSearchOption); + } + + /** + * Set the value of lastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param lastnameDescriptionList The value of lastnameDescription as inScope. + */ + public void setLastnameDescription_InScope(java.util.List lastnameDescriptionList) { + registerLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList)); + } + + /** + * Set the value of lastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param lastnameDescription The value of lastnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setLastnameDescription_InScope(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, inScopeOption); + } + + /** + * Set the value of lastnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param lastnameDescriptionList The value of lastnameDescription as notInScope. + */ + public void setLastnameDescription_NotInScope(java.util.List lastnameDescriptionList) { + registerLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList)); + } + + /** + * Set the value of lastnameDescription using isNull. { is null } + */ + public void setLastnameDescription_IsNull() { + registerLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of lastnameDescription using isNotNull. { is not null } + */ + public void setLastnameDescription_IsNotNull() { + registerLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of lastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of lastnameDescription. (Nullable) + */ + protected void registerLastnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription); + } + + /** + * Register inline condition of lastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of lastnameDescription. (Nullable) + */ + protected void registerInlineLastnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription); + } + + abstract protected ConditionValue getCValueLastnameDescription(); + /** Column db name of streetAddress. */ protected static final String COL_STREET_ADDRESS = "STREET_ADDRESS"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -935,6 +935,322 @@ abstract protected ConditionValue getCValueLastname(); + /** Column db name of firstnameDescription. */ + protected static final String COL_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION"; + + /** Column java name of firstnameDescription. */ + protected static final String J_FirstnameDescription = "FirstnameDescription"; + + /** Column uncapitalised java name of firstnameDescription. */ + protected static final String UJ_firstnameDescription = "firstnameDescription"; + + /** + * Set the value of firstnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as equal. + */ + public void setFirstnameDescription_Equal(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as notEqual. + */ + public void setFirstnameDescription_NotEqual(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as greaterThan. + */ + public void setFirstnameDescription_GreaterThan(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as lessThan. + */ + public void setFirstnameDescription_LessThan(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as greaterEqual. + */ + public void setFirstnameDescription_GreaterEqual(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as lessEqual. + */ + public void setFirstnameDescription_LessEqual(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param firstnameDescription The value of firstnameDescription as prefixSearch. + */ + public void setFirstnameDescription_PrefixSearch(String firstnameDescription) { + registerFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(firstnameDescription)); + } + + /** + * Set the value of firstnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param firstnameDescription The value of firstnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setFirstnameDescription_LikeSearch(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, likeSearchOption); + } + + /** + * Set the value of firstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param firstnameDescriptionList The value of firstnameDescription as inScope. + */ + public void setFirstnameDescription_InScope(java.util.List firstnameDescriptionList) { + registerFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList)); + } + + /** + * Set the value of firstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param firstnameDescription The value of firstnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setFirstnameDescription_InScope(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, inScopeOption); + } + + /** + * Set the value of firstnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param firstnameDescriptionList The value of firstnameDescription as notInScope. + */ + public void setFirstnameDescription_NotInScope(java.util.List firstnameDescriptionList) { + registerFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList)); + } + + /** + * Set the value of firstnameDescription using isNull. { is null } + */ + public void setFirstnameDescription_IsNull() { + registerFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of firstnameDescription using isNotNull. { is not null } + */ + public void setFirstnameDescription_IsNotNull() { + registerFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of firstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of firstnameDescription. (Nullable) + */ + protected void registerFirstnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription); + } + + /** + * Register inline condition of firstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of firstnameDescription. (Nullable) + */ + protected void registerInlineFirstnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription); + } + + abstract protected ConditionValue getCValueFirstnameDescription(); + + /** Column db name of lastnameDescription. */ + protected static final String COL_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION"; + + /** Column java name of lastnameDescription. */ + protected static final String J_LastnameDescription = "LastnameDescription"; + + /** Column uncapitalised java name of lastnameDescription. */ + protected static final String UJ_lastnameDescription = "lastnameDescription"; + + /** + * Set the value of lastnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as equal. + */ + public void setLastnameDescription_Equal(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as notEqual. + */ + public void setLastnameDescription_NotEqual(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as greaterThan. + */ + public void setLastnameDescription_GreaterThan(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as lessThan. + */ + public void setLastnameDescription_LessThan(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as greaterEqual. + */ + public void setLastnameDescription_GreaterEqual(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as lessEqual. + */ + public void setLastnameDescription_LessEqual(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param lastnameDescription The value of lastnameDescription as prefixSearch. + */ + public void setLastnameDescription_PrefixSearch(String lastnameDescription) { + registerLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(lastnameDescription)); + } + + /** + * Set the value of lastnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param lastnameDescription The value of lastnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setLastnameDescription_LikeSearch(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, likeSearchOption); + } + + /** + * Set the value of lastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param lastnameDescriptionList The value of lastnameDescription as inScope. + */ + public void setLastnameDescription_InScope(java.util.List lastnameDescriptionList) { + registerLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList)); + } + + /** + * Set the value of lastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param lastnameDescription The value of lastnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setLastnameDescription_InScope(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, inScopeOption); + } + + /** + * Set the value of lastnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param lastnameDescriptionList The value of lastnameDescription as notInScope. + */ + public void setLastnameDescription_NotInScope(java.util.List lastnameDescriptionList) { + registerLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList)); + } + + /** + * Set the value of lastnameDescription using isNull. { is null } + */ + public void setLastnameDescription_IsNull() { + registerLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of lastnameDescription using isNotNull. { is not null } + */ + public void setLastnameDescription_IsNotNull() { + registerLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of lastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of lastnameDescription. (Nullable) + */ + protected void registerLastnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription); + } + + /** + * Register inline condition of lastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of lastnameDescription. (Nullable) + */ + protected void registerInlineLastnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription); + } + + abstract protected ConditionValue getCValueLastnameDescription(); + /** Column db name of nickname. */ protected static final String COL_NICKNAME = "NICKNAME"; 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -1037,6 +1037,322 @@ abstract protected ConditionValue getCValueCustomerLastname(); + /** Column db name of customerFirstnameDescription. */ + protected static final String COL_CUSTOMER_FIRSTNAME_DESCRIPTION = "CUSTOMER_FIRSTNAME_DESCRIPTION"; + + /** Column java name of customerFirstnameDescription. */ + protected static final String J_CustomerFirstnameDescription = "CustomerFirstnameDescription"; + + /** Column uncapitalised java name of customerFirstnameDescription. */ + protected static final String UJ_customerFirstnameDescription = "customerFirstnameDescription"; + + /** + * Set the value of customerFirstnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as equal. + */ + public void setCustomerFirstnameDescription_Equal(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as notEqual. + */ + public void setCustomerFirstnameDescription_NotEqual(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as greaterThan. + */ + public void setCustomerFirstnameDescription_GreaterThan(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as lessThan. + */ + public void setCustomerFirstnameDescription_LessThan(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as greaterEqual. + */ + public void setCustomerFirstnameDescription_GreaterEqual(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as lessEqual. + */ + public void setCustomerFirstnameDescription_LessEqual(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as prefixSearch. + */ + public void setCustomerFirstnameDescription_PrefixSearch(String customerFirstnameDescription) { + registerCustomerFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(customerFirstnameDescription)); + } + + /** + * Set the value of customerFirstnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setCustomerFirstnameDescription_LikeSearch(String customerFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(customerFirstnameDescription), getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription, likeSearchOption); + } + + /** + * Set the value of customerFirstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param customerFirstnameDescriptionList The value of customerFirstnameDescription as inScope. + */ + public void setCustomerFirstnameDescription_InScope(java.util.List customerFirstnameDescriptionList) { + registerCustomerFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(customerFirstnameDescriptionList)); + } + + /** + * Set the value of customerFirstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param customerFirstnameDescription The value of customerFirstnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setCustomerFirstnameDescription_InScope(String customerFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(customerFirstnameDescription), getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription, inScopeOption); + } + + /** + * Set the value of customerFirstnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param customerFirstnameDescriptionList The value of customerFirstnameDescription as notInScope. + */ + public void setCustomerFirstnameDescription_NotInScope(java.util.List customerFirstnameDescriptionList) { + registerCustomerFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(customerFirstnameDescriptionList)); + } + + /** + * Set the value of customerFirstnameDescription using isNull. { is null } + */ + public void setCustomerFirstnameDescription_IsNull() { + registerCustomerFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of customerFirstnameDescription using isNotNull. { is not null } + */ + public void setCustomerFirstnameDescription_IsNotNull() { + registerCustomerFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of customerFirstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of customerFirstnameDescription. (Nullable) + */ + protected void registerCustomerFirstnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription); + } + + /** + * Register inline condition of customerFirstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of customerFirstnameDescription. (Nullable) + */ + protected void registerInlineCustomerFirstnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription); + } + + abstract protected ConditionValue getCValueCustomerFirstnameDescription(); + + /** Column db name of customerLastnameDescription. */ + protected static final String COL_CUSTOMER_LASTNAME_DESCRIPTION = "CUSTOMER_LASTNAME_DESCRIPTION"; + + /** Column java name of customerLastnameDescription. */ + protected static final String J_CustomerLastnameDescription = "CustomerLastnameDescription"; + + /** Column uncapitalised java name of customerLastnameDescription. */ + protected static final String UJ_customerLastnameDescription = "customerLastnameDescription"; + + /** + * Set the value of customerLastnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as equal. + */ + public void setCustomerLastnameDescription_Equal(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as notEqual. + */ + public void setCustomerLastnameDescription_NotEqual(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as greaterThan. + */ + public void setCustomerLastnameDescription_GreaterThan(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as lessThan. + */ + public void setCustomerLastnameDescription_LessThan(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as greaterEqual. + */ + public void setCustomerLastnameDescription_GreaterEqual(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as lessEqual. + */ + public void setCustomerLastnameDescription_LessEqual(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as prefixSearch. + */ + public void setCustomerLastnameDescription_PrefixSearch(String customerLastnameDescription) { + registerCustomerLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(customerLastnameDescription)); + } + + /** + * Set the value of customerLastnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param customerLastnameDescription The value of customerLastnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setCustomerLastnameDescription_LikeSearch(String customerLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(customerLastnameDescription), getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription, likeSearchOption); + } + + /** + * Set the value of customerLastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param customerLastnameDescriptionList The value of customerLastnameDescription as inScope. + */ + public void setCustomerLastnameDescription_InScope(java.util.List customerLastnameDescriptionList) { + registerCustomerLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(customerLastnameDescriptionList)); + } + + /** + * Set the value of customerLastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param customerLastnameDescription The value of customerLastnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setCustomerLastnameDescription_InScope(String customerLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(customerLastnameDescription), getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription, inScopeOption); + } + + /** + * Set the value of customerLastnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param customerLastnameDescriptionList The value of customerLastnameDescription as notInScope. + */ + public void setCustomerLastnameDescription_NotInScope(java.util.List customerLastnameDescriptionList) { + registerCustomerLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(customerLastnameDescriptionList)); + } + + /** + * Set the value of customerLastnameDescription using isNull. { is null } + */ + public void setCustomerLastnameDescription_IsNull() { + registerCustomerLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of customerLastnameDescription using isNotNull. { is not null } + */ + public void setCustomerLastnameDescription_IsNotNull() { + registerCustomerLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of customerLastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of customerLastnameDescription. (Nullable) + */ + protected void registerCustomerLastnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription); + } + + /** + * Register inline condition of customerLastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of customerLastnameDescription. (Nullable) + */ + protected void registerInlineCustomerLastnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription); + } + + abstract protected ConditionValue getCValueCustomerLastnameDescription(); + /** Column db name of customerDayOfBirth. */ protected static final String COL_CUSTOMER_DAY_OF_BIRTH = "CUSTOMER_DAY_OF_BIRTH"; @@ -3391,6 +3707,322 @@ abstract protected ConditionValue getCValueDeliveryLastname(); + /** Column db name of deliveryFirstnameDescription. */ + protected static final String COL_DELIVERY_FIRSTNAME_DESCRIPTION = "DELIVERY_FIRSTNAME_DESCRIPTION"; + + /** Column java name of deliveryFirstnameDescription. */ + protected static final String J_DeliveryFirstnameDescription = "DeliveryFirstnameDescription"; + + /** Column uncapitalised java name of deliveryFirstnameDescription. */ + protected static final String UJ_deliveryFirstnameDescription = "deliveryFirstnameDescription"; + + /** + * Set the value of deliveryFirstnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as equal. + */ + public void setDeliveryFirstnameDescription_Equal(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as notEqual. + */ + public void setDeliveryFirstnameDescription_NotEqual(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as greaterThan. + */ + public void setDeliveryFirstnameDescription_GreaterThan(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as lessThan. + */ + public void setDeliveryFirstnameDescription_LessThan(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as greaterEqual. + */ + public void setDeliveryFirstnameDescription_GreaterEqual(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as lessEqual. + */ + public void setDeliveryFirstnameDescription_LessEqual(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as prefixSearch. + */ + public void setDeliveryFirstnameDescription_PrefixSearch(String deliveryFirstnameDescription) { + registerDeliveryFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryFirstnameDescription)); + } + + /** + * Set the value of deliveryFirstnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setDeliveryFirstnameDescription_LikeSearch(String deliveryFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryFirstnameDescription), getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription, likeSearchOption); + } + + /** + * Set the value of deliveryFirstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryFirstnameDescriptionList The value of deliveryFirstnameDescription as inScope. + */ + public void setDeliveryFirstnameDescription_InScope(java.util.List deliveryFirstnameDescriptionList) { + registerDeliveryFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryFirstnameDescriptionList)); + } + + /** + * Set the value of deliveryFirstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setDeliveryFirstnameDescription_InScope(String deliveryFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryFirstnameDescription), getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription, inScopeOption); + } + + /** + * Set the value of deliveryFirstnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryFirstnameDescriptionList The value of deliveryFirstnameDescription as notInScope. + */ + public void setDeliveryFirstnameDescription_NotInScope(java.util.List deliveryFirstnameDescriptionList) { + registerDeliveryFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryFirstnameDescriptionList)); + } + + /** + * Set the value of deliveryFirstnameDescription using isNull. { is null } + */ + public void setDeliveryFirstnameDescription_IsNull() { + registerDeliveryFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of deliveryFirstnameDescription using isNotNull. { is not null } + */ + public void setDeliveryFirstnameDescription_IsNotNull() { + registerDeliveryFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of deliveryFirstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryFirstnameDescription. (Nullable) + */ + protected void registerDeliveryFirstnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription); + } + + /** + * Register inline condition of deliveryFirstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryFirstnameDescription. (Nullable) + */ + protected void registerInlineDeliveryFirstnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription); + } + + abstract protected ConditionValue getCValueDeliveryFirstnameDescription(); + + /** Column db name of deliveryLastDescription. */ + protected static final String COL_DELIVERY_LAST_DESCRIPTION = "DELIVERY_LAST_DESCRIPTION"; + + /** Column java name of deliveryLastDescription. */ + protected static final String J_DeliveryLastDescription = "DeliveryLastDescription"; + + /** Column uncapitalised java name of deliveryLastDescription. */ + protected static final String UJ_deliveryLastDescription = "deliveryLastDescription"; + + /** + * Set the value of deliveryLastDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as equal. + */ + public void setDeliveryLastDescription_Equal(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as notEqual. + */ + public void setDeliveryLastDescription_NotEqual(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as greaterThan. + */ + public void setDeliveryLastDescription_GreaterThan(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as lessThan. + */ + public void setDeliveryLastDescription_LessThan(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as greaterEqual. + */ + public void setDeliveryLastDescription_GreaterEqual(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as lessEqual. + */ + public void setDeliveryLastDescription_LessEqual(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as prefixSearch. + */ + public void setDeliveryLastDescription_PrefixSearch(String deliveryLastDescription) { + registerDeliveryLastDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryLastDescription)); + } + + /** + * Set the value of deliveryLastDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param deliveryLastDescription The value of deliveryLastDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setDeliveryLastDescription_LikeSearch(String deliveryLastDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryLastDescription), getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription, likeSearchOption); + } + + /** + * Set the value of deliveryLastDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryLastDescriptionList The value of deliveryLastDescription as inScope. + */ + public void setDeliveryLastDescription_InScope(java.util.List deliveryLastDescriptionList) { + registerDeliveryLastDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastDescriptionList)); + } + + /** + * Set the value of deliveryLastDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryLastDescription The value of deliveryLastDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setDeliveryLastDescription_InScope(String deliveryLastDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryLastDescription), getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription, inScopeOption); + } + + /** + * Set the value of deliveryLastDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryLastDescriptionList The value of deliveryLastDescription as notInScope. + */ + public void setDeliveryLastDescription_NotInScope(java.util.List deliveryLastDescriptionList) { + registerDeliveryLastDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastDescriptionList)); + } + + /** + * Set the value of deliveryLastDescription using isNull. { is null } + */ + public void setDeliveryLastDescription_IsNull() { + registerDeliveryLastDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of deliveryLastDescription using isNotNull. { is not null } + */ + public void setDeliveryLastDescription_IsNotNull() { + registerDeliveryLastDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of deliveryLastDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryLastDescription. (Nullable) + */ + protected void registerDeliveryLastDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription); + } + + /** + * Register inline condition of deliveryLastDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryLastDescription. (Nullable) + */ + protected void registerInlineDeliveryLastDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription); + } + + abstract protected ConditionValue getCValueDeliveryLastDescription(); + /** Column db name of deliveryStreetAddress. */ protected static final String COL_DELIVERY_STREET_ADDRESS = "DELIVERY_STREET_ADDRESS"; @@ -5189,6 +5821,322 @@ abstract protected ConditionValue getCValueBillingLastname(); + /** Column db name of billingFirstnameDescription. */ + protected static final String COL_BILLING_FIRSTNAME_DESCRIPTION = "BILLING_FIRSTNAME_DESCRIPTION"; + + /** Column java name of billingFirstnameDescription. */ + protected static final String J_BillingFirstnameDescription = "BillingFirstnameDescription"; + + /** Column uncapitalised java name of billingFirstnameDescription. */ + protected static final String UJ_billingFirstnameDescription = "billingFirstnameDescription"; + + /** + * Set the value of billingFirstnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as equal. + */ + public void setBillingFirstnameDescription_Equal(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as notEqual. + */ + public void setBillingFirstnameDescription_NotEqual(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as greaterThan. + */ + public void setBillingFirstnameDescription_GreaterThan(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as lessThan. + */ + public void setBillingFirstnameDescription_LessThan(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as greaterEqual. + */ + public void setBillingFirstnameDescription_GreaterEqual(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as lessEqual. + */ + public void setBillingFirstnameDescription_LessEqual(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as prefixSearch. + */ + public void setBillingFirstnameDescription_PrefixSearch(String billingFirstnameDescription) { + registerBillingFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(billingFirstnameDescription)); + } + + /** + * Set the value of billingFirstnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setBillingFirstnameDescription_LikeSearch(String billingFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(billingFirstnameDescription), getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription, likeSearchOption); + } + + /** + * Set the value of billingFirstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param billingFirstnameDescriptionList The value of billingFirstnameDescription as inScope. + */ + public void setBillingFirstnameDescription_InScope(java.util.List billingFirstnameDescriptionList) { + registerBillingFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(billingFirstnameDescriptionList)); + } + + /** + * Set the value of billingFirstnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param billingFirstnameDescription The value of billingFirstnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setBillingFirstnameDescription_InScope(String billingFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(billingFirstnameDescription), getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription, inScopeOption); + } + + /** + * Set the value of billingFirstnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param billingFirstnameDescriptionList The value of billingFirstnameDescription as notInScope. + */ + public void setBillingFirstnameDescription_NotInScope(java.util.List billingFirstnameDescriptionList) { + registerBillingFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(billingFirstnameDescriptionList)); + } + + /** + * Set the value of billingFirstnameDescription using isNull. { is null } + */ + public void setBillingFirstnameDescription_IsNull() { + registerBillingFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of billingFirstnameDescription using isNotNull. { is not null } + */ + public void setBillingFirstnameDescription_IsNotNull() { + registerBillingFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of billingFirstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of billingFirstnameDescription. (Nullable) + */ + protected void registerBillingFirstnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription); + } + + /** + * Register inline condition of billingFirstnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of billingFirstnameDescription. (Nullable) + */ + protected void registerInlineBillingFirstnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription); + } + + abstract protected ConditionValue getCValueBillingFirstnameDescription(); + + /** Column db name of billingLastnameDescription. */ + protected static final String COL_BILLING_LASTNAME_DESCRIPTION = "BILLING_LASTNAME_DESCRIPTION"; + + /** Column java name of billingLastnameDescription. */ + protected static final String J_BillingLastnameDescription = "BillingLastnameDescription"; + + /** Column uncapitalised java name of billingLastnameDescription. */ + protected static final String UJ_billingLastnameDescription = "billingLastnameDescription"; + + /** + * Set the value of billingLastnameDescription using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as equal. + */ + public void setBillingLastnameDescription_Equal(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as notEqual. + */ + public void setBillingLastnameDescription_NotEqual(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as greaterThan. + */ + public void setBillingLastnameDescription_GreaterThan(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as lessThan. + */ + public void setBillingLastnameDescription_LessThan(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as greaterEqual. + */ + public void setBillingLastnameDescription_GreaterEqual(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as lessEqual. + */ + public void setBillingLastnameDescription_LessEqual(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as prefixSearch. + */ + public void setBillingLastnameDescription_PrefixSearch(String billingLastnameDescription) { + registerBillingLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(billingLastnameDescription)); + } + + /** + * Set the value of billingLastnameDescription using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param billingLastnameDescription The value of billingLastnameDescription as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setBillingLastnameDescription_LikeSearch(String billingLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(billingLastnameDescription), getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription, likeSearchOption); + } + + /** + * Set the value of billingLastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param billingLastnameDescriptionList The value of billingLastnameDescription as inScope. + */ + public void setBillingLastnameDescription_InScope(java.util.List billingLastnameDescriptionList) { + registerBillingLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(billingLastnameDescriptionList)); + } + + /** + * Set the value of billingLastnameDescription using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param billingLastnameDescription The value of billingLastnameDescription as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setBillingLastnameDescription_InScope(String billingLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(billingLastnameDescription), getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription, inScopeOption); + } + + /** + * Set the value of billingLastnameDescription using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param billingLastnameDescriptionList The value of billingLastnameDescription as notInScope. + */ + public void setBillingLastnameDescription_NotInScope(java.util.List billingLastnameDescriptionList) { + registerBillingLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(billingLastnameDescriptionList)); + } + + /** + * Set the value of billingLastnameDescription using isNull. { is null } + */ + public void setBillingLastnameDescription_IsNull() { + registerBillingLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of billingLastnameDescription using isNotNull. { is not null } + */ + public void setBillingLastnameDescription_IsNotNull() { + registerBillingLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of billingLastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of billingLastnameDescription. (Nullable) + */ + protected void registerBillingLastnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription); + } + + /** + * Register inline condition of billingLastnameDescription. + * + * @param key Condition key. (NotNull) + * @param value The value of billingLastnameDescription. (Nullable) + */ + protected void registerInlineBillingLastnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription); + } + + abstract protected ConditionValue getCValueBillingLastnameDescription(); + /** Column db name of billingStreetAddress. */ protected static final String COL_BILLING_STREET_ADDRESS = "BILLING_STREET_ADDRESS"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -399,6 +399,164 @@ abstract protected ConditionValue getCValueProductId(); + /** Column db name of code. */ + protected static final String COL_CODE = "CODE"; + + /** Column java name of code. */ + protected static final String J_Code = "Code"; + + /** Column uncapitalised java name of code. */ + protected static final String UJ_code = "code"; + + /** + * Set the value of code using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as equal. + */ + public void setCode_Equal(String code) { + registerCode(ConditionKey.CK_EQUAL, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as notEqual. + */ + public void setCode_NotEqual(String code) { + registerCode(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as greaterThan. + */ + public void setCode_GreaterThan(String code) { + registerCode(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as lessThan. + */ + public void setCode_LessThan(String code) { + registerCode(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as greaterEqual. + */ + public void setCode_GreaterEqual(String code) { + registerCode(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as lessEqual. + */ + public void setCode_LessEqual(String code) { + registerCode(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param code The value of code as prefixSearch. + */ + public void setCode_PrefixSearch(String code) { + registerCode(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(code)); + } + + /** + * Set the value of code using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param code The value of code as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setCode_LikeSearch(String code, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(code), getCValueCode(), COL_CODE, J_Code, UJ_code, likeSearchOption); + } + + /** + * Set the value of code using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param codeList The value of code as inScope. + */ + public void setCode_InScope(java.util.List codeList) { + registerCode(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(codeList)); + } + + /** + * Set the value of code using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param code The value of code as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setCode_InScope(String code, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(code), getCValueCode(), COL_CODE, J_Code, UJ_code, inScopeOption); + } + + /** + * Set the value of code using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param codeList The value of code as notInScope. + */ + public void setCode_NotInScope(java.util.List codeList) { + registerCode(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(codeList)); + } + + /** + * Set the value of code using isNull. { is null } + */ + public void setCode_IsNull() { + registerCode(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of code using isNotNull. { is not null } + */ + public void setCode_IsNotNull() { + registerCode(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of code. + * + * @param key Condition key. (NotNull) + * @param value The value of code. (Nullable) + */ + protected void registerCode(ConditionKey key, Object value) { + registerQuery(key, value, getCValueCode(), COL_CODE, J_Code, UJ_code); + } + + /** + * Register inline condition of code. + * + * @param key Condition key. (NotNull) + * @param value The value of code. (Nullable) + */ + protected void registerInlineCode(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueCode(), COL_CODE, J_Code, UJ_code); + } + + abstract protected ConditionValue getCValueCode(); + /** Column db name of model. */ protected static final String COL_MODEL = "MODEL"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -163,6 +163,42 @@ } /** + * Include select-column of firstnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_FirstnameDescription() { + registerIncludedSelectColumn("FirstnameDescription", getRealColumnName("FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of firstnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_FirstnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of lastnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_LastnameDescription() { + registerIncludedSelectColumn("LastnameDescription", getRealColumnName("LASTNAME_DESCRIPTION")); + } + + /** + * Include select-column of lastnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_LastnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("LASTNAME_DESCRIPTION")); + } + + /** * Include select-column of streetAddress as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -654,6 +690,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of firstnameDescription. */ + protected ConditionValue _firstnameDescription; + + /** + * Get the value of firstnameDescription. + * + * @return The value of firstnameDescription. + */ + public ConditionValue getFirstnameDescription() { + if (_firstnameDescription == null) { + _firstnameDescription = new ConditionValue(); + } + return _firstnameDescription; + } + + protected ConditionValue getCValueFirstnameDescription() { + return getFirstnameDescription(); + } + + + /** + * Add order-by of firstnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsAddressBookCQ addOrderBy_FirstnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of firstnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsAddressBookCQ addOrderBy_FirstnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of lastnameDescription. */ + protected ConditionValue _lastnameDescription; + + /** + * Get the value of lastnameDescription. + * + * @return The value of lastnameDescription. + */ + public ConditionValue getLastnameDescription() { + if (_lastnameDescription == null) { + _lastnameDescription = new ConditionValue(); + } + return _lastnameDescription; + } + + protected ConditionValue getCValueLastnameDescription() { + return getLastnameDescription(); + } + + + /** + * Add order-by of lastnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsAddressBookCQ addOrderBy_LastnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of lastnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsAddressBookCQ addOrderBy_LastnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [STREET_ADDRESS] // - - - - - - - - -/ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -145,6 +145,42 @@ } /** + * Include select-column of firstnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_FirstnameDescription() { + registerIncludedSelectColumn("FirstnameDescription", getRealColumnName("FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of firstnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_FirstnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of lastnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_LastnameDescription() { + registerIncludedSelectColumn("LastnameDescription", getRealColumnName("LASTNAME_DESCRIPTION")); + } + + /** + * Include select-column of lastnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_LastnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("LASTNAME_DESCRIPTION")); + } + + /** * Include select-column of nickname as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -644,6 +680,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of firstnameDescription. */ + protected ConditionValue _firstnameDescription; + + /** + * Get the value of firstnameDescription. + * + * @return The value of firstnameDescription. + */ + public ConditionValue getFirstnameDescription() { + if (_firstnameDescription == null) { + _firstnameDescription = new ConditionValue(); + } + return _firstnameDescription; + } + + protected ConditionValue getCValueFirstnameDescription() { + return getFirstnameDescription(); + } + + + /** + * Add order-by of firstnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsCustomerCQ addOrderBy_FirstnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of firstnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsCustomerCQ addOrderBy_FirstnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of lastnameDescription. */ + protected ConditionValue _lastnameDescription; + + /** + * Get the value of lastnameDescription. + * + * @return The value of lastnameDescription. + */ + public ConditionValue getLastnameDescription() { + if (_lastnameDescription == null) { + _lastnameDescription = new ConditionValue(); + } + return _lastnameDescription; + } + + protected ConditionValue getCValueLastnameDescription() { + return getLastnameDescription(); + } + + + /** + * Add order-by of lastnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsCustomerCQ addOrderBy_LastnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of lastnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsCustomerCQ addOrderBy_LastnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [NICKNAME] // - - - - - - - - -/ 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -163,6 +163,42 @@ } /** + * Include select-column of customerFirstnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_CustomerFirstnameDescription() { + registerIncludedSelectColumn("CustomerFirstnameDescription", getRealColumnName("CUSTOMER_FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of customerFirstnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_CustomerFirstnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("CUSTOMER_FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of customerLastnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_CustomerLastnameDescription() { + registerIncludedSelectColumn("CustomerLastnameDescription", getRealColumnName("CUSTOMER_LASTNAME_DESCRIPTION")); + } + + /** + * Include select-column of customerLastnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_CustomerLastnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("CUSTOMER_LASTNAME_DESCRIPTION")); + } + + /** * Include select-column of customerDayOfBirth as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -451,6 +487,42 @@ } /** + * Include select-column of deliveryFirstnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_DeliveryFirstnameDescription() { + registerIncludedSelectColumn("DeliveryFirstnameDescription", getRealColumnName("DELIVERY_FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of deliveryFirstnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_DeliveryFirstnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of deliveryLastDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_DeliveryLastDescription() { + registerIncludedSelectColumn("DeliveryLastDescription", getRealColumnName("DELIVERY_LAST_DESCRIPTION")); + } + + /** + * Include select-column of deliveryLastDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_DeliveryLastDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_LAST_DESCRIPTION")); + } + + /** * Include select-column of deliveryStreetAddress as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -667,6 +739,42 @@ } /** + * Include select-column of billingFirstnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_BillingFirstnameDescription() { + registerIncludedSelectColumn("BillingFirstnameDescription", getRealColumnName("BILLING_FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of billingFirstnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_BillingFirstnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_FIRSTNAME_DESCRIPTION")); + } + + /** + * Include select-column of billingLastnameDescription as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_BillingLastnameDescription() { + registerIncludedSelectColumn("BillingLastnameDescription", getRealColumnName("BILLING_LASTNAME_DESCRIPTION")); + } + + /** + * Include select-column of billingLastnameDescription as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_BillingLastnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_LASTNAME_DESCRIPTION")); + } + + /** * Include select-column of billingStreetAddress as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -1516,6 +1624,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CUSTOMER_FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of customerFirstnameDescription. */ + protected ConditionValue _customerFirstnameDescription; + + /** + * Get the value of customerFirstnameDescription. + * + * @return The value of customerFirstnameDescription. + */ + public ConditionValue getCustomerFirstnameDescription() { + if (_customerFirstnameDescription == null) { + _customerFirstnameDescription = new ConditionValue(); + } + return _customerFirstnameDescription; + } + + protected ConditionValue getCValueCustomerFirstnameDescription() { + return getCustomerFirstnameDescription(); + } + + + /** + * Add order-by of customerFirstnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_CustomerFirstnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_FIRSTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of customerFirstnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_CustomerFirstnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_FIRSTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CUSTOMER_LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of customerLastnameDescription. */ + protected ConditionValue _customerLastnameDescription; + + /** + * Get the value of customerLastnameDescription. + * + * @return The value of customerLastnameDescription. + */ + public ConditionValue getCustomerLastnameDescription() { + if (_customerLastnameDescription == null) { + _customerLastnameDescription = new ConditionValue(); + } + return _customerLastnameDescription; + } + + protected ConditionValue getCValueCustomerLastnameDescription() { + return getCustomerLastnameDescription(); + } + + + /** + * Add order-by of customerLastnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_CustomerLastnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_LASTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of customerLastnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_CustomerLastnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_LASTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [CUSTOMER_DAY_OF_BIRTH] // - - - - - - - - -/ @@ -2188,6 +2380,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of deliveryFirstnameDescription. */ + protected ConditionValue _deliveryFirstnameDescription; + + /** + * Get the value of deliveryFirstnameDescription. + * + * @return The value of deliveryFirstnameDescription. + */ + public ConditionValue getDeliveryFirstnameDescription() { + if (_deliveryFirstnameDescription == null) { + _deliveryFirstnameDescription = new ConditionValue(); + } + return _deliveryFirstnameDescription; + } + + protected ConditionValue getCValueDeliveryFirstnameDescription() { + return getDeliveryFirstnameDescription(); + } + + + /** + * Add order-by of deliveryFirstnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryFirstnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_FIRSTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of deliveryFirstnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryFirstnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_FIRSTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_LAST_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of deliveryLastDescription. */ + protected ConditionValue _deliveryLastDescription; + + /** + * Get the value of deliveryLastDescription. + * + * @return The value of deliveryLastDescription. + */ + public ConditionValue getDeliveryLastDescription() { + if (_deliveryLastDescription == null) { + _deliveryLastDescription = new ConditionValue(); + } + return _deliveryLastDescription; + } + + protected ConditionValue getCValueDeliveryLastDescription() { + return getDeliveryLastDescription(); + } + + + /** + * Add order-by of deliveryLastDescription as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryLastDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LAST_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of deliveryLastDescription as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryLastDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LAST_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [DELIVERY_STREET_ADDRESS] // - - - - - - - - -/ @@ -2692,6 +2968,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [BILLING_FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of billingFirstnameDescription. */ + protected ConditionValue _billingFirstnameDescription; + + /** + * Get the value of billingFirstnameDescription. + * + * @return The value of billingFirstnameDescription. + */ + public ConditionValue getBillingFirstnameDescription() { + if (_billingFirstnameDescription == null) { + _billingFirstnameDescription = new ConditionValue(); + } + return _billingFirstnameDescription; + } + + protected ConditionValue getCValueBillingFirstnameDescription() { + return getBillingFirstnameDescription(); + } + + + /** + * Add order-by of billingFirstnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_BillingFirstnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_FIRSTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of billingFirstnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_BillingFirstnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_FIRSTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [BILLING_LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + + /** The attribute of billingLastnameDescription. */ + protected ConditionValue _billingLastnameDescription; + + /** + * Get the value of billingLastnameDescription. + * + * @return The value of billingLastnameDescription. + */ + public ConditionValue getBillingLastnameDescription() { + if (_billingLastnameDescription == null) { + _billingLastnameDescription = new ConditionValue(); + } + return _billingLastnameDescription; + } + + protected ConditionValue getCValueBillingLastnameDescription() { + return getBillingLastnameDescription(); + } + + + /** + * Add order-by of billingLastnameDescription as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_BillingLastnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_LASTNAME_DESCRIPTION), null, true);return this; + } + + /** + * Add order-by of billingLastnameDescription as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_BillingLastnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_LASTNAME_DESCRIPTION), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [BILLING_STREET_ADDRESS] // - - - - - - - - -/ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -109,6 +109,24 @@ } /** + * Include select-column of code as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_Code() { + registerIncludedSelectColumn("Code", getRealColumnName("CODE")); + } + + /** + * Include select-column of code as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_Code(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("CODE")); + } + + /** * Include select-column of model as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -364,6 +382,48 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CODE] + // - - - - - - - - -/ + + /** The attribute of code. */ + protected ConditionValue _code; + + /** + * Get the value of code. + * + * @return The value of code. + */ + public ConditionValue getCode() { + if (_code == null) { + _code = new ConditionValue(); + } + return _code; + } + + protected ConditionValue getCValueCode() { + return getCode(); + } + + + /** + * Add order-by of code as ASC. + * + * @return this. (NotNull) + */ + public BsOrderProductCQ addOrderBy_Code_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CODE), null, true);return this; + } + + /** + * Add order-by of code as DESC. + * + * @return this. (NotNull) + */ + public BsOrderProductCQ addOrderBy_Code_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CODE), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [MODEL] // - - - - - - - - -/ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -129,6 +129,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueFirstnameDescription() { + return _myCQ.getFirstnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueLastnameDescription() { + return _myCQ.getLastnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [STREET_ADDRESS] // - - - - - - - - -/ protected ConditionValue getCValueStreetAddress() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -171,6 +171,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueFirstnameDescription() { + return _myCQ.getFirstnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueLastnameDescription() { + return _myCQ.getLastnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [NICKNAME] // - - - - - - - - -/ protected ConditionValue getCValueNickname() { 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -174,6 +174,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CUSTOMER_FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueCustomerFirstnameDescription() { + return _myCQ.getCustomerFirstnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CUSTOMER_LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueCustomerLastnameDescription() { + return _myCQ.getCustomerLastnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [CUSTOMER_DAY_OF_BIRTH] // - - - - - - - - -/ protected ConditionValue getCValueCustomerDayOfBirth() { @@ -302,6 +318,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueDeliveryFirstnameDescription() { + return _myCQ.getDeliveryFirstnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_LAST_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueDeliveryLastDescription() { + return _myCQ.getDeliveryLastDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [DELIVERY_STREET_ADDRESS] // - - - - - - - - -/ protected ConditionValue getCValueDeliveryStreetAddress() { @@ -398,6 +430,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [BILLING_FIRSTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueBillingFirstnameDescription() { + return _myCQ.getBillingFirstnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [BILLING_LASTNAME_DESCRIPTION] + // - - - - - - - - -/ + protected ConditionValue getCValueBillingLastnameDescription() { + return _myCQ.getBillingLastnameDescription(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [BILLING_STREET_ADDRESS] // - - - - - - - - -/ protected ConditionValue getCValueBillingStreetAddress() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java 2007-10-01 13:00:14 UTC (rev 599) @@ -109,6 +109,14 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CODE] + // - - - - - - - - -/ + protected ConditionValue getCValueCode() { + return _myCQ.getCode(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [MODEL] // - - - - - - - - -/ protected ConditionValue getCValueModel() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2007-10-01 13:00:14 UTC (rev 599) @@ -7,33 +7,12 @@ import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.web.admin.customer.AbstractCustomerEditPage; -import jp.sf.pal.pompei.web.admin.customer.CustomerConfirmPage; import jp.sf.pal.pompei.web.user.checkout.CheckoutConfirmPage; import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage; import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage; -import org.seasar.extension.dxo.annotation.ConversionRule; - public interface CustomerDxo extends Serializable { - Customer convert(AbstractCustomerEditPage memberEditPage); - - AddressBook convertAddress(AbstractCustomerEditPage memberEditPage); - - Customer convert(CustomerConfirmPage memberConfirmPage); - - AddressBook convertAddress(CustomerConfirmPage memberConfirmPage); - - //TODO - @ConversionRule("customerId : customerId" + ",lastName : lLastname" - + ",firstName : customerFirstname" - + ",entryCity : addressBook.entryCity" - + ",entryState : addressBook.entryState" - + ",entryCompany : addressBook.entryCompany") - List> convertMap(List memberItems); - - //TODO above methods might not be needed.. - public void convert(AbstractCustomerEditPage memberConfirmPage, AddressBook book); 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-10-01 13:00:14 UTC (rev 599) @@ -3,11 +3,15 @@ import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.faces.context.FacesContext; +import jp.sf.pal.common.util.DateUtil; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.dxo.CustomerDxo; @@ -44,24 +48,72 @@ } public Class prerender() { + //TODO to initialize + // state items + List> stateItems = new ArrayList>(); + String states = getUserInfoEditPage().getLabelHelper().getLabelValue( + "state.items"); + String[] stateArray = states.split(","); + for (String state : stateArray) { + Map map = new HashMap(); + map.put("label", state); + map.put("value", state); + stateItems.add(map); + } + getUserInfoEditPage().setStateItems(stateItems); + // dayOfBirth + Date now = new Date(); + List> yearOfDayOfBirthItems = new ArrayList>(); + int year = DateUtil.getYear(now) + 1900; + for (int i = 0; i < 100; i++) { + Map map = new HashMap(); + map.put("label", Integer.toString(year - i)); + map.put("value", Integer.toString(year - i)); + yearOfDayOfBirthItems.add(map); + } + getUserInfoEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems); + getUserInfoEditPage().setYearOfDayOfBirth(new Integer(year)); + + List> monthOfDayOfBirthItems = new ArrayList>(); + for (int i = 1; i < 13; i++) { + Map map = new HashMap(); + map.put("label", Integer.toString(i)); + map.put("value", Integer.toString(i)); + monthOfDayOfBirthItems.add(map); + } + getUserInfoEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); + getUserInfoEditPage().setMonthOfDayOfBirth( + new Integer(DateUtil.getMonth(now) + 1)); + + List> dateOfDayOfBirthItems = new ArrayList>(); + for (int i = 1; i < 32; i++) { + Map map = new HashMap(); + map.put("label", Integer.toString(i)); + map.put("value", Integer.toString(i)); + dateOfDayOfBirthItems.add(map); + } + getUserInfoEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems); + getUserInfoEditPage().setDateOfDayOfBirth( + new Integer(DateUtil.getDate(now))); + // check login String remoteUser = FacesContext.getCurrentInstance() .getExternalContext().getRemoteUser(); if (remoteUser == null) { - getUserInfoEditPage().setIsLogin(false); - getUserInfoEditPage().setIsUser(false); + getUserInfoEditPage().setLogin(false); + getUserInfoEditPage().setUser(false); return null; } - getUserInfoEditPage().setIsLogin(true); + getUserInfoEditPage().setLogin(true); getUserInfoEditPage().setPortalId(remoteUser); Customer customer = getCustomerService().getCustomerByPortalId( remoteUser); if (customer == null) { - getUserInfoEditPage().setIsUser(false); + getUserInfoEditPage().setUser(false); return null; } - getUserInfoEditPage().setIsUser(true); + getUserInfoEditPage().setUser(true); getCustomerDxo().convert(customer, getUserInfoEditPage()); // set default address @@ -71,34 +123,126 @@ getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage()); } + if (getUserInfoEditPage().isEdit()) { + postprocessingForRender(); + } + // render FacesMessages FacesMessageUtil.renderMessages(); return null; } - public Class doRegister() { - Date now = new Date(); - Customer customer = new Customer(); - customer.setDateAdded(new Timestamp(now.getTime())); - customer.setLastModified(new Timestamp(now.getTime())); - AddressBook addressBook = new AddressBook(); - getCustomerDxo().convert(getUserInfoEditPage(), customer); - getCustomerDxo().convert(getUserInfoEditPage(), addressBook); + private void postprocessingForRender() { + // day of birth + if (getUserInfoEditPage().getDayOfBirth() != null) { + Date b = getUserInfoEditPage().getDayOfBirth(); + getUserInfoEditPage().setYearOfDayOfBirth( + DateUtil.getYear(b) + 1900); + getUserInfoEditPage() + .setMonthOfDayOfBirth(DateUtil.getMonth(b) + 1); + getUserInfoEditPage().setDateOfDayOfBirth(DateUtil.getDate(b)); + } - //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); + // postcode + if (getUserInfoEditPage().getPostcode() != null) { + String[] postcode = getUserInfoEditPage().getPostcode().split("-"); + if (postcode.length == 2) { + getUserInfoEditPage().setPrimaryPostcode(postcode[0]); + getUserInfoEditPage().setSecondaryPostcode(postcode[1]); + } + } - getCustomerService().addCustomer(customer, addressBook); + // email Confirmation + getUserInfoEditPage().setEmailAddressConfirm( + getUserInfoEditPage().getEmailAddress()); + } - FacesMessageUtil.addInfoMessage("added.customer"); + private void preprocessingForUpdate() { + // day of birth + getUserInfoEditPage().setDayOfBirth( + DateUtil.get( + getUserInfoEditPage().getYearOfDayOfBirth() - 1900, + getUserInfoEditPage().getMonthOfDayOfBirth() - 1, + getUserInfoEditPage().getDateOfDayOfBirth())); + + // postcode + getUserInfoEditPage().setPostcode( + getUserInfoEditPage().getPrimaryPostcode() + "-" + + getUserInfoEditPage().getSecondaryPostcode()); + } + + public Class doUpdate() { + // check email + if (!getUserInfoEditPage().getEmailAddress().equals( + getUserInfoEditPage().getEmailAddressConfirm())) { + FacesMessageUtil.addWarnMessage("email.address.does.not.match"); + return null; + } + + preprocessingForUpdate(); + if (PompeiConstants.UPDATE_MODE.equals(getUserInfoEditPage().getMode())) { + // update + // check login + String remoteUser = FacesContext.getCurrentInstance() + .getExternalContext().getRemoteUser(); + if (remoteUser == null) { + //TODO needs message? + return null; + } + + Customer customer = getCustomerService().getCustomerByPortalId( + remoteUser); + if (customer == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.customer.in.userinfoedit"); + return null; + } + + AddressBook defaultAddressBook = getCustomerService() + .getDefaultAddressBook(customer.getCustomerId()); + if (defaultAddressBook == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.default.address.book.in.userinfoedit"); + return null; + } + + Date now = new Date(); + customer.setLastModified(new Timestamp(now.getTime())); + + // do not put customerId and addressBookId on user's userInfoEdit.html + getCustomerDxo().convert(getUserInfoEditPage(), customer); + getCustomerDxo().convert(getUserInfoEditPage(), defaultAddressBook); + + getCustomerService().updateCustomer(customer, defaultAddressBook); + + getUserInfoEditPage().setMode(null); + FacesMessageUtil.addInfoMessage("updated.customer"); + } else { + // new + Date now = new Date(); + Customer customer = new Customer(); + customer.setDateAdded(new Timestamp(now.getTime())); + customer.setLastModified(new Timestamp(now.getTime())); + AddressBook addressBook = new AddressBook(); + getCustomerDxo().convert(getUserInfoEditPage(), customer); + getCustomerDxo().convert(getUserInfoEditPage(), addressBook); + + //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().addCustomer(customer, addressBook); + + FacesMessageUtil.addInfoMessage("added.customer"); + } + return UserInfoEditPage.class; } @@ -122,10 +266,15 @@ } public Class doModify() { - //TODO modify info - return null; + getUserInfoEditPage().setMode(PompeiConstants.UPDATE_MODE); + return UserInfoEditPage.class; } + public Class doCancel() { + getUserInfoEditPage().setMode(null); + return UserInfoEditPage.class; + } + /** * @return userInfoEditPage */ 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-10-01 13:00:14 UTC (rev 599) @@ -3,8 +3,13 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; +import java.util.Map; +import jp.sf.pal.pompei.PompeiConstants; + import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; +import org.seasar.teeda.extension.annotation.validator.Required; import org.seasar.teeda.extension.util.LabelHelper; public class UserInfoEditPage implements Serializable { @@ -20,18 +25,32 @@ private String cellphone; + @Required private String emailAddress; + @Required + private String emailAddressConfirm; + private String fax; + @Required private String firstname; + @Required + private String firstnameDescription; + + @Required private String gender; + @Required private String lastname; + @Required + private String lastnameDescription; + private String telephone; + @Required private String city; private String company; @@ -40,8 +59,18 @@ private String postcode; + @Required + private String primaryPostcode; + + @Required + private String secondaryPostcode; + + private List> stateItems; + + @Required private String state; + @Required private String streetAddress; private String portalId; @@ -51,10 +80,27 @@ @DateTimeConverter(pattern = "yyyy/MM/dd") private Date dayOfBirth; - private boolean isUser; + @Required + private Integer yearOfDayOfBirth; - private boolean isLogin; + private List> yearOfDayOfBirthItems; + @Required + private Integer monthOfDayOfBirth; + + private List> monthOfDayOfBirthItems; + + @Required + private Integer dateOfDayOfBirth; + + private List> dateOfDayOfBirthItems; + + private boolean user; + + private boolean login; + + private String mode; + /** * @return labelHelper */ @@ -216,11 +262,11 @@ } public boolean isUser() { - return isUser; + return user; } - public void setIsUser(boolean flag) { - isUser = flag; + public void setUser(boolean flag) { + user = flag; } public String getEntryFax() { @@ -244,11 +290,11 @@ } public boolean isLogin() { - return isLogin; + return login; } - public void setIsLogin(boolean flag) { - isLogin = flag; + public void setLogin(boolean flag) { + login = flag; } public String getGenderString() { @@ -268,4 +314,199 @@ public void setDayOfBirth(Date dayOfBirth) { this.dayOfBirth = dayOfBirth; } + + /** + * @return stateItems + */ + public List> getStateItems() { + return stateItems; + } + + /** + * @param stateItems 設定する stateItems + */ + public void setStateItems(List> stateItems) { + this.stateItems = stateItems; + } + + /** + * @return firstnameDescription + */ + public String getFirstnameDescription() { + return firstnameDescription; + } + + /** + * @param firstnameDescription 設定する firstnameDescription + */ + public void setFirstnameDescription(String firstnameDescription) { + this.firstnameDescription = firstnameDescription; + } + + /** + * @return lastnameDescription + */ + public String getLastnameDescription() { + return lastnameDescription; + } + + /** + * @param lastnameDescription 設定する lastnameDescription + */ + public void setLastnameDescription(String lastnameDescription) { + this.lastnameDescription = lastnameDescription; + } + + /** + * @return emailAddressConfirm + */ + public String getEmailAddressConfirm() { + return emailAddressConfirm; + } + + /** + * @param emailAddressConfirm 設定する emailAddressConfirm + */ + public void setEmailAddressConfirm(String emailAddressConfirm) { + this.emailAddressConfirm = emailAddressConfirm; + } + + /** + * @return primaryPostcode + */ + public String getPrimaryPostcode() { + return primaryPostcode; + } + + /** + * @param primaryPostcode 設定する primaryPostcode + */ + public void setPrimaryPostcode(String primaryPostcode) { + this.primaryPostcode = primaryPostcode; + } + + /** + * @return secondaryPostcode + */ + public String getSecondaryPostcode() { + return secondaryPostcode; + } + + /** + * @param secondaryPostcode 設定する secondaryPostcode + */ + public void setSecondaryPostcode(String secondaryPostcode) { + this.secondaryPostcode = secondaryPostcode; + } + + /** + * @return yearOfDayOfBirth + */ + public Integer getYearOfDayOfBirth() { + return yearOfDayOfBirth; + } + + /** + * @param yearOfDayOfBirth 設定する yearOfDayOfBirth + */ + public void setYearOfDayOfBirth(Integer yearOfDayOfBirth) { + this.yearOfDayOfBirth = yearOfDayOfBirth; + } + + /** + * @return yearOfDayOfBirthItems + */ + public List> getYearOfDayOfBirthItems() { + return yearOfDayOfBirthItems; + } + + /** + * @param yearOfDayOfBirthItems 設定する yearOfDayOfBirthItems + */ + public void setYearOfDayOfBirthItems( + List> yearOfDayOfBirthItems) { + this.yearOfDayOfBirthItems = yearOfDayOfBirthItems; + } + + /** + * @return monthOfDayOfBirth + */ + public Integer getMonthOfDayOfBirth() { + return monthOfDayOfBirth; + } + + /** + * @param monthOfDayOfBirth 設定する monthOfDayOfBirth + */ + public void setMonthOfDayOfBirth(Integer monthOfDayOfBirth) { + this.monthOfDayOfBirth = monthOfDayOfBirth; + } + + /** + * @return monthOfDayOfBirthItems + */ + public List> getMonthOfDayOfBirthItems() { + return monthOfDayOfBirthItems; + } + + /** + * @param monthOfDayOfBirthItems 設定する monthOfDayOfBirthItems + */ + public void setMonthOfDayOfBirthItems( + List> monthOfDayOfBirthItems) { + this.monthOfDayOfBirthItems = monthOfDayOfBirthItems; + } + + /** + * @return dateOfDayOfBirth + */ + public Integer getDateOfDayOfBirth() { + return dateOfDayOfBirth; + } + + /** + * @param dateOfDayOfBirth 設定する dateOfDayOfBirth + */ + public void setDateOfDayOfBirth(Integer dateOfDayOfBirth) { + this.dateOfDayOfBirth = dateOfDayOfBirth; + } + + /** + * @return dateOfDayOfBirthItems + */ + public List> getDateOfDayOfBirthItems() { + return dateOfDayOfBirthItems; + } + + /** + * @param dateOfDayOfBirthItems 設定する dateOfDayOfBirthItems + */ + public void setDateOfDayOfBirthItems( + List> dateOfDayOfBirthItems) { + this.dateOfDayOfBirthItems = dateOfDayOfBirthItems; + } + + public boolean isEdit() { + if (!isUser()) { + return true; + } + if (isUser() && PompeiConstants.UPDATE_MODE.equals(mode)) { + return true; + } + return false; + } + + /** + * @return mode + */ + public String getMode() { + return mode; + } + + /** + * @param mode 設定する mode + */ + public void setMode(String mode) { + this.mode = mode; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-01 13:00:14 UTC (rev 599) @@ -113,7 +113,11 @@ # UserInfoEditAction.java added.customer=\u4f1a\u54e1\u60c5\u5831\u3092\u767b\u9332\u3057\u307e\u3057\u305f\u3002 +updated.customer=\u4f1a\u54e1\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 could.not.find.customer.id.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +could.not.find.customer.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +could.not.find.default.address.book.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +email.address.does.not.match=\u78ba\u8a8d\u7528\u306b\u5165\u529b\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002 # ProductDetailsAction.java could.not.find.product.in.productdetail=\u5bfe\u8c61\u306e\u5546\u54c1\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 2007-10-01 13:00:14 UTC (rev 599) @@ -3,4 +3,5 @@ orderConfirm.title=\u6ce8\u6587\u7ba1\u7406\u3000\u78ba\u8a8d\u753b\u9762 M=\u7537\u6027 -F=\u5973\u6027 \ No newline at end of file +F=\u5973\u6027 +state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c, Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties 2007-09-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties 2007-10-01 13:00:14 UTC (rev 599) @@ -3,4 +3,6 @@ COD=\u4ee3\u91d1\u5f15\u63db\u3048 BANK=\u9280\u884c\u632f\u8fbc\u307f -CREDITCARD=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9 \ No newline at end of file +CREDITCARD=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9 + +state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c, 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-01 13:00:14 UTC (rev 599) @@ -2,8 +2,10 @@ CUSTOMER_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1) , PORTAL_ID VARCHAR(255) NOT NULL , GENDER CHAR(1) NOT NULL - , FIRSTNAME VARCHAR(32) NOT NULL - , LASTNAME VARCHAR(32) NOT NULL + , FIRSTNAME VARCHAR(40) NOT NULL + , LASTNAME VARCHAR(40) NOT NULL + , FIRSTNAME_DESCRIPTION VARCHAR(40) + , LASTNAME_DESCRIPTION VARCHAR(40) , NICKNAME VARCHAR(64) , DAY_OF_BIRTH DATE NOT NULL DEFAULT '0000-00-00 00:00:00' , EMAIL_ADDRESS VARCHAR(128) NOT NULL @@ -129,8 +131,10 @@ , ORDER_FORM_NUMBER VARCHAR(32) NOT NULL , CUSTOMER_ID BIGINT , CUSTOMER_GENDER CHAR(1) NOT NULL - , CUSTOMER_FIRSTNAME VARCHAR(32) NOT NULL - , CUSTOMER_LASTNAME VARCHAR(32) NOT NULL + , CUSTOMER_FIRSTNAME VARCHAR(40) NOT NULL + , CUSTOMER_LASTNAME VARCHAR(40) NOT NULL + , CUSTOMER_FIRSTNAME_DESCRIPTION VARCHAR(40) + , CUSTOMER_LASTNAME_DESCRIPTION VARCHAR(40) , CUSTOMER_DAY_OF_BIRTH DATE NOT NULL , CUSTOMER_EMAIL_ADDRESS VARCHAR(128) NOT NULL , CUSTOMER_COMPANY VARCHAR(128) @@ -145,8 +149,10 @@ , CUSTOMER_LOCALE_NAME VARCHAR(16) NOT NULL , DELIVERY_COMPANY VARCHAR(128) , DELIVERY_DEPARTMENT VARCHAR(64) - , DELIVERY_FIRSTNAME VARCHAR(32) NOT NULL - , DELIVERY_LASTNAME VARCHAR(32) NOT NULL + , DELIVERY_FIRSTNAME VARCHAR(40) NOT NULL + , DELIVERY_LASTNAME VARCHAR(40) NOT NULL + , DELIVERY_FIRSTNAME_DESCRIPTION VARCHAR(40) + , DELIVERY_LAST_DESCRIPTION VARCHAR(40) , DELIVERY_STREET_ADDRESS VARCHAR(255) NOT NULL , DELIVERY_SUBURB VARCHAR(32) , DELIVERY_CITY VARCHAR(64) NOT NULL @@ -157,8 +163,10 @@ , DELIVERY_LOCALE_NAME VARCHAR(16) NOT NULL , BILLING_COMPANY VARCHAR(128) , BILLING_DEPARTMENT VARCHAR(64) - , BILLING_FIRSTNAME VARCHAR(32) NOT NULL - , BILLING_LASTNAME VARCHAR(32) NOT NULL + , BILLING_FIRSTNAME VARCHAR(40) NOT NULL + , BILLING_LASTNAME VARCHAR(40) NOT NULL + , BILLING_FIRSTNAME_DESCRIPTION VARCHAR(40) + , BILLING_LASTNAME_DESCRIPTION VARCHAR(40) , BILLING_STREET_ADDRESS VARCHAR(255) NOT NULL , BILLING_SUBURB VARCHAR(32) , BILLING_CITY VARCHAR(64) NOT NULL @@ -293,6 +301,7 @@ ORDER_PRODUCT_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1) , ORDER_FORM_ID BIGINT NOT NULL , PRODUCT_ID BIGINT NOT NULL + , CODE VARCHAR(64) , MODEL VARCHAR(64) , PRICE DECIMAL(15, 4) NOT NULL , FINAL_PRICE DECIMAL(15,4) NOT NULL @@ -490,8 +499,10 @@ , CUSTOMER_ID BIGINT NOT NULL , COMPANY VARCHAR(128) , DEPARTMENT VARCHAR(64) - , FIRSTNAME VARCHAR(32) NOT NULL - , LASTNAME VARCHAR(32) NOT NULL + , FIRSTNAME VARCHAR(40) NOT NULL + , LASTNAME VARCHAR(40) NOT NULL + , FIRSTNAME_DESCRIPTION VARCHAR(40) + , LASTNAME_DESCRIPTION VARCHAR(40) , STREET_ADDRESS VARCHAR(255) NOT NULL , SUBURB VARCHAR(32) , CITY VARCHAR(64) NOT NULL 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-30 13:20:43 UTC (rev 598) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-01 13:00:14 UTC (rev 599) @@ -18,154 +18,213 @@
-
+
ユーザー情報登録
- - - + + + + + + + + - - - + + + + - - - - - - - -
- + + [必須] - +
- + + [必須] - +
- + + [必須] + +
+ [必須] + + +
+ [必須] + - 男性 - 女性 + +
- + + [必須] - +
- + + [必須] - +
+ + [必須] + + + / + + / + + +
- +
+ - +
+ - +
- + + [必須] - + + - + +
- + + [必須] - +
- + + [必須] - +
- + + [必須] - +
+ - +
+ - +
- + + -
+
ユーザー情報の確認
- - - + + + + + + + + - - - - - - - - - - -
- + + VALUE
- + + VALUE
+ + + + VALUE +
+ + + VALUE +
@@ -173,7 +232,7 @@
+ @@ -181,15 +240,15 @@
- + + VALUE
+ @@ -197,7 +256,7 @@
+ @@ -205,7 +264,7 @@
+ @@ -213,7 +272,7 @@
+ @@ -221,7 +280,7 @@
+ @@ -229,7 +288,7 @@
+ @@ -237,7 +296,7 @@
+ @@ -245,7 +304,7 @@
+ @@ -253,7 +312,7 @@
+ @@ -265,7 +324,7 @@
- +
From svnnotify @ sourceforge.jp Tue Oct 2 15:51:33 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 02 Oct 2007 15:51:33 +0900 Subject: [pal-cvs 2855] [600] removed no border. Message-ID: <1191307893.775606.4309.nullmailer@users.sourceforge.jp> Revision: 600 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=600 Author: shinsuke Date: 2007-10-02 15:51:33 +0900 (Tue, 02 Oct 2007) Log Message: ----------- removed no border. Modified Paths: -------------- pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css -------------- next part -------------- Modified: pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css =================================================================== --- pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css 2007-10-01 13:00:14 UTC (rev 599) +++ pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css 2007-10-02 06:51:33 UTC (rev 600) @@ -521,7 +521,6 @@ .nextgen td { vertical-align: top; font-size: 10pt; - border: none; white-space: normal; /* action buttons shifts right a few millimeters by the following */ } From svnnotify @ sourceforge.jp Tue Oct 2 16:48:43 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 02 Oct 2007 16:48:43 +0900 Subject: [pal-cvs 2856] [601] updated teeda. Message-ID: <1191311323.631265.9481.nullmailer@users.sourceforge.jp> Revision: 601 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=601 Author: shinsuke Date: 2007-10-02 16:48:42 +0900 (Tue, 02 Oct 2007) Log Message: ----------- updated teeda. put order status on pages. check if order complete page is displayed. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/.classpath pompei/portlets/pompei-core/trunk/pom.xml 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/web/user/checkout/CheckoutCompleteAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/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 -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/.classpath =================================================================== --- pompei/portlets/pompei-core/trunk/.classpath 2007-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/.classpath 2007-10-02 07:48:42 UTC (rev 601) @@ -9,8 +9,8 @@ - + @@ -21,30 +21,27 @@ - - + - - - + - + - - + + Modified: pompei/portlets/pompei-core/trunk/pom.xml =================================================================== --- pompei/portlets/pompei-core/trunk/pom.xml 2007-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/pom.xml 2007-10-02 07:48:42 UTC (rev 601) @@ -207,17 +207,17 @@ org.seasar.teeda teeda-extension - 1.0.11-RC2 + 1.0.11 org.seasar.teeda teeda-ajax - 1.0.11-RC2 + 1.0.11 org.seasar.teeda teeda-tiger - 1.0.9 + 1.0.11 org.seasar.teeda 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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-02 07:48:42 UTC (rev 601) @@ -94,4 +94,6 @@ public static final String THUMBNAIL_IMAGE_URL = "thumbnailImageUrl"; public static final String DETAILS_IMAGE_URL = "detailsImageUrl"; + + public static final String DISPLAYED_ORDER_COMPLETION = "DisplayedOrderCompletion"; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java 2007-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java 2007-10-02 07:48:42 UTC (rev 601) @@ -4,8 +4,10 @@ import javax.faces.context.FacesContext; +import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.service.CustomerService; +import jp.sf.pal.pompei.util.SessionUtil; public class CheckoutCompleteAction implements Serializable { @@ -44,6 +46,15 @@ return UserInfoEditPage.class; } + if (SessionUtil + .getFromLocalScope(PompeiConstants.DISPLAYED_ORDER_COMPLETION) != null) { + SessionUtil + .removeFromLocalScope(PompeiConstants.DISPLAYED_ORDER_COMPLETION); + return UserInfoEditPage.class; + } + SessionUtil.putToLocalScope(PompeiConstants.DISPLAYED_ORDER_COMPLETION, + Boolean.TRUE); + return null; } 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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2007-10-02 07:48:42 UTC (rev 601) @@ -336,6 +336,10 @@ return null; } + // remove order process id + SessionUtil.removeFromLocalScope(getCheckoutConfirmPage() + .getOrderProcessId()); + return CheckoutCompletePage.class; } 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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-02 07:48:42 UTC (rev 601) @@ -6,6 +6,23 @@ 注文確認画面 +
+
+ + + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-02 07:48:42 UTC (rev 601) @@ -18,6 +18,23 @@ } --> +
+
+ + + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-10-02 07:48:42 UTC (rev 601) @@ -6,6 +6,23 @@ 注文画面: ユーザー情報確認 +
+
+ + + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
@@ -26,7 +43,7 @@
- +
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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-02 07:48:42 UTC (rev 601) @@ -6,6 +6,23 @@ 注文画面: ユーザー情報確認 +
+
+ + + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
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-10-02 06:51:33 UTC (rev 600) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-02 07:48:42 UTC (rev 601) @@ -42,11 +42,13 @@
-
- -
- +
+ +
+
+ +
From svnnotify @ sourceforge.jp Wed Oct 3 06:42:35 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 03 Oct 2007 06:42:35 +0900 Subject: [pal-cvs 2857] [602] added pompei decorator. Message-ID: <1191361355.105452.6338.nullmailer@users.sourceforge.jp> Revision: 602 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=602 Author: shinsuke Date: 2007-10-03 06:42:34 +0900 (Wed, 03 Oct 2007) Log Message: ----------- added pompei decorator. Added Paths: ----------- pompei/portal/trunk/src/custom/portal/files/src/ pompei/portal/trunk/src/custom/portal/files/src/webapp/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator-macros.vm pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator.properties pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/footer.vm pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/coreback.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/footer_bg.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/footer_bg.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header.jpg pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header_bg.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header_bg.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/logo.png pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/logo.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/readmore_arrow.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/readmore_over.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/tab_bg.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/tab_bg.xcf -------------- next part -------------- Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css 2007-10-02 07:48:42 UTC (rev 601) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css 2007-10-02 21:42:34 UTC (rev 602) @@ -0,0 +1,289 @@ +/* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +/*@import url("../../css/portal-standard.css");*/ + +body { + height: auto; + background: #FFF; + color: #000000; + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; +} + +/** + This white-space setting is VERY important as it keeps content from "spilling" + outside of portlets. + */ + +a:link, a:visited { + color: #335599; + text-decoration: underline; +} + +a:hover { + color: #4466aa; +} + +body.layout-pompei +{ + margin: 0; + padding: 0; +} + + +#portal-page-actions A img +{ + display: inline; +} + +#portal-page-actions +{ + text-align:right; +} + +.layout-pompei .layout-edit-bar +{ + width: 100%; + padding-top: 5px; + font-size: 8pt; + color: blue; + overflow:hidden; + clip:auto; +} + +.layout-pompei .layout-edit-bar label, +.layout-pompei .layout-edit-bar input, +.layout-pompei .layout-edit-bar select +{ + font-size: 8pt; + color: blue; +} + +.layout-pompei .layout-edit-bar input +{ + font-size: 8pt; +} + +.layout-pompei .layout-edit-bar-left +{ + display:inline; + float:left; +} + +.layout-pompei .layout-edit-bar-right +{ + display:inline; + float:right; + padding-right: 5px; +} + +.layout-pompei .portlet-edit-bar select +{ + font-size: 8pt; + color: blue; +} + + + +/* site specific styling */ + + +/* the container centers the page */ +.layout-pompei #container { + height: auto; + margin: 0 10px 0 10px; + text-align:left; +} + + +/* the header that contains the big image */ +.layout-pompei #header { + height:60px; +} + +.layout-pompei #header img { + margin: 10px 0px 0px 30px; + float:left; +} + +.layout-pompei #header .info { + margin: 10px 30px 0px 0px; + display:inline; + text-align:right; + float:right; +} + +.layout-pompei #header .info .action { + padding: 2px 0px; +} + +.layout-pompei #header .info .action a { + padding: 0px 3px; + text-decoration: none; +} + +.layout-pompei #header .info .action a:hover { + color:#0000ff; +} + +/* the navigationbar in the header */ +.layout-pompei #navbar { + margin:0px; + padding:0px; + height:25px; + background-image: url(../images/tab_bg.gif); +} + +/* the links in the navigationbar are an unordered list */ +.layout-pompei #navbar ul { + margin:0px; + padding:0px; +} + +.layout-pompei #navbar li { + list-style: none; + margin:0px; + padding:0px; + height:30px; + float: left; +} +.layout-pompei #navbar a { + float: left; + text-decoration: none; + margin:0px; + padding: 8px 5px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight: bold; + color: #ffffff; +} +.layout-pompei #navbar a:hover { + background: #71758a; + color: #ffffff; +} +.layout-pompei #navbar span { + float: left; + text-decoration: none; + margin:0px; + padding: 8px 5px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight: bold; + color: #ffffff; +} + +.layout-pompei #navbar img { + background-color:#ffffff; + float:right; + margin:0px; + padding: 0px; +} + +/* the core contains all the site contents */ +.layout-pompei #core { + clear:both; + height: auto; + margin-top: 5px; + padding:0px 1px; + width:100%; +} + +.layout-pompei #breadcrumbs { + border-top: 1px dotted #666; + border-bottom: 1px dotted #666; + voice-family: "\"}\""; + voice-family: inherit; + font-size: x-small; + padding: 3px 8px; + margin: 3px; +} + +.layout-pompei #breadcrumbs a { + text-decoration: none; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color:#12248d; +} + +/* the navigationbar in the header */ +.layout-pompei #subnavbar { + margin:0px; + padding:0px; + height:30px; +} + +/* the links in the navigationbar are an unordered list */ +.layout-pompei #subnavbar ul { + margin:0px; + padding:0px; +} + +.layout-pompei #subnavbar li { + list-style: none; + margin:0px; + padding:0px; + height:30px; + float: left; +} +.layout-pompei #subnavbar span { + float: left; + text-decoration: none; + margin:0px; + padding: 5px 2px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight: bold; + color: #666666; +} +.layout-pompei #subnavbar a { + text-decoration: none; +} +.layout-pompei #subnavbar a:hover { + color: #0000ff; +} + +/* the corecenter contains the center part of the core */ +.layout-pompei #corecenter { + margin:2px; + height: auto; + width:100%; +} +.layout-pompei #corecenter .portlet { + margin:1px; + width:99%; +} + +/* the footer contains all copyright info etcetera */ +.layout-pompei #footer { + clear: both; + vertical-align: middle; + text-align: center; + font-family: Arial Black, Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + margin-bottom:10px; + margin-top:10px; + /*position:relative;*/ + /*top:30px;*/ +} +.layout-pompei #footer div { + color: #666666; + padding: 5px 20px; +} +.layout-pompei #footer a { + color: #666666; +} + Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator-macros.vm =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator-macros.vm 2007-10-02 07:48:42 UTC (rev 601) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator-macros.vm 2007-10-02 21:42:34 UTC (rev 602) @@ -0,0 +1,300 @@ +#* define navigation constants *# +#macro (defineNavigationConstants) + #set($LEFT_TO_RIGHT = "LeftToRight") + #set($RIGHT_TO_LEFT = "RightToLeft") + #set($TOP_TO_BOTTOM = "TopToBottom") + #set($BOTTOM_TO_TOP = "BottomToTop") + #set($TITLE_FIRST = "TitleFirst") + #set($TITLE_LAST = "TitleLast") + #set($BREADCRUMBS_STYLE = "BreadcrumbsStyle") +#end + +#* include tabs navigation component *# +#macro (includeTabsNavigation $_menu $_orientation) +
    + #foreach($element in $_menu.elements.iterator()) + #if($element.elementType == "option") + #set($tabTitle = $element.getTitle($preferedLocale)) + #set($tabName = $element.getShortTitle($preferedLocale)) + #if($_orientation == $LEFT_TO_RIGHT) + #if($element.isSelected($site)) +
  • ${tabName}
  • + #else + #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url)) +
  • ${tabName}
  • + #end + #end + #end + #end +
  • +
+#end + +#macro (includeMenuNavigation $_menu $_orientation) + #set($sepa="") +
    + #foreach($element in $_menu.elements.iterator()) + #if($element.elementType == "option") + #set($tabTitle = $element.getTitle($preferedLocale)) + #set($tabName = $element.getShortTitle($preferedLocale)) + #if($_orientation == $TOP_TO_BOTTOM) + #if($element.isSelected($site)) +
  • ? ${tabName}
  • + #else + #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url)) +
  • + #end + #end + #if($_orientation == $LEFT_TO_RIGHT) + ${sepa} + #if($element.isSelected($site)) +
  • ${tabName}
  • + #else + #set($tabUrl = $jetspeed.getAbsoluteUrl($element.url)) +
  • ${tabName}
  • + #end + #end + #end + #set($sepa="
  • |
  • ") + #end +
+#end + +#* include links navigation component *# +#macro (includeLinksNavigation $_menu $_orientation $_title $_style $_delimiter) + #if(!$_delimiter || $_delimiter == "") + #if($_style != $BREADCRUMBS_STYLE) + #set($_delimiter = " ") + #else + #set($_delimiter = " >> ") + #end + #end + #set($menuTitle = $_menu.getTitle($preferedLocale)) + #set($menuName = $_menu.getShortTitle($preferedLocale)) + +
+ #if($_title == $TITLE_FIRST) + #if($_orientation == $LEFT_TO_RIGHT) + + ${menuName}  + #elseif($_orientation == $TOP_TO_BOTTOM) + +
${menuName}
+ #end + #end + #foreach($element in $_menu.elements.iterator()) + #if($element.elementType == "option") + #set($linkTitle = $element.getTitle($preferedLocale)) + #set($linkName = $element.getShortTitle($preferedLocale)) + #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url)) + #if($_style != $BREADCRUMBS_STYLE || $element.type != "page" || $velocityCount < $_menu.elements.size()) + #if($_orientation == $LEFT_TO_RIGHT) + + + #elseif($_orientation == $TOP_TO_BOTTOM) + +
+ #end + #if($element.type == "page") + + ${linkName} + #elseif($element.type == "link") + + ${linkName} + #elseif($element.type == "folder") + + ${linkName} + #else + + ${linkName} + #end + #if($_orientation == $LEFT_TO_RIGHT) + ${_delimiter} + #elseif($_orientation == $TOP_TO_BOTTOM) + +
+ #end + #else + #if($_orientation == $LEFT_TO_RIGHT) + + ${linkName}  + #elseif($_orientation == $TOP_TO_BOTTOM) + +
${linkName}
+ #end + #end + #elseif($element.elementType == "separator") + #set($separatorTitle = $element.getTitle($preferedLocale)) + #set($separatorText = $element.getText($preferedLocale)) + #if($_orientation == $LEFT_TO_RIGHT) + + ${separatorText}${_delimiter} + #elseif($_orientation == $TOP_TO_BOTTOM) + +
${separatorText}
+ #end + #end + #end + #if($_title == $TITLE_LAST) + #if($_orientation == $LEFT_TO_RIGHT) + + ${menuName}  + #elseif($_orientation == $TOP_TO_BOTTOM) + +
${menuName}
+ #end + #end + +
+#end + +#* include nested menu links navigation component *# +#macro (includeNestedLinksWithIconNavigation $_menu $_orientation) + #set($menuTitle = $_menu.getTitle($preferedLocale)) + #set($menuName = $_menu.getShortTitle($preferedLocale)) + #if($menuName) +
${menuName}
+ #end +
+ #foreach($element in $_menu.elements.iterator()) + #if($element.elementType == "option") + #set($linkTitle = $element.getTitle($preferedLocale)) + #set($linkName = $element.getShortTitle($preferedLocale)) + #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url)) + #if($element.type == "page") + + #elseif($element.type == "link") + #set($linkTarget = $element.target) + + #elseif($element.type == "folder") + + #end + #elseif($element.elementType == "menu") + #includeNestedLinksWithIconNavigation($element $_orientation) + #elseif($element.elementType == "separator") + #set($separatorTitle = $element.getTitle($preferedLocale)) + #set($separatorText = $element.getText($preferedLocale)) +
${separatorText}
+ #end + #end +
+#end + +#* include top level menu links navigation component *# +#macro (includeLinksWithIconNavigation $_menu $_orientation) + #set($itemIndex = 1) + #set($rowStarted = false) + #set($elementsStarted = false) + +
    + #foreach($element in $_menu.elements.iterator()) + #if($element.elementType == "option") + #if(!$rowStarted) + +#* + + +
    +
    +
    +*# + #elseif(!$elementsStarted) +
      +#* +
      +
      +*# + #end + #set($linkTitle = $element.getTitle($preferedLocale)) + #set($linkName = $element.getShortTitle($preferedLocale)) + #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url)) + #if($element.type == "page") +
    1. ? ${linkName}
    2. + #elseif($element.type == "link") + #set($linkTarget = $element.target) +
    3. ? ${linkName}
    4. + #elseif($element.type == "folder") +
    5. ? $linkName
    6. + #end + #set($rowStarted = true) + #set($elementsStarted = true) + #elseif($element.elementType == "menu") + #if(!$rowStarted) + +#* + + +
      +
      +
      +*# + #elseif(!$elementsStarted) + +#* +
      +
      +*# + #end + #includeNestedLinksWithIconNavigation($element $_orientation) + #set($rowStarted = true) + #set($elementsStarted = true) + #elseif($element.elementType == "separator") + #if(!$rowStarted) + +#* + + +
      +*# + #elseif($elementsStarted) +
    + + #set($itemIndex = $itemIndex + 1) +#* +
    +
    +*# + #end + #set($separatorTitle = $element.getTitle($preferedLocale)) + #set($separatorText = $element.getText($preferedLocale)) + +#* +
    +
+*# + #end + #if($rowStarted) + +#* +
+ + +*# + #end + +#end Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator.properties =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator.properties 2007-10-02 07:48:42 UTC (rev 601) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator.properties 2007-10-02 21:42:34 UTC (rev 602) @@ -0,0 +1,28 @@ +# Copyright 2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +id=pompei +template.type=velocity +template.extension=.vm +template.macros=-macros +decorates=layout +base.css.class=layout-pompei + +##following are defaults +#allow.change.page.theme=true +#allow.change.layout=true +#max.layout.nesting=2 +#allow.add.page=true +#allow.add.portlet=true +#allow.change.portlet.decorator=true Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/decorator.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/footer.vm =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/footer.vm 2007-10-02 07:48:42 UTC (rev 601) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/footer.vm 2007-10-02 21:42:34 UTC (rev 602) @@ -0,0 +1,29 @@ +#* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*# + +
+ +
+
+ + + + Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm 2007-10-02 07:48:42 UTC (rev 601) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm 2007-10-02 21:42:34 UTC (rev 602) @@ -0,0 +1,112 @@ +#* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*# + +#* +This original design comes from Open Web Design. + http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php + Modified by Shinsuke Sugaya +*# + +#* Add the current layouts configuration values to the context *# +#defineLayoutObjects() + +#* Loads our custom macros *# +#parse($layoutDecoration.getResource("decorator-macros.vm")) + +#* Add all template constants to the current context *# +#defineNavigationConstants() + +#* Username *# +#set($username = $JS2RequestContext.request.remoteUser) + +#* Login Error Code *# +#set($errorcode = $JS2RequestContext.getSessionAttribute("org.apache.jetspeed.login.errorcode")) + + + + ## include header resources immdiately after head and before base is reset to the portal + ## web application context path root; this implies that header resources can not reliably + ## employ relative urls to locate content + #includeHeaderResource() + + + + + + #includeJavaScriptForHead() + #IncludeStylesheets() + + #PageTitle() + + + + + + + +
+ +
+
+ +
+ + + + + +
+
+ + + + #PageActionBar() + Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/coreback.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/coreback.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/footer_bg.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/footer_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/footer_bg.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/footer_bg.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header.jpg =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header_bg.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header_bg.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/header_bg.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/logo.png =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/logo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/logo.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/logo.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/readmore_arrow.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/readmore_arrow.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/readmore_over.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/readmore_over.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/tab_bg.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/tab_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/tab_bg.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/images/tab_bg.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify @ sourceforge.jp Wed Oct 3 06:43:15 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 03 Oct 2007 06:43:15 +0900 Subject: [pal-cvs 2858] [603] updated psml files Message-ID: <1191361395.978394.6483.nullmailer@users.sourceforge.jp> Revision: 603 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=603 Author: shinsuke Date: 2007-10-03 06:43:15 +0900 (Wed, 03 Oct 2007) Log Message: ----------- updated psml files Modified Paths: -------------- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/cart.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/folder.metadata pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/order.psml pompei/portal/trunk/src/psml/default/_role/site/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/register.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/docomo-html/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/docomo-html/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/docomo-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/docomo-wap2/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/cart.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/order.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/kddi-hdml/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/kddi-hdml/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/kddi-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/kddi-wap2/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/softbank-html/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/softbank-html/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/softbank-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/softbank-wap2/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/folder.metadata pompei/portal/trunk/src/psml/default/default-page.psml pompei/portal/trunk/src/psml/default/my-account.psml Added Paths: ----------- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/company.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/help.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/howtoorder.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/folder.metadata pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/company.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/help.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/howtoorder.psml -------------- next part -------------- Modified: pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/cart.psml =================================================================== --- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/cart.psml 2007-10-02 21:42:34 UTC (rev 602) +++ pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/cart.psml 2007-10-02 21:43:15 UTC (rev 603) @@ -1,8 +1,8 @@ -
+
+
+
+ -
-
- ユーザー登録へ進む -
-
-
-
-
+
+
+
+ -
-
- ユーザー登録へ進む -
-
- - +
+
+ ユーザー登録へ進む + +
+
+ + + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,25 +1,62 @@ - - - - - - 注文受付画面 - - -
-

- -

-
- -
-
- -
- -
-
- - + + + + + + 注文受付画面 + + +
+
+ + + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
+
+
+
+ +
+
+
5. ご注文が完了しました
+ + + + + + +
  + + +
+ + 12345 + +
+
+
+ +
+
+
+
+
+
+ + 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-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,216 +1,245 @@ - - - - - - 注文確認画面 - - -
-
- - - - - - - - - - - - -
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
-
-
-
- -
- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -
- XXX 01MAX - - MX-XXX - - アディダス - - 1 - - 30,000 -
小計30,000
送料1000
消費税50
合計31,050
-
- - - - - - - - - - - + + + + + + 注文確認画面 + + +
+
+
- - - VALUE -
- - - VALUE -
+ + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
+
+ + +
+ +
+
+
4. ご注文内容をご確認ください
+ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -   + + - 男性 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ XXX 01MAX + + MX-XXX + + アディダス + + 1 + + 30,000 +
小計 + 30,000 + +
送料 + 1000 + +
消費税 + 50 + +
合計 + 31,050 + +
- - - VALUE -
- - - VALUE -
- - - VALUE -
それ以降の住所 - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
-
- - - 代金引換え -
- - - 一括配送 -
-
-
-
- - -
- - + + + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + VALUE VALUE +
+ + + 男性 +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
それ以降の住所: + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+
+ + + + + + +
  + + + 代金引換え +
+ + + + + + +
  + + + 一括配送 +
+
+
+
+ + +
+ +
+ +
+ + 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-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-05 08:57:34 UTC (rev 605) @@ -1,12 +1,12 @@ - + 注文画面: 支払方法選択 - -
-
- - - - - - - - - - - - -
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
-
-
-
- -
- -
-
-

- -

- - + +
+
+
- + + + + + + + + + - - - -
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
説明
-

- -

- - - - - -
- - - - - - - - - - - - - - - - - -
- - - -
- - - -- -- -
- - / -
- - - -
-
-

- -

- - - - - - - - - -
説明
- -
+
+
+
+
+ +
+ +
+
+
3-1. お支払い方法を選択してください
+ + + + + + +
  + + +
+ +
+ + + + + + + + + + + + +

+ +
+ 説明 +
+
+
+
3-2. クレジットカード情報を入力してください (カード払いの場合のみ)
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + - + - + - + +
+ + + + + + / + + + +
+ + + +
+
+
+
3-3. 配送方法を選択してください
+ + + + + + +
  + + +
+ +
+ + + + + + + + + + + + +

+ +
+ 説明 +
+
+
+
+
+ +
+
+
+ + 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-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-10-05 08:57:34 UTC (rev 605) @@ -6,144 +6,197 @@ 注文画面: ユーザー情報確認 -
-
- - - - - - - - - - - - -
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
-
-
-
- -
- -
-
-

- -

-

- -

-
- - 会員住所
- 届け先1
- 届け先2
-
-
-
- - -
-
- -
-

- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
- - - -
- - - -
- - - -
- - - - -
- - - -
それ以降の住所 - -
- - - -
- - - -
- - - -
- - - -
- - + + + + + + + + +
- - - - 1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
- -
-
+
+
+
+
+ +
+ +
+
+
+
2-1. お届け先を選択してください
+ + + + + + +
  + + + 会員住所
+ 届け先1
+ 届け先2
+
+
+
+
+ + +
+
+
+ +
+
+
+
+
+ +
2-2. お届け先を追加する (追加する場合のみ)
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + - + + +
+ + [必須] + + + +
+ + [必須] + + +
+ + [必須] + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+
+ +
+
+
+ + 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-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-05 08:57:34 UTC (rev 605) @@ -6,345 +6,422 @@ 注文画面: ユーザー情報確認 -
-
- - - - - - - - - - - - -
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
-
-
-
- -
- -
-
-
- - - -
-
-
-
ユーザー情報登録
- - - - - - - - - - - - - - - - - - - - - - +
+
+
- [必須] - - -
- [必須] - - -
- [必須] - - -
- [必須] - - -
- [必須] - - - - - -
+ + + + + + + + + + + +
1. 会員情報の確認>2. お届け先の選択>3. 支払方法とお届け方法の選択>4. ご注文内容の確認>5. ご注文完了
+
+
+ + +
+
+ +
+
+
+ + + +
+
+
+
1-1. 会員情報を入力してください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + + + + +
- [必須] - - -
- [必須] - - -
- [必須] - - - / - - / - - -
- - - -
- - - -
- - - -
- [必須] - - - - - - -
- [必須] - - -
- [必須] - - -
- [必須] - - -
- - - -
- - - -
+ + [必須] + + +
+ + [必須] + + +
+ + [必須] + + + + / + + + / + + + +
+
+
+
+
1-2. お届け先を入力してください
+ + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
+ + [必須] + + - + + +
+ + [必須] + + + +
+ + [必須] + + +
+ + [必須] + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+ + + - - -
-
-
ユーザー情報の確認
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ + + +
+
1-1. 会員情報をご確認ください
+
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - 性別 -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
- - - VALUE -
+ + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + 性別 +
+ + + VALUE +
+ + + VALUE +
+
+
+
+
1-2. お届け先をご確認ください
+ + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+ + + VALUE +
+
+ + + - - - -
-
- +
+
+ +
+ + +
+
+
+
+ + + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html 2007-10-05 08:53:42 UTC (rev 604) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html 2007-10-05 08:57:34 UTC (rev 605) @@ -17,10 +17,15 @@ -->
From svnnotify @ sourceforge.jp Fri Oct 5 18:10:12 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 05 Oct 2007 18:10:12 +0900 Subject: [pal-cvs 2862] [606] added payment type for card info. Message-ID: <1191575412.044783.16020.nullmailer@users.sourceforge.jp> Revision: 606 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=606 Author: shinsuke Date: 2007-10-05 18:10:11 +0900 (Fri, 05 Oct 2007) Log Message: ----------- added payment type for card info. Modified Paths: -------------- 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/bsbhv/BsOrderCardInfoBhv.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/bsentity/BsOrderCardInfo.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/cbean/cq/bs/AbstractBsOrderCardInfoCQ.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/ciq/OrderCardInfoCIQ.java pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml =================================================================== --- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-05 09:10:11 UTC (rev 606) @@ -387,6 +387,8 @@ required="true" size="255" type="VARCHAR"/> + + + + + + + + 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderCardInfoBhv.java 2007-10-05 09:10:11 UTC (rev 606) @@ -28,7 +28,7 @@ * ORDER_CARD_INFO_ID * * [column-property] - * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES + * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE * * [foreign-property] * @@ -643,6 +643,7 @@ if (names.contains("cardOwner")) { destinationMyEntity.setCardOwner(sourceMyEntity.getCardOwner()); } if (names.contains("cardNumber")) { destinationMyEntity.setCardNumber(sourceMyEntity.getCardNumber()); } if (names.contains("cardExpires")) { destinationMyEntity.setCardExpires(sourceMyEntity.getCardExpires()); } + if (names.contains("cardPaymentType")) { destinationMyEntity.setCardPaymentType(sourceMyEntity.getCardPaymentType()); } } 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderCardInfoDao.java 2007-10-05 09:10:11 UTC (rev 606) @@ -11,7 +11,7 @@ * ORDER_CARD_INFO_ID * * [column-property] - * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES + * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE * * [foreign-property] * @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_CARD_INFO_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, CARD_PAYMENT_TYPE from ORDER_CARD_INFO"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - 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"; + public static final String getEntity_SQL = "select ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE 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/bsentity/BsOrderCardInfo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java 2007-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java 2007-10-05 09:10:11 UTC (rev 606) @@ -14,7 +14,7 @@ * ORDER_CARD_INFO_ID * * [column-property] - * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES + * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE * * [foreign-property] * @@ -72,6 +72,9 @@ /** The value of cardExpires. VARCHAR(255) : NotNull */ protected String _cardExpires; + /** The value of cardPaymentType. VARCHAR(64) */ + protected String _cardPaymentType; + // =================================================================================== // Constructor // =========== @@ -257,20 +260,44 @@ this._cardExpires = cardExpires; } + /** Column Annotation for S2Dao. VARCHAR(64) */ + public static final String cardPaymentType_COLUMN = "CARD_PAYMENT_TYPE"; + /** + * Get the value of cardPaymentType.
+ * {VARCHAR(64)} + * + * @return The value of cardPaymentType. (Nullable) + */ + public String getCardPaymentType() { + return _cardPaymentType; + } + + /** + * Set the value of cardPaymentType.
+ * {VARCHAR(64)} + * + * @param cardPaymentType The value of cardPaymentType. (Nullable) + */ + public void setCardPaymentType(String cardPaymentType) { + _modifiedProperties.addPropertyName("cardPaymentType"); + this._cardPaymentType = cardPaymentType; + } + + // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -382,6 +409,7 @@ sb.append(delimiter).append(getCardOwner()); sb.append(delimiter).append(getCardNumber()); sb.append(delimiter).append(getCardExpires()); + sb.append(delimiter).append(getCardPaymentType()); sb.delete(0, delimiter.length()); sb.insert(0, "{").append("}"); 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java 2007-10-05 09:10:11 UTC (rev 606) @@ -16,7 +16,7 @@ * ORDER_CARD_INFO_ID * * [column-property] - * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES + * ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE * * [foreign-property] * @@ -103,6 +103,8 @@ public static final String DB_NAME_CARD_NUMBER = "CARD_NUMBER"; /** Db-name of CARD_EXPIRES. VARCHAR(255) : NotNull */ public static final String DB_NAME_CARD_EXPIRES = "CARD_EXPIRES"; + /** Db-name of CARD_PAYMENT_TYPE. VARCHAR(64) */ + public static final String DB_NAME_CARD_PAYMENT_TYPE = "CARD_PAYMENT_TYPE"; /** @deprecated Deprecated! So use DB_NAME_OrderCardInfoId. */ public static final String COLUMN_DB_NAME_OF_OrderCardInfoId = "ORDER_CARD_INFO_ID"; @@ -114,6 +116,8 @@ public static final String COLUMN_DB_NAME_OF_CardNumber = "CARD_NUMBER"; /** @deprecated Deprecated! So use DB_NAME_CardExpires. */ public static final String COLUMN_DB_NAME_OF_CardExpires = "CARD_EXPIRES"; + /** @deprecated Deprecated! So use DB_NAME_CardPaymentType. */ + public static final String COLUMN_DB_NAME_OF_CardPaymentType = "CARD_PAYMENT_TYPE"; // ----------------------------------------------------- // Column Prop-Name(JavaBeansRule) @@ -128,6 +132,8 @@ public static final String PROPERTY_NAME_cardNumber = "cardNumber"; /** Prop-name(JavaBeansRule) of cardExpires. VARCHAR(255) : NotNull */ public static final String PROPERTY_NAME_cardExpires = "cardExpires"; + /** Prop-name(JavaBeansRule) of cardPaymentType. VARCHAR(64) */ + public static final String PROPERTY_NAME_cardPaymentType = "cardPaymentType"; // ----------------------------------------------------- // Column Cap-Prop-Name @@ -142,6 +148,8 @@ public static final String CAP_PROP_NAME_CardNumber = "CardNumber"; /** Cap-prop-name of cardExpires. VARCHAR(255) : NotNull */ public static final String CAP_PROP_NAME_CardExpires = "CardExpires"; + /** Cap-prop-name of cardPaymentType. VARCHAR(64) */ + public static final String CAP_PROP_NAME_CardPaymentType = "CardPaymentType"; /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderCardInfoId. */ public static final String COLUMN_CAP_PROP_NAME_OF_OrderCardInfoId = "OrderCardInfoId"; @@ -153,6 +161,8 @@ public static final String COLUMN_CAP_PROP_NAME_OF_CardNumber = "CardNumber"; /** @deprecated Deprecated! So use CAP_PROP_NAME_CardExpires. */ public static final String COLUMN_CAP_PROP_NAME_OF_CardExpires = "CardExpires"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_CardPaymentType. */ + public static final String COLUMN_CAP_PROP_NAME_OF_CardPaymentType = "CardPaymentType"; // ----------------------------------------------------- // Column Uncap-Prop-Name @@ -167,6 +177,8 @@ public static final String UNCAP_PROP_NAME_cardNumber = "cardNumber"; /** Uncap-prop-name of cardExpires. VARCHAR(255) : NotNull */ public static final String UNCAP_PROP_NAME_cardExpires = "cardExpires"; + /** Uncap-prop-name of cardPaymentType. VARCHAR(64) */ + public static final String UNCAP_PROP_NAME_cardPaymentType = "cardPaymentType"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderCardInfoId. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderCardInfoId = "orderCardInfoId"; @@ -178,6 +190,8 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_CardNumber = "cardNumber"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardExpires. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_CardExpires = "cardExpires"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CardPaymentType. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_CardPaymentType = "cardPaymentType"; // ----------------------------------------------------- // Foreign Name @@ -203,6 +217,7 @@ map.put(DB_NAME_CARD_OWNER.toLowerCase(), PROPERTY_NAME_cardOwner); map.put(DB_NAME_CARD_NUMBER.toLowerCase(), PROPERTY_NAME_cardNumber); map.put(DB_NAME_CARD_EXPIRES.toLowerCase(), PROPERTY_NAME_cardExpires); + map.put(DB_NAME_CARD_PAYMENT_TYPE.toLowerCase(), PROPERTY_NAME_cardPaymentType); _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map); return _dbNamePropertyNameKeyToLowerMap; @@ -222,6 +237,7 @@ map.put(PROPERTY_NAME_cardOwner.toLowerCase(), DB_NAME_CARD_OWNER); map.put(PROPERTY_NAME_cardNumber.toLowerCase(), DB_NAME_CARD_NUMBER); map.put(PROPERTY_NAME_cardExpires.toLowerCase(), DB_NAME_CARD_EXPIRES); + map.put(PROPERTY_NAME_cardPaymentType.toLowerCase(), DB_NAME_CARD_PAYMENT_TYPE); _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map); return _propertyNameDbNameKeyToLowerMap; @@ -243,6 +259,7 @@ map.put(DB_NAME_CARD_OWNER, CAP_PROP_NAME_CardOwner); map.put(DB_NAME_CARD_NUMBER, CAP_PROP_NAME_CardNumber); map.put(DB_NAME_CARD_EXPIRES, CAP_PROP_NAME_CardExpires); + map.put(DB_NAME_CARD_PAYMENT_TYPE, CAP_PROP_NAME_CardPaymentType); _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map); return _dbNameCapPropNameMap; @@ -264,6 +281,7 @@ map.put(DB_NAME_CARD_OWNER, UNCAP_PROP_NAME_cardOwner); map.put(DB_NAME_CARD_NUMBER, UNCAP_PROP_NAME_cardNumber); map.put(DB_NAME_CARD_EXPIRES, UNCAP_PROP_NAME_cardExpires); + map.put(DB_NAME_CARD_PAYMENT_TYPE, UNCAP_PROP_NAME_cardPaymentType); _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map); return _dbNameUncapPropNameMap; @@ -285,6 +303,7 @@ map.put(CAP_PROP_NAME_CardOwner, DB_NAME_CARD_OWNER); map.put(CAP_PROP_NAME_CardNumber, DB_NAME_CARD_NUMBER); map.put(CAP_PROP_NAME_CardExpires, DB_NAME_CARD_EXPIRES); + map.put(CAP_PROP_NAME_CardPaymentType, DB_NAME_CARD_PAYMENT_TYPE); _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map); return _capPropNameDbNameMap; @@ -306,6 +325,7 @@ map.put(CAP_PROP_NAME_CardOwner, UNCAP_PROP_NAME_cardOwner); map.put(CAP_PROP_NAME_CardNumber, UNCAP_PROP_NAME_cardNumber); map.put(CAP_PROP_NAME_CardExpires, UNCAP_PROP_NAME_cardExpires); + map.put(CAP_PROP_NAME_CardPaymentType, UNCAP_PROP_NAME_cardPaymentType); _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map); return _capPropNameUncapPropNameMap; @@ -327,6 +347,7 @@ map.put(UNCAP_PROP_NAME_cardOwner, DB_NAME_CARD_OWNER); map.put(UNCAP_PROP_NAME_cardNumber, DB_NAME_CARD_NUMBER); map.put(UNCAP_PROP_NAME_cardExpires, DB_NAME_CARD_EXPIRES); + map.put(UNCAP_PROP_NAME_cardPaymentType, DB_NAME_CARD_PAYMENT_TYPE); _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map); return _uncapPropNameDbNameMap; @@ -348,6 +369,7 @@ map.put(UNCAP_PROP_NAME_cardOwner, CAP_PROP_NAME_CardOwner); map.put(UNCAP_PROP_NAME_cardNumber, CAP_PROP_NAME_CardNumber); map.put(UNCAP_PROP_NAME_cardExpires, CAP_PROP_NAME_CardExpires); + map.put(UNCAP_PROP_NAME_cardPaymentType, CAP_PROP_NAME_CardPaymentType); _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map); return _uncapPropNameCapPropNameMap; @@ -561,6 +583,7 @@ columnInfoList.add(columnCardOwner()); columnInfoList.add(columnCardNumber()); columnInfoList.add(columnCardExpires()); + columnInfoList.add(columnCardPaymentType()); return columnInfoList; } @@ -616,7 +639,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES"; + return "ORDER_CARD_INFO_ID, CARD_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE"; } /** @@ -649,6 +672,12 @@ public ColumnInfo columnCardExpires() { return new ColumnInfo(this, "CARD_EXPIRES", "cardExpires", String.class, false); } + /** + * @return Column information of cardPaymentType. (NotNull) + */ + public ColumnInfo columnCardPaymentType() { + return new ColumnInfo(this, "CARD_PAYMENT_TYPE", "cardPaymentType", String.class, false); + } // =================================================================================== // Unique Info @@ -752,6 +781,7 @@ public RelationTrace columnCardOwner() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardOwner()); } public RelationTrace columnCardNumber() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardNumber()); } public RelationTrace columnCardExpires() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardExpires()); } + public RelationTrace columnCardPaymentType() { return fixTrace(_relationList, OrderCardInfoDbm.getInstance().columnCardPaymentType()); } } // =================================================================================== @@ -827,6 +857,7 @@ 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)); }; if (analyzer.init("CARD_EXPIRES", "cardExpires", "cardExpires")) { myEntity.setCardExpires(analyzer.analyzeString(String.class)); }; + if (analyzer.init("CARD_PAYMENT_TYPE", "cardPaymentType", "cardPaymentType")) { myEntity.setCardPaymentType(analyzer.analyzeString(String.class)); }; } @@ -904,6 +935,7 @@ helpAppendingColumnValueString(sb, delimiter, equal, "CARD_OWNER", myEntity.getCardOwner()); helpAppendingColumnValueString(sb, delimiter, equal, "CARD_NUMBER", myEntity.getCardNumber()); helpAppendingColumnValueString(sb, delimiter, equal, "CARD_EXPIRES", myEntity.getCardExpires()); + helpAppendingColumnValueString(sb, delimiter, equal, "CARD_PAYMENT_TYPE", myEntity.getCardPaymentType()); sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace); return sb.toString(); @@ -963,6 +995,7 @@ valueMap.put("CARD_OWNER", myEntity.getCardOwner()); valueMap.put("CARD_NUMBER", myEntity.getCardNumber()); valueMap.put("CARD_EXPIRES", myEntity.getCardExpires()); + valueMap.put("CARD_PAYMENT_TYPE", myEntity.getCardPaymentType()); return valueMap; } @@ -990,6 +1023,7 @@ valueMap.put("CARD_OWNER", helpGettingColumnStringValue(myEntity.getCardOwner())); valueMap.put("CARD_NUMBER", helpGettingColumnStringValue(myEntity.getCardNumber())); valueMap.put("CARD_EXPIRES", helpGettingColumnStringValue(myEntity.getCardExpires())); + valueMap.put("CARD_PAYMENT_TYPE", helpGettingColumnStringValue(myEntity.getCardPaymentType())); return valueMap; } @@ -1014,9 +1048,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_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, CARD_PAYMENT_TYPE) values(? , ? , ? , ? , ? , ? )"; } - return "insert into 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_CODE, CARD_OWNER, CARD_NUMBER, CARD_EXPIRES, CARD_PAYMENT_TYPE) values(? , ? , ? , ? , ? , ? )"; } // =================================================================================== 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderCardInfoCQ.java 2007-10-05 09:10:11 UTC (rev 606) @@ -730,6 +730,164 @@ } abstract protected ConditionValue getCValueCardExpires(); + + /** Column db name of cardPaymentType. */ + protected static final String COL_CARD_PAYMENT_TYPE = "CARD_PAYMENT_TYPE"; + + /** Column java name of cardPaymentType. */ + protected static final String J_CardPaymentType = "CardPaymentType"; + + /** Column uncapitalised java name of cardPaymentType. */ + protected static final String UJ_cardPaymentType = "cardPaymentType"; + + /** + * Set the value of cardPaymentType using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as equal. + */ + public void setCardPaymentType_Equal(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_EQUAL, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as notEqual. + */ + public void setCardPaymentType_NotEqual(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as greaterThan. + */ + public void setCardPaymentType_GreaterThan(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as lessThan. + */ + public void setCardPaymentType_LessThan(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as greaterEqual. + */ + public void setCardPaymentType_GreaterEqual(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as lessEqual. + */ + public void setCardPaymentType_LessEqual(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param cardPaymentType The value of cardPaymentType as prefixSearch. + */ + public void setCardPaymentType_PrefixSearch(String cardPaymentType) { + registerCardPaymentType(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(cardPaymentType)); + } + + /** + * Set the value of cardPaymentType using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param cardPaymentType The value of cardPaymentType as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setCardPaymentType_LikeSearch(String cardPaymentType, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(cardPaymentType), getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType, likeSearchOption); + } + + /** + * Set the value of cardPaymentType using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param cardPaymentTypeList The value of cardPaymentType as inScope. + */ + public void setCardPaymentType_InScope(java.util.List cardPaymentTypeList) { + registerCardPaymentType(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(cardPaymentTypeList)); + } + + /** + * Set the value of cardPaymentType using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param cardPaymentType The value of cardPaymentType as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setCardPaymentType_InScope(String cardPaymentType, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(cardPaymentType), getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType, inScopeOption); + } + + /** + * Set the value of cardPaymentType using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param cardPaymentTypeList The value of cardPaymentType as notInScope. + */ + public void setCardPaymentType_NotInScope(java.util.List cardPaymentTypeList) { + registerCardPaymentType(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(cardPaymentTypeList)); + } + + /** + * Set the value of cardPaymentType using isNull. { is null } + */ + public void setCardPaymentType_IsNull() { + registerCardPaymentType(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of cardPaymentType using isNotNull. { is not null } + */ + public void setCardPaymentType_IsNotNull() { + registerCardPaymentType(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of cardPaymentType. + * + * @param key Condition key. (NotNull) + * @param value The value of cardPaymentType. (Nullable) + */ + protected void registerCardPaymentType(ConditionKey key, Object value) { + registerQuery(key, value, getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType); + } + + /** + * Register inline condition of cardPaymentType. + * + * @param key Condition key. (NotNull) + * @param value The value of cardPaymentType. (Nullable) + */ + protected void registerInlineCardPaymentType(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueCardPaymentType(), COL_CARD_PAYMENT_TYPE, J_CardPaymentType, UJ_cardPaymentType); + } + + abstract protected ConditionValue getCValueCardPaymentType(); // =================================================================================== // Basic Override 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderCardInfoCQ.java 2007-10-05 09:10:11 UTC (rev 606) @@ -143,6 +143,24 @@ registerIncludedSelectColumn(aliasName, getRealColumnName("CARD_EXPIRES")); } + /** + * Include select-column of cardPaymentType as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_CardPaymentType() { + registerIncludedSelectColumn("CardPaymentType", getRealColumnName("CARD_PAYMENT_TYPE")); + } + + /** + * Include select-column of cardPaymentType as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_CardPaymentType(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("CARD_PAYMENT_TYPE")); + } + // =================================================================================== // Query // ===== @@ -360,6 +378,48 @@ getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_EXPIRES), null, false);return this; } + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CARD_PAYMENT_TYPE] + // - - - - - - - - -/ + + /** The attribute of cardPaymentType. */ + protected ConditionValue _cardPaymentType; + + /** + * Get the value of cardPaymentType. + * + * @return The value of cardPaymentType. + */ + public ConditionValue getCardPaymentType() { + if (_cardPaymentType == null) { + _cardPaymentType = new ConditionValue(); + } + return _cardPaymentType; + } + + protected ConditionValue getCValueCardPaymentType() { + return getCardPaymentType(); + } + + + /** + * Add order-by of cardPaymentType as ASC. + * + * @return this. (NotNull) + */ + public BsOrderCardInfoCQ addOrderBy_CardPaymentType_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_PAYMENT_TYPE), null, true);return this; + } + + /** + * Add order-by of cardPaymentType as DESC. + * + * @return this. (NotNull) + */ + public BsOrderCardInfoCQ addOrderBy_CardPaymentType_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_CARD_PAYMENT_TYPE), null, false);return this; + } + // =================================================================================== // Union Query // =========== 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderCardInfoCIQ.java 2007-10-05 09:10:11 UTC (rev 606) @@ -116,4 +116,12 @@ } + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CARD_PAYMENT_TYPE] + // - - - - - - - - -/ + protected ConditionValue getCValueCardPaymentType() { + return _myCQ.getCardPaymentType(); + } + + } 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-10-05 08:57:34 UTC (rev 605) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-05 09:10:11 UTC (rev 606) @@ -115,6 +115,7 @@ , CARD_OWNER VARCHAR(255) NOT NULL , CARD_NUMBER VARCHAR(255) NOT NULL , CARD_EXPIRES VARCHAR(255) NOT NULL + , CARD_PAYMENT_TYPE VARCHAR(64) , PRIMARY KEY (ORDER_CARD_INFO_ID) ); From svnnotify @ sourceforge.jp Fri Oct 5 21:25:53 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 05 Oct 2007 21:25:53 +0900 Subject: [pal-cvs 2863] [607] modified navigation links Message-ID: <1191587153.227221.30178.nullmailer@users.sourceforge.jp> Revision: 607 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=607 Author: shinsuke Date: 2007-10-05 21:25:52 +0900 (Fri, 05 Oct 2007) Log Message: ----------- modified navigation links Modified Paths: -------------- 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/ProductDetailsPage.java 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/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html -------------- next part -------------- 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-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-10-05 12:25:52 UTC (rev 607) @@ -17,7 +17,9 @@ 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.CustomerBasket; import jp.sf.pal.pompei.exentity.Zone; +import jp.sf.pal.pompei.service.CartService; import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.SessionUtil; @@ -41,6 +43,8 @@ private LanguageService languageService; + private CartService cartService; + private CustomerDxo customerDxo; public Class initialize() { @@ -125,6 +129,19 @@ postprocessingForRender(); } + // check cart + if (customer != null) { + List customerBasketList = getCartService() + .getCustomerBasketList(customer.getCustomerId()); + if (customerBasketList != null && !customerBasketList.isEmpty()) { + getUserInfoEditPage().setBasket(true); + } else { + getUserInfoEditPage().setBasket(false); + } + } else { + getUserInfoEditPage().setBasket(false); + } + // render FacesMessages FacesMessageUtil.renderMessages(); return null; @@ -329,4 +346,18 @@ this.languageService = languageService; } + /** + * @return cartService + */ + public CartService getCartService() { + return cartService; + } + + /** + * @param cartService 設定する cartService + */ + public void setCartService(CartService cartService) { + this.cartService = cartService; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-10-05 12:25:52 UTC (rev 607) @@ -7,6 +7,7 @@ import java.util.Map; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.util.UrlBuilderUtil; import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; import org.seasar.teeda.extension.annotation.validator.Required; @@ -99,6 +100,8 @@ private boolean login; + private boolean basket; + private String mode; /** @@ -509,4 +512,22 @@ public void setMode(String mode) { this.mode = mode; } + + /** + * @return basket + */ + public boolean isBasket() { + return basket; + } + + /** + * @param basket 設定する basket + */ + public void setBasket(boolean basket) { + this.basket = basket; + } + + public String getProductListLinkHref() { + return UrlBuilderUtil.createProductListUrl(); + } } 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-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-10-05 12:25:52 UTC (rev 607) @@ -4,6 +4,7 @@ import java.math.BigDecimal; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.util.UrlBuilderUtil; import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; @@ -232,4 +233,8 @@ public void setDetailsImageUrl(String detailsImageUrl) { this.detailsImageUrl = detailsImageUrl; } + + public String getOrderLinkHref() { + return UrlBuilderUtil.createOrderUrl(); + } } 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-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-05 12:25:52 UTC (rev 607) @@ -13,7 +13,7 @@
-
+
@@ -81,28 +81,28 @@ 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-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-05 12:25:52 UTC (rev 607) @@ -240,7 +240,6 @@
@@ -415,7 +414,14 @@
- +
+ +
+
+
+
カートに商品が入っていません。
+ お買物を続ける
+
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-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-05 12:25:52 UTC (rev 607) @@ -48,6 +48,8 @@
+
+ 会員情報登録へ進む
From svnnotify @ sourceforge.jp Fri Oct 5 22:12:48 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 05 Oct 2007 22:12:48 +0900 Subject: [pal-cvs 2864] [608] updated image Message-ID: <1191589968.943434.24509.nullmailer@users.sourceforge.jp> Revision: 608 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=608 Author: shinsuke Date: 2007-10-05 22:12:48 +0900 (Fri, 05 Oct 2007) Log Message: ----------- updated image Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/images/product/noimage.png -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/images/product/noimage.png =================================================================== (Binary files differ) From svnnotify @ sourceforge.jp Fri Oct 5 22:14:10 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 05 Oct 2007 22:14:10 +0900 Subject: [pal-cvs 2865] [609] added properties files. Message-ID: <1191590050.362607.25421.nullmailer@users.sourceforge.jp> Revision: 609 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=609 Author: shinsuke Date: 2007-10-05 22:14:09 +0900 (Fri, 05 Oct 2007) Log Message: ----------- added properties files. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList_ja.properties -------------- next part -------------- Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u4f1a\u54e1\u7ba1\u7406 +javax.portlet.short-title=\u4f1a\u54e1 +javax.portlet.keywords=\u4f1a\u54e1,\u7ba1\u7406 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/customer/CustomerManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u914d\u9054\u65b9\u6cd5\u7ba1\u7406 +javax.portlet.short-title=\u914d\u9054\u65b9\u6cd5 +javax.portlet.keywords=\u914d\u9054\u65b9\u6cd5,\u7ba1\u7406 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/DeliveryManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u6ce8\u6587\u7ba1\u7406 +javax.portlet.short-title=\u6ce8\u6587 +javax.portlet.keywords=\u6ce8\u6587,\u7ba1\u7406 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/OrderManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30ab\u30c6\u30b4\u30ea\u7ba1\u7406 +javax.portlet.short-title=\u30ab\u30c6\u30b4\u30ea +javax.portlet.keywords=\u30ab\u30c6\u30b4\u30ea,\u7ba1\u7406 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/CategoryManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30e1\u30fc\u30ab\u30fc\u7ba1\u7406 +javax.portlet.short-title=\u30e1\u30fc\u30ab\u30fc +javax.portlet.keywords=\u30e1\u30fc\u30ab\u30fc,\u7ba1\u7406 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ManufacturerManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u5546\u54c1\u7ba1\u7406 +javax.portlet.short-title=\u5546\u54c1 +javax.portlet.keywords=\u5546\u54c1,\u7ba1\u7406 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/product/ProductManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30b7\u30e7\u30c3\u30d4\u30f3\u30b0\u30ab\u30fc\u30c8\u306e\u78ba\u8a8d +javax.portlet.short-title=\u30b7\u30e7\u30c3\u30d4\u30f3\u30b0\u30ab\u30fc\u30c8 +javax.portlet.keywords=\u30b7\u30e7\u30c3\u30d4\u30f3\u30b0\u30ab\u30fc\u30c8,\u78ba\u8a8d Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/cart/CheckCart_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u6ce8\u6587\u624b\u7d9a\u304d +javax.portlet.short-title=\u6ce8\u6587 +javax.portlet.keywords=\u6ce8\u6587 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/OrderProcess_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30ab\u30c6\u30b4\u30ea\u4e00\u89a7 +javax.portlet.short-title=\u30ab\u30c6\u30b4\u30ea +javax.portlet.keywords=\u30ab\u30c6\u30b4\u30ea,\u4e00\u89a7 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/CategoryList_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList_ja.properties 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList_ja.properties 2007-10-05 13:14:09 UTC (rev 609) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u5546\u54c1\u4e00\u89a7 +javax.portlet.short-title=\u5546\u54c1 +javax.portlet.keywords=\u5546\u54c1,\u4e00\u89a7 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/ProductList_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-05 13:12:48 UTC (rev 608) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-05 13:14:09 UTC (rev 609) @@ -50,10 +50,10 @@ en ja - + jp.sf.pal.pompei.web.admin.product.CategoryManagement Category Management - Management + Categories Cateogry,Management @@ -92,10 +92,10 @@ en ja - + jp.sf.pal.pompei.web.admin.product.ManufacturerManagement Manufacturer Management - Management + Manufacturers Manufacturer,Management @@ -134,18 +134,18 @@ en ja - + jp.sf.pal.pompei.web.admin.product.ProductManagement Product Management - Management + Products Product,Management Manages a customer 顧客を管理します - MemberManagement - Pompei: Member Management + CustomerManagement + Pompei: Customer Management Pompei: 会員管理 org.apache.portals.bridges.portletfilter.FilterPortlet @@ -158,7 +158,7 @@ view-page - /view/admin/member/memberList.html + /view/admin/customer/customerList.html + jp.sf.pal.pompei.web.admin.customer.CustomerManagement - Member Management - Management - Member,Management + Customer Management + Customers + Customer,Management @@ -210,10 +210,10 @@ en ja - + jp.sf.pal.pompei.web.admin.order.OrderManagement Order Management - Management + Orders Order,Management @@ -248,10 +248,10 @@ en ja - + jp.sf.pal.pompei.web.admin.order.DeliveryManagement Delivery Method Management - Management + Delivereis Delivery,Management @@ -286,10 +286,10 @@ en ja - + jp.sf.pal.pompei.web.user.product.ProductList Product List - List + Products Product,List @@ -324,10 +324,10 @@ en ja - + jp.sf.pal.pompei.web.user.product.CategoryList Category List - List + Categories Category,List @@ -335,7 +335,7 @@ Checks products in a cart カート内の商品を確認します ProductListInCart - Pompei: Cart Check + Pompei: Check Cart Pompei: カート確認 org.apache.portals.bridges.portletfilter.FilterPortlet @@ -362,9 +362,9 @@ en ja - + jp.sf.pal.pompei.web.user.cart.CheckCart - Cart Check + Check Cart Cart Cart,Check @@ -400,9 +400,9 @@ en ja - + jp.sf.pal.pompei.web.user.checkout.OrderProcess - Order + Order Process Order Order From svnnotify @ sourceforge.jp Sun Oct 7 22:00:47 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 07 Oct 2007 22:00:47 +0900 Subject: [pal-cvs 2866] [610] renamed methods Message-ID: <1191762047.703593.27732.nullmailer@users.sourceforge.jp> Revision: 610 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=610 Author: shinsuke Date: 2007-10-07 22:00:46 +0900 (Sun, 07 Oct 2007) Log Message: ----------- renamed methods Modified Paths: -------------- 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/checkout/CheckoutConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java -------------- next part -------------- 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-10-05 13:14:09 UTC (rev 609) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java 2007-10-07 13:00:46 UTC (rev 610) @@ -98,7 +98,7 @@ if (isUpdate()) { // update ProductDescription description = productService - .getProdcutsDescription(productEditPage.getProductId(), + .getProdcutDescription(productEditPage.getProductId(), getLanguageService().getDefaultLanguage() .getLanguageId()); productDxo.convert(description, productEditPage); @@ -145,7 +145,7 @@ } } else if (isUpdate()) { - ProductDescription pd = getProductService().getProdcutsDescription( + ProductDescription pd = getProductService().getProdcutDescription( getProductEditPage().getProductId(), getLanguageService().getDefaultLanguage().getLanguageId()); getProductDxo().convertPageToDescription(getProductEditPage(), pd); 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-10-05 13:14:09 UTC (rev 609) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java 2007-10-07 13:00:46 UTC (rev 610) @@ -91,7 +91,7 @@ // TODO Dxo... it may be difficult.. for (CustomerBasket basket : baskets) { totalPrice = totalPrice.add(basket.getFinalPrice()); - ProductDescription pd = getProductService().getProdcutsDescription( + ProductDescription pd = getProductService().getProdcutDescription( basket.getProductId()); // ManufacturerDescription mi = getManufacturerService() // .getManufactureDescription( 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-10-05 13:14:09 UTC (rev 609) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2007-10-07 13:00:46 UTC (rev 610) @@ -120,7 +120,7 @@ for (CustomerBasket basket : baskets) { customersBasketIdList.add(basket.getCustomerBasketId()); subTotalPrice = subTotalPrice.add(basket.getFinalPrice()); - ProductDescription pd = getProductService().getProdcutsDescription( + ProductDescription pd = getProductService().getProdcutDescription( basket.getProductId()); ManufacturerDescription mi = getManufacturerService() .getManufactureDescription( 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-10-05 13:14:09 UTC (rev 609) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-10-07 13:00:46 UTC (rev 610) @@ -83,7 +83,7 @@ } ProductDescription description = productService - .getProdcutsDescription(getProductDetailsPage().getProductId()); + .getProdcutDescription(getProductDetailsPage().getProductId()); productDxo.convert(description, productDetailsPage); Manufacturer manufacturers = productService.getManufacturer(description From svnnotify @ sourceforge.jp Sun Oct 7 22:03:18 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 07 Oct 2007 22:03:18 +0900 Subject: [pal-cvs 2867] [611] added page navigation in product list. Message-ID: <1191762198.169304.29131.nullmailer@users.sourceforge.jp> Revision: 611 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=611 Author: shinsuke Date: 2007-10-07 22:03:17 +0900 (Sun, 07 Oct 2007) Log Message: ----------- added page navigation in product list. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/PagingResultBeanWrapper.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 13:03:17 UTC (rev 611) @@ -3,6 +3,12 @@ import java.math.BigDecimal; public class PompeiConstants { + public static int DEFULAT_PAGE_SIZE = 25; + + public static int DEFULAT_PAGE_RANGE_SIZE = 5; + + public static int DEFULAT_CURRENT_PAGE_NUMBER = 1; + public static final String JPEG = ".jpg"; public static final String PNG = ".png"; Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java 2007-10-07 13:03:17 UTC (rev 611) @@ -0,0 +1,21 @@ +package jp.sf.pal.pompei.dxo; + +import java.io.Serializable; + +import jp.sf.pal.pompei.pager.DefaultPager; +import jp.sf.pal.pompei.util.PagingResultBeanWrapper; +import jp.sf.pal.pompei.web.PagingResultPage; + +import org.seasar.extension.dxo.annotation.ConversionRule; + +public interface PagerDxo extends Serializable { + + @ConversionRule("allRecordCount : allRecordCount" + ",pageSize : pageSize" + + ",currentPageNumber : currentPageNumber" + + ",allPageCount : allPageCount" + ",existPrePage : existPrePage" + + ",existNextPage : existNextPage") + public void convert(PagingResultBeanWrapper result, PagingResultPage page); + + @ConversionRule("pageSize : pageSize" + ",currentPageNumber : pageNumber") + public void convert(PagingResultPage page, DefaultPager pager); +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java 2007-10-07 13:03:17 UTC (rev 611) @@ -0,0 +1,45 @@ +package jp.sf.pal.pompei.pager; + +import java.io.Serializable; + +import jp.sf.pal.pompei.PompeiConstants; + +public abstract class DefaultPager implements Serializable { + private int pageSize; + + private int currentPageNumber; + + /** + * @return pageSize + */ + public int getPageSize() { + if (pageSize <= 0) { + pageSize = PompeiConstants.DEFULAT_PAGE_SIZE; + } + return pageSize; + } + + /** + * @param pageSize 設定する pageSize + */ + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + /** + * @return currentPageNumber + */ + public int getCurrentPageNumber() { + if (currentPageNumber <= 0) { + currentPageNumber = PompeiConstants.DEFULAT_CURRENT_PAGE_NUMBER; + } + return currentPageNumber; + } + + /** + * @param currentPageNumber 設定する currentPageNumber + */ + public void setCurrentPageNumber(int currentPageNumber) { + this.currentPageNumber = currentPageNumber; + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 13:03:17 UTC (rev 611) @@ -0,0 +1,26 @@ +package jp.sf.pal.pompei.pager; + +import java.math.BigDecimal; + +public class ProductPager extends DefaultPager { + /** + * + */ + private static final long serialVersionUID = 5634903690975646435L; + + private BigDecimal categoryId; + + /** + * @return categoryId + */ + public BigDecimal getCategoryId() { + return categoryId; + } + + /** + * @param categoryId 設定する categoryId + */ + public void setCategoryId(BigDecimal categoryId) { + this.categoryId = categoryId; + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java 2007-10-07 13:03:17 UTC (rev 611) @@ -5,10 +5,12 @@ import java.util.List; import jp.sf.pal.common.CommonException; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.exentity.Manufacturer; import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.exentity.ProductDescription; import jp.sf.pal.pompei.exentity.ProductImage; +import jp.sf.pal.pompei.pager.ProductPager; public interface ProductService extends Serializable { @@ -19,14 +21,15 @@ public Product getProdcut(BigDecimal id); - public ProductDescription getProdcutsDescription(BigDecimal id); + public ProductDescription getProdcutDescription(BigDecimal id); - public ProductDescription getProdcutsDescription(BigDecimal id, + public ProductDescription getProdcutDescription(BigDecimal id, BigDecimal languagesId); - public List getProductList(); + public List getProductList(BigDecimal categoryId); - public List getProductList(BigDecimal categoriesId); + public PagingResultBean getProductListByPager( + ProductPager productPager); public void updateProductDescription(ProductDescription description) throws CommonException; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2007-10-07 13:03:17 UTC (rev 611) @@ -7,6 +7,7 @@ import java.util.List; import jp.sf.pal.common.CommonException; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.cbean.ManufacturerCB; import jp.sf.pal.pompei.cbean.ProductCB; import jp.sf.pal.pompei.cbean.ProductDescriptionCB; @@ -28,6 +29,7 @@ import jp.sf.pal.pompei.exentity.ProductDescription; import jp.sf.pal.pompei.exentity.ProductImage; import jp.sf.pal.pompei.exentity.ProductToCategory; +import jp.sf.pal.pompei.pager.ProductPager; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.UploadedFileUtil; @@ -164,12 +166,12 @@ //TODO remove image } - public ProductDescription getProdcutsDescription(BigDecimal id) { - return getProdcutsDescription(id, getLanguageService() + public ProductDescription getProdcutDescription(BigDecimal id) { + return getProdcutDescription(id, getLanguageService() .getCurrentLanguage().getLanguageId()); } - public ProductDescription getProdcutsDescription(BigDecimal id, + public ProductDescription getProdcutDescription(BigDecimal id, BigDecimal languagesId) { ProductDescriptionCB cb = new ProductDescriptionCB(); cb.setupSelect_Product(); @@ -179,12 +181,36 @@ return productDescriptionBhv.selectEntity(cb); } - public List getProductList() { - // TODO 自動生成されたメソッド・スタブ - return null; + public PagingResultBean getProductListByPager( + ProductPager productPager) { + ProductCB cb = new ProductCB(); + + // pager + cb.fetchFirst(productPager.getPageSize()); + cb.fetchPage(productPager.getCurrentPageNumber()); + + // setup + cb.setupSelect_Manufacturer(); + //TODO needed? + // cb.setupSelect_TaxClass(); + + // query + // categoryId + if (productPager.getCategoryId() != null) { + ProductToCategoryCB subCb = new ProductToCategoryCB(); + subCb.query().setCategoryId_Equal(productPager.getCategoryId()); + cb.query().setProductId_ExistsSubQuery_ProductToCategoryList( + subCb.query()); + } + + PagingResultBean productList = getProductBhv().selectPage(cb); + //TODO there may be better method.. + getProductBhv().loadProductDescriptionList(productList); + return productList; } public List getProductList(BigDecimal categoryId) { + //TODO rewrite ProductToCategoryCB cb = new ProductToCategoryCB(); cb.setupSelect_Product().withManufacturer(); cb.query().setCategoryId_Equal(categoryId); Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/PagingResultBeanWrapper.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/PagingResultBeanWrapper.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/PagingResultBeanWrapper.java 2007-10-07 13:03:17 UTC (rev 611) @@ -0,0 +1,110 @@ +package jp.sf.pal.pompei.util; + +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; + +public class PagingResultBeanWrapper { + private PagingResultBean pagingResultBean; + + public PagingResultBeanWrapper(PagingResultBean pagingResultBean) { + this.pagingResultBean = pagingResultBean; + } + + /** + * @return pagingResultBean + */ + public PagingResultBean getPagingResultBean() { + return pagingResultBean; + } + + /** + * @param pagingResultBean 設定する pagingResultBean + */ + public void setPagingResultBean(PagingResultBean pagingResultBean) { + this.pagingResultBean = pagingResultBean; + } + + /** + * @return allRecordCount + */ + public int getAllRecordCount() { + return pagingResultBean.getAllRecordCount(); + } + + /** + * @param allRecordCount 設定する allRecordCount + */ + public void setAllRecordCount(int allRecordCount) { + pagingResultBean.setAllRecordCount(allRecordCount); + } + + /** + * @return pageSize + */ + public int getPageSize() { + return pagingResultBean.getPageSize(); + } + + /** + * @param pageSize 設定する pageSize + */ + public void setPageSize(int pageSize) { + pagingResultBean.setPageSize(pageSize); + } + + /** + * @return currentPageNumber + */ + public int getCurrentPageNumber() { + return pagingResultBean.getCurrentPageNumber(); + } + + /** + * @param currentPageNumber 設定する currentPageNumber + */ + public void setCurrentPageNumber(int currentPageNumber) { + pagingResultBean.setCurrentPageNumber(currentPageNumber); + } + + /** + * @return allPageCount + */ + public int getAllPageCount() { + return pagingResultBean.getAllPageCount(); + } + + /** + * @param allPageCount 設定する allPageCount + */ + public void setAllPageCount(int allPageCount) { + // nothing + } + + /** + * @return existPrePage + */ + public boolean isExistPrePage() { + return pagingResultBean.isExistPrePage(); + } + + /** + * @param existPrePage 設定する existPrePage + */ + public void setExistPrePage(boolean existPrePage) { + // nothing + } + + /** + * @return existNextPage + */ + public boolean isExistNextPage() { + return pagingResultBean.isExistNextPage(); + } + + /** + * @param existNextPage 設定する existNextPage + */ + public void setExistNextPage(boolean existNextPage) { + // nothing + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/PagingResultBeanWrapper.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-07 13:03:17 UTC (rev 611) @@ -0,0 +1,145 @@ +package jp.sf.pal.pompei.web; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +public abstract class PagingResultPage implements Serializable { + private int allRecordCount; + + private int pageSize; + + private int currentPageNumber; + + private int allPageCount; + + private boolean existPrePage; + + private boolean existNextPage; + + private int pageNumber; + + private List> pageNumberItems; + + /** + * @return allRecordCount + */ + public int getAllRecordCount() { + return allRecordCount; + } + + /** + * @param allRecordCount 設定する allRecordCount + */ + public void setAllRecordCount(int allRecordCount) { + this.allRecordCount = allRecordCount; + } + + /** + * @return pageSize + */ + public int getPageSize() { + return pageSize; + } + + /** + * @param pageSize 設定する pageSize + */ + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + /** + * @return currentPageNumber + */ + public int getCurrentPageNumber() { + return currentPageNumber; + } + + /** + * @param currentPageNumber 設定する currentPageNumber + */ + public void setCurrentPageNumber(int currentPageNumber) { + this.currentPageNumber = currentPageNumber; + } + + /** + * @return allPageCount + */ + public int getAllPageCount() { + return allPageCount; + } + + /** + * @param allPageCount 設定する allPageCount + */ + public void setAllPageCount(int allPageCount) { + this.allPageCount = allPageCount; + } + + /** + * @return existPrePage + */ + public boolean isExistPrePage() { + if (existPrePage) { + pageNumber = currentPageNumber - 1; + } + return existPrePage; + } + + /** + * @param existPrePage 設定する existPrePage + */ + public void setExistPrePage(boolean existPrePage) { + this.existPrePage = existPrePage; + } + + /** + * @return existNextPage + */ + public boolean isExistNextPage() { + if (existNextPage) { + pageNumber = currentPageNumber + 1; + } + return existNextPage; + } + + /** + * @param existNextPage 設定する existNextPage + */ + public void setExistNextPage(boolean existNextPage) { + this.existNextPage = existNextPage; + } + + /** + * @return pageNumber + */ + public int getPageNumber() { + return pageNumber; + } + + /** + * @param pageNumber 設定する pageNumber + */ + public void setPageNumber(int pageNumber) { + this.pageNumber = pageNumber; + } + + /** + * @return pageNumberItems + */ + public List> getPageNumberItems() { + return pageNumberItems; + } + + /** + * @param pageNumberItems 設定する pageNumberItems + */ + public void setPageNumberItems(List> pageNumberItems) { + this.pageNumberItems = pageNumberItems; + } + + public boolean isCurrentPage() { + return pageNumber == currentPageNumber; + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java ___________________________________________________________________ Name: svn:eol-style + native 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-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-07 13:03:17 UTC (rev 611) @@ -3,16 +3,21 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.dxo.CategoryDxo; +import jp.sf.pal.pompei.dxo.PagerDxo; import jp.sf.pal.pompei.dxo.ProductDxo; import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.exentity.ProductImage; +import jp.sf.pal.pompei.pager.ProductPager; import jp.sf.pal.pompei.service.CategoryService; import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.PagingResultBeanWrapper; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; @@ -42,8 +47,12 @@ /** */ private CategoryDxo categoryDxo; + private PagerDxo pagerDxo; + private LabelHelper labelHelper; + private ProductPager productPager; + public Class initialize() { return null; } @@ -57,17 +66,37 @@ //TODO should put it to session? } + //TODO check previous category + // store category id to local session SessionUtil.putToLocalScope(PompeiConstants.CURRENT_CATEGORY_ID, currentCategoryId); + // set page number and size + getPagerDxo().convert(getProductListPage(), getProductPager()); + // set categoryId to pager + getProductPager().setCategoryId(currentCategoryId); + //商品一覧の取得 - List list = getProductService().getProductList( - currentCategoryId); + PagingResultBean productList = getProductService() + .getProductListByPager(getProductPager()); List> sList = new ArrayList>(); - getProductDxo().convert(list, sList); + getProductDxo().convert(productList, sList); getProductListPage().setProductItems(sList); + getPagerDxo().convert(new PagingResultBeanWrapper(productList), + getProductListPage()); + // page range + productList.setPageRangeSize(PompeiConstants.DEFULAT_PAGE_RANGE_SIZE); + int[] pageNumberArray = productList.pageRange().createPageNumberArray(); + List> pageNumberItems = new ArrayList>(); + for (int i : pageNumberArray) { + Map map = new HashMap(); + map.put("pageNumber", new Integer(i)); + pageNumberItems.add(map); + } + getProductListPage().setPageNumberItems(pageNumberItems); + // load thumbnail loadThumbnail(sList); @@ -167,4 +196,32 @@ public void setLabelHelper(LabelHelper labelHelper) { this.labelHelper = labelHelper; } + + /** + * @return productPager + */ + public ProductPager getProductPager() { + return productPager; + } + + /** + * @param productPager 設定する productPager + */ + public void setProductPager(ProductPager productPager) { + this.productPager = productPager; + } + + /** + * @return pagerDxo + */ + public PagerDxo getPagerDxo() { + return pagerDxo; + } + + /** + * @param pagerDxo 設定する pagerDxo + */ + public void setPagerDxo(PagerDxo pagerDxo) { + this.pagerDxo = pagerDxo; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-07 13:03:17 UTC (rev 611) @@ -1,19 +1,19 @@ package jp.sf.pal.pompei.web.user.product; -import java.io.Serializable; import java.math.BigDecimal; import java.util.List; import java.util.Map; -import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; - import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.exentity.ProductDescription; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.UrlBuilderUtil; +import jp.sf.pal.pompei.web.PagingResultPage; -public class ProductListPage implements Serializable { +import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; +public class ProductListPage extends PagingResultPage { + /** * */ 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-10-07 13:00:46 UTC (rev 610) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-07 13:03:17 UTC (rev 611) @@ -1,12 +1,12 @@ - - - - - -商品一覧画面 - - + + + + + +商品一覧画面 + +
サムネイル表示 @@ -15,15 +15,35 @@ リスト表示

-
-
-
- - 画像
- AAAAAAA

- 価格 -
-
-
- - \ No newline at end of file +
+
+
+ 画像 +
+ + AAAAAAA +
+ 価格 +
+
+
+
+
+
+ 前へ +
+
+
+ 1 +
+
+ 1 +
+
+
+ 次へ +
+
+
+ + From svnnotify @ sourceforge.jp Mon Oct 8 06:43:41 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 08 Oct 2007 06:43:41 +0900 Subject: [pal-cvs 2868] [612] added view mode for products Message-ID: <1191793421.317225.23943.nullmailer@users.sourceforge.jp> Revision: 612 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=612 Author: shinsuke Date: 2007-10-08 06:43:40 +0900 (Mon, 08 Oct 2007) Log Message: ----------- added view mode for products Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 13:03:17 UTC (rev 611) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 21:43:40 UTC (rev 612) @@ -91,8 +91,12 @@ public static final String THUMBNAIL_DISPLAY = "thumbnail"; - public static final String LIST_DISPLAY = "list"; + public static final String LIST_WITH_IMAGE_DISPLAY = "listwithimage"; + public static final String LIST_WITH_DISPLAY = "listwithimage"; + + public static final String LIST_WITHOUT_DISPLAY = "listwithoutimage"; + public static final BigDecimal THUMBNAIL_IMAGE_TYPE = new BigDecimal(1); public static final BigDecimal DETAILS_IMAGE_TYPE = new BigDecimal(2); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java 2007-10-07 13:03:17 UTC (rev 611) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PagerDxo.java 2007-10-07 21:43:40 UTC (rev 612) @@ -7,6 +7,7 @@ import jp.sf.pal.pompei.web.PagingResultPage; import org.seasar.extension.dxo.annotation.ConversionRule; +import org.seasar.extension.dxo.annotation.ExcludeNull; public interface PagerDxo extends Serializable { @@ -16,6 +17,7 @@ + ",existNextPage : existNextPage") public void convert(PagingResultBeanWrapper result, PagingResultPage page); + @ExcludeNull @ConversionRule("pageSize : pageSize" + ",currentPageNumber : pageNumber") public void convert(PagingResultPage page, DefaultPager pager); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 13:03:17 UTC (rev 611) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 21:43:40 UTC (rev 612) @@ -8,6 +8,9 @@ */ private static final long serialVersionUID = 5634903690975646435L; + // displayMode is not condition for search + private String displayMode; + private BigDecimal categoryId; /** @@ -23,4 +26,18 @@ public void setCategoryId(BigDecimal categoryId) { this.categoryId = categoryId; } + + /** + * @return displayMode + */ + public String getDisplayMode() { + return displayMode; + } + + /** + * @param displayMode 設定する displayMode + */ + public void setDisplayMode(String displayMode) { + this.displayMode = displayMode; + } } 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-10-07 13:03:17 UTC (rev 611) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-07 21:43:40 UTC (rev 612) @@ -73,7 +73,24 @@ currentCategoryId); // set page number and size - getPagerDxo().convert(getProductListPage(), getProductPager()); + if (getProductListPage().getPageNumber() != 0 + && getProductListPage().getPageSize() != 0) { + getPagerDxo().convert(getProductListPage(), getProductPager()); + } + + // set display mode + if (getProductListPage().getDisplayMode() != null) { + getProductPager().setDisplayMode( + getProductListPage().getDisplayMode()); + } else { + String displayMode = getProductPager().getDisplayMode(); + if (displayMode == null) { + // set default + displayMode = PompeiConstants.THUMBNAIL_DISPLAY; + } + getProductListPage().setDisplayMode(displayMode); + } + // set categoryId to pager getProductPager().setCategoryId(currentCategoryId); 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-10-07 13:03:17 UTC (rev 611) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-07 21:43:40 UTC (rev 612) @@ -102,6 +102,26 @@ return "-"; } + public String getProductTitle() { + //TODO + if (getProductItems() != null + && getProductIndex() < getProductItems().size()) { + List list = (List) productItems + .get(productIndex).get( + PompeiConstants.PRODUCT_DESCRIPTION_LIST); + for (ProductDescription pd : list) { + BigDecimal languagesId = getLanguageService() + .getCurrentLanguage().getLanguageId(); + if (pd.getLanguageId().equals(languagesId)) { + // TODO cut a long message? + return pd.getTitle(); + } + } + // TODO need default lang? + } + return "-"; + } + /** * @return displayMode */ @@ -120,9 +140,12 @@ return PompeiConstants.THUMBNAIL_DISPLAY.equals(getDisplayMode()); } - public boolean isListDisplay() { - return PompeiConstants.LIST_DISPLAY.equals(getDisplayMode()); + public boolean isListWithImageDisplay() { + return PompeiConstants.LIST_WITH_DISPLAY.equals(getDisplayMode()); } + public boolean isListWithoutImageDisplay() { + return PompeiConstants.LIST_WITHOUT_DISPLAY.equals(getDisplayMode()); + } public String getThumbnailSrc() { if (getProductItems() != null 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-10-07 13:03:17 UTC (rev 611) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-07 21:43:40 UTC (rev 612) @@ -8,42 +8,111 @@
- -サムネイル表示 -サムネイル表示 -リスト表示 -リスト表示 +
+
+ + [ + ウィンドウショッピング + ウィンドウショッピング + | + 写真あり一覧 + 写真あり一覧 + | + 写真なし一覧 + 写真なし一覧 + ] +
+
+
+ 前へ +
+
+ 次へ +
+
+


-
-
-
- 画像 -
- - AAAAAAA -
- 価格 -
-
-
-
-
-
- 前へ -
-
-
- 1 -
-
- 1 -
-
-
- 次へ -
+
+
+
+
+ 画像 +
+ + AAAAAAA +
+ 価格 +
+
+
+
@@ -108,7 +108,7 @@

- 会員登録へ進む + 会員情報登録へ進む
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-10-05 09:10:11 UTC (rev 606) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-05 12:25:52 UTC (rev 607) @@ -73,7 +73,7 @@ 1
- 30,000 + 30,000
小計 - 30,000 + 30,000
送料 - 1000 + 1000
消費税 - 50 + 50
合計 - 31,050 + 31,050
+ + + + + + + + + + + + + + +
写真商品名価格
+ 画像 + + + AAAAAAA
+ AAAAAAA +
+
価格
+ +
+ + + + + + + + + + + + + + + +
商品名説明価格
+ + AAAAAAA
+
+
+ AAAAAAA + 価格
+
+
+
+
+
+ 前へ +
+
+
+ 1 +
+
+ 1 +
+
+
+ 次へ +
+
From svnnotify @ sourceforge.jp Mon Oct 8 07:22:53 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 08 Oct 2007 07:22:53 +0900 Subject: [pal-cvs 2869] [613] added sort option. Message-ID: <1191795773.582975.13222.nullmailer@users.sourceforge.jp> Revision: 613 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=613 Author: shinsuke Date: 2007-10-08 07:22:53 +0900 (Mon, 08 Oct 2007) Log Message: ----------- added sort option. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 22:22:53 UTC (rev 613) @@ -97,6 +97,14 @@ public static final String LIST_WITHOUT_DISPLAY = "listwithoutimage"; + public static final String CHEAP_ORDER = "cheap"; + + public static final String EXPENSIVE_ORDER = "expensive"; + + public static final String ORDERED_ORDER = "ordered"; + + public static final String NEW_ARRIVAL_ORDER = "newarrival"; + public static final BigDecimal THUMBNAIL_IMAGE_TYPE = new BigDecimal(1); public static final BigDecimal DETAILS_IMAGE_TYPE = new BigDecimal(2); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2007-10-07 22:22:53 UTC (rev 613) @@ -11,6 +11,8 @@ // displayMode is not condition for search private String displayMode; + private String orderMode; + private BigDecimal categoryId; /** @@ -40,4 +42,18 @@ public void setDisplayMode(String displayMode) { this.displayMode = displayMode; } + + /** + * @return orderMode + */ + public String getOrderMode() { + return orderMode; + } + + /** + * @param orderMode 設定する orderMode + */ + public void setOrderMode(String orderMode) { + this.orderMode = orderMode; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2007-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2007-10-07 22:22:53 UTC (rev 613) @@ -7,6 +7,7 @@ import java.util.List; import jp.sf.pal.common.CommonException; +import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.cbean.ManufacturerCB; import jp.sf.pal.pompei.cbean.ProductCB; @@ -202,6 +203,21 @@ cb.query().setProductId_ExistsSubQuery_ProductToCategoryList( subCb.query()); } + // order + if (productPager.getOrderMode() != null) { + if (PompeiConstants.CHEAP_ORDER.equals(productPager.getOrderMode())) { + cb.query().addOrderBy_Price_Asc(); + } else if (PompeiConstants.EXPENSIVE_ORDER.equals(productPager + .getOrderMode())) { + cb.query().addOrderBy_Price_Desc(); + } else if (PompeiConstants.ORDERED_ORDER.equals(productPager + .getOrderMode())) { + cb.query().addOrderBy_Ordered_Desc(); + } else if (PompeiConstants.NEW_ARRIVAL_ORDER.equals(productPager + .getOrderMode())) { + cb.query().addOrderBy_DateAdded_Desc(); + } + } PagingResultBean productList = getProductBhv().selectPage(cb); //TODO there may be better method.. Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-07 22:22:53 UTC (rev 613) @@ -21,6 +21,18 @@ private List> pageNumberItems; + public int getStartRecordCount() { + return (getCurrentPageNumber() - 1) * getPageSize() + 1; + } + + public int getEndRecordCount() { + int end = getCurrentPageNumber() * getPageSize(); + if (end > allRecordCount) { + end = allRecordCount; + } + return end; + } + /** * @return allRecordCount */ 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-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-07 22:22:53 UTC (rev 613) @@ -87,10 +87,24 @@ if (displayMode == null) { // set default displayMode = PompeiConstants.THUMBNAIL_DISPLAY; + getProductPager().setDisplayMode(displayMode); } getProductListPage().setDisplayMode(displayMode); } + // set order mode + if (getProductListPage().getOrderMode() != null) { + getProductPager().setOrderMode(getProductListPage().getOrderMode()); + } else { + String orderMode = getProductPager().getOrderMode(); + if (orderMode == null) { + // set default + orderMode = PompeiConstants.CHEAP_ORDER; + getProductPager().setOrderMode(orderMode); + } + getProductListPage().setOrderMode(orderMode); + } + // set categoryId to pager getProductPager().setCategoryId(currentCategoryId); 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-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-07 22:22:53 UTC (rev 613) @@ -31,6 +31,8 @@ private String displayMode; + private String orderMode; + private LanguageService languageService; public int getProductIndex() { @@ -136,6 +138,20 @@ this.displayMode = displayMode; } + /** + * @return orderMode + */ + public String getOrderMode() { + return orderMode; + } + + /** + * @param orderMode 設定する orderMode + */ + public void setOrderMode(String orderMode) { + this.orderMode = orderMode; + } + public boolean isThumbnailDisplay() { return PompeiConstants.THUMBNAIL_DISPLAY.equals(getDisplayMode()); } @@ -143,10 +159,27 @@ public boolean isListWithImageDisplay() { return PompeiConstants.LIST_WITH_DISPLAY.equals(getDisplayMode()); } + public boolean isListWithoutImageDisplay() { return PompeiConstants.LIST_WITHOUT_DISPLAY.equals(getDisplayMode()); } + public boolean isCheapOrder() { + return PompeiConstants.CHEAP_ORDER.equals(getOrderMode()); + } + + public boolean isExpensiveOrder() { + return PompeiConstants.EXPENSIVE_ORDER.equals(getOrderMode()); + } + + public boolean isOrderedOrder() { + return PompeiConstants.ORDERED_ORDER.equals(getOrderMode()); + } + + public boolean isNewArrivalOrder() { + return PompeiConstants.NEW_ARRIVAL_ORDER.equals(getOrderMode()); + } + public String getThumbnailSrc() { if (getProductItems() != null && getProductIndex() < getProductItems().size()) { 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-10-07 21:43:40 UTC (rev 612) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-07 22:22:53 UTC (rev 613) @@ -9,18 +9,36 @@
+ + [ + ウィンドウショッピング + ウィンドウショッピング + | + 写真あり一覧 + 写真あり一覧 + | + 写真なし一覧 + 写真なし一覧 + ] +
+ + [ + 安い順 + 安い順 + | + 高い順 + 高い順 + | + 売れている順 + 売れている順 + | + 新着順 + 新着順 + ] +
+
- - [ - ウィンドウショッピング - ウィンドウショッピング - | - 写真あり一覧 - 写真あり一覧 - | - 写真なし一覧 - 写真なし一覧 - ] + 131件中 3145件目
From svnnotify @ sourceforge.jp Mon Oct 8 07:29:22 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 08 Oct 2007 07:29:22 +0900 Subject: [pal-cvs 2870] [614] put a color. Message-ID: <1191796162.214130.16142.nullmailer@users.sourceforge.jp> Revision: 614 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=614 Author: shinsuke Date: 2007-10-08 07:29:21 +0900 (Mon, 08 Oct 2007) Log Message: ----------- put a color. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html -------------- next part -------------- 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-10-07 22:22:53 UTC (rev 613) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-07 22:29:21 UTC (rev 614) @@ -15,33 +15,33 @@
- - + - - - - - - - + - +
+
+ + + + + +   
XXX 01MAX
 MX-XXX
 MX-XXX From svnnotify @ sourceforge.jp Mon Oct 8 22:50:09 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 08 Oct 2007 22:50:09 +0900 Subject: [pal-cvs 2871] [615] added page navigation, sort option, and condition. Message-ID: <1191851409.916596.28549.nullmailer@users.sourceforge.jp> Revision: 615 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=615 Author: shinsuke Date: 2007-10-08 22:50:09 +0900 (Mon, 08 Oct 2007) Log Message: ----------- added page navigation, sort option, and condition. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/OrderFormPager.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-08 13:50:09 UTC (rev 615) @@ -118,4 +118,33 @@ public static final String DEFAULT_DETAILS_IMAGE_NAME = "noimage.png"; public static final String DISPLAYED_ORDER_COMPLETION = "DisplayedOrderCompletion"; + + public static final String ORDER_STATUS_ASC_ORDER = "orderStatusAsc"; + + public static final String ORDER_STATUS_DESC_ORDER = "orderStatusDesc"; + + public static final String ORDER_FORM_NUMBER_ASC_ORDER = "orderFormNumberAsc"; + + public static final String ORDER_FORM_NUMBER_DESC_ORDER = "orderFormNumberDesc"; + + public static final String TOTAL_PRICE_ASC_ORDER = "totalPriceAsc"; + + public static final String TOTAL_PRICE_DESC_ORDER = "totalPriceDesc"; + + public static final String CUSTOMER_NAME_ASC_ORDER = "customerNameAsc"; + + public static final String CUSTOMER_NAME_DESC_ORDER = "customerNameDesc"; + + public static final String CUSTOMER_STATE_ASC_ORDER = "customerStateAsc"; + + public static final String CUSTOMER_STATE_DESC_ORDER = "customerStateDesc"; + + public static final String PURCHASED_DATE_ASC_ORDER = "purchasedDateAsc"; + + public static final String PURCHASED_DATE_DESC_ORDER = "purchasedDateDesc"; + + public static final String LAST_MODIFIED_ASC_ORDER = "lastModifiedAsc"; + + public static final String LAST_MODIFIED_DESC_ORDER = "lastModifiedDesc"; + } Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/OrderFormPager.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/OrderFormPager.java 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/OrderFormPager.java 2007-10-08 13:50:09 UTC (rev 615) @@ -0,0 +1,43 @@ +package jp.sf.pal.pompei.pager; + +import java.math.BigDecimal; + +public class OrderFormPager extends DefaultPager { + + /** + * + */ + private static final long serialVersionUID = 8632942395235732202L; + + private BigDecimal orderStatusId; + + private String sortOrder; + + /** + * @return sortOrder + */ + public String getSortOrder() { + return sortOrder; + } + + /** + * @param sortOrder 設定する sortOrder + */ + public void setSortOrder(String sortOrder) { + this.sortOrder = sortOrder; + } + + /** + * @return orderStatusId + */ + public BigDecimal getOrderStatusId() { + return orderStatusId; + } + + /** + * @param orderStatusId 設定する orderStatusId + */ + public void setOrderStatusId(BigDecimal orderStatusId) { + this.orderStatusId = orderStatusId; + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/OrderFormPager.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-08 13:50:09 UTC (rev 615) @@ -5,6 +5,7 @@ import java.util.List; import jp.sf.pal.common.CommonException; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Currency; import jp.sf.pal.pompei.exentity.Customer; @@ -14,6 +15,7 @@ import jp.sf.pal.pompei.exentity.OrderProduct; import jp.sf.pal.pompei.exentity.OrderStatusDescription; import jp.sf.pal.pompei.exentity.PaymentMethod; +import jp.sf.pal.pompei.pager.OrderFormPager; public interface OrderService extends Serializable { @@ -25,6 +27,8 @@ public List getOrderFormList(); + public PagingResultBean getOrderFormListByPager(OrderFormPager orderFormPager); + public String addOrderForm(Customer customer, List customerBasketIdList, AddressBook customerAddressBook, AddressBook deliveryAddressBook, Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-08 13:50:09 UTC (rev 615) @@ -7,6 +7,7 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.cbean.CurrencyCB; import jp.sf.pal.pompei.cbean.CustomerBasketCB; import jp.sf.pal.pompei.cbean.OrderCardInfoCB; @@ -44,6 +45,7 @@ import jp.sf.pal.pompei.exentity.OrderStatusHistory; import jp.sf.pal.pompei.exentity.PaymentMethod; import jp.sf.pal.pompei.exentity.Product; +import jp.sf.pal.pompei.pager.OrderFormPager; import jp.sf.pal.pompei.service.OrderService; public class OrderServiceImpl implements OrderService { @@ -195,6 +197,83 @@ return orderFormBhv.selectList(cb); } + public PagingResultBean getOrderFormListByPager( + OrderFormPager orderFormPager) { + OrderFormCB cb = new OrderFormCB(); + + // pager + cb.fetchFirst(orderFormPager.getPageSize()); + cb.fetchPage(orderFormPager.getCurrentPageNumber()); + + // setup + cb.setupSelect_OrderStatus(); + // TODO needed? + //cb.setupSelect_Currency(); + // TODO needed? + //cb.setupSelect_Customer(); + // TODO needed? + //cb.setupSelect_DeliveryMethod(); + // TODO needed? + //cb.setupSelect_OrderCommentAsOne(); + // TODO needed? + //cb.setupSelect_PaymentMethod(); + + // condition + if (orderFormPager.getOrderStatusId() != null) { + cb.query() + .setOrderStatusId_Equal(orderFormPager.getOrderStatusId()); + } + + // order + if (PompeiConstants.ORDER_STATUS_ASC_ORDER.equals(orderFormPager + .getSortOrder())) { + cb.query().addOrderBy_OrderStatusId_Asc(); + } else if (PompeiConstants.ORDER_STATUS_DESC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_OrderStatusId_Desc(); + } else if (PompeiConstants.ORDER_FORM_NUMBER_ASC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_OrderFormNumber_Asc(); + } else if (PompeiConstants.ORDER_FORM_NUMBER_DESC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_OrderFormNumber_Desc(); + } else if (PompeiConstants.TOTAL_PRICE_ASC_ORDER.equals(orderFormPager + .getSortOrder())) { + cb.query().addOrderBy_TotalPrice_Asc(); + } else if (PompeiConstants.TOTAL_PRICE_DESC_ORDER.equals(orderFormPager + .getSortOrder())) { + cb.query().addOrderBy_TotalPrice_Desc(); + } else if (PompeiConstants.CUSTOMER_NAME_ASC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_CustomerLastname_Asc(); + cb.query().addOrderBy_CustomerFirstname_Asc(); + } else if (PompeiConstants.CUSTOMER_NAME_DESC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_CustomerLastname_Desc(); + cb.query().addOrderBy_CustomerFirstname_Desc(); + } else if (PompeiConstants.CUSTOMER_STATE_ASC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_CustomerState_Asc(); + } else if (PompeiConstants.CUSTOMER_STATE_DESC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_CustomerState_Desc(); + } else if (PompeiConstants.PURCHASED_DATE_ASC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_PurchasedDate_Asc(); + } else if (PompeiConstants.PURCHASED_DATE_DESC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_PurchasedDate_Desc(); + } else if (PompeiConstants.LAST_MODIFIED_ASC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_LastModified_Asc(); + } else if (PompeiConstants.LAST_MODIFIED_DESC_ORDER + .equals(orderFormPager.getSortOrder())) { + cb.query().addOrderBy_LastModified_Desc(); + } + + return getOrderFormBhv().selectPage(cb); + } + public OrderForm getOrderForm(BigDecimal orderFormId) { OrderFormCB cb = new OrderFormCB(); // cb.setupSelect_Currency(); @@ -221,7 +300,8 @@ || billingAddressBook == null || paymentMethod == null || deliveryMethod == null || currency == null || totalPrice == null) { - throw new CommonException("invaild.order.parameters", "Some parameters are null."); + throw new CommonException("invaild.order.parameters", + "Some parameters are null."); } if (customerBasketIdList.isEmpty()) { @@ -246,7 +326,8 @@ .getCode())) { //TODO insert card info if (orderCardInfo == null) { - throw new CommonException("card.info.is.null", "A card info is null."); + throw new CommonException("card.info.is.null", + "A card info is null."); } getOrderCardInfoBhv().insert(orderCardInfo); orderForm.setOrderCardInfoId(orderCardInfo.getOrderCardInfoId()); @@ -300,8 +381,8 @@ // check customer info if (!customer.getCustomerId().equals( customerBasket.getCustomer().getCustomerId())) { - throw new CommonException("invalid.customer.info.in.cart", "Invalid customer info:" - + customer.getCustomerId()); + throw new CommonException("invalid.customer.info.in.cart", + "Invalid customer info:" + customer.getCustomerId()); } OrderProduct orderProduct = new OrderProduct(); @@ -320,8 +401,9 @@ BigDecimal quantity = product.getQuantity().subtract( customerBasket.getQuantity()); if (quantity.intValue() < 0) { - throw new CommonException("prodocut.is.shortage", "The product is a shortage." - + customer.getCustomerId()); + throw new CommonException("prodocut.is.shortage", + "The product is a shortage." + + customer.getCustomerId()); } product.setQuantity(quantity); getProductBhv().update(product); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2007-10-08 13:50:09 UTC (rev 615) @@ -9,11 +9,15 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.dxo.OrderFormDxo; +import jp.sf.pal.pompei.dxo.PagerDxo; import jp.sf.pal.pompei.exentity.OrderForm; import jp.sf.pal.pompei.exentity.OrderStatusDescription; +import jp.sf.pal.pompei.pager.OrderFormPager; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.service.OrderService; +import jp.sf.pal.pompei.util.PagingResultBeanWrapper; public class OrderListAction implements Serializable { @@ -33,6 +37,10 @@ private OrderFormDxo orderFormDxo; + private PagerDxo pagerDxo; + + private OrderFormPager orderFormPager; + public Class initialize() { return null; } @@ -48,11 +56,45 @@ // orderService.updateOrder(orders); } + // set page number and size + if (getOrderListPage().getPageNumber() != 0 + && getOrderListPage().getPageSize() != 0) { + getPagerDxo().convert(getOrderListPage(), getOrderFormPager()); + } + + // sort order + if (getOrderListPage().getSortOrder() != null) { + getOrderFormPager().setSortOrder(getOrderListPage().getSortOrder()); + } else { + String sortOrder = getOrderFormPager().getSortOrder(); + if (sortOrder == null) { + sortOrder = PompeiConstants.ORDER_STATUS_ASC_ORDER; + getOrderFormPager().setSortOrder(sortOrder); + } + getOrderListPage().setSortOrder(sortOrder); + } + // order from - List list = getOrderService().getOrderFormList(); - List> items = getOrderFormDxo().convert(list); + PagingResultBean orderFormList = getOrderService() + .getOrderFormListByPager(getOrderFormPager()); + List> items = getOrderFormDxo().convert( + orderFormList); getOrderListPage().setOrderFormItems(items); + getPagerDxo().convert(new PagingResultBeanWrapper(orderFormList), + getOrderListPage()); + // page range + orderFormList.setPageRangeSize(PompeiConstants.DEFULAT_PAGE_RANGE_SIZE); + int[] pageNumberArray = orderFormList.pageRange() + .createPageNumberArray(); + List> pageNumberItems = new ArrayList>(); + for (int i : pageNumberArray) { + Map map = new HashMap(); + map.put("pageNumber", new Integer(i)); + pageNumberItems.add(map); + } + getOrderListPage().setPageNumberItems(pageNumberItems); + // order status List orderStatusDescriptionList = getOrderService() .getOrderStatusDescriptionList( @@ -60,17 +102,25 @@ .getLanguageId()); List> orderStatusCountItems = new ArrayList>(); Map orderStatusNameMap = new HashMap(); + List> orderStatusIdItems = new ArrayList>(); for (OrderStatusDescription osd : orderStatusDescriptionList) { orderStatusNameMap.put(osd.getOrderStatusId(), osd.getName()); + // orderStatusCountItems Map map = new HashMap(); map.put("orderStatusId", osd.getOrderStatusId()); map.put("name", osd.getName()); map.put("count", new BigDecimal(getOrderService() .getOrderFormCountByOrderStatus(osd.getOrderStatusId()))); orderStatusCountItems.add(map); + // orderStatusIdItems + Map map2 = new HashMap(); + map2.put("label", osd.getName()); + map2.put("value", osd.getOrderStatusId().toString()); + orderStatusIdItems.add(map2); } getOrderListPage().setOrderStatusNameMap(orderStatusNameMap); getOrderListPage().setOrderStatusCountItems(orderStatusCountItems); + getOrderListPage().setOrderStatusIdItems(orderStatusIdItems); // render FacesMessage FacesMessageUtil.renderMessages(); @@ -89,7 +139,8 @@ * @return */ public Class doSearch() { - //TODO + getOrderFormPager().setOrderStatusId( + getOrderListPage().getOrderStatusId()); return null; } @@ -137,4 +188,32 @@ this.languageService = languageService; } + /** + * @return orderFormPager + */ + public OrderFormPager getOrderFormPager() { + return orderFormPager; + } + + /** + * @param orderFormPager 設定する orderFormPager + */ + public void setOrderFormPager(OrderFormPager orderFormPager) { + this.orderFormPager = orderFormPager; + } + + /** + * @return pagerDxo + */ + public PagerDxo getPagerDxo() { + return pagerDxo; + } + + /** + * @param pagerDxo 設定する pagerDxo + */ + public void setPagerDxo(PagerDxo pagerDxo) { + this.pagerDxo = pagerDxo; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListPage.java 2007-10-08 13:50:09 UTC (rev 615) @@ -1,14 +1,17 @@ package jp.sf.pal.pompei.web.admin.order; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.web.PagingResultPage; + +import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; -public class OrderListPage implements Serializable { +public class OrderListPage extends PagingResultPage { /** * @@ -17,6 +20,8 @@ private String mode; + private String sortOrder; + private String name; private BigDecimal count; @@ -50,8 +55,19 @@ @DateTimeConverter(pattern = "yyyy/MM/dd") private Date purchasedDate; + @DateTimeConverter(pattern = "yyyy/MM/dd") + private Date lastModified; + + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + private BigDecimal totalPrice; + private Map orderStatusNameMap; + private List> orderStatusIdItems; + + private BigDecimal orderStatusId; + public String getCustomerCity() { return customerCity; } @@ -265,4 +281,133 @@ } return ""; } + + /** + * @return totalPrice + */ + public BigDecimal getTotalPrice() { + return totalPrice; + } + + /** + * @param totalPrice 設定する totalPrice + */ + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + + /** + * @return lastModified + */ + public Date getLastModified() { + return lastModified; + } + + /** + * @param lastModified 設定する lastModified + */ + public void setLastModified(Date lastModified) { + this.lastModified = lastModified; + } + + /** + * @return sortOrder + */ + public String getSortOrder() { + return sortOrder; + } + + /** + * @param sortOrder 設定する sortOrder + */ + public void setSortOrder(String sortOrder) { + this.sortOrder = sortOrder; + } + + public boolean isOrderStatusAsc() { + return PompeiConstants.ORDER_STATUS_ASC_ORDER.equals(getSortOrder()); + } + + public boolean isOrderStatusDesc() { + return PompeiConstants.ORDER_STATUS_DESC_ORDER.equals(getSortOrder()); + } + + public boolean isOrderFormNumberAsc() { + return PompeiConstants.ORDER_FORM_NUMBER_ASC_ORDER + .equals(getSortOrder()); + } + + public boolean isOrderFormNumberDesc() { + return PompeiConstants.ORDER_FORM_NUMBER_DESC_ORDER + .equals(getSortOrder()); + } + + public boolean isTotalPriceAsc() { + return PompeiConstants.TOTAL_PRICE_ASC_ORDER.equals(getSortOrder()); + } + + public boolean isTotalPriceDesc() { + return PompeiConstants.TOTAL_PRICE_DESC_ORDER.equals(getSortOrder()); + } + + public boolean isCustomerNameAsc() { + return PompeiConstants.CUSTOMER_NAME_ASC_ORDER.equals(getSortOrder()); + } + + public boolean isCustomerNameDesc() { + return PompeiConstants.CUSTOMER_NAME_DESC_ORDER.equals(getSortOrder()); + } + + public boolean isCustomerStateAsc() { + return PompeiConstants.CUSTOMER_STATE_ASC_ORDER.equals(getSortOrder()); + } + + public boolean isCustomerStateDesc() { + return PompeiConstants.CUSTOMER_STATE_DESC_ORDER.equals(getSortOrder()); + } + + public boolean isPurchasedDateAsc() { + return PompeiConstants.PURCHASED_DATE_ASC_ORDER.equals(getSortOrder()); + } + + public boolean isPurchasedDateDesc() { + return PompeiConstants.PURCHASED_DATE_DESC_ORDER.equals(getSortOrder()); + } + + public boolean isLastModifiedAsc() { + return PompeiConstants.LAST_MODIFIED_ASC_ORDER.equals(getSortOrder()); + } + + public boolean isLastModifiedDesc() { + return PompeiConstants.LAST_MODIFIED_DESC_ORDER.equals(getSortOrder()); + } + + /** + * @return orderStatusIdItems + */ + public List> getOrderStatusIdItems() { + return orderStatusIdItems; + } + + /** + * @param orderStatusIdItems 設定する orderStatusIdItems + */ + public void setOrderStatusIdItems( + List> orderStatusIdItems) { + this.orderStatusIdItems = orderStatusIdItems; + } + + /** + * @return orderStatusId + */ + public BigDecimal getOrderStatusId() { + return orderStatusId; + } + + /** + * @param orderStatusId 設定する orderStatusId + */ + public void setOrderStatusId(BigDecimal orderStatusId) { + this.orderStatusId = orderStatusId; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-07 22:29:21 UTC (rev 614) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-08 13:50:09 UTC (rev 615) @@ -1,53 +1,276 @@ - - - - - -注文一覧 - - - - -
-
-未処理 1
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
 
000120336司馬 遼太郎東京都府中市府中市未処理 - 編集 - 削除 -
- - + + + + + + 注文一覧 + + +
+
+
+
+
+ + + +
+
+
+ 未処理1 +
+
+
+
+
+ 131件中 3145件目 +
+
+
+ 前へ +
+
+ 次へ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + +
+ + + + + + + + + + + + + + + +
+
 
+ 未処理 + + 0001 + + + 100 + + + 司馬 + 遼太郎 + + 東京都 + + 2000/01/01 + + 2000/01/01 + + 編集 + 削除 +
+
+
+
+ 前へ +
+
+
+ 1 +
+
+ 1 +
+
+
+ 次へ +
+
+
+
+
+
+ From svnnotify @ sourceforge.jp Tue Oct 9 08:35:27 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 09 Oct 2007 08:35:27 +0900 Subject: [pal-cvs 2872] [616] modified m2 repo Message-ID: <1191886527.416779.29979.nullmailer@users.sourceforge.jp> Revision: 616 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=616 Author: shinsuke Date: 2007-10-09 08:35:27 +0900 (Tue, 09 Oct 2007) Log Message: ----------- modified m2 repo Modified Paths: -------------- s2helloworld/trunk/pom.xml -------------- next part -------------- Modified: s2helloworld/trunk/pom.xml =================================================================== --- s2helloworld/trunk/pom.xml 2007-10-08 13:50:09 UTC (rev 615) +++ s2helloworld/trunk/pom.xml 2007-10-08 23:35:27 UTC (rev 616) @@ -15,7 +15,7 @@ maven.marevol.com Maven2 Repository on marevol.com - http://www.marevol.com/maven2 + http://maven2.marevol.com/ maven.seasar.org @@ -74,7 +74,7 @@ org.seasar.teeda teeda-extension - 1.0.11-RC2 + 1.0.12-EA1-SNAPSHOT org.seasar.teeda From svnnotify @ sourceforge.jp Tue Oct 9 12:18:51 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 09 Oct 2007 12:18:51 +0900 Subject: [pal-cvs 2873] [617] removed insert. Message-ID: <1191899931.415649.16688.nullmailer@users.sourceforge.jp> Revision: 617 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=617 Author: shinsuke Date: 2007-10-09 12:18:51 +0900 (Tue, 09 Oct 2007) Log Message: ----------- removed insert. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_sample_data.sql -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_sample_data.sql =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_sample_data.sql 2007-10-08 23:35:27 UTC (rev 616) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_sample_data.sql 2007-10-09 03:18:51 UTC (rev 617) @@ -1,371 +0,0 @@ -INSERT INTO LANGUAGE VALUES (2,'English','en','icon.gif','english',2); - -INSERT INTO COUNTRY VALUES (1,'Afghanistan','AF','AFG'); -INSERT INTO COUNTRY VALUES (2,'Albania','AL','ALB'); -INSERT INTO COUNTRY VALUES (3,'Algeria','DZ','DZA'); -INSERT INTO COUNTRY VALUES (4,'American Samoa','AS','ASM'); -INSERT INTO COUNTRY VALUES (5,'Andorra','AD','AND'); -INSERT INTO COUNTRY VALUES (6,'Angola','AO','AGO'); -INSERT INTO COUNTRY VALUES (7,'Anguilla','AI','AIA'); -INSERT INTO COUNTRY VALUES (8,'Antarctica','AQ','ATA'); -INSERT INTO COUNTRY VALUES (9,'Antigua and Barbuda','AG','ATG'); -INSERT INTO COUNTRY VALUES (10,'Argentina','AR','ARG'); -INSERT INTO COUNTRY VALUES (11,'Armenia','AM','ARM'); -INSERT INTO COUNTRY VALUES (12,'Aruba','AW','ABW'); -INSERT INTO COUNTRY VALUES (13,'Australia','AU','AUS'); -INSERT INTO COUNTRY VALUES (14,'Austria','AT','AUT'); -INSERT INTO COUNTRY VALUES (15,'Azerbaijan','AZ','AZE'); -INSERT INTO COUNTRY VALUES (16,'Bahamas','BS','BHS'); -INSERT INTO COUNTRY VALUES (17,'Bahrain','BH','BHR'); -INSERT INTO COUNTRY VALUES (18,'Bangladesh','BD','BGD'); -INSERT INTO COUNTRY VALUES (19,'Barbados','BB','BRB'); -INSERT INTO COUNTRY VALUES (20,'Belarus','BY','BLR'); -INSERT INTO COUNTRY VALUES (21,'Belgium','BE','BEL'); -INSERT INTO COUNTRY VALUES (22,'Belize','BZ','BLZ'); -INSERT INTO COUNTRY VALUES (23,'Benin','BJ','BEN'); -INSERT INTO COUNTRY VALUES (24,'Bermuda','BM','BMU'); -INSERT INTO COUNTRY VALUES (25,'Bhutan','BT','BTN'); -INSERT INTO COUNTRY VALUES (26,'Bolivia','BO','BOL'); -INSERT INTO COUNTRY VALUES (27,'Bosnia and Herzegowina','BA','BIH'); -INSERT INTO COUNTRY VALUES (28,'Botswana','BW','BWA'); -INSERT INTO COUNTRY VALUES (29,'Bouvet Island','BV','BVT'); -INSERT INTO COUNTRY VALUES (30,'Brazil','BR','BRA'); -INSERT INTO COUNTRY VALUES (31,'British Indian Ocean Territory','IO','IOT'); -INSERT INTO COUNTRY VALUES (32,'Brunei Darussalam','BN','BRN'); -INSERT INTO COUNTRY VALUES (33,'Bulgaria','BG','BGR'); -INSERT INTO COUNTRY VALUES (34,'Burkina Faso','BF','BFA'); -INSERT INTO COUNTRY VALUES (35,'Burundi','BI','BDI'); -INSERT INTO COUNTRY VALUES (36,'Cambodia','KH','KHM'); -INSERT INTO COUNTRY VALUES (37,'Cameroon','CM','CMR'); -INSERT INTO COUNTRY VALUES (38,'Canada','CA','CAN'); -INSERT INTO COUNTRY VALUES (39,'Cape Verde','CV','CPV'); -INSERT INTO COUNTRY VALUES (40,'Cayman Islands','KY','CYM'); -INSERT INTO COUNTRY VALUES (41,'Central African Republic','CF','CAF'); -INSERT INTO COUNTRY VALUES (42,'Chad','TD','TCD'); -INSERT INTO COUNTRY VALUES (43,'Chile','CL','CHL'); -INSERT INTO COUNTRY VALUES (44,'China','CN','CHN'); -INSERT INTO COUNTRY VALUES (45,'Christmas Island','CX','CXR'); -INSERT INTO COUNTRY VALUES (46,'Cocos (Keeling) Islands','CC','CCK'); -INSERT INTO COUNTRY VALUES (47,'Colombia','CO','COL'); -INSERT INTO COUNTRY VALUES (48,'Comoros','KM','COM'); -INSERT INTO COUNTRY VALUES (49,'Congo','CG','COG'); -INSERT INTO COUNTRY VALUES (50,'Cook Islands','CK','COK'); -INSERT INTO COUNTRY VALUES (51,'Costa Rica','CR','CRI'); -INSERT INTO COUNTRY VALUES (52,'Cote D''Ivoire','CI','CIV'); -INSERT INTO COUNTRY VALUES (53,'Croatia','HR','HRV'); -INSERT INTO COUNTRY VALUES (54,'Cuba','CU','CUB'); -INSERT INTO COUNTRY VALUES (55,'Cyprus','CY','CYP'); -INSERT INTO COUNTRY VALUES (56,'Czech Republic','CZ','CZE'); -INSERT INTO COUNTRY VALUES (57,'Denmark','DK','DNK'); -INSERT INTO COUNTRY VALUES (58,'Djibouti','DJ','DJI'); -INSERT INTO COUNTRY VALUES (59,'Dominica','DM','DMA'); -INSERT INTO COUNTRY VALUES (60,'Dominican Republic','DO','DOM'); -INSERT INTO COUNTRY VALUES (61,'East Timor','TP','TMP'); -INSERT INTO COUNTRY VALUES (62,'Ecuador','EC','ECU'); -INSERT INTO COUNTRY VALUES (63,'Egypt','EG','EGY'); -INSERT INTO COUNTRY VALUES (64,'El Salvador','SV','SLV'); -INSERT INTO COUNTRY VALUES (65,'Equatorial Guinea','GQ','GNQ'); -INSERT INTO COUNTRY VALUES (66,'Eritrea','ER','ERI'); -INSERT INTO COUNTRY VALUES (67,'Estonia','EE','EST'); -INSERT INTO COUNTRY VALUES (68,'Ethiopia','ET','ETH'); -INSERT INTO COUNTRY VALUES (69,'Falkland Islands (Malvinas)','FK','FLK'); -INSERT INTO COUNTRY VALUES (70,'Faroe Islands','FO','FRO'); -INSERT INTO COUNTRY VALUES (71,'Fiji','FJ','FJI'); -INSERT INTO COUNTRY VALUES (72,'Finland','FI','FIN'); -INSERT INTO COUNTRY VALUES (73,'France','FR','FRA'); -INSERT INTO COUNTRY VALUES (74,'France, Metropolitan','FX','FXX'); -INSERT INTO COUNTRY VALUES (75,'French Guiana','GF','GUF'); -INSERT INTO COUNTRY VALUES (76,'French Polynesia','PF','PYF'); -INSERT INTO COUNTRY VALUES (77,'French Southern Territories','TF','ATF'); -INSERT INTO COUNTRY VALUES (78,'Gabon','GA','GAB'); -INSERT INTO COUNTRY VALUES (79,'Gambia','GM','GMB'); -INSERT INTO COUNTRY VALUES (80,'Georgia','GE','GEO'); -INSERT INTO COUNTRY VALUES (81,'Germany','DE','DEU'); -INSERT INTO COUNTRY VALUES (82,'Ghana','GH','GHA'); -INSERT INTO COUNTRY VALUES (83,'Gibraltar','GI','GIB'); -INSERT INTO COUNTRY VALUES (84,'Greece','GR','GRC'); -INSERT INTO COUNTRY VALUES (85,'Greenland','GL','GRL'); -INSERT INTO COUNTRY VALUES (86,'Grenada','GD','GRD'); -INSERT INTO COUNTRY VALUES (87,'Guadeloupe','GP','GLP'); -INSERT INTO COUNTRY VALUES (88,'Guam','GU','GUM'); -INSERT INTO COUNTRY VALUES (89,'Guatemala','GT','GTM'); -INSERT INTO COUNTRY VALUES (90,'Guinea','GN','GIN'); -INSERT INTO COUNTRY VALUES (91,'Guinea-bissau','GW','GNB'); -INSERT INTO COUNTRY VALUES (92,'Guyana','GY','GUY'); -INSERT INTO COUNTRY VALUES (93,'Haiti','HT','HTI'); -INSERT INTO COUNTRY VALUES (94,'Heard and Mc Donald Islands','HM','HMD'); -INSERT INTO COUNTRY VALUES (95,'Honduras','HN','HND'); -INSERT INTO COUNTRY VALUES (96,'Hong Kong','HK','HKG'); -INSERT INTO COUNTRY VALUES (97,'Hungary','HU','HUN'); -INSERT INTO COUNTRY VALUES (98,'Iceland','IS','ISL'); -INSERT INTO COUNTRY VALUES (99,'India','IN','IND'); -INSERT INTO COUNTRY VALUES (100,'Indonesia','ID','IDN'); -INSERT INTO COUNTRY VALUES (101,'Iran (Islamic Republic of)','IR','IRN'); -INSERT INTO COUNTRY VALUES (102,'Iraq','IQ','IRQ'); -INSERT INTO COUNTRY VALUES (103,'Ireland','IE','IRL'); -INSERT INTO COUNTRY VALUES (104,'Israel','IL','ISR'); -INSERT INTO COUNTRY VALUES (105,'Italy','IT','ITA'); -INSERT INTO COUNTRY VALUES (106,'Jamaica','JM','JAM'); -INSERT INTO COUNTRY VALUES (108,'Jordan','JO','JOR'); -INSERT INTO COUNTRY VALUES (109,'Kazakhstan','KZ','KAZ'); -INSERT INTO COUNTRY VALUES (110,'Kenya','KE','KEN'); -INSERT INTO COUNTRY VALUES (111,'Kiribati','KI','KIR'); -INSERT INTO COUNTRY VALUES (112,'Korea, Democratic People''s Republic of','KP','PRK'); -INSERT INTO COUNTRY VALUES (113,'Korea, Republic of','KR','KOR'); -INSERT INTO COUNTRY VALUES (114,'Kuwait','KW','KWT'); -INSERT INTO COUNTRY VALUES (115,'Kyrgyzstan','KG','KGZ'); -INSERT INTO COUNTRY VALUES (116,'Lao People''s Democratic Republic','LA','LAO'); -INSERT INTO COUNTRY VALUES (117,'Latvia','LV','LVA'); -INSERT INTO COUNTRY VALUES (118,'Lebanon','LB','LBN'); -INSERT INTO COUNTRY VALUES (119,'Lesotho','LS','LSO'); -INSERT INTO COUNTRY VALUES (120,'Liberia','LR','LBR'); -INSERT INTO COUNTRY VALUES (121,'Libyan Arab Jamahiriya','LY','LBY'); -INSERT INTO COUNTRY VALUES (122,'Liechtenstein','LI','LIE'); -INSERT INTO COUNTRY VALUES (123,'Lithuania','LT','LTU'); -INSERT INTO COUNTRY VALUES (124,'Luxembourg','LU','LUX'); -INSERT INTO COUNTRY VALUES (125,'Macau','MO','MAC'); -INSERT INTO COUNTRY VALUES (126,'Macedonia, The Former Yugoslav Republic of','MK','MKD'); -INSERT INTO COUNTRY VALUES (127,'Madagascar','MG','MDG'); -INSERT INTO COUNTRY VALUES (128,'Malawi','MW','MWI'); -INSERT INTO COUNTRY VALUES (129,'Malaysia','MY','MYS'); -INSERT INTO COUNTRY VALUES (130,'Maldives','MV','MDV'); -INSERT INTO COUNTRY VALUES (131,'Mali','ML','MLI'); -INSERT INTO COUNTRY VALUES (132,'Malta','MT','MLT'); -INSERT INTO COUNTRY VALUES (133,'Marshall Islands','MH','MHL'); -INSERT INTO COUNTRY VALUES (134,'Martinique','MQ','MTQ'); -INSERT INTO COUNTRY VALUES (135,'Mauritania','MR','MRT'); -INSERT INTO COUNTRY VALUES (136,'Mauritius','MU','MUS'); -INSERT INTO COUNTRY VALUES (137,'Mayotte','YT','MYT'); -INSERT INTO COUNTRY VALUES (138,'Mexico','MX','MEX'); -INSERT INTO COUNTRY VALUES (139,'Micronesia, Federated States of','FM','FSM'); -INSERT INTO COUNTRY VALUES (140,'Moldova, Republic of','MD','MDA'); -INSERT INTO COUNTRY VALUES (141,'Monaco','MC','MCO'); -INSERT INTO COUNTRY VALUES (142,'Mongolia','MN','MNG'); -INSERT INTO COUNTRY VALUES (143,'Montserrat','MS','MSR'); -INSERT INTO COUNTRY VALUES (144,'Morocco','MA','MAR'); -INSERT INTO COUNTRY VALUES (145,'Mozambique','MZ','MOZ'); -INSERT INTO COUNTRY VALUES (146,'Myanmar','MM','MMR'); -INSERT INTO COUNTRY VALUES (147,'Namibia','NA','NAM'); -INSERT INTO COUNTRY VALUES (148,'Nauru','NR','NRU'); -INSERT INTO COUNTRY VALUES (149,'Nepal','NP','NPL'); -INSERT INTO COUNTRY VALUES (150,'Netherlands','NL','NLD'); -INSERT INTO COUNTRY VALUES (151,'Netherlands Antilles','AN','ANT'); -INSERT INTO COUNTRY VALUES (152,'New Caledonia','NC','NCL'); -INSERT INTO COUNTRY VALUES (153,'New Zealand','NZ','NZL'); -INSERT INTO COUNTRY VALUES (154,'Nicaragua','NI','NIC'); -INSERT INTO COUNTRY VALUES (155,'Niger','NE','NER'); -INSERT INTO COUNTRY VALUES (156,'Nigeria','NG','NGA'); -INSERT INTO COUNTRY VALUES (157,'Niue','NU','NIU'); -INSERT INTO COUNTRY VALUES (158,'Norfolk Island','NF','NFK'); -INSERT INTO COUNTRY VALUES (159,'Northern Mariana Islands','MP','MNP'); -INSERT INTO COUNTRY VALUES (160,'Norway','NO','NOR'); -INSERT INTO COUNTRY VALUES (161,'Oman','OM','OMN'); -INSERT INTO COUNTRY VALUES (162,'Pakistan','PK','PAK'); -INSERT INTO COUNTRY VALUES (163,'Palau','PW','PLW'); -INSERT INTO COUNTRY VALUES (164,'Panama','PA','PAN'); -INSERT INTO COUNTRY VALUES (165,'Papua New Guinea','PG','PNG'); -INSERT INTO COUNTRY VALUES (166,'Paraguay','PY','PRY'); -INSERT INTO COUNTRY VALUES (167,'Peru','PE','PER'); -INSERT INTO COUNTRY VALUES (168,'Philippines','PH','PHL'); -INSERT INTO COUNTRY VALUES (169,'Pitcairn','PN','PCN'); -INSERT INTO COUNTRY VALUES (170,'Poland','PL','POL'); -INSERT INTO COUNTRY VALUES (171,'Portugal','PT','PRT'); -INSERT INTO COUNTRY VALUES (172,'Puerto Rico','PR','PRI'); -INSERT INTO COUNTRY VALUES (173,'Qatar','QA','QAT'); -INSERT INTO COUNTRY VALUES (174,'Reunion','RE','REU'); -INSERT INTO COUNTRY VALUES (175,'Romania','RO','ROM'); -INSERT INTO COUNTRY VALUES (176,'Russian Federation','RU','RUS'); -INSERT INTO COUNTRY VALUES (177,'Rwanda','RW','RWA'); -INSERT INTO COUNTRY VALUES (178,'Saint Kitts and Nevis','KN','KNA'); -INSERT INTO COUNTRY VALUES (179,'Saint Lucia','LC','LCA'); -INSERT INTO COUNTRY VALUES (180,'Saint Vincent and the Grenadines','VC','VCT'); -INSERT INTO COUNTRY VALUES (181,'Samoa','WS','WSM'); -INSERT INTO COUNTRY VALUES (182,'San Marino','SM','SMR'); -INSERT INTO COUNTRY VALUES (183,'Sao Tome and Principe','ST','STP'); -INSERT INTO COUNTRY VALUES (184,'Saudi Arabia','SA','SAU'); -INSERT INTO COUNTRY VALUES (185,'Senegal','SN','SEN'); -INSERT INTO COUNTRY VALUES (186,'Seychelles','SC','SYC'); -INSERT INTO COUNTRY VALUES (187,'Sierra Leone','SL','SLE'); -INSERT INTO COUNTRY VALUES (188,'Singapore','SG','SGP'); -INSERT INTO COUNTRY VALUES (189,'Slovakia (Slovak Republic)','SK','SVK'); -INSERT INTO COUNTRY VALUES (190,'Slovenia','SI','SVN'); -INSERT INTO COUNTRY VALUES (191,'Solomon Islands','SB','SLB'); -INSERT INTO COUNTRY VALUES (192,'Somalia','SO','SOM'); -INSERT INTO COUNTRY VALUES (193,'South Africa','ZA','ZAF'); -INSERT INTO COUNTRY VALUES (194,'South Georgia and the South Sandwich Islands','GS','SGS'); -INSERT INTO COUNTRY VALUES (195,'Spain','ES','ESP'); -INSERT INTO COUNTRY VALUES (196,'Sri Lanka','LK','LKA'); -INSERT INTO COUNTRY VALUES (197,'St. Helena','SH','SHN'); -INSERT INTO COUNTRY VALUES (198,'St. Pierre and Miquelon','PM','SPM'); -INSERT INTO COUNTRY VALUES (199,'Sudan','SD','SDN'); -INSERT INTO COUNTRY VALUES (200,'Suriname','SR','SUR'); -INSERT INTO COUNTRY VALUES (201,'Svalbard and Jan Mayen Islands','SJ','SJM'); -INSERT INTO COUNTRY VALUES (202,'Swaziland','SZ','SWZ'); -INSERT INTO COUNTRY VALUES (203,'Sweden','SE','SWE'); -INSERT INTO COUNTRY VALUES (204,'Switzerland','CH','CHE'); -INSERT INTO COUNTRY VALUES (205,'Syrian Arab Republic','SY','SYR'); -INSERT INTO COUNTRY VALUES (206,'Taiwan','TW','TWN'); -INSERT INTO COUNTRY VALUES (207,'Tajikistan','TJ','TJK'); -INSERT INTO COUNTRY VALUES (208,'Tanzania, United Republic of','TZ','TZA'); -INSERT INTO COUNTRY VALUES (209,'Thailand','TH','THA'); -INSERT INTO COUNTRY VALUES (210,'Togo','TG','TGO'); -INSERT INTO COUNTRY VALUES (211,'Tokelau','TK','TKL'); -INSERT INTO COUNTRY VALUES (212,'Tonga','TO','TON'); -INSERT INTO COUNTRY VALUES (213,'Trinidad and Tobago','TT','TTO'); -INSERT INTO COUNTRY VALUES (214,'Tunisia','TN','TUN'); -INSERT INTO COUNTRY VALUES (215,'Turkey','TR','TUR'); -INSERT INTO COUNTRY VALUES (216,'Turkmenistan','TM','TKM'); -INSERT INTO COUNTRY VALUES (217,'Turks and Caicos Islands','TC','TCA'); -INSERT INTO COUNTRY VALUES (218,'Tuvalu','TV','TUV'); -INSERT INTO COUNTRY VALUES (219,'Uganda','UG','UGA'); -INSERT INTO COUNTRY VALUES (220,'Ukraine','UA','UKR'); -INSERT INTO COUNTRY VALUES (221,'United Arab Emirates','AE','ARE'); -INSERT INTO COUNTRY VALUES (222,'United Kingdom','GB','GBR'); -INSERT INTO COUNTRY VALUES (223,'United States','US','USA'); -INSERT INTO COUNTRY VALUES (224,'United States Minor Outlying Islands','UM','UMI'); -INSERT INTO COUNTRY VALUES (225,'Uruguay','UY','URY'); -INSERT INTO COUNTRY VALUES (226,'Uzbekistan','UZ','UZB'); -INSERT INTO COUNTRY VALUES (227,'Vanuatu','VU','VUT'); -INSERT INTO COUNTRY VALUES (228,'Vatican City State (Holy See)','VA','VAT'); -INSERT INTO COUNTRY VALUES (229,'Venezuela','VE','VEN'); -INSERT INTO COUNTRY VALUES (230,'Viet Nam','VN','VNM'); -INSERT INTO COUNTRY VALUES (231,'Virgin Islands (British)','VG','VGB'); -INSERT INTO COUNTRY VALUES (232,'Virgin Islands (U.S.)','VI','VIR'); -INSERT INTO COUNTRY VALUES (233,'Wallis and Futuna Islands','WF','WLF'); -INSERT INTO COUNTRY VALUES (234,'Western Sahara','EH','ESH'); -INSERT INTO COUNTRY VALUES (235,'Yemen','YE','YEM'); -INSERT INTO COUNTRY VALUES (236,'Yugoslavia','YU','YUG'); -INSERT INTO COUNTRY VALUES (237,'Zaire','ZR','ZAR'); -INSERT INTO COUNTRY VALUES (238,'Zambia','ZM','ZMB'); -INSERT INTO COUNTRY VALUES (239,'Zimbabwe','ZW','ZWE'); - -INSERT INTO CURRENCY VALUES (2,'USD','$','','###,###.##','2007-01-01 00:00:00','2007-01-01 00:00:00'); - -INSERT INTO CURRENCY_DESCRIPTION VALUES (2,2,'US Dollar',''); - -INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 1, 2, 'New Order',''); -INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 2, 2, 'Received Money Processing',''); -INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 3, 2, 'Credit Card Processing',''); -INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 4, 2, 'Delivering',''); -INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 5, 2, 'Delivered',''); -INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 6, 2, 'Pending',''); - --- USA -INSERT INTO ZONE VALUES (1,223,'AL','Alabama'); -INSERT INTO ZONE VALUES (2,223,'AK','Alaska'); -INSERT INTO ZONE VALUES (3,223,'AS','American Samoa'); -INSERT INTO ZONE VALUES (4,223,'AZ','Arizona'); -INSERT INTO ZONE VALUES (5,223,'AR','Arkansas'); -INSERT INTO ZONE VALUES (6,223,'AF','Armed Forces Africa'); -INSERT INTO ZONE VALUES (7,223,'AA','Armed Forces Americas'); -INSERT INTO ZONE VALUES (8,223,'AC','Armed Forces Canada'); -INSERT INTO ZONE VALUES (9,223,'AE','Armed Forces Europe'); -INSERT INTO ZONE VALUES (10,223,'AM','Armed Forces Middle East'); -INSERT INTO ZONE VALUES (11,223,'AP','Armed Forces Pacific'); -INSERT INTO ZONE VALUES (12,223,'CA','California'); -INSERT INTO ZONE VALUES (13,223,'CO','Colorado'); -INSERT INTO ZONE VALUES (14,223,'CT','Connecticut'); -INSERT INTO ZONE VALUES (15,223,'DE','Delaware'); -INSERT INTO ZONE VALUES (16,223,'DC','District of Columbia'); -INSERT INTO ZONE VALUES (17,223,'FM','Federated States Of Micronesia'); -INSERT INTO ZONE VALUES (18,223,'FL','Florida'); -INSERT INTO ZONE VALUES (19,223,'GA','Georgia'); -INSERT INTO ZONE VALUES (20,223,'GU','Guam'); -INSERT INTO ZONE VALUES (21,223,'HI','Hawaii'); -INSERT INTO ZONE VALUES (22,223,'ID','Idaho'); -INSERT INTO ZONE VALUES (23,223,'IL','Illinois'); -INSERT INTO ZONE VALUES (24,223,'IN','Indiana'); -INSERT INTO ZONE VALUES (25,223,'IA','Iowa'); -INSERT INTO ZONE VALUES (26,223,'KS','Kansas'); -INSERT INTO ZONE VALUES (27,223,'KY','Kentucky'); -INSERT INTO ZONE VALUES (28,223,'LA','Louisiana'); -INSERT INTO ZONE VALUES (29,223,'ME','Maine'); -INSERT INTO ZONE VALUES (30,223,'MH','Marshall Islands'); -INSERT INTO ZONE VALUES (31,223,'MD','Maryland'); -INSERT INTO ZONE VALUES (32,223,'MA','Massachusetts'); -INSERT INTO ZONE VALUES (33,223,'MI','Michigan'); -INSERT INTO ZONE VALUES (34,223,'MN','Minnesota'); -INSERT INTO ZONE VALUES (35,223,'MS','Mississippi'); -INSERT INTO ZONE VALUES (36,223,'MO','Missouri'); -INSERT INTO ZONE VALUES (37,223,'MT','Montana'); -INSERT INTO ZONE VALUES (38,223,'NE','Nebraska'); -INSERT INTO ZONE VALUES (39,223,'NV','Nevada'); -INSERT INTO ZONE VALUES (40,223,'NH','New Hampshire'); -INSERT INTO ZONE VALUES (41,223,'NJ','New Jersey'); -INSERT INTO ZONE VALUES (42,223,'NM','New Mexico'); -INSERT INTO ZONE VALUES (43,223,'NY','New York'); -INSERT INTO ZONE VALUES (44,223,'NC','North Carolina'); -INSERT INTO ZONE VALUES (45,223,'ND','North Dakota'); -INSERT INTO ZONE VALUES (46,223,'MP','Northern Mariana Islands'); -INSERT INTO ZONE VALUES (47,223,'OH','Ohio'); -INSERT INTO ZONE VALUES (48,223,'OK','Oklahoma'); -INSERT INTO ZONE VALUES (49,223,'OR','Oregon'); -INSERT INTO ZONE VALUES (50,223,'PW','Palau'); -INSERT INTO ZONE VALUES (51,223,'PA','Pennsylvania'); -INSERT INTO ZONE VALUES (52,223,'PR','Puerto Rico'); -INSERT INTO ZONE VALUES (53,223,'RI','Rhode Island'); -INSERT INTO ZONE VALUES (54,223,'SC','South Carolina'); -INSERT INTO ZONE VALUES (55,223,'SD','South Dakota'); -INSERT INTO ZONE VALUES (56,223,'TN','Tennessee'); -INSERT INTO ZONE VALUES (57,223,'TX','Texas'); -INSERT INTO ZONE VALUES (58,223,'UT','Utah'); -INSERT INTO ZONE VALUES (59,223,'VT','Vermont'); -INSERT INTO ZONE VALUES (60,223,'VI','Virgin Islands'); -INSERT INTO ZONE VALUES (61,223,'VA','Virginia'); -INSERT INTO ZONE VALUES (62,223,'WA','Washington'); -INSERT INTO ZONE VALUES (63,223,'WV','West Virginia'); -INSERT INTO ZONE VALUES (64,223,'WI','Wisconsin'); -INSERT INTO ZONE VALUES (65,223,'WY','Wyoming'); - -INSERT INTO TAX_CLASS VALUES (2, 'Taxable Goods', 'The following types of products are included non-food, services, etc', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); - -INSERT INTO TAX_RATE VALUES (2, 1, 2, 1, 7.0, 'FL TAX 7.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); - -INSERT INTO DELIVERY_METHOD VALUES (1,'POMEPIUNYU','defaultDeliveryMethodCalculator',1,1,'2007-09-20 03:32:13','2007-09-20 03:32:13'); -INSERT INTO DELIVERY_METHOD VALUES (2,'POMPEIKYUBIN','defaultDeliveryMethodCalculator',1,2,'2007-09-20 03:32:28','2007-09-20 03:32:28'); - -INSERT INTO DELIVERY_METHOD_DESCRIPTION VALUES (1,1,'ポンペイ運輸','一般消費者・企業向け小口貨物輸送サービスを提供'); -INSERT INTO DELIVERY_METHOD_DESCRIPTION VALUES (2,1,'ポンペイ急便','宅配便など各種輸送にかかわるサービスを提供'); - -INSERT INTO PAYMENT_METHOD VALUES (1,'COD',1,'2007-09-20 03:32:13','2007-09-20 03:32:13'); -INSERT INTO PAYMENT_METHOD VALUES (2,'BANK',2,'2007-09-20 03:32:28','2007-09-20 03:32:28'); -INSERT INTO PAYMENT_METHOD VALUES (3,'CREDITCARD',3,'2007-09-20 03:32:28','2007-09-20 03:32:28'); - -INSERT INTO PAYMENT_METHOD_DESCRIPTION VALUES (1,1,'代金引換','業者:ポンペイ運輸
備考:
  • 代引手数料は300円(税込)となります。
  • 商品が2つ以上に分かれて配送する場合、お届け明細やメールで表示されている消費税額と、実際に請求される消費税額に誤差が生じる場合がございます。
  • 実際に請求される金額が正しい消費税額となりますので、ご了承ください。
'); -INSERT INTO PAYMENT_METHOD_DESCRIPTION VALUES (2,1,'銀行振込','振込先: ポンペイ銀行 本店事業部 普通 1234567
  • 振込手数料はお客様負担でお願い致します。
  • お申込後、お振り込み金額を記載したご案内メールをお送りしております。必ずメールをご確認の上お振込みください。
  • 当店でご注文確認後三日以内にお振り込みがない場合は、ご注文を取り消させていただく場合があります。
  • 振込伝票は無くさないように保管してください。
  • ご購入金額全てを楽天スーパーポイントで支払う場合(お支払金額がゼロ円になる場合)は、必ず銀行振替を選択してください。
  • 他の支払い方法を選んだ場合、手数料か発生する場合があります(発生した手数料は返金できません)。
'); -INSERT INTO PAYMENT_METHOD_DESCRIPTION VALUES (3,1,'クレジットカード','取扱カード:
取り扱いカードは以下のとおりです。 すべてのカード会社で、一括払いが可能となっております。
カード会社支払方法
VISA一括払い、リボ
MASTER一括払い、リボ
JCB一括払い、リボ

備考:
  • お支払い回数は「1回払い」と「リボルビング払い(リボ払い)」とさせていただきます。
  • 当店ではセキュリティ上の配慮から、クレジットカード利用控は原則としてお送りしておりません。カード会社から送付されますご利用明細をご確認ください。
  • お支払い日は、ご指定のカード会社の規約に基づいた指定日のお支払いとなります。
'); - -INSERT INTO CARD_TYPE VALUES (1,'VISA',1,'2007-09-20 03:32:13','2007-09-20 03:32:13'); -INSERT INTO CARD_TYPE VALUES (2,'MASTER',2,'2007-09-20 03:32:28','2007-09-20 03:32:28'); -INSERT INTO CARD_TYPE VALUES (3,'JCB',3,'2007-09-20 03:32:28','2007-09-20 03:32:28'); - -INSERT INTO CARD_TYPE_DESCRIPTION VALUES (1,1,'VISA',''); -INSERT INTO CARD_TYPE_DESCRIPTION VALUES (2,1,'MASTER',''); -INSERT INTO CARD_TYPE_DESCRIPTION VALUES (3,1,'JCB',''); - -INSERT INTO CATEGORY VALUES (2,NULL,1,1,'2007-09-20 07:09:33','2007-09-20 07:09:33'); -INSERT INTO CATEGORY VALUES (3,NULL,1,2,'2007-09-20 06:30:11','2007-09-20 06:30:11'); - -INSERT INTO CATEGORY_DESCRIPTION VALUES (2,1,'ハードウェア','パソコン関連のハードウェア'); -INSERT INTO CATEGORY_DESCRIPTION VALUES (3,1,'ソフトウェア','パソコン関連のソフトウェア'); - -INSERT INTO MANUFACTURER VALUES (1,'Matrox',NULL,'2007-09-20 08:40:13','2007-09-20 08:40:13'); -INSERT INTO MANUFACTURER VALUES (2,'Microsoft',NULL,'2007-09-20 08:40:47','2007-09-20 08:40:47'); -INSERT INTO MANUFACTURER VALUES (3,'Warner Bros.',NULL,'2007-09-20 08:41:02','2007-09-20 08:41:02'); - -INSERT INTO MANUFACTURER_DESCRIPTION VALUES (1,1,'http://www.matrox.com','ハードウェア会社',NULL); -INSERT INTO MANUFACTURER_DESCRIPTION VALUES (2,1,'http://www.microsoft.com/','ソフトウェア会社',NULL); -INSERT INTO MANUFACTURER_DESCRIPTION VALUES (3,1,'http://www.warner.com',NULL,NULL); - -INSERT INTO PRODUCT VALUES (1,'12345','MG200MMS',100,1000.0000,100.00,NULL,0,0,0,1,'2007-09-20 12:31:53','2007-09-20 12:31:53',NULL,1,1); -INSERT INTO PRODUCT VALUES (2,'123456','MG400-32MB',100,2000.0000,200.00,NULL,0,0,0,1,'2007-09-20 12:32:34','2007-09-20 12:32:34',NULL,1,1); -INSERT INTO PRODUCT VALUES (3,'123457','WINDOWS-XP',100,10000.0000,100.00,NULL,0,0,0,1,'2007-09-20 12:33:59','2007-09-20 12:33:59',NULL,1,2); - -INSERT INTO PRODUCT_DESCRIPTION VALUES (1,1,'Matrox G200 MMS',NULL,NULL,NULL,0); -INSERT INTO PRODUCT_DESCRIPTION VALUES (2,1,'Matrox G400 32MB',NULL,NULL,NULL,0); -INSERT INTO PRODUCT_DESCRIPTION VALUES (3,1,'Windows XP',NULL,NULL,NULL,0); - -INSERT INTO PRODUCT_TO_CATEGORY VALUES (1,2,NULL); -INSERT INTO PRODUCT_TO_CATEGORY VALUES (2,2,NULL); -INSERT INTO PRODUCT_TO_CATEGORY VALUES (3,3,NULL); - From svnnotify @ sourceforge.jp Tue Oct 9 15:07:29 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 09 Oct 2007 15:07:29 +0900 Subject: [pal-cvs 2874] [618] updated db(fixed typo and added type to order status). Message-ID: <1191910049.513919.22361.nullmailer@users.sourceforge.jp> Revision: 618 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=618 Author: shinsuke Date: 2007-10-09 15:07:27 +0900 (Tue, 09 Oct 2007) Log Message: ----------- updated db(fixed typo and added type to order status). updated order admin pages. Modified Paths: -------------- 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/BsOrderFormBhv.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusBhv.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/bsdao/BsOrderStatusDao.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/BsOrderStatus.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/bsentity/dbmeta/OrderStatusDbm.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/AbstractBsOrderStatusCQ.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/bs/BsOrderStatusCQ.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/cq/ciq/OrderStatusCIQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml =================================================================== --- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-09 06:07:27 UTC (rev 618) @@ -455,7 +455,7 @@ + name="DELIVERY_LASTNAME_DESCRIPTION" size="40" type="VARCHAR"/> + Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-09 06:07:27 UTC (rev 618) @@ -1348,7 +1348,7 @@ - + @@ -2087,6 +2087,19 @@ + + + + + + + + + + + + + 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-09 06:07:27 UTC (rev 618) @@ -3,11 +3,11 @@ import java.math.BigDecimal; public class PompeiConstants { - public static int DEFULAT_PAGE_SIZE = 25; + public static final int DEFULAT_PAGE_SIZE = 25; - public static int DEFULAT_PAGE_RANGE_SIZE = 5; + public static final int DEFULAT_PAGE_RANGE_SIZE = 5; - public static int DEFULAT_CURRENT_PAGE_NUMBER = 1; + public static final int DEFULAT_CURRENT_PAGE_NUMBER = 1; public static final String JPEG = ".jpg"; @@ -147,4 +147,12 @@ public static final String LAST_MODIFIED_DESC_ORDER = "lastModifiedDesc"; + public static final BigDecimal PENDING_ORDER_STATUS_TYPE = new BigDecimal(0); + + public static final BigDecimal NEW_ORDER_STATUS_TYPE = new BigDecimal(1); + + public static final BigDecimal NORMAL_ORDER_STATUS_TYPE = new BigDecimal(2); + + public static final BigDecimal FINISHED_ORDER_STATUS_TYPE = new BigDecimal( + 3); } 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2007-10-09 06:07:27 UTC (rev 618) @@ -30,7 +30,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -1514,7 +1514,7 @@ if (names.contains("deliveryFirstname")) { destinationMyEntity.setDeliveryFirstname(sourceMyEntity.getDeliveryFirstname()); } if (names.contains("deliveryLastname")) { destinationMyEntity.setDeliveryLastname(sourceMyEntity.getDeliveryLastname()); } if (names.contains("deliveryFirstnameDescription")) { destinationMyEntity.setDeliveryFirstnameDescription(sourceMyEntity.getDeliveryFirstnameDescription()); } - if (names.contains("deliveryLastDescription")) { destinationMyEntity.setDeliveryLastDescription(sourceMyEntity.getDeliveryLastDescription()); } + if (names.contains("deliveryLastnameDescription")) { destinationMyEntity.setDeliveryLastnameDescription(sourceMyEntity.getDeliveryLastnameDescription()); } if (names.contains("deliveryStreetAddress")) { destinationMyEntity.setDeliveryStreetAddress(sourceMyEntity.getDeliveryStreetAddress()); } if (names.contains("deliverySuburb")) { destinationMyEntity.setDeliverySuburb(sourceMyEntity.getDeliverySuburb()); } if (names.contains("deliveryCity")) { destinationMyEntity.setDeliveryCity(sourceMyEntity.getDeliveryCity()); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusBhv.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderStatusBhv.java 2007-10-09 06:07:27 UTC (rev 618) @@ -30,7 +30,7 @@ * ORDER_STATUS_ID * * [column-property] - * ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -1225,6 +1225,7 @@ final java.util.Set names = sourceMyEntity.getModifiedPropertyNames(); if (names.contains("orderStatusId")) { destinationMyEntity.setOrderStatusId(sourceMyEntity.getOrderStatusId()); } + if (names.contains("type")) { destinationMyEntity.setType(sourceMyEntity.getType()); } if (names.contains("sortOrder")) { destinationMyEntity.setSortOrder(sourceMyEntity.getSortOrder()); } if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); } if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); } 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2007-10-09 06:07:27 UTC (rev 618) @@ -11,7 +11,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM"; + public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; + public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderFormId"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusDao.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderStatusDao.java 2007-10-09 06:07:27 UTC (rev 618) @@ -11,7 +11,7 @@ * ORDER_STATUS_ID * * [column-property] - * ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from ORDER_STATUS"; + public static final String getListAll_SQL = "select ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from ORDER_STATUS"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from ORDER_STATUS where ORDER_STATUS.ORDER_STATUS_ID = /*orderStatusId*/null"; + public static final String getEntity_SQL = "select ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from ORDER_STATUS where ORDER_STATUS.ORDER_STATUS_ID = /*orderStatusId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderStatusId"; 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2007-10-09 06:07:27 UTC (rev 618) @@ -14,7 +14,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -132,8 +132,8 @@ /** The value of deliveryFirstnameDescription. VARCHAR(40) */ protected String _deliveryFirstnameDescription; - /** The value of deliveryLastDescription. VARCHAR(40) */ - protected String _deliveryLastDescription; + /** The value of deliveryLastnameDescription. VARCHAR(40) */ + protected String _deliveryLastnameDescription; /** The value of deliveryStreetAddress. VARCHAR(255) : NotNull */ protected String _deliveryStreetAddress; @@ -912,27 +912,27 @@ } /** Column Annotation for S2Dao. VARCHAR(40) */ - public static final String deliveryLastDescription_COLUMN = "DELIVERY_LAST_DESCRIPTION"; + public static final String deliveryLastnameDescription_COLUMN = "DELIVERY_LASTNAME_DESCRIPTION"; /** - * Get the value of deliveryLastDescription.
+ * Get the value of deliveryLastnameDescription.
* {VARCHAR(40)} * - * @return The value of deliveryLastDescription. (Nullable) + * @return The value of deliveryLastnameDescription. (Nullable) */ - public String getDeliveryLastDescription() { - return _deliveryLastDescription; + public String getDeliveryLastnameDescription() { + return _deliveryLastnameDescription; } /** - * Set the value of deliveryLastDescription.
+ * Set the value of deliveryLastnameDescription.
* {VARCHAR(40)} * - * @param deliveryLastDescription The value of deliveryLastDescription. (Nullable) + * @param deliveryLastnameDescription The value of deliveryLastnameDescription. (Nullable) */ - public void setDeliveryLastDescription(String deliveryLastDescription) { - _modifiedProperties.addPropertyName("deliveryLastDescription"); - this._deliveryLastDescription = deliveryLastDescription; + public void setDeliveryLastnameDescription(String deliveryLastnameDescription) { + _modifiedProperties.addPropertyName("deliveryLastnameDescription"); + this._deliveryLastnameDescription = deliveryLastnameDescription; } /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */ @@ -2421,7 +2421,7 @@ sb.append(delimiter).append(getDeliveryFirstname()); sb.append(delimiter).append(getDeliveryLastname()); sb.append(delimiter).append(getDeliveryFirstnameDescription()); - sb.append(delimiter).append(getDeliveryLastDescription()); + sb.append(delimiter).append(getDeliveryLastnameDescription()); sb.append(delimiter).append(getDeliveryStreetAddress()); sb.append(delimiter).append(getDeliverySuburb()); sb.append(delimiter).append(getDeliveryCity()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java 2007-10-09 06:07:27 UTC (rev 618) @@ -14,7 +14,7 @@ * ORDER_STATUS_ID * * [column-property] - * ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -60,6 +60,9 @@ /** The value of orderStatusId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ protected java.math.BigDecimal _orderStatusId; + /** The value of type. INTEGER : NotNull */ + protected java.math.BigDecimal _type; + /** The value of sortOrder. INTEGER : NotNull */ protected java.math.BigDecimal _sortOrder; @@ -159,6 +162,30 @@ } /** Column Annotation for S2Dao. INTEGER : NotNull */ + public static final String type_COLUMN = "TYPE"; + + /** + * Get the value of type.
+ * {INTEGER : NotNull} + * + * @return The value of type. (Nullable) + */ + public java.math.BigDecimal getType() { + return _type; + } + + /** + * Set the value of type.
+ * {INTEGER : NotNull} + * + * @param type The value of type. (Nullable) + */ + public void setType(java.math.BigDecimal type) { + _modifiedProperties.addPropertyName("type"); + this._type = type; + } + + /** Column Annotation for S2Dao. INTEGER : NotNull */ public static final String sortOrder_COLUMN = "SORT_ORDER"; /** @@ -234,16 +261,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -467,6 +494,7 @@ final StringBuffer sb = new StringBuffer(); sb.append(delimiter).append(getOrderStatusId()); + sb.append(delimiter).append(getType()); sb.append(delimiter).append(getSortOrder()); sb.append(delimiter).append(getDateAdded()); sb.append(delimiter).append(getLastModified()); 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2007-10-09 06:07:27 UTC (rev 618) @@ -16,7 +16,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -143,8 +143,8 @@ public static final String DB_NAME_DELIVERY_LASTNAME = "DELIVERY_LASTNAME"; /** Db-name of DELIVERY_FIRSTNAME_DESCRIPTION. VARCHAR(40) */ public static final String DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION = "DELIVERY_FIRSTNAME_DESCRIPTION"; - /** Db-name of DELIVERY_LAST_DESCRIPTION. VARCHAR(40) */ - public static final String DB_NAME_DELIVERY_LAST_DESCRIPTION = "DELIVERY_LAST_DESCRIPTION"; + /** Db-name of DELIVERY_LASTNAME_DESCRIPTION. VARCHAR(40) */ + public static final String DB_NAME_DELIVERY_LASTNAME_DESCRIPTION = "DELIVERY_LASTNAME_DESCRIPTION"; /** Db-name of DELIVERY_STREET_ADDRESS. VARCHAR(255) : NotNull */ public static final String DB_NAME_DELIVERY_STREET_ADDRESS = "DELIVERY_STREET_ADDRESS"; /** Db-name of DELIVERY_SUBURB. VARCHAR(32) */ @@ -270,8 +270,8 @@ public static final String COLUMN_DB_NAME_OF_DeliveryLastname = "DELIVERY_LASTNAME"; /** @deprecated Deprecated! So use DB_NAME_DeliveryFirstnameDescription. */ public static final String COLUMN_DB_NAME_OF_DeliveryFirstnameDescription = "DELIVERY_FIRSTNAME_DESCRIPTION"; - /** @deprecated Deprecated! So use DB_NAME_DeliveryLastDescription. */ - public static final String COLUMN_DB_NAME_OF_DeliveryLastDescription = "DELIVERY_LAST_DESCRIPTION"; + /** @deprecated Deprecated! So use DB_NAME_DeliveryLastnameDescription. */ + public static final String COLUMN_DB_NAME_OF_DeliveryLastnameDescription = "DELIVERY_LASTNAME_DESCRIPTION"; /** @deprecated Deprecated! So use DB_NAME_DeliveryStreetAddress. */ public static final String COLUMN_DB_NAME_OF_DeliveryStreetAddress = "DELIVERY_STREET_ADDRESS"; /** @deprecated Deprecated! So use DB_NAME_DeliverySuburb. */ @@ -400,8 +400,8 @@ public static final String PROPERTY_NAME_deliveryLastname = "deliveryLastname"; /** Prop-name(JavaBeansRule) of deliveryFirstnameDescription. VARCHAR(40) */ public static final String PROPERTY_NAME_deliveryFirstnameDescription = "deliveryFirstnameDescription"; - /** Prop-name(JavaBeansRule) of deliveryLastDescription. VARCHAR(40) */ - public static final String PROPERTY_NAME_deliveryLastDescription = "deliveryLastDescription"; + /** Prop-name(JavaBeansRule) of deliveryLastnameDescription. VARCHAR(40) */ + public static final String PROPERTY_NAME_deliveryLastnameDescription = "deliveryLastnameDescription"; /** Prop-name(JavaBeansRule) of deliveryStreetAddress. VARCHAR(255) : NotNull */ public static final String PROPERTY_NAME_deliveryStreetAddress = "deliveryStreetAddress"; /** Prop-name(JavaBeansRule) of deliverySuburb. VARCHAR(32) */ @@ -530,8 +530,8 @@ public static final String CAP_PROP_NAME_DeliveryLastname = "DeliveryLastname"; /** Cap-prop-name of deliveryFirstnameDescription. VARCHAR(40) */ public static final String CAP_PROP_NAME_DeliveryFirstnameDescription = "DeliveryFirstnameDescription"; - /** Cap-prop-name of deliveryLastDescription. VARCHAR(40) */ - public static final String CAP_PROP_NAME_DeliveryLastDescription = "DeliveryLastDescription"; + /** Cap-prop-name of deliveryLastnameDescription. VARCHAR(40) */ + public static final String CAP_PROP_NAME_DeliveryLastnameDescription = "DeliveryLastnameDescription"; /** Cap-prop-name of deliveryStreetAddress. VARCHAR(255) : NotNull */ public static final String CAP_PROP_NAME_DeliveryStreetAddress = "DeliveryStreetAddress"; /** Cap-prop-name of deliverySuburb. VARCHAR(32) */ @@ -657,8 +657,8 @@ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastname = "DeliveryLastname"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryFirstnameDescription. */ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryFirstnameDescription = "DeliveryFirstnameDescription"; - /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryLastDescription. */ - public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastDescription = "DeliveryLastDescription"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryLastnameDescription. */ + public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastnameDescription = "DeliveryLastnameDescription"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryStreetAddress. */ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryStreetAddress = "DeliveryStreetAddress"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliverySuburb. */ @@ -787,8 +787,8 @@ public static final String UNCAP_PROP_NAME_deliveryLastname = "deliveryLastname"; /** Uncap-prop-name of deliveryFirstnameDescription. VARCHAR(40) */ public static final String UNCAP_PROP_NAME_deliveryFirstnameDescription = "deliveryFirstnameDescription"; - /** Uncap-prop-name of deliveryLastDescription. VARCHAR(40) */ - public static final String UNCAP_PROP_NAME_deliveryLastDescription = "deliveryLastDescription"; + /** Uncap-prop-name of deliveryLastnameDescription. VARCHAR(40) */ + public static final String UNCAP_PROP_NAME_deliveryLastnameDescription = "deliveryLastnameDescription"; /** Uncap-prop-name of deliveryStreetAddress. VARCHAR(255) : NotNull */ public static final String UNCAP_PROP_NAME_deliveryStreetAddress = "deliveryStreetAddress"; /** Uncap-prop-name of deliverySuburb. VARCHAR(32) */ @@ -914,8 +914,8 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastname = "deliveryLastname"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryFirstnameDescription. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryFirstnameDescription = "deliveryFirstnameDescription"; - /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryLastDescription. */ - public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastDescription = "deliveryLastDescription"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryLastnameDescription. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastnameDescription = "deliveryLastnameDescription"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryStreetAddress. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryStreetAddress = "deliveryStreetAddress"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliverySuburb. */ @@ -1095,7 +1095,7 @@ map.put(DB_NAME_DELIVERY_FIRSTNAME.toLowerCase(), PROPERTY_NAME_deliveryFirstname); map.put(DB_NAME_DELIVERY_LASTNAME.toLowerCase(), PROPERTY_NAME_deliveryLastname); map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryFirstnameDescription); - map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryLastDescription); + map.put(DB_NAME_DELIVERY_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryLastnameDescription); map.put(DB_NAME_DELIVERY_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_deliveryStreetAddress); map.put(DB_NAME_DELIVERY_SUBURB.toLowerCase(), PROPERTY_NAME_deliverySuburb); map.put(DB_NAME_DELIVERY_CITY.toLowerCase(), PROPERTY_NAME_deliveryCity); @@ -1172,7 +1172,7 @@ map.put(PROPERTY_NAME_deliveryFirstname.toLowerCase(), DB_NAME_DELIVERY_FIRSTNAME); map.put(PROPERTY_NAME_deliveryLastname.toLowerCase(), DB_NAME_DELIVERY_LASTNAME); map.put(PROPERTY_NAME_deliveryFirstnameDescription.toLowerCase(), DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION); - map.put(PROPERTY_NAME_deliveryLastDescription.toLowerCase(), DB_NAME_DELIVERY_LAST_DESCRIPTION); + map.put(PROPERTY_NAME_deliveryLastnameDescription.toLowerCase(), DB_NAME_DELIVERY_LASTNAME_DESCRIPTION); map.put(PROPERTY_NAME_deliveryStreetAddress.toLowerCase(), DB_NAME_DELIVERY_STREET_ADDRESS); map.put(PROPERTY_NAME_deliverySuburb.toLowerCase(), DB_NAME_DELIVERY_SUBURB); map.put(PROPERTY_NAME_deliveryCity.toLowerCase(), DB_NAME_DELIVERY_CITY); @@ -1251,7 +1251,7 @@ map.put(DB_NAME_DELIVERY_FIRSTNAME, CAP_PROP_NAME_DeliveryFirstname); map.put(DB_NAME_DELIVERY_LASTNAME, CAP_PROP_NAME_DeliveryLastname); map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_DeliveryFirstnameDescription); - map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION, CAP_PROP_NAME_DeliveryLastDescription); + map.put(DB_NAME_DELIVERY_LASTNAME_DESCRIPTION, CAP_PROP_NAME_DeliveryLastnameDescription); map.put(DB_NAME_DELIVERY_STREET_ADDRESS, CAP_PROP_NAME_DeliveryStreetAddress); map.put(DB_NAME_DELIVERY_SUBURB, CAP_PROP_NAME_DeliverySuburb); map.put(DB_NAME_DELIVERY_CITY, CAP_PROP_NAME_DeliveryCity); @@ -1330,7 +1330,7 @@ map.put(DB_NAME_DELIVERY_FIRSTNAME, UNCAP_PROP_NAME_deliveryFirstname); map.put(DB_NAME_DELIVERY_LASTNAME, UNCAP_PROP_NAME_deliveryLastname); map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_deliveryFirstnameDescription); - map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION, UNCAP_PROP_NAME_deliveryLastDescription); + map.put(DB_NAME_DELIVERY_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_deliveryLastnameDescription); map.put(DB_NAME_DELIVERY_STREET_ADDRESS, UNCAP_PROP_NAME_deliveryStreetAddress); map.put(DB_NAME_DELIVERY_SUBURB, UNCAP_PROP_NAME_deliverySuburb); map.put(DB_NAME_DELIVERY_CITY, UNCAP_PROP_NAME_deliveryCity); @@ -1409,7 +1409,7 @@ map.put(CAP_PROP_NAME_DeliveryFirstname, DB_NAME_DELIVERY_FIRSTNAME); map.put(CAP_PROP_NAME_DeliveryLastname, DB_NAME_DELIVERY_LASTNAME); map.put(CAP_PROP_NAME_DeliveryFirstnameDescription, DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION); - map.put(CAP_PROP_NAME_DeliveryLastDescription, DB_NAME_DELIVERY_LAST_DESCRIPTION); + map.put(CAP_PROP_NAME_DeliveryLastnameDescription, DB_NAME_DELIVERY_LASTNAME_DESCRIPTION); map.put(CAP_PROP_NAME_DeliveryStreetAddress, DB_NAME_DELIVERY_STREET_ADDRESS); map.put(CAP_PROP_NAME_DeliverySuburb, DB_NAME_DELIVERY_SUBURB); map.put(CAP_PROP_NAME_DeliveryCity, DB_NAME_DELIVERY_CITY); @@ -1488,7 +1488,7 @@ map.put(CAP_PROP_NAME_DeliveryFirstname, UNCAP_PROP_NAME_deliveryFirstname); map.put(CAP_PROP_NAME_DeliveryLastname, UNCAP_PROP_NAME_deliveryLastname); map.put(CAP_PROP_NAME_DeliveryFirstnameDescription, UNCAP_PROP_NAME_deliveryFirstnameDescription); - map.put(CAP_PROP_NAME_DeliveryLastDescription, UNCAP_PROP_NAME_deliveryLastDescription); + map.put(CAP_PROP_NAME_DeliveryLastnameDescription, UNCAP_PROP_NAME_deliveryLastnameDescription); map.put(CAP_PROP_NAME_DeliveryStreetAddress, UNCAP_PROP_NAME_deliveryStreetAddress); map.put(CAP_PROP_NAME_DeliverySuburb, UNCAP_PROP_NAME_deliverySuburb); map.put(CAP_PROP_NAME_DeliveryCity, UNCAP_PROP_NAME_deliveryCity); @@ -1567,7 +1567,7 @@ map.put(UNCAP_PROP_NAME_deliveryFirstname, DB_NAME_DELIVERY_FIRSTNAME); map.put(UNCAP_PROP_NAME_deliveryLastname, DB_NAME_DELIVERY_LASTNAME); map.put(UNCAP_PROP_NAME_deliveryFirstnameDescription, DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION); - map.put(UNCAP_PROP_NAME_deliveryLastDescription, DB_NAME_DELIVERY_LAST_DESCRIPTION); + map.put(UNCAP_PROP_NAME_deliveryLastnameDescription, DB_NAME_DELIVERY_LASTNAME_DESCRIPTION); map.put(UNCAP_PROP_NAME_deliveryStreetAddress, DB_NAME_DELIVERY_STREET_ADDRESS); map.put(UNCAP_PROP_NAME_deliverySuburb, DB_NAME_DELIVERY_SUBURB); map.put(UNCAP_PROP_NAME_deliveryCity, DB_NAME_DELIVERY_CITY); @@ -1646,7 +1646,7 @@ map.put(UNCAP_PROP_NAME_deliveryFirstname, CAP_PROP_NAME_DeliveryFirstname); map.put(UNCAP_PROP_NAME_deliveryLastname, CAP_PROP_NAME_DeliveryLastname); map.put(UNCAP_PROP_NAME_deliveryFirstnameDescription, CAP_PROP_NAME_DeliveryFirstnameDescription); - map.put(UNCAP_PROP_NAME_deliveryLastDescription, CAP_PROP_NAME_DeliveryLastDescription); + map.put(UNCAP_PROP_NAME_deliveryLastnameDescription, CAP_PROP_NAME_DeliveryLastnameDescription); map.put(UNCAP_PROP_NAME_deliveryStreetAddress, CAP_PROP_NAME_DeliveryStreetAddress); map.put(UNCAP_PROP_NAME_deliverySuburb, CAP_PROP_NAME_DeliverySuburb); map.put(UNCAP_PROP_NAME_deliveryCity, CAP_PROP_NAME_DeliveryCity); @@ -1917,7 +1917,7 @@ columnInfoList.add(columnDeliveryFirstname()); columnInfoList.add(columnDeliveryLastname()); columnInfoList.add(columnDeliveryFirstnameDescription()); - columnInfoList.add(columnDeliveryLastDescription()); + columnInfoList.add(columnDeliveryLastnameDescription()); columnInfoList.add(columnDeliveryStreetAddress()); columnInfoList.add(columnDeliverySuburb()); columnInfoList.add(columnDeliveryCity()); @@ -2010,7 +2010,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE"; + return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE"; } /** @@ -2164,10 +2164,10 @@ return new ColumnInfo(this, "DELIVERY_FIRSTNAME_DESCRIPTION", "deliveryFirstnameDescription", String.class, false); } /** - * @return Column information of deliveryLastDescription. (NotNull) + * @return Column information of deliveryLastnameDescription. (NotNull) */ - public ColumnInfo columnDeliveryLastDescription() { - return new ColumnInfo(this, "DELIVERY_LAST_DESCRIPTION", "deliveryLastDescription", String.class, false); + public ColumnInfo columnDeliveryLastnameDescription() { + return new ColumnInfo(this, "DELIVERY_LASTNAME_DESCRIPTION", "deliveryLastnameDescription", String.class, false); } /** * @return Column information of deliveryStreetAddress. (NotNull) @@ -2745,7 +2745,7 @@ public RelationTrace columnDeliveryFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryFirstname()); } public RelationTrace columnDeliveryLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastname()); } public RelationTrace columnDeliveryFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryFirstnameDescription()); } - public RelationTrace columnDeliveryLastDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastDescription()); } + public RelationTrace columnDeliveryLastnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastnameDescription()); } public RelationTrace columnDeliveryStreetAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryStreetAddress()); } public RelationTrace columnDeliverySuburb() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliverySuburb()); } public RelationTrace columnDeliveryCity() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryCity()); } @@ -2878,7 +2878,7 @@ if (analyzer.init("DELIVERY_FIRSTNAME", "deliveryFirstname", "deliveryFirstname")) { myEntity.setDeliveryFirstname(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_LASTNAME", "deliveryLastname", "deliveryLastname")) { myEntity.setDeliveryLastname(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_FIRSTNAME_DESCRIPTION", "deliveryFirstnameDescription", "deliveryFirstnameDescription")) { myEntity.setDeliveryFirstnameDescription(analyzer.analyzeString(String.class)); }; - if (analyzer.init("DELIVERY_LAST_DESCRIPTION", "deliveryLastDescription", "deliveryLastDescription")) { myEntity.setDeliveryLastDescription(analyzer.analyzeString(String.class)); }; + if (analyzer.init("DELIVERY_LASTNAME_DESCRIPTION", "deliveryLastnameDescription", "deliveryLastnameDescription")) { myEntity.setDeliveryLastnameDescription(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_STREET_ADDRESS", "deliveryStreetAddress", "deliveryStreetAddress")) { myEntity.setDeliveryStreetAddress(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_SUBURB", "deliverySuburb", "deliverySuburb")) { myEntity.setDeliverySuburb(analyzer.analyzeString(String.class)); }; if (analyzer.init("DELIVERY_CITY", "deliveryCity", "deliveryCity")) { myEntity.setDeliveryCity(analyzer.analyzeString(String.class)); }; @@ -3013,7 +3013,7 @@ helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_FIRSTNAME", myEntity.getDeliveryFirstname()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LASTNAME", myEntity.getDeliveryLastname()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_FIRSTNAME_DESCRIPTION", myEntity.getDeliveryFirstnameDescription()); - helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LAST_DESCRIPTION", myEntity.getDeliveryLastDescription()); + helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LASTNAME_DESCRIPTION", myEntity.getDeliveryLastnameDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_STREET_ADDRESS", myEntity.getDeliveryStreetAddress()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_SUBURB", myEntity.getDeliverySuburb()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_CITY", myEntity.getDeliveryCity()); @@ -3130,7 +3130,7 @@ valueMap.put("DELIVERY_FIRSTNAME", myEntity.getDeliveryFirstname()); valueMap.put("DELIVERY_LASTNAME", myEntity.getDeliveryLastname()); valueMap.put("DELIVERY_FIRSTNAME_DESCRIPTION", myEntity.getDeliveryFirstnameDescription()); - valueMap.put("DELIVERY_LAST_DESCRIPTION", myEntity.getDeliveryLastDescription()); + valueMap.put("DELIVERY_LASTNAME_DESCRIPTION", myEntity.getDeliveryLastnameDescription()); valueMap.put("DELIVERY_STREET_ADDRESS", myEntity.getDeliveryStreetAddress()); valueMap.put("DELIVERY_SUBURB", myEntity.getDeliverySuburb()); valueMap.put("DELIVERY_CITY", myEntity.getDeliveryCity()); @@ -3215,7 +3215,7 @@ valueMap.put("DELIVERY_FIRSTNAME", helpGettingColumnStringValue(myEntity.getDeliveryFirstname())); valueMap.put("DELIVERY_LASTNAME", helpGettingColumnStringValue(myEntity.getDeliveryLastname())); valueMap.put("DELIVERY_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryFirstnameDescription())); - valueMap.put("DELIVERY_LAST_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryLastDescription())); + valueMap.put("DELIVERY_LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryLastnameDescription())); valueMap.put("DELIVERY_STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getDeliveryStreetAddress())); valueMap.put("DELIVERY_SUBURB", helpGettingColumnStringValue(myEntity.getDeliverySuburb())); valueMap.put("DELIVERY_CITY", helpGettingColumnStringValue(myEntity.getDeliveryCity())); @@ -3277,9 +3277,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java 2007-10-09 06:07:27 UTC (rev 618) @@ -16,7 +16,7 @@ * ORDER_STATUS_ID * * [column-property] - * ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -95,6 +95,8 @@ // -------------- /** Db-name of ORDER_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String DB_NAME_ORDER_STATUS_ID = "ORDER_STATUS_ID"; + /** Db-name of TYPE. INTEGER : NotNull */ + public static final String DB_NAME_TYPE = "TYPE"; /** Db-name of SORT_ORDER. INTEGER : NotNull */ public static final String DB_NAME_SORT_ORDER = "SORT_ORDER"; /** Db-name of DATE_ADDED. TIMESTAMP : NotNull */ @@ -104,6 +106,8 @@ /** @deprecated Deprecated! So use DB_NAME_OrderStatusId. */ public static final String COLUMN_DB_NAME_OF_OrderStatusId = "ORDER_STATUS_ID"; + /** @deprecated Deprecated! So use DB_NAME_Type. */ + public static final String COLUMN_DB_NAME_OF_Type = "TYPE"; /** @deprecated Deprecated! So use DB_NAME_SortOrder. */ public static final String COLUMN_DB_NAME_OF_SortOrder = "SORT_ORDER"; /** @deprecated Deprecated! So use DB_NAME_DateAdded. */ @@ -116,6 +120,8 @@ // ------------------------------- /** Prop-name(JavaBeansRule) of orderStatusId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String PROPERTY_NAME_orderStatusId = "orderStatusId"; + /** Prop-name(JavaBeansRule) of type. INTEGER : NotNull */ + public static final String PROPERTY_NAME_type = "type"; /** Prop-name(JavaBeansRule) of sortOrder. INTEGER : NotNull */ public static final String PROPERTY_NAME_sortOrder = "sortOrder"; /** Prop-name(JavaBeansRule) of dateAdded. TIMESTAMP : NotNull */ @@ -128,6 +134,8 @@ // -------------------- /** Cap-prop-name of orderStatusId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String CAP_PROP_NAME_OrderStatusId = "OrderStatusId"; + /** Cap-prop-name of type. INTEGER : NotNull */ + public static final String CAP_PROP_NAME_Type = "Type"; /** Cap-prop-name of sortOrder. INTEGER : NotNull */ public static final String CAP_PROP_NAME_SortOrder = "SortOrder"; /** Cap-prop-name of dateAdded. TIMESTAMP : NotNull */ @@ -137,6 +145,8 @@ /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderStatusId. */ public static final String COLUMN_CAP_PROP_NAME_OF_OrderStatusId = "OrderStatusId"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_Type. */ + public static final String COLUMN_CAP_PROP_NAME_OF_Type = "Type"; /** @deprecated Deprecated! So use CAP_PROP_NAME_SortOrder. */ public static final String COLUMN_CAP_PROP_NAME_OF_SortOrder = "SortOrder"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DateAdded. */ @@ -149,6 +159,8 @@ // ---------------------- /** Uncap-prop-name of orderStatusId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String UNCAP_PROP_NAME_orderStatusId = "orderStatusId"; + /** Uncap-prop-name of type. INTEGER : NotNull */ + public static final String UNCAP_PROP_NAME_type = "type"; /** Uncap-prop-name of sortOrder. INTEGER : NotNull */ public static final String UNCAP_PROP_NAME_sortOrder = "sortOrder"; /** Uncap-prop-name of dateAdded. TIMESTAMP : NotNull */ @@ -158,6 +170,8 @@ /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderStatusId. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderStatusId = "orderStatusId"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Type. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_Type = "type"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_SortOrder. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_SortOrder = "sortOrder"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DateAdded. */ @@ -209,6 +223,7 @@ map.put(TABLE_DB_NAME.toLowerCase(), TABLE_PROPERTY_NAME); map.put(DB_NAME_ORDER_STATUS_ID.toLowerCase(), PROPERTY_NAME_orderStatusId); + map.put(DB_NAME_TYPE.toLowerCase(), PROPERTY_NAME_type); map.put(DB_NAME_SORT_ORDER.toLowerCase(), PROPERTY_NAME_sortOrder); map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded); map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified); @@ -227,6 +242,7 @@ map.put(TABLE_PROPERTY_NAME.toLowerCase(), TABLE_DB_NAME); map.put(PROPERTY_NAME_orderStatusId.toLowerCase(), DB_NAME_ORDER_STATUS_ID); + map.put(PROPERTY_NAME_type.toLowerCase(), DB_NAME_TYPE); map.put(PROPERTY_NAME_sortOrder.toLowerCase(), DB_NAME_SORT_ORDER); map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED); map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED); @@ -247,6 +263,7 @@ map.put(TABLE_DB_NAME, TABLE_CAP_PROP_NAME); map.put(DB_NAME_ORDER_STATUS_ID, CAP_PROP_NAME_OrderStatusId); + map.put(DB_NAME_TYPE, CAP_PROP_NAME_Type); map.put(DB_NAME_SORT_ORDER, CAP_PROP_NAME_SortOrder); map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded); map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified); @@ -267,6 +284,7 @@ map.put(TABLE_DB_NAME, TABLE_UNCAP_PROP_NAME); map.put(DB_NAME_ORDER_STATUS_ID, UNCAP_PROP_NAME_orderStatusId); + map.put(DB_NAME_TYPE, UNCAP_PROP_NAME_type); map.put(DB_NAME_SORT_ORDER, UNCAP_PROP_NAME_sortOrder); map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded); map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified); @@ -287,6 +305,7 @@ map.put(TABLE_CAP_PROP_NAME, TABLE_DB_NAME); map.put(CAP_PROP_NAME_OrderStatusId, DB_NAME_ORDER_STATUS_ID); + map.put(CAP_PROP_NAME_Type, DB_NAME_TYPE); map.put(CAP_PROP_NAME_SortOrder, DB_NAME_SORT_ORDER); map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED); map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED); @@ -307,6 +326,7 @@ map.put(TABLE_CAP_PROP_NAME, TABLE_UNCAP_PROP_NAME); map.put(CAP_PROP_NAME_OrderStatusId, UNCAP_PROP_NAME_orderStatusId); + map.put(CAP_PROP_NAME_Type, UNCAP_PROP_NAME_type); map.put(CAP_PROP_NAME_SortOrder, UNCAP_PROP_NAME_sortOrder); map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded); map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified); @@ -327,6 +347,7 @@ map.put(TABLE_UNCAP_PROP_NAME, TABLE_DB_NAME); map.put(UNCAP_PROP_NAME_orderStatusId, DB_NAME_ORDER_STATUS_ID); + map.put(UNCAP_PROP_NAME_type, DB_NAME_TYPE); map.put(UNCAP_PROP_NAME_sortOrder, DB_NAME_SORT_ORDER); map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED); map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED); @@ -347,6 +368,7 @@ map.put(TABLE_UNCAP_PROP_NAME, TABLE_CAP_PROP_NAME); map.put(UNCAP_PROP_NAME_orderStatusId, CAP_PROP_NAME_OrderStatusId); + map.put(UNCAP_PROP_NAME_type, CAP_PROP_NAME_Type); map.put(UNCAP_PROP_NAME_sortOrder, CAP_PROP_NAME_SortOrder); map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded); map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified); @@ -559,6 +581,7 @@ public java.util.List getColumnInfoList() { final java.util.List columnInfoList = new java.util.ArrayList(); columnInfoList.add(columnOrderStatusId()); + columnInfoList.add(columnType()); columnInfoList.add(columnSortOrder()); columnInfoList.add(columnDateAdded()); columnInfoList.add(columnLastModified()); @@ -617,7 +640,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED"; + return "ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED"; } /** @@ -627,6 +650,12 @@ return new ColumnInfo(this, "ORDER_STATUS_ID", "orderStatusId", java.math.BigDecimal.class, true); } /** + * @return Column information of type. (NotNull) + */ + public ColumnInfo columnType() { + return new ColumnInfo(this, "TYPE", "type", java.math.BigDecimal.class, false); + } + /** * @return Column information of sortOrder. (NotNull) */ public ColumnInfo columnSortOrder() { @@ -827,6 +856,7 @@ } public RelationTrace columnOrderStatusId() { return fixTrace(_relationList, OrderStatusDbm.getInstance().columnOrderStatusId()); } + public RelationTrace columnType() { return fixTrace(_relationList, OrderStatusDbm.getInstance().columnType()); } public RelationTrace columnSortOrder() { return fixTrace(_relationList, OrderStatusDbm.getInstance().columnSortOrder()); } public RelationTrace columnDateAdded() { return fixTrace(_relationList, OrderStatusDbm.getInstance().columnDateAdded()); } public RelationTrace columnLastModified() { return fixTrace(_relationList, OrderStatusDbm.getInstance().columnLastModified()); } @@ -901,6 +931,7 @@ final MapStringValueAnalyzer analyzer = new MapStringValueAnalyzer(columnValueMap, entity.getModifiedPropertyNames()); if (analyzer.init("ORDER_STATUS_ID", "orderStatusId", "orderStatusId")) { myEntity.setOrderStatusId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; + if (analyzer.init("TYPE", "type", "type")) { myEntity.setType(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("SORT_ORDER", "sortOrder", "sortOrder")) { myEntity.setSortOrder(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); }; if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); }; @@ -977,6 +1008,7 @@ final String mapMarkAndStartBrace = MAP_STRING_MAP_MARK + startBrace; final StringBuffer sb = new StringBuffer(); helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_STATUS_ID", myEntity.getOrderStatusId()); + helpAppendingColumnValueString(sb, delimiter, equal, "TYPE", myEntity.getType()); helpAppendingColumnValueString(sb, delimiter, equal, "SORT_ORDER", myEntity.getSortOrder()); helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded()); helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified()); @@ -1035,6 +1067,7 @@ final OrderStatus myEntity = downcast(entity); final java.util.Map valueMap = new java.util.LinkedHashMap(); valueMap.put("ORDER_STATUS_ID", myEntity.getOrderStatusId()); + valueMap.put("TYPE", myEntity.getType()); valueMap.put("SORT_ORDER", myEntity.getSortOrder()); valueMap.put("DATE_ADDED", myEntity.getDateAdded()); valueMap.put("LAST_MODIFIED", myEntity.getLastModified()); @@ -1061,6 +1094,7 @@ final OrderStatus myEntity = downcast(entity); final java.util.Map valueMap = new java.util.LinkedHashMap(); valueMap.put("ORDER_STATUS_ID", helpGettingColumnStringValue(myEntity.getOrderStatusId())); + valueMap.put("TYPE", helpGettingColumnStringValue(myEntity.getType())); valueMap.put("SORT_ORDER", helpGettingColumnStringValue(myEntity.getSortOrder())); valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded())); valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified())); @@ -1088,9 +1122,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ORDER_STATUS(ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ORDER_STATUS(ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? )"; } - return "insert into ORDER_STATUS(ORDER_STATUS_ID, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? )"; + return "insert into ORDER_STATUS(ORDER_STATUS_ID, TYPE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? )"; } // =================================================================================== 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2007-10-09 06:07:27 UTC (rev 618) @@ -3865,163 +3865,163 @@ abstract protected ConditionValue getCValueDeliveryFirstnameDescription(); - /** Column db name of deliveryLastDescription. */ - protected static final String COL_DELIVERY_LAST_DESCRIPTION = "DELIVERY_LAST_DESCRIPTION"; + /** Column db name of deliveryLastnameDescription. */ + protected static final String COL_DELIVERY_LASTNAME_DESCRIPTION = "DELIVERY_LASTNAME_DESCRIPTION"; - /** Column java name of deliveryLastDescription. */ - protected static final String J_DeliveryLastDescription = "DeliveryLastDescription"; + /** Column java name of deliveryLastnameDescription. */ + protected static final String J_DeliveryLastnameDescription = "DeliveryLastnameDescription"; - /** Column uncapitalised java name of deliveryLastDescription. */ - protected static final String UJ_deliveryLastDescription = "deliveryLastDescription"; + /** Column uncapitalised java name of deliveryLastnameDescription. */ + protected static final String UJ_deliveryLastnameDescription = "deliveryLastnameDescription"; /** - * Set the value of deliveryLastDescription using equal. { = } + * Set the value of deliveryLastnameDescription using equal. { = } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as equal. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as equal. */ - public void setDeliveryLastDescription_Equal(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_Equal(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using notEqual. { != } + * Set the value of deliveryLastnameDescription using notEqual. { != } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as notEqual. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as notEqual. */ - public void setDeliveryLastDescription_NotEqual(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_NotEqual(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using greaterThan. { > } + * Set the value of deliveryLastnameDescription using greaterThan. { > } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as greaterThan. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as greaterThan. */ - public void setDeliveryLastDescription_GreaterThan(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_GreaterThan(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using lessThan. { < } + * Set the value of deliveryLastnameDescription using lessThan. { < } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as lessThan. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as lessThan. */ - public void setDeliveryLastDescription_LessThan(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_LessThan(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using greaterEqual. { >= } + * Set the value of deliveryLastnameDescription using greaterEqual. { >= } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as greaterEqual. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as greaterEqual. */ - public void setDeliveryLastDescription_GreaterEqual(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_GreaterEqual(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using lessEqual. { <= } + * Set the value of deliveryLastnameDescription using lessEqual. { <= } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as lessEqual. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as lessEqual. */ - public void setDeliveryLastDescription_LessEqual(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_LessEqual(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using prefixSearch. { like 'xxx%' } + * Set the value of deliveryLastnameDescription using prefixSearch. { like 'xxx%' } * If the value is null or empty-string, this condition is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as prefixSearch. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as prefixSearch. */ - public void setDeliveryLastDescription_PrefixSearch(String deliveryLastDescription) { - registerDeliveryLastDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryLastDescription)); + public void setDeliveryLastnameDescription_PrefixSearch(String deliveryLastnameDescription) { + registerDeliveryLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryLastnameDescription)); } /** - * Set the value of deliveryLastDescription using likeSearch. { like '%xxx%' } + * Set the value of deliveryLastnameDescription using likeSearch. { like '%xxx%' } * If the value is null or empty-string, this condition is ignored. * You can invoke this method several times and the conditions are set up. * - * @param deliveryLastDescription The value of deliveryLastDescription as likeSearch. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as likeSearch. * @param likeSearchOption The option of like-search. (NotNull) */ - public void setDeliveryLastDescription_LikeSearch(String deliveryLastDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { - registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryLastDescription), getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription, likeSearchOption); + public void setDeliveryLastnameDescription_LikeSearch(String deliveryLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryLastnameDescription), getCValueDeliveryLastnameDescription(), COL_DELIVERY_LASTNAME_DESCRIPTION, J_DeliveryLastnameDescription, UJ_deliveryLastnameDescription, likeSearchOption); } /** - * Set the value of deliveryLastDescription using inScope. { in ('a', 'b') } + * Set the value of deliveryLastnameDescription using inScope. { in ('a', 'b') } * If the element in the list is null or empty-string, the condition-element is ignored. * - * @param deliveryLastDescriptionList The value of deliveryLastDescription as inScope. + * @param deliveryLastnameDescriptionList The value of deliveryLastnameDescription as inScope. */ - public void setDeliveryLastDescription_InScope(java.util.List deliveryLastDescriptionList) { - registerDeliveryLastDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastDescriptionList)); + public void setDeliveryLastnameDescription_InScope(java.util.List deliveryLastnameDescriptionList) { + registerDeliveryLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastnameDescriptionList)); } /** - * Set the value of deliveryLastDescription using inScope. { in ('a', 'b') } + * Set the value of deliveryLastnameDescription using inScope. { in ('a', 'b') } * If the element in the list is null or empty-string, the condition-element is ignored. * - * @param deliveryLastDescription The value of deliveryLastDescription as inScope. + * @param deliveryLastnameDescription The value of deliveryLastnameDescription as inScope. * @param inScopeOption The option of in-scope. (NotNull) */ - public void setDeliveryLastDescription_InScope(String deliveryLastDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { - registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryLastDescription), getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription, inScopeOption); + public void setDeliveryLastnameDescription_InScope(String deliveryLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryLastnameDescription), getCValueDeliveryLastnameDescription(), COL_DELIVERY_LASTNAME_DESCRIPTION, J_DeliveryLastnameDescription, UJ_deliveryLastnameDescription, inScopeOption); } /** - * Set the value of deliveryLastDescription using notInScope. { not in ('a', 'b') } + * Set the value of deliveryLastnameDescription using notInScope. { not in ('a', 'b') } * If the element in the list is null or empty-string, the condition-element is ignored. * - * @param deliveryLastDescriptionList The value of deliveryLastDescription as notInScope. + * @param deliveryLastnameDescriptionList The value of deliveryLastnameDescription as notInScope. */ - public void setDeliveryLastDescription_NotInScope(java.util.List deliveryLastDescriptionList) { - registerDeliveryLastDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastDescriptionList)); + public void setDeliveryLastnameDescription_NotInScope(java.util.List deliveryLastnameDescriptionList) { + registerDeliveryLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastnameDescriptionList)); } /** - * Set the value of deliveryLastDescription using isNull. { is null } + * Set the value of deliveryLastnameDescription using isNull. { is null } */ - public void setDeliveryLastDescription_IsNull() { - registerDeliveryLastDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + public void setDeliveryLastnameDescription_IsNull() { + registerDeliveryLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); } /** - * Set the value of deliveryLastDescription using isNotNull. { is not null } + * Set the value of deliveryLastnameDescription using isNotNull. { is not null } */ - public void setDeliveryLastDescription_IsNotNull() { - registerDeliveryLastDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + public void setDeliveryLastnameDescription_IsNotNull() { + registerDeliveryLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); } /** - * Register condition of deliveryLastDescription. + * Register condition of deliveryLastnameDescription. * * @param key Condition key. (NotNull) - * @param value The value of deliveryLastDescription. (Nullable) + * @param value The value of deliveryLastnameDescription. (Nullable) */ - protected void registerDeliveryLastDescription(ConditionKey key, Object value) { - registerQuery(key, value, getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription); + protected void registerDeliveryLastnameDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueDeliveryLastnameDescription(), COL_DELIVERY_LASTNAME_DESCRIPTION, J_DeliveryLastnameDescription, UJ_deliveryLastnameDescription); } /** - * Register inline condition of deliveryLastDescription. + * Register inline condition of deliveryLastnameDescription. * * @param key Condition key. (NotNull) - * @param value The value of deliveryLastDescription. (Nullable) + * @param value The value of deliveryLastnameDescription. (Nullable) */ - protected void registerInlineDeliveryLastDescription(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription); + protected void registerInlineDeliveryLastnameDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueDeliveryLastnameDescription(), COL_DELIVERY_LASTNAME_DESCRIPTION, J_DeliveryLastnameDescription, UJ_deliveryLastnameDescription); } - abstract protected ConditionValue getCValueDeliveryLastDescription(); + abstract protected ConditionValue getCValueDeliveryLastnameDescription(); /** Column db name of deliveryStreetAddress. */ protected static final String COL_DELIVERY_STREET_ADDRESS = "DELIVERY_STREET_ADDRESS"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusCQ.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderStatusCQ.java 2007-10-09 06:07:27 UTC (rev 618) @@ -291,6 +291,111 @@ abstract protected ConditionValue getCValueOrderStatusId(); + /** Column db name of type. */ + protected static final String COL_TYPE = "TYPE"; + + /** Column java name of type. */ + protected static final String J_Type = "Type"; + + /** Column uncapitalised java name of type. */ + protected static final String UJ_type = "type"; + + /** + * Set the value of type using equal. { = } + * + * @param type The value of type as equal. + */ + public void setType_Equal(java.math.BigDecimal type) { + registerType(ConditionKey.CK_EQUAL, type); + } + + /** + * Set the value of type using notEqual. { != } + * + * @param type The value of type as notEqual. + */ + public void setType_NotEqual(java.math.BigDecimal type) { + registerType(ConditionKey.CK_NOT_EQUAL, type); + } + + /** + * Set the value of type using greaterThan. { > } + * + * @param type The value of type as greaterThan. + */ + public void setType_GreaterThan(java.math.BigDecimal type) { + registerType(ConditionKey.CK_GREATER_THAN, type); + } + + /** + * Set the value of type using lessThan. { < } + * + * @param type The value of type as lessThan. + */ + public void setType_LessThan(java.math.BigDecimal type) { + registerType(ConditionKey.CK_LESS_THAN, type); + } + + /** + * Set the value of type using greaterEqual. { >= } + * + * @param type The value of type as greaterEqual. + */ + public void setType_GreaterEqual(java.math.BigDecimal type) { + registerType(ConditionKey.CK_GREATER_EQUAL, type); + } + + /** + * Set the value of type using lessEqual. { <= } + * + * @param type The value of type as lessEqual. + */ + public void setType_LessEqual(java.math.BigDecimal type) { + registerType(ConditionKey.CK_LESS_EQUAL, type); + } + + /** + * Set the value of type using inScope. { in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param typeList The value of type as inScope. + */ + public void setType_InScope(java.util.List typeList) { + registerType(ConditionKey.CK_IN_SCOPE, typeList); + } + + /** + * Set the value of type using notInScope. { not in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param typeList The value of type as notInScope. + */ + public void setType_NotInScope(java.util.List typeList) { + registerType(ConditionKey.CK_NOT_IN_SCOPE, typeList); + } + + /** + * Register condition of type. + * + * @param key Condition key. (NotNull) + * @param value The value of type. (Nullable) + */ + protected void registerType(ConditionKey key, Object value) { + registerQuery(key, value, getCValueType(), COL_TYPE, J_Type, UJ_type); + } + + /** + * Register inline condition of type. + * + * @param key Condition key. (NotNull) + * @param value The value of type. (Nullable) + */ + protected void registerInlineType(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueType(), COL_TYPE, J_Type, UJ_type); + } + + abstract protected ConditionValue getCValueType(); + /** Column db name of sortOrder. */ protected static final String COL_SORT_ORDER = "SORT_ORDER"; 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2007-10-09 06:07:27 UTC (rev 618) @@ -505,21 +505,21 @@ } /** - * Include select-column of deliveryLastDescription as mine. + * Include select-column of deliveryLastnameDescription as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. */ - public void includeAsMine_DeliveryLastDescription() { - registerIncludedSelectColumn("DeliveryLastDescription", getRealColumnName("DELIVERY_LAST_DESCRIPTION")); + public void includeAsMine_DeliveryLastnameDescription() { + registerIncludedSelectColumn("DeliveryLastnameDescription", getRealColumnName("DELIVERY_LASTNAME_DESCRIPTION")); } /** - * Include select-column of deliveryLastDescription as mine. + * Include select-column of deliveryLastnameDescription as mine. * * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) */ - public void includeAsMine_DeliveryLastDescription(String aliasName) { - registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_LAST_DESCRIPTION")); + public void includeAsMine_DeliveryLastnameDescription(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_LASTNAME_DESCRIPTION")); } /** @@ -2422,45 +2422,45 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [DELIVERY_LAST_DESCRIPTION] + // Column = [DELIVERY_LASTNAME_DESCRIPTION] // - - - - - - - - -/ - /** The attribute of deliveryLastDescription. */ - protected ConditionValue _deliveryLastDescription; + /** The attribute of deliveryLastnameDescription. */ + protected ConditionValue _deliveryLastnameDescription; /** - * Get the value of deliveryLastDescription. + * Get the value of deliveryLastnameDescription. * - * @return The value of deliveryLastDescription. + * @return The value of deliveryLastnameDescription. */ - public ConditionValue getDeliveryLastDescription() { - if (_deliveryLastDescription == null) { - _deliveryLastDescription = new ConditionValue(); + public ConditionValue getDeliveryLastnameDescription() { + if (_deliveryLastnameDescription == null) { + _deliveryLastnameDescription = new ConditionValue(); } - return _deliveryLastDescription; + return _deliveryLastnameDescription; } - protected ConditionValue getCValueDeliveryLastDescription() { - return getDeliveryLastDescription(); + protected ConditionValue getCValueDeliveryLastnameDescription() { + return getDeliveryLastnameDescription(); } /** - * Add order-by of deliveryLastDescription as ASC. + * Add order-by of deliveryLastnameDescription as ASC. * * @return this. (NotNull) */ - public BsOrderFormCQ addOrderBy_DeliveryLastDescription_Asc() { - getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LAST_DESCRIPTION), null, true);return this; + public BsOrderFormCQ addOrderBy_DeliveryLastnameDescription_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LASTNAME_DESCRIPTION), null, true);return this; } /** - * Add order-by of deliveryLastDescription as DESC. + * Add order-by of deliveryLastnameDescription as DESC. * * @return this. (NotNull) */ - public BsOrderFormCQ addOrderBy_DeliveryLastDescription_Desc() { - getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LAST_DESCRIPTION), null, false);return this; + public BsOrderFormCQ addOrderBy_DeliveryLastnameDescription_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LASTNAME_DESCRIPTION), null, false);return this; } // /- - - - - - - - - - - - - - - - - - - - - - - Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusCQ.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderStatusCQ.java 2007-10-09 06:07:27 UTC (rev 618) @@ -73,6 +73,24 @@ } /** + * Include select-column of type as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_Type() { + registerIncludedSelectColumn("Type", getRealColumnName("TYPE")); + } + + /** + * Include select-column of type as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_Type(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("TYPE")); + } + + /** * Include select-column of sortOrder as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -304,6 +322,48 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [TYPE] + // - - - - - - - - -/ + + /** The attribute of type. */ + protected ConditionValue _type; + + /** + * Get the value of type. + * + * @return The value of type. + */ + public ConditionValue getType() { + if (_type == null) { + _type = new ConditionValue(); + } + return _type; + } + + protected ConditionValue getCValueType() { + return getType(); + } + + + /** + * Add order-by of type as ASC. + * + * @return this. (NotNull) + */ + public BsOrderStatusCQ addOrderBy_Type_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_TYPE), null, true);return this; + } + + /** + * Add order-by of type as DESC. + * + * @return this. (NotNull) + */ + public BsOrderStatusCQ addOrderBy_Type_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_TYPE), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SORT_ORDER] // - - - - - - - - -/ 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2007-10-09 06:07:27 UTC (rev 618) @@ -326,10 +326,10 @@ // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [DELIVERY_LAST_DESCRIPTION] + // Column = [DELIVERY_LASTNAME_DESCRIPTION] // - - - - - - - - -/ - protected ConditionValue getCValueDeliveryLastDescription() { - return _myCQ.getDeliveryLastDescription(); + protected ConditionValue getCValueDeliveryLastnameDescription() { + return _myCQ.getDeliveryLastnameDescription(); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusCIQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusCIQ.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderStatusCIQ.java 2007-10-09 06:07:27 UTC (rev 618) @@ -121,6 +121,14 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [TYPE] + // - - - - - - - - -/ + protected ConditionValue getCValueType() { + return _myCQ.getType(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SORT_ORDER] // - - - - - - - - -/ protected ConditionValue getCValueSortOrder() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2007-10-09 06:07:27 UTC (rev 618) @@ -5,6 +5,7 @@ import java.util.Map; import org.seasar.extension.dxo.annotation.ConversionRule; +import org.seasar.extension.dxo.annotation.ExcludeNull; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; @@ -27,9 +28,10 @@ public void convertToOrderCardInfo(OrderConfirmPage orderConfirmPage, OrderCardInfo orderCardInfo); + @ExcludeNull public void convert(OrderConfirmPage orderConfirmPage, OrderForm orderForm); - public void convert(OrderForm orders, AbstractOrderEditPage orderEditPage); + public void convert(OrderForm orderForm, AbstractOrderEditPage orderEditPage); @ConversionRule("label : name" + ",value : orderStatusId") public List> convertToOrderStatusItems( @@ -37,8 +39,9 @@ @ConversionRule("orderProductId : orderProductId" + ",orderFormId : orderFormId" + ",productId : productId" - + ",model : model" + ",price : price" + ",tax : tax" - + ",finalPrice : finalPrice" + ",quantity : quantity") + + ",code : code" + ",model : model" + ",price : price" + + ",tax : tax" + ",finalPrice : finalPrice" + + ",quantity : quantity") public List> convertToOrderProductItems( List list); @@ -46,12 +49,13 @@ @ConversionRule("customerId : customerId" + ",customerGender : gender" + ",customerFirstname : firstname" + ",customerLastname : lastname" + + ",customerFirstnameDescription : firstnameDescription" + + ",customerLastnameDescription : lastnameDescription" + ",customerDayOfBirth : dayOfBirth" + ",customerEmailAddress : emailAddress") public void convertToCustomer(Customer customer, OrderForm orderForm); - @ConversionRule("customerFirstname : firstname" - + ",customerLastname : lastname" + ",customerCompany : company" + @ConversionRule("customerCompany : company" + ",customerDepartment : department" + ",customerStreetAddress : streetAddress" + ",customerSuburb : suburb" + ",customerCity : city" @@ -64,8 +68,10 @@ OrderForm orderForm); @ConversionRule("deliveryFirstname : firstname" - + ",deliveryLastname : lastname" + ",deliveryCompany : company" - + ",deliveryDepartment : department" + + ",deliveryLastname : lastname" + + ",deliveryFirstnameDescription : firstnameDescription" + + ",deliveryLastnameDescription : lastnameDescription" + + ",deliveryCompany : company" + ",deliveryDepartment : department" + ",deliveryStreetAddress : streetAddress" + ",deliverySuburb : suburb" + ",deliveryCity : city" + ",deliveryState : state" + ",deliveryPostcode : postcode" @@ -77,8 +83,10 @@ OrderForm orderForm); @ConversionRule("billingFirstname : firstname" - + ",billingLastname : lastname" + ",billingCompany : company" - + ",billingDepartment : department" + + ",billingLastname : lastname" + + ",billingFirstnameDescription : firstnameDescription" + + ",billingLastnameDescription : lastnameDescription" + + ",billingCompany : company" + ",billingDepartment : department" + ",billingStreetAddress : streetAddress" + ",billingSuburb : suburb" + ",billingCity : city" + ",billingState : state" + ",billingPostcode : postcode" Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-09 06:07:27 UTC (rev 618) @@ -13,6 +13,7 @@ import jp.sf.pal.pompei.exentity.OrderCardInfo; import jp.sf.pal.pompei.exentity.OrderForm; import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.exentity.OrderStatusDescription; import jp.sf.pal.pompei.exentity.PaymentMethod; import jp.sf.pal.pompei.pager.OrderFormPager; @@ -27,7 +28,8 @@ public List getOrderFormList(); - public PagingResultBean getOrderFormListByPager(OrderFormPager orderFormPager); + public PagingResultBean getOrderFormListByPager( + OrderFormPager orderFormPager); public String addOrderForm(Customer customer, List customerBasketIdList, @@ -40,6 +42,8 @@ public Currency getCurrency(BigDecimal currencyId); + public OrderStatus getOrderStatus(BigDecimal orderStatusId); + public List getOrderStatusDescriptionList( BigDecimal languageId); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-09 06:07:27 UTC (rev 618) @@ -16,6 +16,7 @@ import jp.sf.pal.pompei.cbean.OrderProductAttributeCB; import jp.sf.pal.pompei.cbean.OrderProductCB; import jp.sf.pal.pompei.cbean.OrderProductDownloadCB; +import jp.sf.pal.pompei.cbean.OrderStatusCB; import jp.sf.pal.pompei.cbean.OrderStatusDescriptionCB; import jp.sf.pal.pompei.cbean.OrderStatusHistoryCB; import jp.sf.pal.pompei.dxo.OrderFormDxo; @@ -27,6 +28,7 @@ import jp.sf.pal.pompei.exbhv.OrderProductAttributeBhv; import jp.sf.pal.pompei.exbhv.OrderProductBhv; import jp.sf.pal.pompei.exbhv.OrderProductDownloadBhv; +import jp.sf.pal.pompei.exbhv.OrderStatusBhv; import jp.sf.pal.pompei.exbhv.OrderStatusDescriptionBhv; import jp.sf.pal.pompei.exbhv.OrderStatusHistoryBhv; import jp.sf.pal.pompei.exbhv.ProductBhv; @@ -41,6 +43,7 @@ import jp.sf.pal.pompei.exentity.OrderProduct; import jp.sf.pal.pompei.exentity.OrderProductAttribute; import jp.sf.pal.pompei.exentity.OrderProductDownload; +import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.exentity.OrderStatusDescription; import jp.sf.pal.pompei.exentity.OrderStatusHistory; import jp.sf.pal.pompei.exentity.PaymentMethod; @@ -69,6 +72,8 @@ private transient OrderStatusDescriptionBhv orderStatusDescriptionBhv; + private transient OrderStatusBhv orderStatusBhv; + private transient OrderStatusHistoryBhv orderStatusHistoryBhv; private transient OrderProductAttributeBhv orderProductAttributeBhv; @@ -133,8 +138,24 @@ public void updateOrderForm(OrderForm orderForm, OrderCardInfo orderCardInfo) { Date now = new Date(); + // set last modified orderForm.setLastModified(new Timestamp(now.getTime())); + if (orderForm.getOrderStatusId() != null) { + OrderStatus orderStatus = getOrderStatus(orderForm + .getOrderStatusId()); + // set finished date + if (PompeiConstants.FINISHED_ORDER_STATUS_TYPE.equals(orderStatus + .getType())) { + orderForm.setFinishedDate(new Timestamp(now.getTime())); + } else { + // TODO is it correct? + orderForm.setFinishedDate(null); + } + } else { + // TODO exception? + } + // update order form getOrderFormBhv().update(orderForm); @@ -181,6 +202,12 @@ return getOrderFormBhv().selectCount(cb); } + public OrderStatus getOrderStatus(BigDecimal orderStatusId) { + OrderStatusCB cb = new OrderStatusCB(); + cb.query().setOrderStatusId_Equal(orderStatusId); + return getOrderStatusBhv().selectEntity(cb); + } + public List getOrderStatusDescriptionList( BigDecimal languageId) { OrderStatusDescriptionCB cb = new OrderStatusDescriptionCB(); @@ -276,11 +303,16 @@ public OrderForm getOrderForm(BigDecimal orderFormId) { OrderFormCB cb = new OrderFormCB(); + // TODO needed? // cb.setupSelect_Currency(); + // TODO needed? // cb.setupSelect_Customer(); + // TODO needed? // cb.setupSelect_DeliveryMethod(); + // TODO needed? // cb.setupSelect_OrderCommentAsOne(); cb.setupSelect_OrderStatus(); + // TODO needed? // cb.setupSelect_PaymentMethod(); cb.query().setOrderFormId_Equal(orderFormId); return orderFormBhv.selectEntity(cb); @@ -592,4 +624,18 @@ this.orderCommentBhv = orderCommentBhv; } + /** + * @return orderStatusBhv + */ + public OrderStatusBhv getOrderStatusBhv() { + return orderStatusBhv; + } + + /** + * @param orderStatusBhv 設定する orderStatusBhv + */ + public void setOrderStatusBhv(OrderStatusBhv orderStatusBhv) { + this.orderStatusBhv = orderStatusBhv; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2007-10-09 06:07:27 UTC (rev 618) @@ -15,6 +15,8 @@ private String model; + private String code; + private BigDecimal price; private BigDecimal finalPrice; @@ -33,6 +35,10 @@ private String billingLastname; + private String billingFirstnameDescription; + + private String billingLastnameDescription; + private String billingLocaleName; private String billingPostcode; @@ -62,12 +68,16 @@ private String customerFirstname; + private String customerFirstnameDescription; + private String customerGender; private BigDecimal customerId; private String customerLastname; + private String customerLastnameDescription; + private String customerLocaleName; private String customerPostcode; @@ -90,6 +100,10 @@ private String deliveryLastname; + private String deliveryFirstnameDescription; + + private String deliveryLastnameDescription; + private String deliveryLocaleName; private String deliveryMethodCode; @@ -745,4 +759,107 @@ this.quantity = quantity; } + /** + * @return code + */ + public String getCode() { + return code; + } + + /** + * @param code 設定する code + */ + public void setCode(String code) { + this.code = code; + } + + /** + * @return billingFirstnameDescription + */ + public String getBillingFirstnameDescription() { + return billingFirstnameDescription; + } + + /** + * @param billingFirstnameDescription 設定する billingFirstnameDescription + */ + public void setBillingFirstnameDescription( + String billingFirstnameDescription) { + this.billingFirstnameDescription = billingFirstnameDescription; + } + + /** + * @return billingLastnameDescription + */ + public String getBillingLastnameDescription() { + return billingLastnameDescription; + } + + /** + * @param billingLastnameDescription 設定する billingLastnameDescription + */ + public void setBillingLastnameDescription(String billingLastnameDescription) { + this.billingLastnameDescription = billingLastnameDescription; + } + + /** + * @return customerFirstnameDescription + */ + public String getCustomerFirstnameDescription() { + return customerFirstnameDescription; + } + + /** + * @param customerFirstnameDescription 設定する customerFirstnameDescription + */ + public void setCustomerFirstnameDescription( + String customerFirstnameDescription) { + this.customerFirstnameDescription = customerFirstnameDescription; + } + + /** + * @return customerLastnameDescription + */ + public String getCustomerLastnameDescription() { + return customerLastnameDescription; + } + + /** + * @param customerLastnameDescription 設定する customerLastnameDescription + */ + public void setCustomerLastnameDescription( + String customerLastnameDescription) { + this.customerLastnameDescription = customerLastnameDescription; + } + + /** + * @return deliveryFirstnameDescription + */ + public String getDeliveryFirstnameDescription() { + return deliveryFirstnameDescription; + } + + /** + * @param deliveryFirstnameDescription 設定する deliveryFirstnameDescription + */ + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + this.deliveryFirstnameDescription = deliveryFirstnameDescription; + } + + /** + * @return deliveryLastnameDescription + */ + public String getDeliveryLastnameDescription() { + return deliveryLastnameDescription; + } + + /** + * @param deliveryLastnameDescription 設定する deliveryLastnameDescription + */ + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + this.deliveryLastnameDescription = deliveryLastnameDescription; + } + } \ No newline at end of file Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2007-10-09 06:07:27 UTC (rev 618) @@ -1,5 +1,12 @@ package jp.sf.pal.pompei.web.admin.order; +import java.math.BigDecimal; +import java.util.Date; + +import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; +import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; +import org.seasar.teeda.extension.annotation.validator.Required; + public class OrderConfirmPage extends AbstractOrderEditPage { /** @@ -29,4 +36,331 @@ public void setOrderStatusName(String orderStatusName) { this.orderStatusName = orderStatusName; } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerDayOfBirth(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd") + @Override + public void setCustomerDayOfBirth(Date customerDayOfBirth) { + super.setCustomerDayOfBirth(customerDayOfBirth); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setLastModified(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") + @Override + public void setLastModified(Date lastModified) { + super.setLastModified(lastModified); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setPrice(BigDecimal price) { + super.setPrice(price); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setPurchasedDate(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") + @Override + public void setPurchasedDate(Date purchasedDate) { + super.setPurchasedDate(purchasedDate); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setSubTotalPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setSubTotalPrice(BigDecimal subTotalPrice) { + super.setSubTotalPrice(subTotalPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setTax(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setTax(BigDecimal tax) { + super.setTax(tax); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setTotalPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setTotalPrice(BigDecimal totalPrice) { + super.setTotalPrice(totalPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setDeliveryPrice(BigDecimal deliveryPrice) { + super.setDeliveryPrice(deliveryPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setFinishedDate(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") + @Override + public void setFinishedDate(Date finishedDate) { + super.setFinishedDate(finishedDate); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setFinalPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setFinalPrice(BigDecimal finalPrice) { + super.setFinalPrice(finalPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingCity(java.lang.String) + */ + @Required + @Override + public void setBillingCity(String billingCity) { + super.setBillingCity(billingCity); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingFirstname(java.lang.String) + */ + @Required + @Override + public void setBillingFirstname(String billingFirstname) { + super.setBillingFirstname(billingFirstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setBillingFirstnameDescription( + String billingFirstnameDescription) { + super.setBillingFirstnameDescription(billingFirstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingLastname(java.lang.String) + */ + @Required + @Override + public void setBillingLastname(String billingLastname) { + super.setBillingLastname(billingLastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setBillingLastnameDescription(String billingLastnameDescription) { + super.setBillingLastnameDescription(billingLastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingPostcode(java.lang.String) + */ + @Required + @Override + public void setBillingPostcode(String billingPostcode) { + super.setBillingPostcode(billingPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingState(java.lang.String) + */ + @Required + @Override + public void setBillingState(String billingState) { + super.setBillingState(billingState); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingStreetAddress(java.lang.String) + */ + @Required + @Override + public void setBillingStreetAddress(String billingStreetAddress) { + super.setBillingStreetAddress(billingStreetAddress); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerCity(java.lang.String) + */ + @Required + @Override + public void setCustomerCity(String customerCity) { + super.setCustomerCity(customerCity); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerEmailAddress(java.lang.String) + */ + @Required + @Override + public void setCustomerEmailAddress(String customerEmailAddress) { + super.setCustomerEmailAddress(customerEmailAddress); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerFirstname(java.lang.String) + */ + @Required + @Override + public void setCustomerFirstname(String customerFirstname) { + super.setCustomerFirstname(customerFirstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setCustomerFirstnameDescription( + String customerFirstnameDescription) { + super.setCustomerFirstnameDescription(customerFirstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerGender(java.lang.String) + */ + @Required + @Override + public void setCustomerGender(String customerGender) { + super.setCustomerGender(customerGender); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerLastname(java.lang.String) + */ + @Required + @Override + public void setCustomerLastname(String customerLastname) { + super.setCustomerLastname(customerLastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setCustomerLastnameDescription( + String customerLastnameDescription) { + super.setCustomerLastnameDescription(customerLastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerPostcode(java.lang.String) + */ + @Required + @Override + public void setCustomerPostcode(String customerPostcode) { + super.setCustomerPostcode(customerPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerState(java.lang.String) + */ + @Required + @Override + public void setCustomerState(String customerState) { + super.setCustomerState(customerState); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryCity(java.lang.String) + */ + @Required + @Override + public void setDeliveryCity(String deliveryCity) { + super.setDeliveryCity(deliveryCity); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryFirstname(java.lang.String) + */ + @Required + @Override + public void setDeliveryFirstname(String deliveryFirstname) { + super.setDeliveryFirstname(deliveryFirstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + super.setDeliveryFirstnameDescription(deliveryFirstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryLastname(java.lang.String) + */ + @Required + @Override + public void setDeliveryLastname(String deliveryLastname) { + super.setDeliveryLastname(deliveryLastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + super.setDeliveryLastnameDescription(deliveryLastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryPostcode(java.lang.String) + */ + @Required + @Override + public void setDeliveryPostcode(String deliveryPostcode) { + super.setDeliveryPostcode(deliveryPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryState(java.lang.String) + */ + @Required + @Override + public void setDeliveryState(String deliveryState) { + super.setDeliveryState(deliveryState); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryStreetAddress(java.lang.String) + */ + @Required + @Override + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + super.setDeliveryStreetAddress(deliveryStreetAddress); + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-10-09 06:07:27 UTC (rev 618) @@ -1,10 +1,15 @@ package jp.sf.pal.pompei.web.admin.order; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Map; +import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; +import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; +import org.seasar.teeda.extension.annotation.validator.Required; -public class OrderEditPage extends AbstractOrderEditPage { +public class OrderEditPage extends AbstractOrderEditPage { /** * @@ -22,4 +27,330 @@ this.orderStatusIdItems = orderStatusIdItems; } + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerDayOfBirth(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd") + @Override + public void setCustomerDayOfBirth(Date customerDayOfBirth) { + super.setCustomerDayOfBirth(customerDayOfBirth); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setLastModified(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") + @Override + public void setLastModified(Date lastModified) { + super.setLastModified(lastModified); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setPrice(BigDecimal price) { + super.setPrice(price); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setPurchasedDate(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") + @Override + public void setPurchasedDate(Date purchasedDate) { + super.setPurchasedDate(purchasedDate); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setSubTotalPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setSubTotalPrice(BigDecimal subTotalPrice) { + super.setSubTotalPrice(subTotalPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setTax(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setTax(BigDecimal tax) { + super.setTax(tax); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setTotalPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setTotalPrice(BigDecimal totalPrice) { + super.setTotalPrice(totalPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setDeliveryPrice(BigDecimal deliveryPrice) { + super.setDeliveryPrice(deliveryPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setFinishedDate(java.util.Date) + */ + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") + @Override + public void setFinishedDate(Date finishedDate) { + super.setFinishedDate(finishedDate); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setFinalPrice(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setFinalPrice(BigDecimal finalPrice) { + super.setFinalPrice(finalPrice); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingCity(java.lang.String) + */ + @Required + @Override + public void setBillingCity(String billingCity) { + super.setBillingCity(billingCity); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingFirstname(java.lang.String) + */ + @Required + @Override + public void setBillingFirstname(String billingFirstname) { + super.setBillingFirstname(billingFirstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setBillingFirstnameDescription( + String billingFirstnameDescription) { + super.setBillingFirstnameDescription(billingFirstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingLastname(java.lang.String) + */ + @Required + @Override + public void setBillingLastname(String billingLastname) { + super.setBillingLastname(billingLastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setBillingLastnameDescription(String billingLastnameDescription) { + super.setBillingLastnameDescription(billingLastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingPostcode(java.lang.String) + */ + @Required + @Override + public void setBillingPostcode(String billingPostcode) { + super.setBillingPostcode(billingPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingState(java.lang.String) + */ + @Required + @Override + public void setBillingState(String billingState) { + super.setBillingState(billingState); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setBillingStreetAddress(java.lang.String) + */ + @Required + @Override + public void setBillingStreetAddress(String billingStreetAddress) { + super.setBillingStreetAddress(billingStreetAddress); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerCity(java.lang.String) + */ + @Required + @Override + public void setCustomerCity(String customerCity) { + super.setCustomerCity(customerCity); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerEmailAddress(java.lang.String) + */ + @Required + @Override + public void setCustomerEmailAddress(String customerEmailAddress) { + super.setCustomerEmailAddress(customerEmailAddress); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerFirstname(java.lang.String) + */ + @Required + @Override + public void setCustomerFirstname(String customerFirstname) { + super.setCustomerFirstname(customerFirstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setCustomerFirstnameDescription( + String customerFirstnameDescription) { + super.setCustomerFirstnameDescription(customerFirstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerGender(java.lang.String) + */ + @Required + @Override + public void setCustomerGender(String customerGender) { + super.setCustomerGender(customerGender); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerLastname(java.lang.String) + */ + @Required + @Override + public void setCustomerLastname(String customerLastname) { + super.setCustomerLastname(customerLastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setCustomerLastnameDescription( + String customerLastnameDescription) { + super.setCustomerLastnameDescription(customerLastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerPostcode(java.lang.String) + */ + @Required + @Override + public void setCustomerPostcode(String customerPostcode) { + super.setCustomerPostcode(customerPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerState(java.lang.String) + */ + @Required + @Override + public void setCustomerState(String customerState) { + super.setCustomerState(customerState); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryCity(java.lang.String) + */ + @Required + @Override + public void setDeliveryCity(String deliveryCity) { + super.setDeliveryCity(deliveryCity); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryFirstname(java.lang.String) + */ + @Required + @Override + public void setDeliveryFirstname(String deliveryFirstname) { + super.setDeliveryFirstname(deliveryFirstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + super.setDeliveryFirstnameDescription(deliveryFirstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryLastname(java.lang.String) + */ + @Required + @Override + public void setDeliveryLastname(String deliveryLastname) { + super.setDeliveryLastname(deliveryLastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + super.setDeliveryLastnameDescription(deliveryLastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryPostcode(java.lang.String) + */ + @Required + @Override + public void setDeliveryPostcode(String deliveryPostcode) { + super.setDeliveryPostcode(deliveryPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryState(java.lang.String) + */ + @Required + @Override + public void setDeliveryState(String deliveryState) { + super.setDeliveryState(deliveryState); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setDeliveryStreetAddress(java.lang.String) + */ + @Required + @Override + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + super.setDeliveryStreetAddress(deliveryStreetAddress); + } + } 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-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-09 06:07:27 UTC (rev 618) @@ -55,6 +55,7 @@ CREATE TABLE ORDER_STATUS ( ORDER_STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1) + , TYPE INTEGER NOT NULL , SORT_ORDER INTEGER NOT NULL , DATE_ADDED TIMESTAMP NOT NULL , LAST_MODIFIED TIMESTAMP NOT NULL @@ -153,7 +154,7 @@ , DELIVERY_FIRSTNAME VARCHAR(40) NOT NULL , DELIVERY_LASTNAME VARCHAR(40) NOT NULL , DELIVERY_FIRSTNAME_DESCRIPTION VARCHAR(40) - , DELIVERY_LAST_DESCRIPTION VARCHAR(40) + , DELIVERY_LASTNAME_DESCRIPTION VARCHAR(40) , DELIVERY_STREET_ADDRESS VARCHAR(255) NOT NULL , DELIVERY_SUBURB VARCHAR(32) , DELIVERY_CITY VARCHAR(64) NOT NULL Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-10-09 06:07:27 UTC (rev 618) @@ -4,14 +4,14 @@ INSERT INTO CURRENCY VALUES (1,'YEN','','円','###,###','2007-01-01 00:00:00','2007-01-01 00:00:00'); -INSERT INTO CURRENCY_DESCRIPTION VALUES (1,1,'Japanese Yen',''); +INSERT INTO CURRENCY_DESCRIPTION VALUES (1,1,'日本円',''); -INSERT INTO ORDER_STATUS VALUES ( 1,1,'2007-01-01 00:00:00','2007-01-01 00:00:00'); -INSERT INTO ORDER_STATUS VALUES ( 2,2,'2007-01-01 00:00:00','2007-01-01 00:00:00'); -INSERT INTO ORDER_STATUS VALUES ( 3,3,'2007-01-01 00:00:00','2007-01-01 00:00:00'); -INSERT INTO ORDER_STATUS VALUES ( 4,4,'2007-01-01 00:00:00','2007-01-01 00:00:00'); -INSERT INTO ORDER_STATUS VALUES ( 5,5,'2007-01-01 00:00:00','2007-01-01 00:00:00'); -INSERT INTO ORDER_STATUS VALUES ( 6,6,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 1,1,1,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 2,2,2,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 3,2,3,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 4,2,4,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 5,3,5,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 6,0,6,'2007-01-01 00:00:00','2007-01-01 00:00:00'); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 1, 1, '新規注文',''); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 2, 1, '入金処理',''); Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-09 06:07:27 UTC (rev 618) @@ -1,265 +1,486 @@ - - -注文情報編集画面 - - -
- - -
-
-注文情報 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
注文番号1234567
注文ステータス1234567
支払い方法コードABC
配達方法コードABC
通貨コードABC
配送料金ABC
小計ABC
ABC
合計ABC
注文日時ABC
注文完了日時ABC
最終更新日時yyyy/MM/DD
- - - -
-
-カード情報 - - - - - - - - - - - - - - - - - -
カードコード:ABC
カード名義:ABC
カード番号:ABC
カード有効期限:ABC
- -
-
-
-注文商品一覧 - - - - - - - - - - - - - - - -
- -
-
-
-会員情報 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
顧客IDABC
顧客名(姓):ABC
顧客名(名):ABC
性別:ABC
生年月日:ABC
メールアドレス:ABC
会社名・組織:ABC
部門名・役職:ABC
郵便番号:ABC
都道府県:ABC
郡市区 (島、国):ABC
それ以降の住所:ABC
電話番号ABC
- - -
-
-
-お届け先 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
顧客名(姓):ABC
顧客名(名):ABC
会社名・組織:ABC
部門名・役職:ABC
郵便番号:ABC
都道府県:ABC
郡市区 (島、国):ABC
それ以降の住所:ABC
電話番号ABC
- - -
-
-
-請求先 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
顧客名(姓):ABC
顧客名(名):ABC
会社名・組織:ABC
部門名・役職:ABC
郵便番号:ABC
都道府県:ABC
郡市区 (島、国):ABC
それ以降の住所:ABC
電話番号ABC
- - -
-
- - -
- + + + 注文情報確認画面 + + +
+ + +
+
+
+
+ +
+
+
1-1. 注文情報をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
注文番号: + 1234567 + +
注文ステータス: + 1234567 +
支払い方法コード: + abc +
配達方法コード: + abc +
通貨コード: + abc +
配送料金: + abc +
小計: + abc +
税: + abc +
合計: + abc  +
注文日時: + abc +
注文完了日時: + abc +
最終更新日時: + yyyy/MM/DD +
+ + + +
+
+
+
1-2. カード情報をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + +
カードコード: + abc +
カード名義: + abc +
カード番号: + abc +
カード有効期限: + abc +
+ +
+
+
+
+
2. 注文商品をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + 1 +
+ +
+
+
+
3. 会員情報をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
顧客ID: + 1 + +
顧客名(名字):[必須] + abc +
顧客名(名前):[必須] + abc +
顧客名(名字フリガナ):[必須] + abc +
顧客名(名前フリガナ):[必須] + abc +
性別:[必須] + ABC +
誕生日:[必須] + abc +
メールアドレス:[必須] + abc +
会社名・組織: + abc +
部門名・役職: + abc +
郵便番号:[必須] + abc +
都道府県:[必須] + abc +
郡市区 (島、国):[必須] + abc +
それ以降の住所:[必須] + abc +
電話番号: + abc +
+ + +
+
+
+
4. お届け先情報をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
顧客名(名字):[必須] + abc +
顧客名(名前):[必須] + abc +
顧客名(名字フリガナ):[必須] + abc +
顧客名(名前フリガナ):[必須] + abc +
会社名・組織: + abc +
部門名・役職: + abc +
郵便番号:[必須] + abc +
都道府県:[必須] + abc +
郡市区 (島、国):[必須] + abc +
それ以降の住所:[必須] + abc +
電話番号: + abc +
+ + +
+
+
+
5. 請求先情報をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
顧客名(名字):[必須] + abc +
顧客名(名前):[必須] + abc +
顧客名(名字フリガナ):[必須] + abc +
顧客名(名前フリガナ):[必須] + abc +
会社名・組織: + abc +
部門名・役職: + abc +
郵便番号:[必須] + abc +
都道府県:[必須] + abc +
郡市区 (島、国):[必須] + abc +
それ以降の住所:[必須] + abc +
電話番号: + abc +
+ + +
+
+
+
+ + +
+
+
+
+
+ Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-09 06:07:27 UTC (rev 618) @@ -1,274 +1,491 @@ - - -注文情報編集画面 - - -
- - -
-
-注文情報 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
注文番号1234567
注文ステータス - -
支払い方法コード
配達方法コード
通貨コード
配送料金
小計
合計
注文日時
注文完了日時
最終更新日時yyyy/MM/DD
- - - -
-
-カード情報 - - - - - - - - - - - - - - - - - -
カードコード:
カード名義:
カード番号:
カード有効期限:
- -
-
-
-注文商品一覧 - - - - - - - - - - - - - - - -
- -
-
-
-会員情報 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
顧客ID
顧客名(姓):
顧客名(名):
性別: - - 男性 - 女性 - -
生年月日:
メールアドレス:
会社名・組織:
部門名・役職:
郵便番号:
都道府県:
郡市区 (島、国):
それ以降の住所:
電話番号
- - -
-
-
-お届け先 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
顧客名(姓):
顧客名(名):
会社名・組織:
部門名・役職:
郵便番号:
都道府県:
郡市区 (島、国):
それ以降の住所:
電話番号
- - -
-
-
-請求先 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
顧客名(姓):
顧客名(名):
会社名・組織:
部門名・役職:
郵便番号:
都道府県:
郡市区 (島、国):
それ以降の住所:
電話番号
- - -
-
- - -
- + + + 注文情報編集画面 + + +
+ + +
+
+
+
+ +
+
+
1-1. 注文情報を入力してください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
注文番号: + 1234567 + +
注文ステータス: + +
支払い方法コード: + +
配達方法コード: + +
通貨コード: + +
配送料金: + +
小計: + +
税: + +
合計: + +
注文日時: + +
注文完了日時: + +
最終更新日時: + yyyy/MM/DD +
+ + + +
+
+
+
1-2. カード情報を入力してください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + +
カードコード: + +
カード名義: + +
カード番号: + +
カード有効期限: + +
+ +
+
+
+
+
2. 注文商品をご確認ください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + 1 +
+ +
+
+
+
3. 会員情報を入力してください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
顧客ID: + 1 + +
顧客名(名字):[必須] + +
顧客名(名前):[必須] + +
顧客名(名字フリガナ):[必須] + +
顧客名(名前フリガナ):[必須] + +
性別:[必須] + + + + +
誕生日:[必須] + +
メールアドレス:[必須] + +
会社名・組織: + +
部門名・役職: + +
郵便番号:[必須] + +
都道府県:[必須] + +
郡市区 (島、国):[必須] + +
それ以降の住所:[必須] + +
電話番号: + +
+ + +
+
+
+
4. お届け先情報を入力してください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
顧客名(名字):[必須] + +
顧客名(名前):[必須] + +
顧客名(名字フリガナ):[必須] + +
顧客名(名前フリガナ):[必須] + +
会社名・組織: + +
部門名・役職: + +
郵便番号:[必須] + +
都道府県:[必須] + +
郡市区 (島、国):[必須] + +
それ以降の住所:[必須] + +
電話番号: + +
+ + +
+
+
+
5. 請求先情報を入力してください
+ + + + + + +
  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
顧客名(名字):[必須] + +
顧客名(名前):[必須] + +
顧客名(名字フリガナ):[必須] + +
顧客名(名前フリガナ):[必須] + +
会社名・組織: + +
部門名・役職: + +
郵便番号:[必須] + +
都道府県:[必須] + +
郡市区 (島、国):[必須] + +
それ以降の住所:[必須] + +
電話番号: + +
+ + +
+
+
+
+ + +
+
+
+
+
+ Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-09 03:18:51 UTC (rev 617) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-09 06:07:27 UTC (rev 618) @@ -10,6 +10,9 @@
+
+ +
+ + +
  + + +
+ +
+ + + + + + + + + + + + +

+ +
+ 説明 +
+
+
+
3-2. お支払い方法を選択してください
+ + + +
  @@ -77,7 +112,7 @@

-
3-2. クレジットカード情報を入力してください (カード払いの場合のみ)
+
3-3. クレジットカード情報を入力してください (カード払いの場合のみ)
@@ -137,41 +172,6 @@
 
-
-
3-3. 配送方法を選択してください
- - - - - - -
  - - -
- -
- - - - - - - - - - - - -

- -
- 説明 -
-


From svnnotify @ sourceforge.jp Tue Oct 9 17:49:38 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 09 Oct 2007 17:49:38 +0900 Subject: [pal-cvs 2875] [619] removed unneeded indexes. Message-ID: <1191919778.324414.23604.nullmailer@users.sourceforge.jp> Revision: 619 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=619 Author: shinsuke Date: 2007-10-09 17:49:37 +0900 (Tue, 09 Oct 2007) Log Message: ----------- removed unneeded indexes. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-09 06:07:27 UTC (rev 618) +++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-09 08:49:37 UTC (rev 619) @@ -523,9 +523,6 @@ - - -
@@ -2282,11 +2279,7 @@ - - - - - +
From svnnotify @ sourceforge.jp Thu Oct 11 17:28:54 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 11 Oct 2007 17:28:54 +0900 Subject: [pal-cvs 2876] [620] added j2 jar files. Message-ID: <1192091334.472237.1879.nullmailer@users.sourceforge.jp> Revision: 620 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=620 Author: shinsuke Date: 2007-10-11 17:28:54 +0900 (Thu, 11 Oct 2007) Log Message: ----------- added j2 jar files. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/pom.xml -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/pom.xml =================================================================== --- pompei/portlets/pompei-core/trunk/pom.xml 2007-10-09 08:49:37 UTC (rev 619) +++ pompei/portlets/pompei-core/trunk/pom.xml 2007-10-11 08:28:54 UTC (rev 620) @@ -328,5 +328,19 @@ commons-io1.1 + + + org.apache.portals.jetspeed-2 + jetspeed-api + 2.1.2_pal-1.0-beta6 + + provided + + + + org.apache.portals.jetspeed-2 + jetspeed-locator + 2.1.2_pal-1.0-beta6 + From svnnotify @ sourceforge.jp Thu Oct 11 22:29:42 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 11 Oct 2007 22:29:42 +0900 Subject: [pal-cvs 2877] [621] added signup portlet. Message-ID: <1192109382.474177.32273.nullmailer@users.sourceforge.jp> Revision: 621 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=621 Author: shinsuke Date: 2007-10-11 22:29:41 +0900 (Thu, 11 Oct 2007) Log Message: ----------- added signup portlet. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.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/user/checkout/UserInfoEditAction.java pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UserRegistrationUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/AbstractUsersignupPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit_ja.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-11 13:29:41 UTC (rev 621) @@ -2,7 +2,11 @@ import java.math.BigDecimal; +import org.apache.jetspeed.om.folder.Folder; + public class PompeiConstants { + public static final String PREFIX = "jp.sf.pal.pompei."; + public static final int DEFULAT_PAGE_SIZE = 25; public static final int DEFULAT_PAGE_RANGE_SIZE = 5; @@ -155,4 +159,78 @@ public static final BigDecimal FINISHED_ORDER_STATUS_TYPE = new BigDecimal( 3); + + public static final String DUMMY_SECRET_ANSWER = "********"; + + public static final String PAGE_MANAGER_COMPONENT = PREFIX + "PageManager"; + + public static final String PORTAL_ADMINISTRATION_COMPONENT = PREFIX + + "PortalAdministration"; + + public static final String USER_MANAGER_COMPONENT = PREFIX + "UserManager"; + + public static final String AUDIT_ACTIVITY_COMPONENT = PREFIX + + "AuditActivity"; + + public static final String USER_REGISTRATION_PARAMS = PREFIX + + "UserRegistrationParams"; + + public static final String EMAIL_TEMPLATE_LOCATION = PREFIX + + "EmailTemplateLocation"; + + public static final String DEFAULT_TEMPLATE_LOCATION = "/WEB-INF/template/userreg/"; + + public static final String EMAIL_TEMPLATE_NAME = PREFIX + + "EmailTemplateName"; + + public static final String DEFAULT_TEMPLATE_NAME = "userRegistrationEmail.vm"; + + public static final String TEMPLATE_LOCATOR = PREFIX + "TemplateLocator"; + + public static final String ROLES = PREFIX + "Roles"; + + public static final String GROUPS = PREFIX + "Groups"; + + public static final String RULES = PREFIX + "Rules"; + + public static final String RULE_NAMES = PREFIX + "RuleNames"; + + public static final String RULE_VALUES = PREFIX + "RuleValues"; + + public static final String FORCE_GENERATED_PASSWORD = PREFIX + + "ForceGeneratedPassword"; + + public static final String FORCE_USE_EMAIL_AS_USERNAME = PREFIX + + "ForceUseEmailAsUsername"; + + public static final String FORCE_UNIQUE_EMAIL = PREFIX + "ForceUniqueEmail"; + + public static final String SEND_MAIL = PREFIX + "SendMail"; + + public static final String DEFAULT_USER_TEMPLATE_FOLDER_NAME = "_template"; + + public static final String DEFAULT_USER_TEMPLATE_FOLDER = Folder.USER_FOLDER + + DEFAULT_USER_TEMPLATE_FOLDER_NAME + "/"; + + public static final String MD_ALGORITHM = "mdAlgorithm"; + + public static final String DEFAULT_MD_ALGORITHM = "MD5"; + + public static final String MD_ENCODING = "mdEncoding"; + + public static final String DEFAULT_MD_ENCODING = "UTF-8"; + + public static final String USER_NAME = "user.name"; + + public static final String USER_PASSWORD = "user.password"; + + public static final String USER_VERIFY_PASSWORD = "user.verify.password"; + + public static final String USER_BUSINESS_INFO_ONLINE_EMAIL = "user.business-info.online.email"; + + public static final String USER_SECRET_QUESTION = "user.secret.question"; + + public static final String USER_SECRET_ANSWER = "user.secret.answer"; + + public static final String EMAIL_SUBJECT_USER_REGISTRATION = "email.subject.registration"; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2007-10-11 13:29:41 UTC (rev 621) @@ -10,21 +10,22 @@ import jp.sf.pal.pompei.web.user.checkout.CheckoutConfirmPage; import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage; import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage; +import jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage; public interface CustomerDxo extends Serializable { - public void convert(AbstractCustomerEditPage memberConfirmPage, - AddressBook book); + public void convert(AbstractCustomerEditPage page, AddressBook book); - public void convert(AbstractCustomerEditPage customerEditPage, - Customer customer); + public void convert(AbstractCustomerEditPage page, Customer customer); - public void convert(Customer customer, - AbstractCustomerEditPage customerEditPage); + public void convert(AbstractUsersignupPage page, AddressBook book); - public void convert(AddressBook addressBook, - AbstractCustomerEditPage customerEditPage); + public void convert(AbstractUsersignupPage page, Customer customer); + public void convert(Customer customer, AbstractCustomerEditPage page); + + public void convert(AddressBook addressBook, AbstractCustomerEditPage page); + public List> convert(List list); public void convert(Customer customer, UserInfoEditPage page); Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,284 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.pompei.filter; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletConfig; +import javax.portlet.PortletContext; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import jp.sf.pal.pompei.PompeiConstants; + +import org.apache.jetspeed.CommonPortletServices; +import org.apache.jetspeed.administration.PortalAdministration; +import org.apache.jetspeed.audit.AuditActivity; +import org.apache.jetspeed.locator.JetspeedTemplateLocator; +import org.apache.jetspeed.page.PageManager; +import org.apache.jetspeed.security.UserManager; +import org.apache.portals.bridges.portletfilter.PortletFilter; +import org.apache.portals.bridges.portletfilter.PortletFilterChain; +import org.apache.portals.bridges.portletfilter.PortletFilterConfig; + +public class UserRegistrationFilter implements PortletFilter { + private PageManager pageManager; + + private PortalAdministration portalAdministration; + + private UserManager userManager; + + private AuditActivity auditActivity; + + private Map userRegistrationParams; + + public void destroy() { + pageManager = null; + portalAdministration = null; + userManager = null; + userRegistrationParams = null; + } + + public void init(PortletFilterConfig filterConfig) throws PortletException { + PortletConfig portletConfig = filterConfig.getPortletConfig(); + PortletContext portletContext = portletConfig.getPortletContext(); + + // pageManager + pageManager = (PageManager) portletContext + .getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT); + if (null == pageManager) { + throw new PortletException( + "Failed to find the Page Manager on portlet initialization"); + } + + // portalAdministration + portalAdministration = (PortalAdministration) portletContext + .getAttribute(CommonPortletServices.CPS_PORTAL_ADMINISTRATION); + if (portalAdministration == null) { + throw new PortletException( + "Failed to find the `prtaon portlet initialization"); + } + + // userManager + userManager = (UserManager) portletContext + .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT); + if (userManager == null) { + throw new PortletException( + "Failed to find the User Manager on portlet initialization"); + } + + // auditActivity + auditActivity = (AuditActivity) portletContext + .getAttribute(CommonPortletServices.CPS_AUDIT_ACTIVITY); + if (auditActivity == null) { + throw new PortletException( + "Failed to find the User Manager on portlet initialization"); + } + + // user params + userRegistrationParams = new HashMap(); + + String templateLocation = portletConfig + .getInitParameter(PompeiConstants.EMAIL_TEMPLATE_LOCATION); + if (templateLocation == null) { + templateLocation = PompeiConstants.DEFAULT_TEMPLATE_LOCATION; + } + templateLocation = portletContext.getRealPath(templateLocation); + userRegistrationParams.put(PompeiConstants.EMAIL_TEMPLATE_LOCATION, + templateLocation); + + String templateName = portletConfig + .getInitParameter(PompeiConstants.EMAIL_TEMPLATE_NAME); + if (templateName == null) { + templateName = PompeiConstants.DEFAULT_TEMPLATE_NAME; + } + userRegistrationParams.put(PompeiConstants.EMAIL_TEMPLATE_NAME, + templateName); + + ArrayList roots = new ArrayList(1); + roots.add(templateLocation); + + try { + JetspeedTemplateLocator templateLocator = new JetspeedTemplateLocator( + roots, "email", portletContext.getRealPath("/")); + templateLocator.start(); + userRegistrationParams.put(PompeiConstants.TEMPLATE_LOCATOR, + templateLocator); + } catch (FileNotFoundException e) { + throw new PortletException("Could not start the template locator.", + e); + } + + // roles + List roles = getInitParameterList(portletConfig, + PompeiConstants.ROLES); + getUserRegistrationParams().put(PompeiConstants.ROLES, roles); + + // groups + List groups = getInitParameterList(portletConfig, + PompeiConstants.GROUPS); + getUserRegistrationParams().put(PompeiConstants.GROUPS, groups); + + // rules (name,value pairs) + List names = getInitParameterList(portletConfig, + PompeiConstants.RULE_NAMES); + List values = getInitParameterList(portletConfig, + PompeiConstants.RULE_VALUES); + Map rules = new HashMap(); + for (int ix = 0; ix < ((names.size() < values.size()) ? names.size() + : values.size()); ix++) { + rules.put(names.get(ix), values.get(ix)); + } + getUserRegistrationParams().put(PompeiConstants.RULES, rules); + + // user attributes ? + + Boolean forceGeneratedPasswords = Boolean + .valueOf( + portletConfig + .getInitParameter(PompeiConstants.FORCE_GENERATED_PASSWORD)) + .booleanValue(); + getUserRegistrationParams().put( + PompeiConstants.FORCE_GENERATED_PASSWORD, + forceGeneratedPasswords); + + Boolean forceEmailAsUsername = Boolean + .valueOf( + portletConfig + .getInitParameter(PompeiConstants.FORCE_USE_EMAIL_AS_USERNAME)) + .booleanValue(); + getUserRegistrationParams().put( + PompeiConstants.FORCE_USE_EMAIL_AS_USERNAME, + forceEmailAsUsername); + + Boolean forceEmailsToBeSystemUnique = Boolean.valueOf( + portletConfig + .getInitParameter(PompeiConstants.FORCE_UNIQUE_EMAIL)) + .booleanValue(); + if (forceEmailAsUsername) { + // just to be sure + forceEmailsToBeSystemUnique = Boolean.TRUE; + } + getUserRegistrationParams().put(PompeiConstants.FORCE_UNIQUE_EMAIL, + forceEmailsToBeSystemUnique); + + Boolean sendMail = Boolean.valueOf(portletConfig + .getInitParameter(PompeiConstants.SEND_MAIL)); + getUserRegistrationParams().put(PompeiConstants.SEND_MAIL, sendMail); + } + + public void processActionFilter(ActionRequest request, + ActionResponse response, PortletFilterChain chain) + throws PortletException, IOException { + request.setAttribute(PompeiConstants.PAGE_MANAGER_COMPONENT, + pageManager); + request.setAttribute(PompeiConstants.PORTAL_ADMINISTRATION_COMPONENT, + portalAdministration); + request.setAttribute(PompeiConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PompeiConstants.USER_REGISTRATION_PARAMS, + userRegistrationParams); + request.setAttribute(PompeiConstants.AUDIT_ACTIVITY_COMPONENT, + auditActivity); + + chain.processActionFilter(request, response); + } + + public void renderFilter(RenderRequest request, RenderResponse response, + PortletFilterChain chain) throws PortletException, IOException { + request.setAttribute(PompeiConstants.PAGE_MANAGER_COMPONENT, + pageManager); + request.setAttribute(PompeiConstants.PORTAL_ADMINISTRATION_COMPONENT, + portalAdministration); + request.setAttribute(PompeiConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PompeiConstants.USER_REGISTRATION_PARAMS, + userRegistrationParams); + request.setAttribute(PompeiConstants.AUDIT_ACTIVITY_COMPONENT, + auditActivity); + + chain.renderFilter(request, response); + } + + protected List getInitParameterList(PortletConfig portletConfig, + String ipName) { + String temp = portletConfig.getInitParameter(ipName); + if (temp == null) { + return new ArrayList(); + } + + String[] temps = temp.split("\\,"); + for (int ix = 0; ix < temps.length; ix++) { + temps[ix] = temps[ix].trim(); + } + + return Arrays.asList(temps); + } + + /** + * @return the portalAdministration + */ + public PortalAdministration getPortalAdministration() { + return portalAdministration; + } + + /** + * @param portalAdministration the portalAdministration to set + */ + public void setPortalAdministration( + PortalAdministration portalAdministration) { + this.portalAdministration = portalAdministration; + } + + /** + * @return the userManager + */ + public UserManager getUserManager() { + return userManager; + } + + /** + * @param userManager the userManager to set + */ + public void setUserManager(UserManager userManager) { + this.userManager = userManager; + } + + /** + * @return the userRegistrationParams + */ + public Map getUserRegistrationParams() { + return userRegistrationParams; + } + + /** + * @param userRegistrationParams the userRegistrationParams to set + */ + public void setUserRegistrationParams( + Map userRegistrationParams) { + this.userRegistrationParams = userRegistrationParams; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.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-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java 2007-10-11 13:29:41 UTC (rev 621) @@ -3,7 +3,9 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.List; +import java.util.Map; +import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.exentity.Zone; @@ -28,6 +30,9 @@ public void addCustomer(Customer customers, AddressBook addressBook); + public void addCustomer(Map userInfo, Customer customers, + AddressBook addressBook) throws CommonException; + public Zone getZone(BigDecimal zoneId); public Customer getCustomerByPortalId(String portalId); 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-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2007-10-11 13:29:41 UTC (rev 621) @@ -1,8 +1,16 @@ package jp.sf.pal.pompei.service.impl; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; +import javax.faces.context.FacesContext; +import javax.portlet.PortletConfig; + +import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.cbean.AddressBookCB; import jp.sf.pal.pompei.cbean.CustomerBasketAttributeCB; @@ -20,7 +28,22 @@ import jp.sf.pal.pompei.exentity.CustomerBasketAttribute; import jp.sf.pal.pompei.exentity.Zone; import jp.sf.pal.pompei.service.CustomerService; +import jp.sf.pal.pompei.util.SystemUtil; +import jp.sf.pal.pompei.util.UserRegistrationUtil; +import org.apache.jetspeed.JetspeedActions; +import org.apache.jetspeed.PortalReservedParameters; +import org.apache.jetspeed.administration.AdministrationEmailException; +import org.apache.jetspeed.locator.JetspeedTemplateLocator; +import org.apache.jetspeed.locator.LocatorDescriptor; +import org.apache.jetspeed.locator.TemplateDescriptor; +import org.apache.jetspeed.locator.TemplateLocatorException; +import org.apache.jetspeed.om.common.SecurityConstraint; +import org.apache.jetspeed.om.folder.Folder; +import org.apache.jetspeed.page.PageManager; +import org.apache.jetspeed.request.RequestContext; +import org.apache.jetspeed.security.User; + public class CustomerServiceImpl implements CustomerService { /** @@ -28,6 +51,8 @@ */ private static final long serialVersionUID = -5106715434338567436L; + private static final String PATH_SEPARATOR = "/"; + private transient CustomerBhv customerBhv; private transient AddressBookBhv addressBookBhv; @@ -142,6 +167,247 @@ getAddressBookBhv().insert(addressBook); } + public void addCustomer(Map userInfo, Customer customer, + AddressBook addressBook) throws CommonException { + + String password = userInfo.remove(PompeiConstants.USER_PASSWORD); + String verifyPassword = userInfo + .remove(PompeiConstants.USER_VERIFY_PASSWORD); + String emailSubject = userInfo + .remove(PompeiConstants.EMAIL_SUBJECT_USER_REGISTRATION); + if (!UserRegistrationUtil + .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) { + if (password == null || password.equals("")) { + throw new CommonException("error.lacking.password", + "The password is null."); + } + } + + if (UserRegistrationUtil + .getBoolean(PompeiConstants.FORCE_USE_EMAIL_AS_USERNAME)) { + // force user.name to be same as email + userInfo.put(PompeiConstants.USER_NAME, userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL)); + } + + boolean userIdExistsFlag = true; + try { + SystemUtil.getUserManager().getUser( + userInfo.get(PompeiConstants.USER_NAME)); + } catch (org.apache.jetspeed.security.SecurityException e) { + userIdExistsFlag = false; + } + + if (userIdExistsFlag) { + throw new CommonException("error.userid_already_exists", + "The user id already exists."); + } + + if (UserRegistrationUtil.getBoolean(PompeiConstants.FORCE_UNIQUE_EMAIL)) { + boolean emailExistsFlag = true; + User user = null; + try { + user = SystemUtil + .getPortalAdministration() + .lookupUserFromEmail( + userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL)); + } catch (AdministrationEmailException e) { + emailExistsFlag = false; + } + if ((emailExistsFlag) || (user != null)) { + throw new CommonException("error.email_already_exists", + "The email already exists."); + } + + } + + if (UserRegistrationUtil + .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) { + try { + password = SystemUtil.getPortalAdministration() + .generatePassword(); + } catch (Exception e) { + throw new CommonException("error.failed_to_generate_password", + "Could not create password.", e); + } + } else { + if (verifyPassword == null || !verifyPassword.equals(password)) { + throw new CommonException("error.two_passwords_do_not_match", + "Two passwords do not match."); + } + } + + String userName = userInfo.get(PompeiConstants.USER_NAME); + try { + SystemUtil.getPortalAdministration().registerUser( + userName, + password, + UserRegistrationUtil.getStringList(PompeiConstants.ROLES), + UserRegistrationUtil.getStringList(PompeiConstants.GROUPS), + userInfo, // note use of only + // PLT.D values here. + UserRegistrationUtil.getStringMap(PompeiConstants.RULES), + PompeiConstants.DEFAULT_USER_TEMPLATE_FOLDER); // TODO default template path + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer, addressBook); + throw new CommonException("error.failed_to_add", + "Could not register a user.", e); + } + + // set security constraint + String userhome = Folder.USER_FOLDER + userName; + try { + PageManager pageManager = SystemUtil.getPageManager(); + SecurityConstraint sc = pageManager.newPageSecurityConstraint(); + sc.setUsers(parseCSVList(userName)); + List permissions = new ArrayList(); + permissions.add(JetspeedActions.VIEW); + permissions.add(JetspeedActions.EDIT); + permissions.add(JetspeedActions.HELP); + sc.setPermissions(permissions); + Folder userFolder = pageManager.getFolder(userhome); + + if (userFolder.getSecurityConstraints() == null) { + userFolder.setSecurityConstraints(pageManager + .newSecurityConstraints()); + } + userFolder.getSecurityConstraints().getSecurityConstraints() + .add(sc); + + pageManager.updateFolder(userFolder); + pageManager.reset(); + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer, addressBook); + throw new CommonException("could.not.access.folder", + "Could not access a folder: " + userhome, e); + } + + // set portal id + customer.setPortalId(userName); + + try { + // create customer + getCustomerBhv().insert(customer); + addressBook.setCustomerId(customer.getCustomerId()); + getAddressBookBhv().insert(addressBook); + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer, addressBook); + throw new CommonException("could.not.insert.customer.data", + "Could not insert customer data. ", e); + } + + if (UserRegistrationUtil.getBoolean(PompeiConstants.SEND_MAIL)) { + if (password != null) { + userInfo.put("password", password); + } + + try { + // template + String templ = getTemplatePath(FacesContext + .getCurrentInstance()); + + if (templ == null) { + cancelToAddCustomer(userInfo, customer, addressBook); + throw new CommonException( + "error.registration_completed_but_could_not_find_template", + "Email template is not available."); + } + SystemUtil + .getPortalAdministration() + .sendEmail( + (PortletConfig) FacesContext + .getCurrentInstance() + .getExternalContext().getRequestMap() + .get("javax.portlet.PortletConfig"), + userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), + emailSubject, templ, userInfo); + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer, addressBook); + throw new CommonException( + "error.registration_completed_but_could_not_send", + "Could not send a registration mail.", e); + } + } + + } + + protected void cancelToAddCustomer(Map userInfo, + Customer customer, AddressBook addressBook) { + try { + getAddressBookBhv().delete(addressBook); + } catch (Exception e) { + } + + try { + getCustomerBhv().delete(customer); + } catch (Exception e) { + } + + try { + String userhome = Folder.USER_FOLDER + + userInfo.get(PompeiConstants.USER_NAME); + PageManager pageManager = SystemUtil.getPageManager(); + Folder folder = pageManager.getFolder(userhome); + pageManager.removeFolder(folder); + } catch (Exception e) { + } + + try { + SystemUtil.getUserManager().removeUser( + userInfo.get(PompeiConstants.USER_NAME)); + } catch (Exception e) { + } + } + + private String getTemplatePath(FacesContext facesContext) { + JetspeedTemplateLocator templateLocator = UserRegistrationUtil + .getTemplateLocator(); + String templateLocation = UserRegistrationUtil + .getString(PompeiConstants.EMAIL_TEMPLATE_LOCATION); + String templateName = UserRegistrationUtil + .getString(PompeiConstants.EMAIL_TEMPLATE_NAME); + if (templateLocator == null) { + return templateLocation + PATH_SEPARATOR + templateName; + } + + RequestContext requestContext = (RequestContext) facesContext + .getExternalContext().getRequestMap().get( + PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); + Locale locale = facesContext.getViewRoot().getLocale(); + + try { + LocatorDescriptor locator = templateLocator + .createLocatorDescriptor("email"); + locator.setName(templateName); + locator.setMediaType(requestContext.getMediaType()); + locator.setLanguage(locale.getLanguage()); + locator.setCountry(locale.getCountry()); + TemplateDescriptor template = templateLocator + .locateTemplate(locator); + + return template.getAppRelativePath(); + } catch (TemplateLocatorException e) { + return templateLocation + PATH_SEPARATOR + templateName; + } + } + + private List parseCSVList(String csv) { + List csvList = new ArrayList(); + if (csv != null) { + if (csv.indexOf(',') != -1) { + StringTokenizer csvTokens = new StringTokenizer(csv, ","); + while (csvTokens.hasMoreTokens()) { + csvList.add(csvTokens.nextToken().trim()); + } + } else { + csvList.add(csv); + } + } + return csvList; + } + public Zone getZone(BigDecimal zoneId) { ZoneCB cb = new ZoneCB(); cb.setupSelect_Country(); Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,90 @@ +package jp.sf.pal.pompei.util; + +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +import javax.faces.context.FacesContext; +import javax.portlet.PortletConfig; + +import jp.sf.pal.common.CommonException; +import jp.sf.pal.pompei.PompeiConstants; + +import org.apache.jetspeed.administration.PortalAdministration; +import org.apache.jetspeed.page.PageManager; +import org.apache.jetspeed.security.UserManager; + +public class SystemUtil { + private static FacesContext getFacesContext() { + FacesContext context = FacesContext.getCurrentInstance(); + if (context == null) { + throw new IllegalStateException( + "Could not find FacesContext instance."); + } + return context; + } + + public static PortletConfig getPortletConfig() { + String name = "javax.portlet.PortletConfig"; + return (PortletConfig) getFacesContext().getExternalContext() + .getRequestMap().get(name); + } + + public static String getContextRealPath(String path) { + return getPortletConfig().getPortletContext().getRealPath(path); + } + + public static String getMessageDigest(String str) throws CommonException { + if (str == null) { + str = ""; + } + // TODO move following params to portlet.xml + String algorithm = getPortletConfig().getInitParameter( + PompeiConstants.MD_ALGORITHM); + if (algorithm == null || algorithm.equals("")) { + algorithm = PompeiConstants.DEFAULT_MD_ALGORITHM; + } + String encoding = getPortletConfig().getInitParameter( + PompeiConstants.MD_ENCODING); + if (encoding == null || encoding.equals("")) { + encoding = PompeiConstants.DEFAULT_MD_ENCODING; + } + try { + MessageDigest md = MessageDigest.getInstance(algorithm); + md.update(str.getBytes(encoding)); + byte[] digest = md.digest(); + StringBuffer buf = new StringBuffer(); + for (int i = 0; i < digest.length; i++) { + int val = digest[i] & 0xFF; + if (val < 16) { + buf.append("0"); + } + buf.append(Integer.toString(val, 16)); + } + return buf.toString(); + } catch (NoSuchAlgorithmException e) { + throw new CommonException("could.not.encode.secret.password", + "Could not encode secret password", e); + } catch (UnsupportedEncodingException e) { + throw new CommonException("could.not.encode.secret.password", + "Could not encode secret password", e); + } + } + + public static UserManager getUserManager() { + return (UserManager) getFacesContext().getExternalContext() + .getRequestMap().get(PompeiConstants.USER_MANAGER_COMPONENT); + } + + public static PortalAdministration getPortalAdministration() { + return (PortalAdministration) getFacesContext().getExternalContext() + .getRequestMap().get( + PompeiConstants.PORTAL_ADMINISTRATION_COMPONENT); + } + + public static PageManager getPageManager() { + return (PageManager) getFacesContext().getExternalContext() + .getRequestMap().get(PompeiConstants.PAGE_MANAGER_COMPONENT); + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UserRegistrationUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UserRegistrationUtil.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UserRegistrationUtil.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,77 @@ +package jp.sf.pal.pompei.util; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.pompei.PompeiConstants; + +import org.apache.jetspeed.locator.JetspeedTemplateLocator; + +public class UserRegistrationUtil { + private static FacesContext getFacesContext() + { + return FacesContext.getCurrentInstance(); + } + + public static Map getUserRegistrationParams() + { + Map params = (Map) getFacesContext() + .getExternalContext().getRequestMap().get( + PompeiConstants.USER_REGISTRATION_PARAMS); + if (params == null) + { + throw new IllegalStateException( + "The user registration params is null. "); + } + return params; + } + + public static boolean getBoolean(String key) + { + Object value = getUserRegistrationParams().get(key); + if (value == null) + { + return false; + } + return ((Boolean) value).booleanValue(); + } + + public static String getString(String key) + { + return (String) getUserRegistrationParams().get(key); + } + + public static List getStringList(String key) + { + Object value = getUserRegistrationParams().get(key); + if (value == null) + { + return new ArrayList(); + } + return (List) value; + + } + + public static Map getStringMap(String key) + { + Object value = getUserRegistrationParams().get(key); + if (value == null) + { + return new HashMap(); + } + return (Map) value; + + } + + public static JetspeedTemplateLocator getTemplateLocator() + { + return (JetspeedTemplateLocator) getUserRegistrationParams().get( + PompeiConstants.TEMPLATE_LOCATOR); + } + + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UserRegistrationUtil.java ___________________________________________________________________ Name: svn:eol-style + native 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-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-10-11 13:29:41 UTC (rev 621) @@ -71,7 +71,7 @@ yearOfDayOfBirthItems.add(map); } getUserInfoEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems); - getUserInfoEditPage().setYearOfDayOfBirth(new Integer(year)); + getUserInfoEditPage().setYearOfDayOfBirth(Integer.valueOf(year)); List> monthOfDayOfBirthItems = new ArrayList>(); for (int i = 1; i < 13; i++) { @@ -82,7 +82,7 @@ } getUserInfoEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); getUserInfoEditPage().setMonthOfDayOfBirth( - new Integer(DateUtil.getMonth(now) + 1)); + Integer.valueOf(DateUtil.getMonth(now) + 1)); List> dateOfDayOfBirthItems = new ArrayList>(); for (int i = 1; i < 32; i++) { @@ -93,7 +93,7 @@ } getUserInfoEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems); getUserInfoEditPage().setDateOfDayOfBirth( - new Integer(DateUtil.getDate(now))); + Integer.valueOf(DateUtil.getDate(now))); return null; } @@ -130,14 +130,10 @@ } // check cart - if (customer != null) { - List customerBasketList = getCartService() - .getCustomerBasketList(customer.getCustomerId()); - if (customerBasketList != null && !customerBasketList.isEmpty()) { - getUserInfoEditPage().setBasket(true); - } else { - getUserInfoEditPage().setBasket(false); - } + List customerBasketList = getCartService() + .getCustomerBasketList(customer.getCustomerId()); + if (customerBasketList != null && !customerBasketList.isEmpty()) { + getUserInfoEditPage().setBasket(true); } else { getUserInfoEditPage().setBasket(false); } Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/AbstractUsersignupPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/AbstractUsersignupPage.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/AbstractUsersignupPage.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,456 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.util.Date; + +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractUsersignupPage { + private LabelHelper labelHelper; + + private Date dayOfBirth; + + private String postcode; + + private String cellphone; + + private String city; + + private String company; + + private Integer dateOfDayOfBirth; + + private String department; + + private String emailAddress; + + private String emailAddressConfirm; + + private String fax; + + private String firstname; + + private String firstnameDescription; + + private String gender; + + private String lastname; + + private String lastnameDescription; + + private Integer monthOfDayOfBirth; + + private String primaryPostcode; + + private String secondaryPostcode; + + private String state; + + private String streetAddress; + + private String telephone; + + private String termOfService; + + private String userName; + + private String userSecretAnswer; + + private String userSecretQuestion; + + private String userSecretQuestionSelection; + + private Integer yearOfDayOfBirth; + + /** + * @return the cellphone + */ + public String getCellphone() { + return cellphone; + } + + /** + * @param cellphone the cellphone to set + */ + public void setCellphone(String cellphone) { + this.cellphone = cellphone; + } + + /** + * @return the city + */ + public String getCity() { + return city; + } + + /** + * @param city the city to set + */ + public void setCity(String city) { + this.city = city; + } + + /** + * @return the company + */ + public String getCompany() { + return company; + } + + /** + * @param company the company to set + */ + public void setCompany(String company) { + this.company = company; + } + + /** + * @return the dateOfDayOfBirth + */ + public Integer getDateOfDayOfBirth() { + return dateOfDayOfBirth; + } + + /** + * @param dateOfDayOfBirth the dateOfDayOfBirth to set + */ + public void setDateOfDayOfBirth(Integer dateOfDayOfBirth) { + this.dateOfDayOfBirth = dateOfDayOfBirth; + } + + /** + * @return the department + */ + public String getDepartment() { + return department; + } + + /** + * @param department the department to set + */ + public void setDepartment(String department) { + this.department = department; + } + + /** + * @return the emailAddress + */ + public String getEmailAddress() { + return emailAddress; + } + + /** + * @param emailAddress the emailAddress to set + */ + public void setEmailAddress(String emailAddress) { + this.emailAddress = emailAddress; + } + + /** + * @return the emailAddressConfirm + */ + public String getEmailAddressConfirm() { + return emailAddressConfirm; + } + + /** + * @param emailAddressConfirm the emailAddressConfirm to set + */ + public void setEmailAddressConfirm(String emailAddressConfirm) { + this.emailAddressConfirm = emailAddressConfirm; + } + + /** + * @return the fax + */ + public String getFax() { + return fax; + } + + /** + * @param fax the fax to set + */ + public void setFax(String fax) { + this.fax = fax; + } + + /** + * @return the firstname + */ + public String getFirstname() { + return firstname; + } + + /** + * @param firstname the firstname to set + */ + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + /** + * @return the firstnameDescription + */ + public String getFirstnameDescription() { + return firstnameDescription; + } + + /** + * @param firstnameDescription the firstnameDescription to set + */ + public void setFirstnameDescription(String firstnameDescription) { + this.firstnameDescription = firstnameDescription; + } + + /** + * @return the gender + */ + public String getGender() { + return gender; + } + + /** + * @param gender the gender to set + */ + public void setGender(String gender) { + this.gender = gender; + } + + /** + * @return the lastname + */ + public String getLastname() { + return lastname; + } + + /** + * @param lastname the lastname to set + */ + public void setLastname(String lastname) { + this.lastname = lastname; + } + + /** + * @return the lastnameDescription + */ + public String getLastnameDescription() { + return lastnameDescription; + } + + /** + * @param lastnameDescription the lastnameDescription to set + */ + public void setLastnameDescription(String lastnameDescription) { + this.lastnameDescription = lastnameDescription; + } + + /** + * @return the monthOfDayOfBirth + */ + public Integer getMonthOfDayOfBirth() { + return monthOfDayOfBirth; + } + + /** + * @param monthOfDayOfBirth the monthOfDayOfBirth to set + */ + public void setMonthOfDayOfBirth(Integer monthOfDayOfBirth) { + this.monthOfDayOfBirth = monthOfDayOfBirth; + } + + /** + * @return the primaryPostcode + */ + public String getPrimaryPostcode() { + return primaryPostcode; + } + + /** + * @param primaryPostcode the primaryPostcode to set + */ + public void setPrimaryPostcode(String primaryPostcode) { + this.primaryPostcode = primaryPostcode; + } + + /** + * @return the secondaryPostcode + */ + public String getSecondaryPostcode() { + return secondaryPostcode; + } + + /** + * @param secondaryPostcode the secondaryPostcode to set + */ + public void setSecondaryPostcode(String secondaryPostcode) { + this.secondaryPostcode = secondaryPostcode; + } + + /** + * @return the state + */ + public String getState() { + return state; + } + + /** + * @param state the state to set + */ + public void setState(String state) { + this.state = state; + } + + /** + * @return the streetAddress + */ + public String getStreetAddress() { + return streetAddress; + } + + /** + * @param streetAddress the streetAddress to set + */ + public void setStreetAddress(String streetAddress) { + this.streetAddress = streetAddress; + } + + /** + * @return the telephone + */ + public String getTelephone() { + return telephone; + } + + /** + * @param telephone the telephone to set + */ + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + /** + * @return the termOfService + */ + public String getTermOfService() { + return termOfService; + } + + /** + * @param termOfService the termOfService to set + */ + public void setTermOfService(String termOfService) { + this.termOfService = termOfService; + } + + /** + * @return the userName + */ + public String getUserName() { + return userName; + } + + /** + * @param userName the userName to set + */ + public void setUserName(String userName) { + this.userName = userName; + } + + /** + * @return the userSecretAnswer + */ + public String getUserSecretAnswer() { + return userSecretAnswer; + } + + /** + * @param userSecretAnswer the userSecretAnswer to set + */ + public void setUserSecretAnswer(String userSecretAnswer) { + this.userSecretAnswer = userSecretAnswer; + } + + /** + * @return the userSecretQuestion + */ + public String getUserSecretQuestion() { + return userSecretQuestion; + } + + /** + * @param userSecretQuestion the userSecretQuestion to set + */ + public void setUserSecretQuestion(String userSecretQuestion) { + this.userSecretQuestion = userSecretQuestion; + } + + /** + * @return the userSecretQuestionSelection + */ + public String getUserSecretQuestionSelection() { + return userSecretQuestionSelection; + } + + /** + * @param userSecretQuestionSelection the userSecretQuestionSelection to set + */ + public void setUserSecretQuestionSelection( + String userSecretQuestionSelection) { + this.userSecretQuestionSelection = userSecretQuestionSelection; + } + + /** + * @return the yearOfDayOfBirth + */ + public Integer getYearOfDayOfBirth() { + return yearOfDayOfBirth; + } + + /** + * @param yearOfDayOfBirth the yearOfDayOfBirth to set + */ + public void setYearOfDayOfBirth(Integer yearOfDayOfBirth) { + this.yearOfDayOfBirth = yearOfDayOfBirth; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + /** + * @return the dayOfBirth + */ + public Date getDayOfBirth() { + return dayOfBirth; + } + + /** + * @param dayOfBirth the dayOfBirth to set + */ + public void setDayOfBirth(Date dayOfBirth) { + this.dayOfBirth = dayOfBirth; + } + + /** + * @return the postcode + */ + public String getPostcode() { + return postcode; + } + + /** + * @param postcode the postcode to set + */ + public void setPostcode(String postcode) { + this.postcode = postcode; + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/AbstractUsersignupPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,40 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.io.Serializable; + +import jp.sf.pal.common.util.FacesMessageUtil; + +public class SignupCompleteAction implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 2689633390570340463L; + /** + * + */ + private SignupCompletePage signupCompletePage; + public Class initialize() { + return null; + } + + public Class prerender() { + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + /** + * @return the signupCompletePage + */ + public SignupCompletePage getSignupCompletePage() { + return signupCompletePage; + } + + /** + * @param signupCompletePage the signupCompletePage to set + */ + public void setSignupCompletePage(SignupCompletePage signupCompletePage) { + this.signupCompletePage = signupCompletePage; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,17 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.io.Serializable; + +public class SignupCompletePage extends AbstractUsersignupPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = 1424283975909978739L; + + public boolean isSendEmail() { + return getEmailAddress() != null; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,233 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.dxo.CustomerDxo; +import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.Customer; +import jp.sf.pal.pompei.exentity.Zone; +import jp.sf.pal.pompei.service.CustomerService; +import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; + +public class SignupConfirmAction implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 4440511977300860903L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(SignupConfirmAction.class); + + /** + * + */ + private SignupConfirmPage signupConfirmPage; + + private CustomerDxo customerDxo; + + private CustomerService customerService; + + private LanguageService languageService; + + public Class initialize() { + return null; + } + + public Class prerender() { + getSignupConfirmPage().setUserSecretAnswer( + PompeiConstants.DUMMY_SECRET_ANSWER); + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + public Class doCancel() { + return SignupEditPage.class; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress") + public Class doCreate() { + + // message digest + try { + getSignupConfirmPage().setUserSecretAnswer( + SystemUtil.getMessageDigest(getSignupConfirmPage() + .getUserSecretAnswer())); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log(e); + return null; + } + + // new + Date now = new Date(); + Customer customer = new Customer(); + customer.setDateAdded(new Timestamp(now.getTime())); + customer.setLastModified(new Timestamp(now.getTime())); + AddressBook addressBook = new AddressBook(); + getCustomerDxo().convert(getSignupConfirmPage(), customer); + getCustomerDxo().convert(getSignupConfirmPage(), addressBook); + + //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); + + Map userInfo = new HashMap(); + + // put user attribute + userInfo.put(PompeiConstants.USER_SECRET_ANSWER, (String) SessionUtil + .getFromLocalScope(PompeiConstants.USER_SECRET_ANSWER)); + userInfo.put(PompeiConstants.USER_NAME, getSignupConfirmPage() + .getUserName()); + userInfo.put(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL, + getSignupConfirmPage().getEmailAddress()); + userInfo.put(PompeiConstants.USER_SECRET_QUESTION, + getSignupConfirmPage().getUserSecretQuestion()); + userInfo.put("user.home-info.telecom.mobile.number", + convertNotNull(getSignupConfirmPage().getCellphone())); + userInfo.put("user.home-info.postal.city", + convertNotNull(getSignupConfirmPage().getCity())); + userInfo.put("user.employer", convertNotNull(getSignupConfirmPage() + .getCompany())); + userInfo.put("user.department", convertNotNull(getSignupConfirmPage() + .getDepartment())); + userInfo.put("user.home-info.online.email", + convertNotNull(getSignupConfirmPage().getEmailAddress())); + userInfo.put("user.home-info.telecom.fax.number", + convertNotNull(getSignupConfirmPage().getFax())); + userInfo.put("user.name.given", convertNotNull(getSignupConfirmPage() + .getFirstname())); + userInfo + .put("user.name.given.yomi", + convertNotNull(getSignupConfirmPage() + .getFirstnameDescription())); + userInfo.put("user.gender", convertNotNull(getSignupConfirmPage() + .getGender())); + userInfo.put("user.name.family", convertNotNull(getSignupConfirmPage() + .getLastname())); + userInfo + .put("user.name.family.yomi", + convertNotNull(getSignupConfirmPage() + .getLastnameDescription())); + userInfo.put("user.home-info.postal.postalcode", + convertNotNull(getSignupConfirmPage().getPostcode())); + userInfo.put("user.home-info.postal.stateprov", + convertNotNull(getSignupConfirmPage().getState())); + userInfo.put("user.home-info.postal.street", + convertNotNull(getSignupConfirmPage().getStreetAddress())); + userInfo.put("user.home-info.telecom.telephone.number", + convertNotNull(getSignupConfirmPage().getTelephone())); + userInfo.put("user.bdate", convertNotNull(getSignupConfirmPage() + .getDayOfBirth().toString())); + + // set email title + userInfo.put(PompeiConstants.EMAIL_SUBJECT_USER_REGISTRATION, + getSignupConfirmPage().getLabelHelper().getLabelValue( + PompeiConstants.EMAIL_SUBJECT_USER_REGISTRATION)); + + try { + getCustomerService().addCustomer(userInfo, customer, addressBook); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log(e); + return null; + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("could.not.create.user.by.system.error"); + logger.log(e); + return null; + } + + return SignupCompletePage.class; + } + + private String convertNotNull(String str) { + if (str == null) { + return ""; + } + return str; + } + + /** + * @return the signupConfirmPage + */ + public SignupConfirmPage getSignupConfirmPage() { + return signupConfirmPage; + } + + /** + * @param signupConfirmPage the signupConfirmPage to set + */ + public void setSignupConfirmPage(SignupConfirmPage signupConfirmPage) { + this.signupConfirmPage = signupConfirmPage; + } + + /** + * @return the customerDxo + */ + public CustomerDxo getCustomerDxo() { + return customerDxo; + } + + /** + * @param customerDxo the customerDxo to set + */ + public void setCustomerDxo(CustomerDxo customerDxo) { + this.customerDxo = customerDxo; + } + + /** + * @return the customerService + */ + public CustomerService getCustomerService() { + return customerService; + } + + /** + * @param customerService the customerService to set + */ + public void setCustomerService(CustomerService customerService) { + this.customerService = customerService; + } + + /** + * @return the languageService + */ + public LanguageService getLanguageService() { + return languageService; + } + + /** + * @param languageService the languageService to set + */ + public void setLanguageService(LanguageService languageService) { + this.languageService = languageService; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmPage.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmPage.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,17 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.io.Serializable; + +public class SignupConfirmPage extends AbstractUsersignupPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -1370068406355672437L; + + public String getGenderString() { + return getLabelHelper().getLabelValue(getGender()); + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,206 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.seasar.framework.log.Logger; + +import jp.sf.pal.common.util.DateUtil; +import jp.sf.pal.common.util.FacesMessageUtil; +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; + +public class SignupEditAction implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -2384511292540333093L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(SignupEditAction.class); + + /** + * + */ + private SignupEditPage signupEditPage; + + public Class initialize() { + // state items + List> stateItems = new ArrayList>(); + String states = getSignupEditPage().getLabelHelper().getLabelValue( + "state.items"); + String[] stateArray = states.split(","); + for (String state : stateArray) { + Map map = new HashMap(); + map.put("label", state); + map.put("value", state); + stateItems.add(map); + } + getSignupEditPage().setStateItems(stateItems); + // dayOfBirth + Date now = new Date(); + List> yearOfDayOfBirthItems = new ArrayList>(); + int year = DateUtil.getYear(now) + 1900; + for (int i = 0; i < 100; i++) { + Map map = new HashMap(); + map.put("label", Integer.toString(year - i)); + map.put("value", Integer.toString(year - i)); + yearOfDayOfBirthItems.add(map); + } + getSignupEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems); + getSignupEditPage().setYearOfDayOfBirth(Integer.valueOf(year)); + + List> monthOfDayOfBirthItems = new ArrayList>(); + for (int i = 1; i < 13; i++) { + Map map = new HashMap(); + map.put("label", Integer.toString(i)); + map.put("value", Integer.toString(i)); + monthOfDayOfBirthItems.add(map); + } + getSignupEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); + getSignupEditPage().setMonthOfDayOfBirth( + Integer.valueOf(DateUtil.getMonth(now) + 1)); + + List> dateOfDayOfBirthItems = new ArrayList>(); + for (int i = 1; i < 32; i++) { + Map map = new HashMap(); + map.put("label", Integer.toString(i)); + map.put("value", Integer.toString(i)); + dateOfDayOfBirthItems.add(map); + } + getSignupEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems); + getSignupEditPage().setDateOfDayOfBirth( + Integer.valueOf(DateUtil.getDate(now))); + + // Load Secret Question + List> questionItems = new ArrayList>(); + int numOfQuestions = Integer.parseInt(getSignupEditPage() + .getLabelHelper().getLabelValue("secretQuestion.num")); + for (int i = 1; i <= numOfQuestions; i++) { + Map map = new HashMap(2); + String value = getSignupEditPage().getLabelHelper().getLabelValue( + "secretQuestion." + i); + map.put("label", value); + map.put("value", value); + questionItems.add(map); + } + getSignupEditPage().setUserSecretQuestionSelectionItems(questionItems); + + return null; + } + + public Class prerender() { + // Load Term Of Service + String filename = getSignupEditPage().getLabelHelper().getLabelValue( + "termOfServiceFile"); + if (filename == null) { + filename = "/WEB-INF/template/term_of_service.txt"; + } + String encoding = getSignupEditPage().getLabelHelper().getLabelValue( + "termOfServiceEncoding"); + if (encoding == null) { + encoding = "UTF-8"; + } + StringBuffer buf = new StringBuffer(); + BufferedReader reader = null; + try { + reader = new BufferedReader( + new InputStreamReader(new FileInputStream(SystemUtil + .getContextRealPath(filename)), encoding)); + String line; + while ((line = reader.readLine()) != null) { + buf.append(line).append("\n"); + } + } catch (UnsupportedEncodingException e) { + FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); + logger.log("EPA0004", new Object[] { this.toString() }, e); + } catch (FileNotFoundException e) { + FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); + logger.log("EPA0004", new Object[] { this.toString() }, e); + } catch (IOException e) { + FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); + logger.log("EPA0004", new Object[] { this.toString() }, e); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + getSignupEditPage().setTermOfService(buf.toString()); + + // reset secret answer + getSignupEditPage().setUserSecretAnswer(""); + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + private void preprocessingForUpdate() { + // day of birth + getSignupEditPage().setDayOfBirth( + DateUtil.get(getSignupEditPage().getYearOfDayOfBirth() - 1900, + getSignupEditPage().getMonthOfDayOfBirth() - 1, + getSignupEditPage().getDateOfDayOfBirth())); + + // postcode + getSignupEditPage().setPostcode( + getSignupEditPage().getPrimaryPostcode() + "-" + + getSignupEditPage().getSecondaryPostcode()); + } + + public Class doConfirm() { + if (getSignupEditPage().getUserSecretQuestionSelection() != null) { + getSignupEditPage().setUserSecretQuestion( + getSignupEditPage().getUserSecretQuestionSelection()); + } + // check secret question + if (getSignupEditPage().getUserSecretQuestion() == null + || getSignupEditPage().getUserSecretQuestion().equals("")) { + FacesMessageUtil.addErrorMessage("type.secret.question"); + return null; + } + + preprocessingForUpdate(); + + // put secret answer to session + SessionUtil.putToLocalScope(PompeiConstants.USER_SECRET_ANSWER, + getSignupEditPage().getUserSecretAnswer()); + getSignupEditPage().setUserSecretAnswer( + PompeiConstants.DUMMY_SECRET_ANSWER); + + return SignupConfirmPage.class; + } + + /** + * @return signupEditPage + */ + public SignupEditPage getSignupEditPage() { + return signupEditPage; + } + + /** + * @param signupEditPage 設定する signupEditPage + */ + public void setSignupEditPage(SignupEditPage signupEditPage) { + this.signupEditPage = signupEditPage; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,271 @@ +package jp.sf.pal.pompei.web.user.signup; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import org.seasar.teeda.extension.annotation.validator.Required; + +public class SignupEditPage extends AbstractUsersignupPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -527070376132944358L; + + private List> dateOfDayOfBirthItems; + + private List> monthOfDayOfBirthItems; + + private List> stateItems; + + private List> userSecretQuestionSelectionItems; + + private List> yearOfDayOfBirthItems; + + /** + * @return the dateOfDayOfBirthItems + */ + public List> getDateOfDayOfBirthItems() { + return dateOfDayOfBirthItems; + } + + /** + * @param dateOfDayOfBirthItems the dateOfDayOfBirthItems to set + */ + public void setDateOfDayOfBirthItems( + List> dateOfDayOfBirthItems) { + this.dateOfDayOfBirthItems = dateOfDayOfBirthItems; + } + + /** + * @return the monthOfDayOfBirthItems + */ + public List> getMonthOfDayOfBirthItems() { + return monthOfDayOfBirthItems; + } + + /** + * @param monthOfDayOfBirthItems the monthOfDayOfBirthItems to set + */ + public void setMonthOfDayOfBirthItems( + List> monthOfDayOfBirthItems) { + this.monthOfDayOfBirthItems = monthOfDayOfBirthItems; + } + + /** + * @return the stateItems + */ + public List> getStateItems() { + return stateItems; + } + + /** + * @param stateItems the stateItems to set + */ + public void setStateItems(List> stateItems) { + this.stateItems = stateItems; + } + + /** + * @return the userSecretQuestionSelectionItems + */ + public List> getUserSecretQuestionSelectionItems() { + return userSecretQuestionSelectionItems; + } + + /** + * @param userSecretQuestionSelectionItems the userSecretQuestionSelectionItems to set + */ + public void setUserSecretQuestionSelectionItems( + List> userSecretQuestionSelectionItems) { + this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems; + } + + /** + * @return the yearOfDayOfBirthItems + */ + public List> getYearOfDayOfBirthItems() { + return yearOfDayOfBirthItems; + } + + /** + * @param yearOfDayOfBirthItems the yearOfDayOfBirthItems to set + */ + public void setYearOfDayOfBirthItems( + List> yearOfDayOfBirthItems) { + this.yearOfDayOfBirthItems = yearOfDayOfBirthItems; + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCity(java.lang.String) + */ + @Required + @Override + public void setCity(String city) { + // TODO Auto-generated method stub + super.setCity(city); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setDateOfDayOfBirth(java.lang.Integer) + */ + @Required + @Override + public void setDateOfDayOfBirth(Integer dateOfDayOfBirth) { + // TODO Auto-generated method stub + super.setDateOfDayOfBirth(dateOfDayOfBirth); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setEmailAddress(java.lang.String) + */ + @Required + @Override + public void setEmailAddress(String emailAddress) { + // TODO Auto-generated method stub + super.setEmailAddress(emailAddress); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setEmailAddressConfirm(java.lang.String) + */ + @Required + @Override + public void setEmailAddressConfirm(String emailAddressConfirm) { + // TODO Auto-generated method stub + super.setEmailAddressConfirm(emailAddressConfirm); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFirstname(java.lang.String) + */ + @Required + @Override + public void setFirstname(String firstname) { + // TODO Auto-generated method stub + super.setFirstname(firstname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFirstnameDescription(java.lang.String) + */ + @Required + @Override + public void setFirstnameDescription(String firstnameDescription) { + // TODO Auto-generated method stub + super.setFirstnameDescription(firstnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setGender(java.lang.String) + */ + @Required + @Override + public void setGender(String gender) { + // TODO Auto-generated method stub + super.setGender(gender); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setLastname(java.lang.String) + */ + @Required + @Override + public void setLastname(String lastname) { + // TODO Auto-generated method stub + super.setLastname(lastname); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setLastnameDescription(java.lang.String) + */ + @Required + @Override + public void setLastnameDescription(String lastnameDescription) { + // TODO Auto-generated method stub + super.setLastnameDescription(lastnameDescription); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setMonthOfDayOfBirth(java.lang.Integer) + */ + @Required + @Override + public void setMonthOfDayOfBirth(Integer monthOfDayOfBirth) { + // TODO Auto-generated method stub + super.setMonthOfDayOfBirth(monthOfDayOfBirth); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setPrimaryPostcode(java.lang.String) + */ + @Required + @Override + public void setPrimaryPostcode(String primaryPostcode) { + // TODO Auto-generated method stub + super.setPrimaryPostcode(primaryPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setSecondaryPostcode(java.lang.String) + */ + @Required + @Override + public void setSecondaryPostcode(String secondaryPostcode) { + // TODO Auto-generated method stub + super.setSecondaryPostcode(secondaryPostcode); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setState(java.lang.String) + */ + @Required + @Override + public void setState(String state) { + // TODO Auto-generated method stub + super.setState(state); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setStreetAddress(java.lang.String) + */ + @Required + @Override + public void setStreetAddress(String streetAddress) { + // TODO Auto-generated method stub + super.setStreetAddress(streetAddress); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserName(java.lang.String) + */ + @Required + @Override + public void setUserName(String userName) { + // TODO Auto-generated method stub + super.setUserName(userName); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserSecretAnswer(java.lang.String) + */ + @Required + @Override + public void setUserSecretAnswer(String userSecretAnswer) { + // TODO Auto-generated method stub + super.setUserSecretAnswer(userSecretAnswer); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setYearOfDayOfBirth(java.lang.Integer) + */ + @Required + @Override + public void setYearOfDayOfBirth(Integer yearOfDayOfBirth) { + // TODO Auto-generated method stub + super.setYearOfDayOfBirth(yearOfDayOfBirth); + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-11 13:29:41 UTC (rev 621) @@ -125,4 +125,22 @@ added.product.to.cart=\u5546\u54c1\u3092\u30ab\u30fc\u30c8\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 need.to.register.as.customer=\u30ab\u30fc\u30c8\u3092\u5229\u7528\u3059\u308b\u305f\u3081\u306b\u306f\u4f1a\u54e1\u767b\u9332\u304c\u5fc5\u8981\u3067\u3059\u3002\u4f1a\u54e1\u767b\u9332\u5f8c\u3001\u518d\u5ea6\u3001\u30ab\u30fc\u30c8\u306b\u5546\u54c1\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +# SignupEditAction.java +could.not.read.term.of.service=\u5229\u7528\u898f\u7d04\u304c\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +type.secret.question=\u79d8\u5bc6\u306e\u8cea\u554f\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u79d8\u5bc6\u306e\u8cea\u554f\u3092\u9078\u629e\u307e\u305f\u306f\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +# SignupEditConfirm.java +could.not.encode.secret.password=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +error.lacking.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +error.userid_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fcID\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u30e6\u30fc\u30b6\u30fcID\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +error.email_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u65e2\u306b\u30b7\u30b9\u30c6\u30e0\u3067\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u65e2\u306b\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u6240\u6709\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u78ba\u8a8d\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +error.failed_to_generate_password=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +error.two_passwords_do_not_match=\u78ba\u8a8d\u7528\u30d1\u30b9\u30ef\u30fc\u30c9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +error.failed_to_add=\u30e6\u30fc\u30b6\u30fc\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.access.folder=\u4f1a\u54e1\u7528\u30da\u30fc\u30b8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.folder=\u4f1a\u54e1\u7528\u30da\u30fc\u30b8\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +error.registration_completed_but_could_not_send=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +error.registration_completed_but_could_not_find_template=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.create.user.by.system.error=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.insert.customer.data=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit.properties =================================================================== Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit_ja.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit_ja.properties 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit_ja.properties 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7 +javax.portlet.short-title=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7 +javax.portlet.keywords=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7 Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/SignupEdit_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,16 @@ +M=\u7537\u6027 +F=\u5973\u6027 + +state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c, + +secretQuestion.num=8 +secretQuestion.1=\u30da\u30c3\u30c8\u3068\u3044\u3048\u3070\uff1f +secretQuestion.2=\u65c5\u884c\u3068\u3044\u3048\u3070\uff1f +secretQuestion.3=\u30d2\u30fc\u30ed\u30fc\u3068\u3044\u3048\u3070\uff1f +secretQuestion.4=\u98df\u3079\u7269\u3068\u3044\u3048\u3070\uff1f +secretQuestion.5=\u30c1\u30fc\u30e0\u3068\u3044\u3048\u3070\uff1f +secretQuestion.6=\u5b66\u6821\u3068\u3044\u3048\u3070\uff1f +secretQuestion.7=\u6620\u753b\u3068\u3044\u3048\u3070\uff1f +secretQuestion.8=\u8a18\u5ff5\u65e5\u3068\u3044\u3048\u3070\uff1f + +email.subject.registration=\u4f1a\u54e1\u767b\u9332\u306e\u78ba\u8a8d \ No newline at end of file Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,69 @@ + + + + admin + Pompei Core Portlets + Pompei Core ポートレット + PAL Team + + ProductList + public-view + true + true + + + CategoryList + public-view + true + true + + + ProductListInCart + public-view + + + OrderProducts + public-view + + + + + + + + + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-11 13:29:41 UTC (rev 621) @@ -408,4 +408,77 @@ + + Provides users with the ability register as a new user. + 会員登録する機能を提供します。 + CustomerSignupPortlet + Pompei: Signup + Pompei: サインアップ + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.pompei.filter.UserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/user/signup/signupEdit.html + + + This option will generate a new password for each user registration + jp.sf.pal.pompei.ForceGeneratedPassword + true + + + This option will force email address to be system wide unique + jp.sf.pal.pompei.ForceUniqueEmail + true + + + This option will use the email address as the username + jp.sf.pal.pompei.ForceUseEmailAsUsername + false + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.pompei.EmailTemplateLocation + /WEB-INF/template/userreg/ + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.pompei.EmailTemplateName + userRegistrationEmail.vm + + + Profiling rules to be assigned at registration. + jp.sf.pal.pompei.RuleNames + page + + + Profiling rules to be assigned at registration. + jp.sf.pal.pompei.RuleValues + j2 + + + Profiling rules to be assigned at registration. + jp.sf.pal.pompei.SendMail + true + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.pompei.web.signup.signupEdit + + Customer Signup + Signup + Signup + + Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,5 @@ +利用規約 + +・・・ +・・・ +・・・ Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,15 @@ +こんにちは、$!{map.get("user.name.family")} $!{map.get("user.name.given")} さん + +Pompei ポータルに登録していただきありがとうございます。 + +ユーザー名: $!{map.get("user.name")} +パスワード: $!{map.get("password")} + +パスワードは、ログインして変更できます。 + +以上をよろしくお願いいたします。 + +--- +Pompei ポータル +http://sourceforge.jp/projects/pal/ + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html 2007-10-11 13:29:41 UTC (rev 621) @@ -25,6 +25,7 @@
  • カテゴリリスト
  • カート確認
  • 注文
  • +
  • 会員登録
  • Added: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,55 @@ + + + + + + 会員登録 + + +
    +
    +
    +
    +
    + +
    +
    +
    会員登録が完了しました
    +
    + + + + + +
      + + +
    + +
    +
    + + mail 宛に会員情報を送信しました。 + +
    + メールに記述されている会員情報でログインして、ご利用ください。 +
    + メールが届かない場合は、管理者にお問い合わせください。 +
    +
    + 登録された会員情報でログインして、ご利用ください。 +
    + ログインできない場合は、管理者にお問い合わせください。 +
    +
    +
    + +
    + +
    + +
    + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,229 @@ + + + + + + + + +
    +
    + +
    +
    +
    +
    +
    1. 会員情報を確認してください
    + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    +
    +
    +
    +
    2. お届け先を確認してください
    + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    + + + abc +
    +
    +
    +
    +
    3. 秘密の質問と答えを確認してください
    + + + + + + +
      + + + + + + + + + + + + + +
    + + + abc +
    + + + abc +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-10-11 08:28:54 UTC (rev 620) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-10-11 13:29:41 UTC (rev 621) @@ -0,0 +1,291 @@ + + + + + + + + +
    +
    + +
    +
    +
    +
    +
    1. 会員情報を入力してください
    + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + [必須] + + + +
    + + [必須] + + +
    + + [必須] + + +
    + + [必須] + + +
    + + [必須] + + +
    + + [必須] + + + + + +
    + + [必須] + + +
    + + [必須] + + +
    + + [必須] + + + + / + + + / + + + +
    +
    +
    +
    +
    2. お届け先を入力してください
    + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + [必須] + + - + + +
    + + [必須] + + + +
    + + [必須] + + +
    + + [必須] + + +
    + + + +
    + + + +
    + + + +
    + + + +
    + + + +
    +
    +
    +
    +
    3. 秘密の質問と答えを入力してください
    + + + + + + +
      + + + + + + + + + + + + + + + + + +
    + + [必須] + + + +
      + +
    + +
    + + [必須] + + +
    +
    +
    +
    +
    4. 利用規約をご確認ください。
    + + + + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Fri Oct 12 16:13:40 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 12 Oct 2007 16:13:40 +0900 Subject: [pal-cvs 2878] [622] fixed minor problems. Message-ID: <1192173220.578606.15251.nullmailer@users.sourceforge.jp> Revision: 622 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=622 Author: shinsuke Date: 2007-10-12 16:13:39 +0900 (Fri, 12 Oct 2007) Log Message: ----------- fixed minor problems. put portlet-msg class in html files. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.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/CheckoutCompletePage.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/resources/jp/sf/pal/pompei/web/user/signup/label.properties pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/PagingResultPage.java 2007-10-12 07:13:39 UTC (rev 622) @@ -22,6 +22,9 @@ private List> pageNumberItems; public int getStartRecordCount() { + if (getAllRecordCount() == 0) { + return 0; + } return (getCurrentPageNumber() - 1) * getPageSize() + 1; } @@ -154,4 +157,8 @@ public boolean isCurrentPage() { return pageNumber == currentPageNumber; } + + public boolean isEmptyRecord() { + return getAllRecordCount() == 0; + } } 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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2007-10-12 07:13:39 UTC (rev 622) @@ -197,4 +197,8 @@ public void setLogin(boolean login) { this.login = login; } + + public boolean isEmptyProducts() { + return productItems == null || productItems.isEmpty(); + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java 2007-10-12 07:13:39 UTC (rev 622) @@ -2,6 +2,8 @@ import java.io.Serializable; +import jp.sf.pal.pompei.util.UrlBuilderUtil; + public class CheckoutCompletePage implements Serializable { /** @@ -19,4 +21,7 @@ this.orderFormNumber = orderFormNumber; } + public String getProductListLinkHref() { + return UrlBuilderUtil.createProductListUrl(); + } } 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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-10-12 07:13:39 UTC (rev 622) @@ -123,7 +123,7 @@ List> pageNumberItems = new ArrayList>(); for (int i : pageNumberArray) { Map map = new HashMap(); - map.put("pageNumber", new Integer(i)); + map.put("pageNumber", Integer.valueOf(i)); pageNumberItems.add(map); } getProductListPage().setPageNumberItems(pageNumberItems); 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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-10-12 07:13:39 UTC (rev 622) @@ -188,4 +188,12 @@ } return ""; } + + public String getThumbnailByThumbnailSrc() { + return getThumbnailSrc(); + } + + public String getThumbnailByListWithImageSrc() { + return getThumbnailSrc(); + } } Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-10-12 07:13:39 UTC (rev 622) @@ -1,3 +1,16 @@ +secondaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0b4\u6841 +lastnameDescription=\u540d\u5b57[\u30d5\u30ea\u30ac\u30ca] +lastname=\u540d\u5b57 +streetAddress=\u305d\u308c\u4ee5\u964d\u306e\u4f4f\u6240 +city=\u90e1\u5e02\u533a (\u5cf6\u3001\u56fd) +userName=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fcID +emailAddress=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +firstname=\u540d\u524d +emailAddressConfirm=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9(\u78ba\u8a8d) +firstnameDescription=\u540d\u524d[\u30d5\u30ea\u30ac\u30ca] +primaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0a3\u6841 +userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 + M=\u7537\u6027 F=\u5973\u6027 Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-12 07:13:39 UTC (rev 622) @@ -474,7 +474,7 @@ en ja - jp.sf.pal.pompei.web.signup.signupEdit + jp.sf.pal.pompei.web.user.signup.SignupEdit Customer Signup Signup Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,6 +7,9 @@
    +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,6 +7,9 @@ +
    + +
    住所ID住所ID
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,6 +7,9 @@ +
    + +
    住所ID
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,10 +10,10 @@ -
    - +
    +
    -
    +
    ユーザー登録情報
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,8 +10,8 @@ -
    - +
    +
    ユーザー登録情報
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -16,6 +16,9 @@

    --> +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,8 +7,8 @@ -
    - +
    +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -17,8 +17,8 @@ } --> -
    - +
    +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-12 07:13:39 UTC (rev 622) @@ -12,7 +12,7 @@
    -
    +

    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -12,7 +12,7 @@
    -
    +

    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,7 +10,7 @@
    -
    +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -11,7 +11,9 @@

    -
    +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -23,6 +23,9 @@

    +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -8,7 +8,9 @@ -
    +
    + +
    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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -19,6 +19,9 @@ --> +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html 2007-10-12 07:13:39 UTC (rev 622) @@ -8,6 +8,9 @@ 下記の内容で登録します。よろしければ登録ボタンを押して下さい。 +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -11,7 +11,9 @@
    -
    +
    + +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -9,7 +9,7 @@ -
    +
    商品名商品名
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + +  
    + XXX 01MAX
    +  MX-XXX
    +  MX-XXX +
    + + 30,000 + + + 1 + + + 30,000 + + + + + + + + + 削除 +
    + + + + 10000 + + + +
    +
    +
    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -  
    XXX 01MAX
    -  MX-XXX
    -  MX-XXX -
    - - 30,000 - - - 1 - - - 30,000 - - - - - - - - - 削除 -
    - - - - 10000 - - - -
    - -
    - 購入手続きへ +
    +
    + +

    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,22 +10,22 @@
    - + - + - + - + - +
    1. 会員情報の確認1. 会員情報の確認 >2. お届け先の選択2. お届け先の選択 >3. 支払方法とお届け方法の選択3. 支払方法とお届け方法の選択 >4. ご注文内容の確認4. ご注文内容の確認 >5. ご注文完了5. ご注文完了


    -
    +

    @@ -51,6 +51,11 @@ またのご利用をお待ちしております。
    +
    +
    + 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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,15 +10,15 @@
    - + - + - + - + - +
    1. 会員情報の確認1. 会員情報の確認 >2. お届け先の選択2. お届け先の選択 >3. 支払方法とお届け方法の選択3. 支払方法とお届け方法の選択 >4. ご注文内容の確認4. ご注文内容の確認 >5. ご注文完了5. ご注文完了

    @@ -26,7 +26,7 @@
    -
    +

    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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-12 07:13:39 UTC (rev 622) @@ -22,15 +22,15 @@
    - + - + - + - + - +
    1. 会員情報の確認1. 会員情報の確認 >2. お届け先の選択2. お届け先の選択 >3. 支払方法とお届け方法の選択3. 支払方法とお届け方法の選択 >4. ご注文内容の確認4. ご注文内容の確認 >5. ご注文完了5. ご注文完了

    @@ -38,7 +38,7 @@
    -
    +

    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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,15 +10,15 @@
    - + - + - + - + - +
    1. 会員情報の確認1. 会員情報の確認 >2. お届け先の選択2. お届け先の選択 >3. 支払方法とお届け方法の選択3. 支払方法とお届け方法の選択 >4. ご注文内容の確認4. ご注文内容の確認 >5. ご注文完了5. ご注文完了

    @@ -26,7 +26,7 @@
    -
    +

    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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,15 +10,15 @@
    - + - + - + - + - +
    1. 会員情報の確認1. 会員情報の確認 >2. お届け先の選択2. お届け先の選択 >3. 支払方法とお届け方法の選択3. 支払方法とお届け方法の選択 >4. ご注文内容の確認4. ご注文内容の確認 >5. ご注文完了5. ご注文完了

    @@ -26,7 +26,7 @@
    -
    +

    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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,9 +7,11 @@ -
    +
    + +
    - +
    画像 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-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-10-12 07:13:39 UTC (rev 622) @@ -36,7 +36,9 @@ 新着順 ] -
    +
    +
    +
    131件中 3145件目
    @@ -49,13 +51,17 @@
    +
    +
    + ご指定のカテゴリに登録されている商品はありませんでした。 +
    +

    -
    -
    - 画像 + 画像 @@ -116,6 +122,7 @@

    + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-10-12 07:13:39 UTC (rev 622) @@ -10,7 +10,7 @@
    -
    +

    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,7 +7,7 @@ -
    +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-10-11 13:29:41 UTC (rev 621) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-10-12 07:13:39 UTC (rev 622) @@ -7,7 +7,7 @@ -
    +
    From svnnotify @ sourceforge.jp Fri Oct 12 17:26:16 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 12 Oct 2007 17:26:16 +0900 Subject: [pal-cvs 2879] [623] orderNotificationId is autoincrement. Message-ID: <1192177576.378338.29130.nullmailer@users.sourceforge.jp> Revision: 623 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=623 Author: shinsuke Date: 2007-10-12 17:26:15 +0900 (Fri, 12 Oct 2007) Log Message: ----------- orderNotificationId is autoincrement. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderNotificationBhv.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderNotificationDao.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml =================================================================== --- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-12 07:13:39 UTC (rev 622) +++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-12 08:26:15 UTC (rev 623) @@ -547,10 +547,11 @@
    + - Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderNotificationBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderNotificationBhv.java 2007-10-12 07:13:39 UTC (rev 622) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderNotificationBhv.java 2007-10-12 08:26:15 UTC (rev 623) @@ -40,7 +40,7 @@ * * * [identity] - * + * orderNotificationId * * [update-date] * @@ -751,6 +751,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 orderNotificationId) { + OrderNotification entity = new OrderNotification(); + entity.setOrderNotificationId(orderNotificationId); + final OrderNotificationCB cb = newMyConditionBean(); + cb.acceptPrimaryKeyMapString(getDBMeta().extractPrimaryKeyMapString(entity)); + final OrderNotification currentEntity = selectEntityWithDeletedCheck(cb); + return delegateInsert(currentEntity); + } + + /** + * Filter 'copy-insert' entity. + * + * @param orderNotification Entity. (NotNull) + */ + protected void filterCopyInsertEntity(OrderNotification orderNotification) { + } // =================================================================================== // Hierarchy Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderNotificationDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderNotificationDao.java 2007-10-12 07:13:39 UTC (rev 622) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderNotificationDao.java 2007-10-12 08:26:15 UTC (rev 623) @@ -23,7 +23,7 @@ * * * [identity] - * + * orderNotificationId * * [update-date] * Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java 2007-10-12 07:13:39 UTC (rev 622) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java 2007-10-12 08:26:15 UTC (rev 623) @@ -26,7 +26,7 @@ * * * [identity] - * + * orderNotificationId * * [update-date] * @@ -47,6 +47,9 @@ /** TABLE-Annotation for S2Dao. The value is ORDER_NOTIFICATION. */ public static final String TABLE = "ORDER_NOTIFICATION"; + + /** ID-Annotation */ + public static final String orderNotificationId_ID = "identity"; // =================================================================================== // Attribute @@ -54,7 +57,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderNotificationId. PK : INTEGER : NotNull */ + /** The value of orderNotificationId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ protected java.math.BigDecimal _orderNotificationId; /** The value of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ @@ -134,12 +137,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. PK : INTEGER : NotNull */ + /** Column Annotation for S2Dao. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String orderNotificationId_COLUMN = "ORDER_NOTIFICATION_ID"; /** * Get the value of orderNotificationId.
    - * {PK : INTEGER : NotNull} + * {PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT]} * * @return The value of orderNotificationId. (Nullable) */ @@ -149,7 +152,7 @@ /** * Set the value of orderNotificationId.
    - * {PK : INTEGER : NotNull} + * {PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT]} * * @param orderNotificationId The value of orderNotificationId. (Nullable) */ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java 2007-10-12 07:13:39 UTC (rev 622) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java 2007-10-12 08:26:15 UTC (rev 623) @@ -28,7 +28,7 @@ * * * [identity] - * + * orderNotificationId * * [update-date] * @@ -93,7 +93,7 @@ // ----------------------------------------------------- // Column DB-Name // -------------- - /** Db-name of ORDER_NOTIFICATION_ID. PK : INTEGER : NotNull */ + /** Db-name of ORDER_NOTIFICATION_ID. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String DB_NAME_ORDER_NOTIFICATION_ID = "ORDER_NOTIFICATION_ID"; /** Db-name of ORDER_STATUS_ID. INTEGER : NotNull : FK to ORDER_STATUS */ public static final String DB_NAME_ORDER_STATUS_ID = "ORDER_STATUS_ID"; @@ -118,7 +118,7 @@ // ----------------------------------------------------- // Column Prop-Name(JavaBeansRule) // ------------------------------- - /** Prop-name(JavaBeansRule) of orderNotificationId. PK : INTEGER : NotNull */ + /** Prop-name(JavaBeansRule) of orderNotificationId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String PROPERTY_NAME_orderNotificationId = "orderNotificationId"; /** Prop-name(JavaBeansRule) of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ public static final String PROPERTY_NAME_orderStatusId = "orderStatusId"; @@ -132,7 +132,7 @@ // ----------------------------------------------------- // Column Cap-Prop-Name // -------------------- - /** Cap-prop-name of orderNotificationId. PK : INTEGER : NotNull */ + /** Cap-prop-name of orderNotificationId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String CAP_PROP_NAME_OrderNotificationId = "OrderNotificationId"; /** Cap-prop-name of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ public static final String CAP_PROP_NAME_OrderStatusId = "OrderStatusId"; @@ -157,7 +157,7 @@ // ----------------------------------------------------- // Column Uncap-Prop-Name // ---------------------- - /** Uncap-prop-name of orderNotificationId. PK : INTEGER : NotNull */ + /** Uncap-prop-name of orderNotificationId. PK : INC : INTEGER : NotNull : Default=[GENERATED_BY_DEFAULT] */ public static final String UNCAP_PROP_NAME_orderNotificationId = "orderNotificationId"; /** Uncap-prop-name of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ public static final String UNCAP_PROP_NAME_orderStatusId = "orderStatusId"; 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-10-12 07:13:39 UTC (rev 622) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-12 08:26:15 UTC (rev 623) @@ -480,7 +480,7 @@ ); CREATE TABLE ORDER_NOTIFICATION ( - ORDER_NOTIFICATION_ID INTEGER NOT NULL + ORDER_NOTIFICATION_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1) , ORDER_STATUS_ID INTEGER NOT NULL , EMAIL_ADDRESS VARCHAR(128) , TEMPLATE_NAME VARCHAR(32) NOT NULL From svnnotify @ sourceforge.jp Fri Oct 12 17:26:43 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 12 Oct 2007 17:26:43 +0900 Subject: [pal-cvs 2880] [624] orderNotificationId is autoincrement. Message-ID: <1192177603.113978.29224.nullmailer@users.sourceforge.jp> Revision: 624 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=624 Author: shinsuke Date: 2007-10-12 17:26:42 +0900 (Fri, 12 Oct 2007) Log Message: ----------- orderNotificationId is autoincrement. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-12 08:26:15 UTC (rev 623) +++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-12 08:26:42 UTC (rev 624) @@ -4296,7 +4296,7 @@ - + From svnnotify @ sourceforge.jp Sat Oct 13 23:10:49 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 13 Oct 2007 23:10:49 +0900 Subject: [pal-cvs 2881] [625] supported PORTLET DEV key. Message-ID: <1192284649.331926.16931.nullmailer@users.sourceforge.jp> Revision: 625 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=625 Author: shinsuke Date: 2007-10-13 23:10:49 +0900 (Sat, 13 Oct 2007) Log Message: ----------- supported PORTLET DEV key. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/build.xml -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/build.xml =================================================================== --- pompei/portlets/pompei-core/trunk/build.xml 2007-10-12 08:26:42 UTC (rev 624) +++ pompei/portlets/pompei-core/trunk/build.xml 2007-10-13 14:10:49 UTC (rev 625) @@ -1,6 +1,6 @@ - + @@ -8,41 +8,30 @@ - - - - - + - + - + - + - - @@ -71,6 +60,18 @@ value="<!-- SERVLET DEV: END -->" > + + + + + + + + - ${shell.options} - + @@ -133,9 +145,21 @@ + + + + + + + + From svnnotify @ sourceforge.jp Sun Oct 14 07:36:33 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 14 Oct 2007 07:36:33 +0900 Subject: [pal-cvs 2882] [626] added velocity and updated others. Message-ID: <1192314993.078017.27922.nullmailer@users.sourceforge.jp> Revision: 626 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=626 Author: shinsuke Date: 2007-10-14 07:36:32 +0900 (Sun, 14 Oct 2007) Log Message: ----------- added velocity and updated others. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/pom.xml -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/pom.xml =================================================================== --- pompei/portlets/pompei-core/trunk/pom.xml 2007-10-13 14:10:49 UTC (rev 625) +++ pompei/portlets/pompei-core/trunk/pom.xml 2007-10-13 22:36:32 UTC (rev 626) @@ -133,7 +133,21 @@ log4j log4j - 1.2.9 + 1.2.15 + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + com.sun.jmx + jmxri + + xerces @@ -207,13 +221,15 @@ org.seasar.teeda teeda-extension - 1.0.12-EA1-SNAPSHOT + 1.0.12-SNAPSHOT + org.seasar.teeda teeda-tiger @@ -240,17 +256,21 @@ derby 10.2.2.0 - + + org.apache.portals.jetspeed-2 From svnnotify @ sourceforge.jp Sun Oct 14 07:41:36 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 14 Oct 2007 07:41:36 +0900 Subject: [pal-cvs 2883] [627] updated eclipse config file Message-ID: <1192315296.908775.30466.nullmailer@users.sourceforge.jp> Revision: 627 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=627 Author: shinsuke Date: 2007-10-14 07:41:36 +0900 (Sun, 14 Oct 2007) Log Message: ----------- updated eclipse config file Modified Paths: -------------- pompei/portlets/pompei-core/trunk/.classpath -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/.classpath =================================================================== --- pompei/portlets/pompei-core/trunk/.classpath 2007-10-13 22:36:32 UTC (rev 626) +++ pompei/portlets/pompei-core/trunk/.classpath 2007-10-13 22:41:36 UTC (rev 627) @@ -10,30 +10,37 @@ - - + + + + + + - + + + - + - + + @@ -41,9 +48,9 @@ - + - + From svnnotify @ sourceforge.jp Sun Oct 14 07:48:10 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 14 Oct 2007 07:48:10 +0900 Subject: [pal-cvs 2884] [628] updated db, added payment fee, added delivery number, added order notification. Message-ID: <1192315690.031238.2197.nullmailer@users.sourceforge.jp> Revision: 628 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=628 Author: shinsuke Date: 2007-10-14 07:48:08 +0900 (Sun, 14 Oct 2007) Log Message: ----------- updated db, added payment fee, added delivery number, added order notification. Modified Paths: -------------- 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/BsOrderFormBhv.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.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/bsdao/BsPaymentMethodDao.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/BsPaymentMethod.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/bsentity/dbmeta/PaymentMethodDbm.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/AbstractBsPaymentMethodCQ.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/bs/BsPaymentMethodCQ.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/cq/ciq/PaymentMethodCIQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/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/signup/SignupEditAction.java pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 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/insert_data.sql pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml =================================================================== --- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-13 22:48:08 UTC (rev 628) @@ -510,6 +510,8 @@ name="DELIVERY_METHOD_ID" type="INTEGER"/> + - + + @@ -701,6 +705,8 @@ primaryKey="true" required="true" type="INTEGER"/> +
    - + @@ -1552,6 +1552,13 @@ + + + + + + + @@ -1607,7 +1614,7 @@ - + @@ -1621,7 +1628,7 @@ - + @@ -1635,7 +1642,7 @@ - + @@ -1649,6 +1656,20 @@ + + + + + + + + + + + + + + @@ -3977,7 +3998,7 @@
    - + @@ -3999,6 +4020,20 @@ + + + + + + + + + + + + + + @@ -4037,7 +4072,7 @@
    - + 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-13 22:48:08 UTC (rev 628) @@ -7,6 +7,10 @@ public class PompeiConstants { public static final String PREFIX = "jp.sf.pal.pompei."; + public static final String LABEL = "label"; + + public static final String VALUE = "value"; + public static final int DEFULAT_PAGE_SIZE = 25; public static final int DEFULAT_PAGE_RANGE_SIZE = 5; @@ -89,6 +93,8 @@ public static final BigDecimal DEFAULT_DELIVERY_PRICE = new BigDecimal(0); + public static final BigDecimal DEFAULT_PAYMENT_FEE = new BigDecimal(0); + public static final String CATEGORY_BREADCRUMB = "CategoryBreadcrumb"; public static final String CURRENT_CATEGORY_ID = "CurrentCategoryId"; @@ -233,4 +239,18 @@ public static final String USER_SECRET_ANSWER = "user.secret.answer"; public static final String EMAIL_SUBJECT_USER_REGISTRATION = "email.subject.registration"; + + public static final String ADMINISTRATOR_EMAIL = "administratorEmail"; + + public static final String DEFAULT_ADMINISTRATOR_EMAIL = "root @ pal.sourceforge.jp"; + + public static final String ORDER_NOTIFICATION_PATH = "orderNotificationPath"; + + public static final String DEFAULT_ORDER_NOTIFICATION_PATH = "/notification/order/"; + + public static final String DEFAULT_TEMPLATE_PATH = "/WEB-INF/template/"; + + public static final String SMTP_HOST = "smtpHost"; + + public static final String DEFAULT_SMTP_HOST = "localhost"; } 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2007-10-13 22:48:08 UTC (rev 628) @@ -30,7 +30,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -1542,15 +1542,17 @@ if (names.contains("orderCardInfoId")) { destinationMyEntity.setOrderCardInfoId(sourceMyEntity.getOrderCardInfoId()); } if (names.contains("deliveryMethodId")) { destinationMyEntity.setDeliveryMethodId(sourceMyEntity.getDeliveryMethodId()); } if (names.contains("deliveryMethodCode")) { destinationMyEntity.setDeliveryMethodCode(sourceMyEntity.getDeliveryMethodCode()); } + if (names.contains("deliveryNumber")) { destinationMyEntity.setDeliveryNumber(sourceMyEntity.getDeliveryNumber()); } if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); } if (names.contains("orderStatusId")) { destinationMyEntity.setOrderStatusId(sourceMyEntity.getOrderStatusId()); } if (names.contains("purchasedDate")) { destinationMyEntity.setPurchasedDate(sourceMyEntity.getPurchasedDate()); } if (names.contains("finishedDate")) { destinationMyEntity.setFinishedDate(sourceMyEntity.getFinishedDate()); } if (names.contains("currencyId")) { destinationMyEntity.setCurrencyId(sourceMyEntity.getCurrencyId()); } if (names.contains("currencyCode")) { destinationMyEntity.setCurrencyCode(sourceMyEntity.getCurrencyCode()); } - if (names.contains("deliveryPrice")) { destinationMyEntity.setDeliveryPrice(sourceMyEntity.getDeliveryPrice()); } if (names.contains("subTotalPrice")) { destinationMyEntity.setSubTotalPrice(sourceMyEntity.getSubTotalPrice()); } if (names.contains("tax")) { destinationMyEntity.setTax(sourceMyEntity.getTax()); } + if (names.contains("deliveryPrice")) { destinationMyEntity.setDeliveryPrice(sourceMyEntity.getDeliveryPrice()); } + if (names.contains("paymentFee")) { destinationMyEntity.setPaymentFee(sourceMyEntity.getPaymentFee()); } if (names.contains("totalPrice")) { destinationMyEntity.setTotalPrice(sourceMyEntity.getTotalPrice()); } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java 2007-10-13 22:48:08 UTC (rev 628) @@ -30,7 +30,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -934,6 +934,7 @@ if (names.contains("paymentMethodId")) { destinationMyEntity.setPaymentMethodId(sourceMyEntity.getPaymentMethodId()); } if (names.contains("code")) { destinationMyEntity.setCode(sourceMyEntity.getCode()); } + if (names.contains("fee")) { destinationMyEntity.setFee(sourceMyEntity.getFee()); } if (names.contains("sortOrder")) { destinationMyEntity.setSortOrder(sourceMyEntity.getSortOrder()); } if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); } if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); } 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2007-10-13 22:48:08 UTC (rev 628) @@ -11,7 +11,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM"; + public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_FORM"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; + public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderFormId"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java 2007-10-13 22:48:08 UTC (rev 628) @@ -11,7 +11,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD"; + public static final String getListAll_SQL = "select PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD where PAYMENT_METHOD.PAYMENT_METHOD_ID = /*paymentMethodId*/null"; + public static final String getEntity_SQL = "select PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD where PAYMENT_METHOD.PAYMENT_METHOD_ID = /*paymentMethodId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "paymentMethodId"; 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2007-10-13 22:48:08 UTC (rev 628) @@ -14,7 +14,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -216,6 +216,9 @@ /** The value of deliveryMethodCode. VARCHAR(16) : NotNull */ protected String _deliveryMethodCode; + /** The value of deliveryNumber. VARCHAR(32) */ + protected String _deliveryNumber; + /** The value of lastModified. TIMESTAMP : NotNull */ protected java.sql.Timestamp _lastModified; @@ -234,15 +237,18 @@ /** The value of currencyCode. CHAR(3) : NotNull */ protected String _currencyCode; - /** The value of deliveryPrice. DECIMAL(14) */ - protected java.math.BigDecimal _deliveryPrice; - /** The value of subTotalPrice. DECIMAL(14) */ protected java.math.BigDecimal _subTotalPrice; /** The value of tax. DECIMAL(14) */ protected java.math.BigDecimal _tax; + /** The value of deliveryPrice. DECIMAL(14) */ + protected java.math.BigDecimal _deliveryPrice; + + /** The value of paymentFee. DECIMAL(14) */ + protected java.math.BigDecimal _paymentFee; + /** The value of totalPrice. DECIMAL(14) : NotNull */ protected java.math.BigDecimal _totalPrice; @@ -1583,6 +1589,30 @@ this._deliveryMethodCode = deliveryMethodCode; } + /** Column Annotation for S2Dao. VARCHAR(32) */ + public static final String deliveryNumber_COLUMN = "DELIVERY_NUMBER"; + + /** + * Get the value of deliveryNumber.
    + * {VARCHAR(32)} + * + * @return The value of deliveryNumber. (Nullable) + */ + public String getDeliveryNumber() { + return _deliveryNumber; + } + + /** + * Set the value of deliveryNumber.
    + * {VARCHAR(32)} + * + * @param deliveryNumber The value of deliveryNumber. (Nullable) + */ + public void setDeliveryNumber(String deliveryNumber) { + _modifiedProperties.addPropertyName("deliveryNumber"); + this._deliveryNumber = deliveryNumber; + } + /** Column Annotation for S2Dao. TIMESTAMP : NotNull */ public static final String lastModified_COLUMN = "LAST_MODIFIED"; @@ -1728,30 +1758,6 @@ } /** Column Annotation for S2Dao. DECIMAL(14) */ - public static final String deliveryPrice_COLUMN = "DELIVERY_PRICE"; - - /** - * Get the value of deliveryPrice.
    - * {DECIMAL(14)} - * - * @return The value of deliveryPrice. (Nullable) - */ - public java.math.BigDecimal getDeliveryPrice() { - return _deliveryPrice; - } - - /** - * Set the value of deliveryPrice.
    - * {DECIMAL(14)} - * - * @param deliveryPrice The value of deliveryPrice. (Nullable) - */ - public void setDeliveryPrice(java.math.BigDecimal deliveryPrice) { - _modifiedProperties.addPropertyName("deliveryPrice"); - this._deliveryPrice = deliveryPrice; - } - - /** Column Annotation for S2Dao. DECIMAL(14) */ public static final String subTotalPrice_COLUMN = "SUB_TOTAL_PRICE"; /** @@ -1799,6 +1805,54 @@ this._tax = tax; } + /** Column Annotation for S2Dao. DECIMAL(14) */ + public static final String deliveryPrice_COLUMN = "DELIVERY_PRICE"; + + /** + * Get the value of deliveryPrice.
    + * {DECIMAL(14)} + * + * @return The value of deliveryPrice. (Nullable) + */ + public java.math.BigDecimal getDeliveryPrice() { + return _deliveryPrice; + } + + /** + * Set the value of deliveryPrice.
    + * {DECIMAL(14)} + * + * @param deliveryPrice The value of deliveryPrice. (Nullable) + */ + public void setDeliveryPrice(java.math.BigDecimal deliveryPrice) { + _modifiedProperties.addPropertyName("deliveryPrice"); + this._deliveryPrice = deliveryPrice; + } + + /** Column Annotation for S2Dao. DECIMAL(14) */ + public static final String paymentFee_COLUMN = "PAYMENT_FEE"; + + /** + * Get the value of paymentFee.
    + * {DECIMAL(14)} + * + * @return The value of paymentFee. (Nullable) + */ + public java.math.BigDecimal getPaymentFee() { + return _paymentFee; + } + + /** + * Set the value of paymentFee.
    + * {DECIMAL(14)} + * + * @param paymentFee The value of paymentFee. (Nullable) + */ + public void setPaymentFee(java.math.BigDecimal paymentFee) { + _modifiedProperties.addPropertyName("paymentFee"); + this._paymentFee = paymentFee; + } + /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */ public static final String totalPrice_COLUMN = "TOTAL_PRICE"; @@ -1827,16 +1881,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -2449,15 +2503,17 @@ sb.append(delimiter).append(getOrderCardInfoId()); sb.append(delimiter).append(getDeliveryMethodId()); sb.append(delimiter).append(getDeliveryMethodCode()); + sb.append(delimiter).append(getDeliveryNumber()); sb.append(delimiter).append(getLastModified()); sb.append(delimiter).append(getOrderStatusId()); sb.append(delimiter).append(getPurchasedDate()); sb.append(delimiter).append(getFinishedDate()); sb.append(delimiter).append(getCurrencyId()); sb.append(delimiter).append(getCurrencyCode()); - sb.append(delimiter).append(getDeliveryPrice()); sb.append(delimiter).append(getSubTotalPrice()); sb.append(delimiter).append(getTax()); + sb.append(delimiter).append(getDeliveryPrice()); + sb.append(delimiter).append(getPaymentFee()); sb.append(delimiter).append(getTotalPrice()); sb.delete(0, delimiter.length()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2007-10-13 22:48:08 UTC (rev 628) @@ -14,7 +14,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -63,6 +63,9 @@ /** The value of code. VARCHAR(16) : NotNull */ protected String _code; + /** The value of fee. DECIMAL(14) : NotNull */ + protected java.math.BigDecimal _fee; + /** The value of sortOrder. INTEGER : NotNull */ protected java.math.BigDecimal _sortOrder; @@ -185,6 +188,30 @@ this._code = code; } + /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */ + public static final String fee_COLUMN = "FEE"; + + /** + * Get the value of fee.
    + * {DECIMAL(14) : NotNull} + * + * @return The value of fee. (Nullable) + */ + public java.math.BigDecimal getFee() { + return _fee; + } + + /** + * Set the value of fee.
    + * {DECIMAL(14) : NotNull} + * + * @param fee The value of fee. (Nullable) + */ + public void setFee(java.math.BigDecimal fee) { + _modifiedProperties.addPropertyName("fee"); + this._fee = fee; + } + /** Column Annotation for S2Dao. INTEGER : NotNull */ public static final String sortOrder_COLUMN = "SORT_ORDER"; @@ -261,16 +288,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -437,6 +464,7 @@ sb.append(delimiter).append(getPaymentMethodId()); sb.append(delimiter).append(getCode()); + sb.append(delimiter).append(getFee()); sb.append(delimiter).append(getSortOrder()); sb.append(delimiter).append(getDateAdded()); sb.append(delimiter).append(getLastModified()); 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2007-10-13 22:48:08 UTC (rev 628) @@ -16,7 +16,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE + * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * currency, customer, deliveryMethod, orderStatus, paymentMethod @@ -199,6 +199,8 @@ public static final String DB_NAME_DELIVERY_METHOD_ID = "DELIVERY_METHOD_ID"; /** Db-name of DELIVERY_METHOD_CODE. VARCHAR(16) : NotNull */ public static final String DB_NAME_DELIVERY_METHOD_CODE = "DELIVERY_METHOD_CODE"; + /** Db-name of DELIVERY_NUMBER. VARCHAR(32) */ + public static final String DB_NAME_DELIVERY_NUMBER = "DELIVERY_NUMBER"; /** Db-name of LAST_MODIFIED. TIMESTAMP : NotNull */ public static final String DB_NAME_LAST_MODIFIED = "LAST_MODIFIED"; /** Db-name of ORDER_STATUS_ID. INTEGER : NotNull : FK to ORDER_STATUS */ @@ -211,12 +213,14 @@ public static final String DB_NAME_CURRENCY_ID = "CURRENCY_ID"; /** Db-name of CURRENCY_CODE. CHAR(3) : NotNull */ public static final String DB_NAME_CURRENCY_CODE = "CURRENCY_CODE"; - /** Db-name of DELIVERY_PRICE. DECIMAL(14) */ - public static final String DB_NAME_DELIVERY_PRICE = "DELIVERY_PRICE"; /** Db-name of SUB_TOTAL_PRICE. DECIMAL(14) */ public static final String DB_NAME_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE"; /** Db-name of TAX. DECIMAL(14) */ public static final String DB_NAME_TAX = "TAX"; + /** Db-name of DELIVERY_PRICE. DECIMAL(14) */ + public static final String DB_NAME_DELIVERY_PRICE = "DELIVERY_PRICE"; + /** Db-name of PAYMENT_FEE. DECIMAL(14) */ + public static final String DB_NAME_PAYMENT_FEE = "PAYMENT_FEE"; /** Db-name of TOTAL_PRICE. DECIMAL(14) : NotNull */ public static final String DB_NAME_TOTAL_PRICE = "TOTAL_PRICE"; @@ -326,6 +330,8 @@ public static final String COLUMN_DB_NAME_OF_DeliveryMethodId = "DELIVERY_METHOD_ID"; /** @deprecated Deprecated! So use DB_NAME_DeliveryMethodCode. */ public static final String COLUMN_DB_NAME_OF_DeliveryMethodCode = "DELIVERY_METHOD_CODE"; + /** @deprecated Deprecated! So use DB_NAME_DeliveryNumber. */ + public static final String COLUMN_DB_NAME_OF_DeliveryNumber = "DELIVERY_NUMBER"; /** @deprecated Deprecated! So use DB_NAME_LastModified. */ public static final String COLUMN_DB_NAME_OF_LastModified = "LAST_MODIFIED"; /** @deprecated Deprecated! So use DB_NAME_OrderStatusId. */ @@ -338,12 +344,14 @@ public static final String COLUMN_DB_NAME_OF_CurrencyId = "CURRENCY_ID"; /** @deprecated Deprecated! So use DB_NAME_CurrencyCode. */ public static final String COLUMN_DB_NAME_OF_CurrencyCode = "CURRENCY_CODE"; - /** @deprecated Deprecated! So use DB_NAME_DeliveryPrice. */ - public static final String COLUMN_DB_NAME_OF_DeliveryPrice = "DELIVERY_PRICE"; /** @deprecated Deprecated! So use DB_NAME_SubTotalPrice. */ public static final String COLUMN_DB_NAME_OF_SubTotalPrice = "SUB_TOTAL_PRICE"; /** @deprecated Deprecated! So use DB_NAME_Tax. */ public static final String COLUMN_DB_NAME_OF_Tax = "TAX"; + /** @deprecated Deprecated! So use DB_NAME_DeliveryPrice. */ + public static final String COLUMN_DB_NAME_OF_DeliveryPrice = "DELIVERY_PRICE"; + /** @deprecated Deprecated! So use DB_NAME_PaymentFee. */ + public static final String COLUMN_DB_NAME_OF_PaymentFee = "PAYMENT_FEE"; /** @deprecated Deprecated! So use DB_NAME_TotalPrice. */ public static final String COLUMN_DB_NAME_OF_TotalPrice = "TOTAL_PRICE"; @@ -456,6 +464,8 @@ public static final String PROPERTY_NAME_deliveryMethodId = "deliveryMethodId"; /** Prop-name(JavaBeansRule) of deliveryMethodCode. VARCHAR(16) : NotNull */ public static final String PROPERTY_NAME_deliveryMethodCode = "deliveryMethodCode"; + /** Prop-name(JavaBeansRule) of deliveryNumber. VARCHAR(32) */ + public static final String PROPERTY_NAME_deliveryNumber = "deliveryNumber"; /** Prop-name(JavaBeansRule) of lastModified. TIMESTAMP : NotNull */ public static final String PROPERTY_NAME_lastModified = "lastModified"; /** Prop-name(JavaBeansRule) of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ @@ -468,12 +478,14 @@ public static final String PROPERTY_NAME_currencyId = "currencyId"; /** Prop-name(JavaBeansRule) of currencyCode. CHAR(3) : NotNull */ public static final String PROPERTY_NAME_currencyCode = "currencyCode"; - /** Prop-name(JavaBeansRule) of deliveryPrice. DECIMAL(14) */ - public static final String PROPERTY_NAME_deliveryPrice = "deliveryPrice"; /** Prop-name(JavaBeansRule) of subTotalPrice. DECIMAL(14) */ public static final String PROPERTY_NAME_subTotalPrice = "subTotalPrice"; /** Prop-name(JavaBeansRule) of tax. DECIMAL(14) */ public static final String PROPERTY_NAME_tax = "tax"; + /** Prop-name(JavaBeansRule) of deliveryPrice. DECIMAL(14) */ + public static final String PROPERTY_NAME_deliveryPrice = "deliveryPrice"; + /** Prop-name(JavaBeansRule) of paymentFee. DECIMAL(14) */ + public static final String PROPERTY_NAME_paymentFee = "paymentFee"; /** Prop-name(JavaBeansRule) of totalPrice. DECIMAL(14) : NotNull */ public static final String PROPERTY_NAME_totalPrice = "totalPrice"; @@ -586,6 +598,8 @@ public static final String CAP_PROP_NAME_DeliveryMethodId = "DeliveryMethodId"; /** Cap-prop-name of deliveryMethodCode. VARCHAR(16) : NotNull */ public static final String CAP_PROP_NAME_DeliveryMethodCode = "DeliveryMethodCode"; + /** Cap-prop-name of deliveryNumber. VARCHAR(32) */ + public static final String CAP_PROP_NAME_DeliveryNumber = "DeliveryNumber"; /** Cap-prop-name of lastModified. TIMESTAMP : NotNull */ public static final String CAP_PROP_NAME_LastModified = "LastModified"; /** Cap-prop-name of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ @@ -598,12 +612,14 @@ public static final String CAP_PROP_NAME_CurrencyId = "CurrencyId"; /** Cap-prop-name of currencyCode. CHAR(3) : NotNull */ public static final String CAP_PROP_NAME_CurrencyCode = "CurrencyCode"; - /** Cap-prop-name of deliveryPrice. DECIMAL(14) */ - public static final String CAP_PROP_NAME_DeliveryPrice = "DeliveryPrice"; /** Cap-prop-name of subTotalPrice. DECIMAL(14) */ public static final String CAP_PROP_NAME_SubTotalPrice = "SubTotalPrice"; /** Cap-prop-name of tax. DECIMAL(14) */ public static final String CAP_PROP_NAME_Tax = "Tax"; + /** Cap-prop-name of deliveryPrice. DECIMAL(14) */ + public static final String CAP_PROP_NAME_DeliveryPrice = "DeliveryPrice"; + /** Cap-prop-name of paymentFee. DECIMAL(14) */ + public static final String CAP_PROP_NAME_PaymentFee = "PaymentFee"; /** Cap-prop-name of totalPrice. DECIMAL(14) : NotNull */ public static final String CAP_PROP_NAME_TotalPrice = "TotalPrice"; @@ -713,6 +729,8 @@ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryMethodId = "DeliveryMethodId"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryMethodCode. */ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryMethodCode = "DeliveryMethodCode"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryNumber. */ + public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryNumber = "DeliveryNumber"; /** @deprecated Deprecated! So use CAP_PROP_NAME_LastModified. */ public static final String COLUMN_CAP_PROP_NAME_OF_LastModified = "LastModified"; /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderStatusId. */ @@ -725,12 +743,14 @@ public static final String COLUMN_CAP_PROP_NAME_OF_CurrencyId = "CurrencyId"; /** @deprecated Deprecated! So use CAP_PROP_NAME_CurrencyCode. */ public static final String COLUMN_CAP_PROP_NAME_OF_CurrencyCode = "CurrencyCode"; - /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryPrice. */ - public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryPrice = "DeliveryPrice"; /** @deprecated Deprecated! So use CAP_PROP_NAME_SubTotalPrice. */ public static final String COLUMN_CAP_PROP_NAME_OF_SubTotalPrice = "SubTotalPrice"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Tax. */ public static final String COLUMN_CAP_PROP_NAME_OF_Tax = "Tax"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryPrice. */ + public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryPrice = "DeliveryPrice"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_PaymentFee. */ + public static final String COLUMN_CAP_PROP_NAME_OF_PaymentFee = "PaymentFee"; /** @deprecated Deprecated! So use CAP_PROP_NAME_TotalPrice. */ public static final String COLUMN_CAP_PROP_NAME_OF_TotalPrice = "TotalPrice"; @@ -843,6 +863,8 @@ public static final String UNCAP_PROP_NAME_deliveryMethodId = "deliveryMethodId"; /** Uncap-prop-name of deliveryMethodCode. VARCHAR(16) : NotNull */ public static final String UNCAP_PROP_NAME_deliveryMethodCode = "deliveryMethodCode"; + /** Uncap-prop-name of deliveryNumber. VARCHAR(32) */ + public static final String UNCAP_PROP_NAME_deliveryNumber = "deliveryNumber"; /** Uncap-prop-name of lastModified. TIMESTAMP : NotNull */ public static final String UNCAP_PROP_NAME_lastModified = "lastModified"; /** Uncap-prop-name of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */ @@ -855,12 +877,14 @@ public static final String UNCAP_PROP_NAME_currencyId = "currencyId"; /** Uncap-prop-name of currencyCode. CHAR(3) : NotNull */ public static final String UNCAP_PROP_NAME_currencyCode = "currencyCode"; - /** Uncap-prop-name of deliveryPrice. DECIMAL(14) */ - public static final String UNCAP_PROP_NAME_deliveryPrice = "deliveryPrice"; /** Uncap-prop-name of subTotalPrice. DECIMAL(14) */ public static final String UNCAP_PROP_NAME_subTotalPrice = "subTotalPrice"; /** Uncap-prop-name of tax. DECIMAL(14) */ public static final String UNCAP_PROP_NAME_tax = "tax"; + /** Uncap-prop-name of deliveryPrice. DECIMAL(14) */ + public static final String UNCAP_PROP_NAME_deliveryPrice = "deliveryPrice"; + /** Uncap-prop-name of paymentFee. DECIMAL(14) */ + public static final String UNCAP_PROP_NAME_paymentFee = "paymentFee"; /** Uncap-prop-name of totalPrice. DECIMAL(14) : NotNull */ public static final String UNCAP_PROP_NAME_totalPrice = "totalPrice"; @@ -970,6 +994,8 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryMethodId = "deliveryMethodId"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryMethodCode. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryMethodCode = "deliveryMethodCode"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryNumber. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryNumber = "deliveryNumber"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastModified. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_LastModified = "lastModified"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderStatusId. */ @@ -982,12 +1008,14 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_CurrencyId = "currencyId"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CurrencyCode. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_CurrencyCode = "currencyCode"; - /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryPrice. */ - public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryPrice = "deliveryPrice"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_SubTotalPrice. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_SubTotalPrice = "subTotalPrice"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Tax. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Tax = "tax"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryPrice. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryPrice = "deliveryPrice"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_PaymentFee. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_PaymentFee = "paymentFee"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_TotalPrice. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_TotalPrice = "totalPrice"; @@ -1123,15 +1151,17 @@ map.put(DB_NAME_ORDER_CARD_INFO_ID.toLowerCase(), PROPERTY_NAME_orderCardInfoId); map.put(DB_NAME_DELIVERY_METHOD_ID.toLowerCase(), PROPERTY_NAME_deliveryMethodId); map.put(DB_NAME_DELIVERY_METHOD_CODE.toLowerCase(), PROPERTY_NAME_deliveryMethodCode); + map.put(DB_NAME_DELIVERY_NUMBER.toLowerCase(), PROPERTY_NAME_deliveryNumber); map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified); map.put(DB_NAME_ORDER_STATUS_ID.toLowerCase(), PROPERTY_NAME_orderStatusId); map.put(DB_NAME_PURCHASED_DATE.toLowerCase(), PROPERTY_NAME_purchasedDate); map.put(DB_NAME_FINISHED_DATE.toLowerCase(), PROPERTY_NAME_finishedDate); map.put(DB_NAME_CURRENCY_ID.toLowerCase(), PROPERTY_NAME_currencyId); map.put(DB_NAME_CURRENCY_CODE.toLowerCase(), PROPERTY_NAME_currencyCode); - map.put(DB_NAME_DELIVERY_PRICE.toLowerCase(), PROPERTY_NAME_deliveryPrice); map.put(DB_NAME_SUB_TOTAL_PRICE.toLowerCase(), PROPERTY_NAME_subTotalPrice); map.put(DB_NAME_TAX.toLowerCase(), PROPERTY_NAME_tax); + map.put(DB_NAME_DELIVERY_PRICE.toLowerCase(), PROPERTY_NAME_deliveryPrice); + map.put(DB_NAME_PAYMENT_FEE.toLowerCase(), PROPERTY_NAME_paymentFee); map.put(DB_NAME_TOTAL_PRICE.toLowerCase(), PROPERTY_NAME_totalPrice); _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map); @@ -1200,15 +1230,17 @@ map.put(PROPERTY_NAME_orderCardInfoId.toLowerCase(), DB_NAME_ORDER_CARD_INFO_ID); map.put(PROPERTY_NAME_deliveryMethodId.toLowerCase(), DB_NAME_DELIVERY_METHOD_ID); map.put(PROPERTY_NAME_deliveryMethodCode.toLowerCase(), DB_NAME_DELIVERY_METHOD_CODE); + map.put(PROPERTY_NAME_deliveryNumber.toLowerCase(), DB_NAME_DELIVERY_NUMBER); map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED); map.put(PROPERTY_NAME_orderStatusId.toLowerCase(), DB_NAME_ORDER_STATUS_ID); map.put(PROPERTY_NAME_purchasedDate.toLowerCase(), DB_NAME_PURCHASED_DATE); map.put(PROPERTY_NAME_finishedDate.toLowerCase(), DB_NAME_FINISHED_DATE); map.put(PROPERTY_NAME_currencyId.toLowerCase(), DB_NAME_CURRENCY_ID); map.put(PROPERTY_NAME_currencyCode.toLowerCase(), DB_NAME_CURRENCY_CODE); - map.put(PROPERTY_NAME_deliveryPrice.toLowerCase(), DB_NAME_DELIVERY_PRICE); map.put(PROPERTY_NAME_subTotalPrice.toLowerCase(), DB_NAME_SUB_TOTAL_PRICE); map.put(PROPERTY_NAME_tax.toLowerCase(), DB_NAME_TAX); + map.put(PROPERTY_NAME_deliveryPrice.toLowerCase(), DB_NAME_DELIVERY_PRICE); + map.put(PROPERTY_NAME_paymentFee.toLowerCase(), DB_NAME_PAYMENT_FEE); map.put(PROPERTY_NAME_totalPrice.toLowerCase(), DB_NAME_TOTAL_PRICE); _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map); @@ -1279,15 +1311,17 @@ map.put(DB_NAME_ORDER_CARD_INFO_ID, CAP_PROP_NAME_OrderCardInfoId); map.put(DB_NAME_DELIVERY_METHOD_ID, CAP_PROP_NAME_DeliveryMethodId); map.put(DB_NAME_DELIVERY_METHOD_CODE, CAP_PROP_NAME_DeliveryMethodCode); + map.put(DB_NAME_DELIVERY_NUMBER, CAP_PROP_NAME_DeliveryNumber); map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified); map.put(DB_NAME_ORDER_STATUS_ID, CAP_PROP_NAME_OrderStatusId); map.put(DB_NAME_PURCHASED_DATE, CAP_PROP_NAME_PurchasedDate); map.put(DB_NAME_FINISHED_DATE, CAP_PROP_NAME_FinishedDate); map.put(DB_NAME_CURRENCY_ID, CAP_PROP_NAME_CurrencyId); map.put(DB_NAME_CURRENCY_CODE, CAP_PROP_NAME_CurrencyCode); - map.put(DB_NAME_DELIVERY_PRICE, CAP_PROP_NAME_DeliveryPrice); map.put(DB_NAME_SUB_TOTAL_PRICE, CAP_PROP_NAME_SubTotalPrice); map.put(DB_NAME_TAX, CAP_PROP_NAME_Tax); + map.put(DB_NAME_DELIVERY_PRICE, CAP_PROP_NAME_DeliveryPrice); + map.put(DB_NAME_PAYMENT_FEE, CAP_PROP_NAME_PaymentFee); map.put(DB_NAME_TOTAL_PRICE, CAP_PROP_NAME_TotalPrice); _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map); @@ -1358,15 +1392,17 @@ map.put(DB_NAME_ORDER_CARD_INFO_ID, UNCAP_PROP_NAME_orderCardInfoId); map.put(DB_NAME_DELIVERY_METHOD_ID, UNCAP_PROP_NAME_deliveryMethodId); map.put(DB_NAME_DELIVERY_METHOD_CODE, UNCAP_PROP_NAME_deliveryMethodCode); + map.put(DB_NAME_DELIVERY_NUMBER, UNCAP_PROP_NAME_deliveryNumber); map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified); map.put(DB_NAME_ORDER_STATUS_ID, UNCAP_PROP_NAME_orderStatusId); map.put(DB_NAME_PURCHASED_DATE, UNCAP_PROP_NAME_purchasedDate); map.put(DB_NAME_FINISHED_DATE, UNCAP_PROP_NAME_finishedDate); map.put(DB_NAME_CURRENCY_ID, UNCAP_PROP_NAME_currencyId); map.put(DB_NAME_CURRENCY_CODE, UNCAP_PROP_NAME_currencyCode); - map.put(DB_NAME_DELIVERY_PRICE, UNCAP_PROP_NAME_deliveryPrice); map.put(DB_NAME_SUB_TOTAL_PRICE, UNCAP_PROP_NAME_subTotalPrice); map.put(DB_NAME_TAX, UNCAP_PROP_NAME_tax); + map.put(DB_NAME_DELIVERY_PRICE, UNCAP_PROP_NAME_deliveryPrice); + map.put(DB_NAME_PAYMENT_FEE, UNCAP_PROP_NAME_paymentFee); map.put(DB_NAME_TOTAL_PRICE, UNCAP_PROP_NAME_totalPrice); _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map); @@ -1437,15 +1473,17 @@ map.put(CAP_PROP_NAME_OrderCardInfoId, DB_NAME_ORDER_CARD_INFO_ID); map.put(CAP_PROP_NAME_DeliveryMethodId, DB_NAME_DELIVERY_METHOD_ID); map.put(CAP_PROP_NAME_DeliveryMethodCode, DB_NAME_DELIVERY_METHOD_CODE); + map.put(CAP_PROP_NAME_DeliveryNumber, DB_NAME_DELIVERY_NUMBER); map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED); map.put(CAP_PROP_NAME_OrderStatusId, DB_NAME_ORDER_STATUS_ID); map.put(CAP_PROP_NAME_PurchasedDate, DB_NAME_PURCHASED_DATE); map.put(CAP_PROP_NAME_FinishedDate, DB_NAME_FINISHED_DATE); map.put(CAP_PROP_NAME_CurrencyId, DB_NAME_CURRENCY_ID); map.put(CAP_PROP_NAME_CurrencyCode, DB_NAME_CURRENCY_CODE); - map.put(CAP_PROP_NAME_DeliveryPrice, DB_NAME_DELIVERY_PRICE); map.put(CAP_PROP_NAME_SubTotalPrice, DB_NAME_SUB_TOTAL_PRICE); map.put(CAP_PROP_NAME_Tax, DB_NAME_TAX); + map.put(CAP_PROP_NAME_DeliveryPrice, DB_NAME_DELIVERY_PRICE); + map.put(CAP_PROP_NAME_PaymentFee, DB_NAME_PAYMENT_FEE); map.put(CAP_PROP_NAME_TotalPrice, DB_NAME_TOTAL_PRICE); _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map); @@ -1516,15 +1554,17 @@ map.put(CAP_PROP_NAME_OrderCardInfoId, UNCAP_PROP_NAME_orderCardInfoId); map.put(CAP_PROP_NAME_DeliveryMethodId, UNCAP_PROP_NAME_deliveryMethodId); map.put(CAP_PROP_NAME_DeliveryMethodCode, UNCAP_PROP_NAME_deliveryMethodCode); + map.put(CAP_PROP_NAME_DeliveryNumber, UNCAP_PROP_NAME_deliveryNumber); map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified); map.put(CAP_PROP_NAME_OrderStatusId, UNCAP_PROP_NAME_orderStatusId); map.put(CAP_PROP_NAME_PurchasedDate, UNCAP_PROP_NAME_purchasedDate); map.put(CAP_PROP_NAME_FinishedDate, UNCAP_PROP_NAME_finishedDate); map.put(CAP_PROP_NAME_CurrencyId, UNCAP_PROP_NAME_currencyId); map.put(CAP_PROP_NAME_CurrencyCode, UNCAP_PROP_NAME_currencyCode); - map.put(CAP_PROP_NAME_DeliveryPrice, UNCAP_PROP_NAME_deliveryPrice); map.put(CAP_PROP_NAME_SubTotalPrice, UNCAP_PROP_NAME_subTotalPrice); map.put(CAP_PROP_NAME_Tax, UNCAP_PROP_NAME_tax); + map.put(CAP_PROP_NAME_DeliveryPrice, UNCAP_PROP_NAME_deliveryPrice); + map.put(CAP_PROP_NAME_PaymentFee, UNCAP_PROP_NAME_paymentFee); map.put(CAP_PROP_NAME_TotalPrice, UNCAP_PROP_NAME_totalPrice); _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map); @@ -1595,15 +1635,17 @@ map.put(UNCAP_PROP_NAME_orderCardInfoId, DB_NAME_ORDER_CARD_INFO_ID); map.put(UNCAP_PROP_NAME_deliveryMethodId, DB_NAME_DELIVERY_METHOD_ID); map.put(UNCAP_PROP_NAME_deliveryMethodCode, DB_NAME_DELIVERY_METHOD_CODE); + map.put(UNCAP_PROP_NAME_deliveryNumber, DB_NAME_DELIVERY_NUMBER); map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED); map.put(UNCAP_PROP_NAME_orderStatusId, DB_NAME_ORDER_STATUS_ID); map.put(UNCAP_PROP_NAME_purchasedDate, DB_NAME_PURCHASED_DATE); map.put(UNCAP_PROP_NAME_finishedDate, DB_NAME_FINISHED_DATE); map.put(UNCAP_PROP_NAME_currencyId, DB_NAME_CURRENCY_ID); map.put(UNCAP_PROP_NAME_currencyCode, DB_NAME_CURRENCY_CODE); - map.put(UNCAP_PROP_NAME_deliveryPrice, DB_NAME_DELIVERY_PRICE); map.put(UNCAP_PROP_NAME_subTotalPrice, DB_NAME_SUB_TOTAL_PRICE); map.put(UNCAP_PROP_NAME_tax, DB_NAME_TAX); + map.put(UNCAP_PROP_NAME_deliveryPrice, DB_NAME_DELIVERY_PRICE); + map.put(UNCAP_PROP_NAME_paymentFee, DB_NAME_PAYMENT_FEE); map.put(UNCAP_PROP_NAME_totalPrice, DB_NAME_TOTAL_PRICE); _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map); @@ -1674,15 +1716,17 @@ map.put(UNCAP_PROP_NAME_orderCardInfoId, CAP_PROP_NAME_OrderCardInfoId); map.put(UNCAP_PROP_NAME_deliveryMethodId, CAP_PROP_NAME_DeliveryMethodId); map.put(UNCAP_PROP_NAME_deliveryMethodCode, CAP_PROP_NAME_DeliveryMethodCode); + map.put(UNCAP_PROP_NAME_deliveryNumber, CAP_PROP_NAME_DeliveryNumber); map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified); map.put(UNCAP_PROP_NAME_orderStatusId, CAP_PROP_NAME_OrderStatusId); map.put(UNCAP_PROP_NAME_purchasedDate, CAP_PROP_NAME_PurchasedDate); map.put(UNCAP_PROP_NAME_finishedDate, CAP_PROP_NAME_FinishedDate); map.put(UNCAP_PROP_NAME_currencyId, CAP_PROP_NAME_CurrencyId); map.put(UNCAP_PROP_NAME_currencyCode, CAP_PROP_NAME_CurrencyCode); - map.put(UNCAP_PROP_NAME_deliveryPrice, CAP_PROP_NAME_DeliveryPrice); map.put(UNCAP_PROP_NAME_subTotalPrice, CAP_PROP_NAME_SubTotalPrice); map.put(UNCAP_PROP_NAME_tax, CAP_PROP_NAME_Tax); + map.put(UNCAP_PROP_NAME_deliveryPrice, CAP_PROP_NAME_DeliveryPrice); + map.put(UNCAP_PROP_NAME_paymentFee, CAP_PROP_NAME_PaymentFee); map.put(UNCAP_PROP_NAME_totalPrice, CAP_PROP_NAME_TotalPrice); _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map); @@ -1945,15 +1989,17 @@ columnInfoList.add(columnOrderCardInfoId()); columnInfoList.add(columnDeliveryMethodId()); columnInfoList.add(columnDeliveryMethodCode()); + columnInfoList.add(columnDeliveryNumber()); columnInfoList.add(columnLastModified()); columnInfoList.add(columnOrderStatusId()); columnInfoList.add(columnPurchasedDate()); columnInfoList.add(columnFinishedDate()); columnInfoList.add(columnCurrencyId()); columnInfoList.add(columnCurrencyCode()); - columnInfoList.add(columnDeliveryPrice()); columnInfoList.add(columnSubTotalPrice()); columnInfoList.add(columnTax()); + columnInfoList.add(columnDeliveryPrice()); + columnInfoList.add(columnPaymentFee()); columnInfoList.add(columnTotalPrice()); return columnInfoList; } @@ -2010,7 +2056,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE"; + return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE"; } /** @@ -2332,6 +2378,12 @@ return new ColumnInfo(this, "DELIVERY_METHOD_CODE", "deliveryMethodCode", String.class, false); } /** + * @return Column information of deliveryNumber. (NotNull) + */ + public ColumnInfo columnDeliveryNumber() { + return new ColumnInfo(this, "DELIVERY_NUMBER", "deliveryNumber", String.class, false); + } + /** * @return Column information of lastModified. (NotNull) */ public ColumnInfo columnLastModified() { @@ -2368,12 +2420,6 @@ return new ColumnInfo(this, "CURRENCY_CODE", "currencyCode", String.class, false); } /** - * @return Column information of deliveryPrice. (NotNull) - */ - public ColumnInfo columnDeliveryPrice() { - return new ColumnInfo(this, "DELIVERY_PRICE", "deliveryPrice", java.math.BigDecimal.class, false); - } - /** * @return Column information of subTotalPrice. (NotNull) */ public ColumnInfo columnSubTotalPrice() { @@ -2386,6 +2432,18 @@ return new ColumnInfo(this, "TAX", "tax", java.math.BigDecimal.class, false); } /** + * @return Column information of deliveryPrice. (NotNull) + */ + public ColumnInfo columnDeliveryPrice() { + return new ColumnInfo(this, "DELIVERY_PRICE", "deliveryPrice", java.math.BigDecimal.class, false); + } + /** + * @return Column information of paymentFee. (NotNull) + */ + public ColumnInfo columnPaymentFee() { + return new ColumnInfo(this, "PAYMENT_FEE", "paymentFee", java.math.BigDecimal.class, false); + } + /** * @return Column information of totalPrice. (NotNull) */ public ColumnInfo columnTotalPrice() { @@ -2773,15 +2831,17 @@ public RelationTrace columnOrderCardInfoId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderCardInfoId()); } public RelationTrace columnDeliveryMethodId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryMethodId()); } public RelationTrace columnDeliveryMethodCode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryMethodCode()); } + public RelationTrace columnDeliveryNumber() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryNumber()); } public RelationTrace columnLastModified() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnLastModified()); } public RelationTrace columnOrderStatusId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderStatusId()); } public RelationTrace columnPurchasedDate() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnPurchasedDate()); } public RelationTrace columnFinishedDate() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnFinishedDate()); } public RelationTrace columnCurrencyId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCurrencyId()); } public RelationTrace columnCurrencyCode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCurrencyCode()); } - public RelationTrace columnDeliveryPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryPrice()); } public RelationTrace columnSubTotalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnSubTotalPrice()); } public RelationTrace columnTax() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnTax()); } + public RelationTrace columnDeliveryPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryPrice()); } + public RelationTrace columnPaymentFee() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnPaymentFee()); } public RelationTrace columnTotalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnTotalPrice()); } } @@ -2906,15 +2966,17 @@ if (analyzer.init("ORDER_CARD_INFO_ID", "orderCardInfoId", "orderCardInfoId")) { myEntity.setOrderCardInfoId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("DELIVERY_METHOD_ID", "deliveryMethodId", "deliveryMethodId")) { myEntity.setDeliveryMethodId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("DELIVERY_METHOD_CODE", "deliveryMethodCode", "deliveryMethodCode")) { myEntity.setDeliveryMethodCode(analyzer.analyzeString(String.class)); }; + if (analyzer.init("DELIVERY_NUMBER", "deliveryNumber", "deliveryNumber")) { myEntity.setDeliveryNumber(analyzer.analyzeString(String.class)); }; if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); }; if (analyzer.init("ORDER_STATUS_ID", "orderStatusId", "orderStatusId")) { myEntity.setOrderStatusId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("PURCHASED_DATE", "purchasedDate", "purchasedDate")) { myEntity.setPurchasedDate(analyzer.analyzeDate(java.sql.Timestamp.class)); }; if (analyzer.init("FINISHED_DATE", "finishedDate", "finishedDate")) { myEntity.setFinishedDate(analyzer.analyzeDate(java.sql.Timestamp.class)); }; if (analyzer.init("CURRENCY_ID", "currencyId", "currencyId")) { myEntity.setCurrencyId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("CURRENCY_CODE", "currencyCode", "currencyCode")) { myEntity.setCurrencyCode(analyzer.analyzeString(String.class)); }; - if (analyzer.init("DELIVERY_PRICE", "deliveryPrice", "deliveryPrice")) { myEntity.setDeliveryPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("SUB_TOTAL_PRICE", "subTotalPrice", "subTotalPrice")) { myEntity.setSubTotalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("TAX", "tax", "tax")) { myEntity.setTax(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; + if (analyzer.init("DELIVERY_PRICE", "deliveryPrice", "deliveryPrice")) { myEntity.setDeliveryPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; + if (analyzer.init("PAYMENT_FEE", "paymentFee", "paymentFee")) { myEntity.setPaymentFee(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("TOTAL_PRICE", "totalPrice", "totalPrice")) { myEntity.setTotalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; } @@ -3041,15 +3103,17 @@ helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_METHOD_ID", myEntity.getDeliveryMethodId()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_METHOD_CODE", myEntity.getDeliveryMethodCode()); + helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_NUMBER", myEntity.getDeliveryNumber()); helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified()); helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_STATUS_ID", myEntity.getOrderStatusId()); helpAppendingColumnValueString(sb, delimiter, equal, "PURCHASED_DATE", myEntity.getPurchasedDate()); helpAppendingColumnValueString(sb, delimiter, equal, "FINISHED_DATE", myEntity.getFinishedDate()); helpAppendingColumnValueString(sb, delimiter, equal, "CURRENCY_ID", myEntity.getCurrencyId()); helpAppendingColumnValueString(sb, delimiter, equal, "CURRENCY_CODE", myEntity.getCurrencyCode()); - helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_PRICE", myEntity.getDeliveryPrice()); helpAppendingColumnValueString(sb, delimiter, equal, "SUB_TOTAL_PRICE", myEntity.getSubTotalPrice()); helpAppendingColumnValueString(sb, delimiter, equal, "TAX", myEntity.getTax()); + helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_PRICE", myEntity.getDeliveryPrice()); + helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_FEE", myEntity.getPaymentFee()); helpAppendingColumnValueString(sb, delimiter, equal, "TOTAL_PRICE", myEntity.getTotalPrice()); sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace); @@ -3158,15 +3222,17 @@ valueMap.put("ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId()); valueMap.put("DELIVERY_METHOD_ID", myEntity.getDeliveryMethodId()); valueMap.put("DELIVERY_METHOD_CODE", myEntity.getDeliveryMethodCode()); + valueMap.put("DELIVERY_NUMBER", myEntity.getDeliveryNumber()); valueMap.put("LAST_MODIFIED", myEntity.getLastModified()); valueMap.put("ORDER_STATUS_ID", myEntity.getOrderStatusId()); valueMap.put("PURCHASED_DATE", myEntity.getPurchasedDate()); valueMap.put("FINISHED_DATE", myEntity.getFinishedDate()); valueMap.put("CURRENCY_ID", myEntity.getCurrencyId()); valueMap.put("CURRENCY_CODE", myEntity.getCurrencyCode()); - valueMap.put("DELIVERY_PRICE", myEntity.getDeliveryPrice()); valueMap.put("SUB_TOTAL_PRICE", myEntity.getSubTotalPrice()); valueMap.put("TAX", myEntity.getTax()); + valueMap.put("DELIVERY_PRICE", myEntity.getDeliveryPrice()); + valueMap.put("PAYMENT_FEE", myEntity.getPaymentFee()); valueMap.put("TOTAL_PRICE", myEntity.getTotalPrice()); return valueMap; } @@ -3243,15 +3309,17 @@ valueMap.put("ORDER_CARD_INFO_ID", helpGettingColumnStringValue(myEntity.getOrderCardInfoId())); valueMap.put("DELIVERY_METHOD_ID", helpGettingColumnStringValue(myEntity.getDeliveryMethodId())); valueMap.put("DELIVERY_METHOD_CODE", helpGettingColumnStringValue(myEntity.getDeliveryMethodCode())); + valueMap.put("DELIVERY_NUMBER", helpGettingColumnStringValue(myEntity.getDeliveryNumber())); valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified())); valueMap.put("ORDER_STATUS_ID", helpGettingColumnStringValue(myEntity.getOrderStatusId())); valueMap.put("PURCHASED_DATE", helpGettingColumnStringValue(myEntity.getPurchasedDate())); valueMap.put("FINISHED_DATE", helpGettingColumnStringValue(myEntity.getFinishedDate())); valueMap.put("CURRENCY_ID", helpGettingColumnStringValue(myEntity.getCurrencyId())); valueMap.put("CURRENCY_CODE", helpGettingColumnStringValue(myEntity.getCurrencyCode())); - valueMap.put("DELIVERY_PRICE", helpGettingColumnStringValue(myEntity.getDeliveryPrice())); valueMap.put("SUB_TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getSubTotalPrice())); valueMap.put("TAX", helpGettingColumnStringValue(myEntity.getTax())); + valueMap.put("DELIVERY_PRICE", helpGettingColumnStringValue(myEntity.getDeliveryPrice())); + valueMap.put("PAYMENT_FEE", helpGettingColumnStringValue(myEntity.getPaymentFee())); valueMap.put("TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getTotalPrice())); return valueMap; } @@ -3277,9 +3345,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2007-10-13 22:48:08 UTC (rev 628) @@ -16,7 +16,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -97,6 +97,8 @@ public static final String DB_NAME_PAYMENT_METHOD_ID = "PAYMENT_METHOD_ID"; /** Db-name of CODE. VARCHAR(16) : NotNull */ public static final String DB_NAME_CODE = "CODE"; + /** Db-name of FEE. DECIMAL(14) : NotNull */ + public static final String DB_NAME_FEE = "FEE"; /** Db-name of SORT_ORDER. INTEGER : NotNull */ public static final String DB_NAME_SORT_ORDER = "SORT_ORDER"; /** Db-name of DATE_ADDED. TIMESTAMP : NotNull */ @@ -108,6 +110,8 @@ public static final String COLUMN_DB_NAME_OF_PaymentMethodId = "PAYMENT_METHOD_ID"; /** @deprecated Deprecated! So use DB_NAME_Code. */ public static final String COLUMN_DB_NAME_OF_Code = "CODE"; + /** @deprecated Deprecated! So use DB_NAME_Fee. */ + public static final String COLUMN_DB_NAME_OF_Fee = "FEE"; /** @deprecated Deprecated! So use DB_NAME_SortOrder. */ public static final String COLUMN_DB_NAME_OF_SortOrder = "SORT_ORDER"; /** @deprecated Deprecated! So use DB_NAME_DateAdded. */ @@ -122,6 +126,8 @@ public static final String PROPERTY_NAME_paymentMethodId = "paymentMethodId"; /** Prop-name(JavaBeansRule) of code. VARCHAR(16) : NotNull */ public static final String PROPERTY_NAME_code = "code"; + /** Prop-name(JavaBeansRule) of fee. DECIMAL(14) : NotNull */ + public static final String PROPERTY_NAME_fee = "fee"; /** Prop-name(JavaBeansRule) of sortOrder. INTEGER : NotNull */ public static final String PROPERTY_NAME_sortOrder = "sortOrder"; /** Prop-name(JavaBeansRule) of dateAdded. TIMESTAMP : NotNull */ @@ -136,6 +142,8 @@ public static final String CAP_PROP_NAME_PaymentMethodId = "PaymentMethodId"; /** Cap-prop-name of code. VARCHAR(16) : NotNull */ public static final String CAP_PROP_NAME_Code = "Code"; + /** Cap-prop-name of fee. DECIMAL(14) : NotNull */ + public static final String CAP_PROP_NAME_Fee = "Fee"; /** Cap-prop-name of sortOrder. INTEGER : NotNull */ public static final String CAP_PROP_NAME_SortOrder = "SortOrder"; /** Cap-prop-name of dateAdded. TIMESTAMP : NotNull */ @@ -147,6 +155,8 @@ public static final String COLUMN_CAP_PROP_NAME_OF_PaymentMethodId = "PaymentMethodId"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Code. */ public static final String COLUMN_CAP_PROP_NAME_OF_Code = "Code"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_Fee. */ + public static final String COLUMN_CAP_PROP_NAME_OF_Fee = "Fee"; /** @deprecated Deprecated! So use CAP_PROP_NAME_SortOrder. */ public static final String COLUMN_CAP_PROP_NAME_OF_SortOrder = "SortOrder"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DateAdded. */ @@ -161,6 +171,8 @@ public static final String UNCAP_PROP_NAME_paymentMethodId = "paymentMethodId"; /** Uncap-prop-name of code. VARCHAR(16) : NotNull */ public static final String UNCAP_PROP_NAME_code = "code"; + /** Uncap-prop-name of fee. DECIMAL(14) : NotNull */ + public static final String UNCAP_PROP_NAME_fee = "fee"; /** Uncap-prop-name of sortOrder. INTEGER : NotNull */ public static final String UNCAP_PROP_NAME_sortOrder = "sortOrder"; /** Uncap-prop-name of dateAdded. TIMESTAMP : NotNull */ @@ -172,6 +184,8 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_PaymentMethodId = "paymentMethodId"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Code. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Code = "code"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Fee. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_Fee = "fee"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_SortOrder. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_SortOrder = "sortOrder"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DateAdded. */ @@ -212,6 +226,7 @@ map.put(DB_NAME_PAYMENT_METHOD_ID.toLowerCase(), PROPERTY_NAME_paymentMethodId); map.put(DB_NAME_CODE.toLowerCase(), PROPERTY_NAME_code); + map.put(DB_NAME_FEE.toLowerCase(), PROPERTY_NAME_fee); map.put(DB_NAME_SORT_ORDER.toLowerCase(), PROPERTY_NAME_sortOrder); map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded); map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified); @@ -231,6 +246,7 @@ map.put(PROPERTY_NAME_paymentMethodId.toLowerCase(), DB_NAME_PAYMENT_METHOD_ID); map.put(PROPERTY_NAME_code.toLowerCase(), DB_NAME_CODE); + map.put(PROPERTY_NAME_fee.toLowerCase(), DB_NAME_FEE); map.put(PROPERTY_NAME_sortOrder.toLowerCase(), DB_NAME_SORT_ORDER); map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED); map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED); @@ -252,6 +268,7 @@ map.put(DB_NAME_PAYMENT_METHOD_ID, CAP_PROP_NAME_PaymentMethodId); map.put(DB_NAME_CODE, CAP_PROP_NAME_Code); + map.put(DB_NAME_FEE, CAP_PROP_NAME_Fee); map.put(DB_NAME_SORT_ORDER, CAP_PROP_NAME_SortOrder); map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded); map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified); @@ -273,6 +290,7 @@ map.put(DB_NAME_PAYMENT_METHOD_ID, UNCAP_PROP_NAME_paymentMethodId); map.put(DB_NAME_CODE, UNCAP_PROP_NAME_code); + map.put(DB_NAME_FEE, UNCAP_PROP_NAME_fee); map.put(DB_NAME_SORT_ORDER, UNCAP_PROP_NAME_sortOrder); map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded); map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified); @@ -294,6 +312,7 @@ map.put(CAP_PROP_NAME_PaymentMethodId, DB_NAME_PAYMENT_METHOD_ID); map.put(CAP_PROP_NAME_Code, DB_NAME_CODE); + map.put(CAP_PROP_NAME_Fee, DB_NAME_FEE); map.put(CAP_PROP_NAME_SortOrder, DB_NAME_SORT_ORDER); map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED); map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED); @@ -315,6 +334,7 @@ map.put(CAP_PROP_NAME_PaymentMethodId, UNCAP_PROP_NAME_paymentMethodId); map.put(CAP_PROP_NAME_Code, UNCAP_PROP_NAME_code); + map.put(CAP_PROP_NAME_Fee, UNCAP_PROP_NAME_fee); map.put(CAP_PROP_NAME_SortOrder, UNCAP_PROP_NAME_sortOrder); map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded); map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified); @@ -336,6 +356,7 @@ map.put(UNCAP_PROP_NAME_paymentMethodId, DB_NAME_PAYMENT_METHOD_ID); map.put(UNCAP_PROP_NAME_code, DB_NAME_CODE); + map.put(UNCAP_PROP_NAME_fee, DB_NAME_FEE); map.put(UNCAP_PROP_NAME_sortOrder, DB_NAME_SORT_ORDER); map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED); map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED); @@ -357,6 +378,7 @@ map.put(UNCAP_PROP_NAME_paymentMethodId, CAP_PROP_NAME_PaymentMethodId); map.put(UNCAP_PROP_NAME_code, CAP_PROP_NAME_Code); + map.put(UNCAP_PROP_NAME_fee, CAP_PROP_NAME_Fee); map.put(UNCAP_PROP_NAME_sortOrder, CAP_PROP_NAME_SortOrder); map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded); map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified); @@ -570,6 +592,7 @@ final java.util.List columnInfoList = new java.util.ArrayList(); columnInfoList.add(columnPaymentMethodId()); columnInfoList.add(columnCode()); + columnInfoList.add(columnFee()); columnInfoList.add(columnSortOrder()); columnInfoList.add(columnDateAdded()); columnInfoList.add(columnLastModified()); @@ -628,7 +651,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED"; + return "PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED"; } /** @@ -644,6 +667,12 @@ return new ColumnInfo(this, "CODE", "code", String.class, false); } /** + * @return Column information of fee. (NotNull) + */ + public ColumnInfo columnFee() { + return new ColumnInfo(this, "FEE", "fee", java.math.BigDecimal.class, false); + } + /** * @return Column information of sortOrder. (NotNull) */ public ColumnInfo columnSortOrder() { @@ -803,6 +832,7 @@ public RelationTrace columnPaymentMethodId() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnPaymentMethodId()); } public RelationTrace columnCode() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnCode()); } + public RelationTrace columnFee() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnFee()); } public RelationTrace columnSortOrder() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnSortOrder()); } public RelationTrace columnDateAdded() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnDateAdded()); } public RelationTrace columnLastModified() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnLastModified()); } @@ -878,6 +908,7 @@ if (analyzer.init("PAYMENT_METHOD_ID", "paymentMethodId", "paymentMethodId")) { myEntity.setPaymentMethodId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("CODE", "code", "code")) { myEntity.setCode(analyzer.analyzeString(String.class)); }; + if (analyzer.init("FEE", "fee", "fee")) { myEntity.setFee(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("SORT_ORDER", "sortOrder", "sortOrder")) { myEntity.setSortOrder(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); }; if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); }; @@ -955,6 +986,7 @@ final StringBuffer sb = new StringBuffer(); helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_METHOD_ID", myEntity.getPaymentMethodId()); helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode()); + helpAppendingColumnValueString(sb, delimiter, equal, "FEE", myEntity.getFee()); helpAppendingColumnValueString(sb, delimiter, equal, "SORT_ORDER", myEntity.getSortOrder()); helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded()); helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified()); @@ -1014,6 +1046,7 @@ final java.util.Map valueMap = new java.util.LinkedHashMap(); valueMap.put("PAYMENT_METHOD_ID", myEntity.getPaymentMethodId()); valueMap.put("CODE", myEntity.getCode()); + valueMap.put("FEE", myEntity.getFee()); valueMap.put("SORT_ORDER", myEntity.getSortOrder()); valueMap.put("DATE_ADDED", myEntity.getDateAdded()); valueMap.put("LAST_MODIFIED", myEntity.getLastModified()); @@ -1041,6 +1074,7 @@ final java.util.Map valueMap = new java.util.LinkedHashMap(); valueMap.put("PAYMENT_METHOD_ID", helpGettingColumnStringValue(myEntity.getPaymentMethodId())); valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode())); + valueMap.put("FEE", helpGettingColumnStringValue(myEntity.getFee())); valueMap.put("SORT_ORDER", helpGettingColumnStringValue(myEntity.getSortOrder())); valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded())); valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified())); @@ -1068,9 +1102,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? )"; } - return "insert into PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? )"; + return "insert into PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? )"; } // =================================================================================== 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2007-10-13 22:48:08 UTC (rev 628) @@ -8010,6 +8010,164 @@ abstract protected ConditionValue getCValueDeliveryMethodCode(); + /** Column db name of deliveryNumber. */ + protected static final String COL_DELIVERY_NUMBER = "DELIVERY_NUMBER"; + + /** Column java name of deliveryNumber. */ + protected static final String J_DeliveryNumber = "DeliveryNumber"; + + /** Column uncapitalised java name of deliveryNumber. */ + protected static final String UJ_deliveryNumber = "deliveryNumber"; + + /** + * Set the value of deliveryNumber using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as equal. + */ + public void setDeliveryNumber_Equal(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as notEqual. + */ + public void setDeliveryNumber_NotEqual(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as greaterThan. + */ + public void setDeliveryNumber_GreaterThan(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as lessThan. + */ + public void setDeliveryNumber_LessThan(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as greaterEqual. + */ + public void setDeliveryNumber_GreaterEqual(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as lessEqual. + */ + public void setDeliveryNumber_LessEqual(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param deliveryNumber The value of deliveryNumber as prefixSearch. + */ + public void setDeliveryNumber_PrefixSearch(String deliveryNumber) { + registerDeliveryNumber(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryNumber)); + } + + /** + * Set the value of deliveryNumber using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param deliveryNumber The value of deliveryNumber as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setDeliveryNumber_LikeSearch(String deliveryNumber, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryNumber), getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber, likeSearchOption); + } + + /** + * Set the value of deliveryNumber using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryNumberList The value of deliveryNumber as inScope. + */ + public void setDeliveryNumber_InScope(java.util.List deliveryNumberList) { + registerDeliveryNumber(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryNumberList)); + } + + /** + * Set the value of deliveryNumber using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryNumber The value of deliveryNumber as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setDeliveryNumber_InScope(String deliveryNumber, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryNumber), getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber, inScopeOption); + } + + /** + * Set the value of deliveryNumber using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryNumberList The value of deliveryNumber as notInScope. + */ + public void setDeliveryNumber_NotInScope(java.util.List deliveryNumberList) { + registerDeliveryNumber(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryNumberList)); + } + + /** + * Set the value of deliveryNumber using isNull. { is null } + */ + public void setDeliveryNumber_IsNull() { + registerDeliveryNumber(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of deliveryNumber using isNotNull. { is not null } + */ + public void setDeliveryNumber_IsNotNull() { + registerDeliveryNumber(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of deliveryNumber. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryNumber. (Nullable) + */ + protected void registerDeliveryNumber(ConditionKey key, Object value) { + registerQuery(key, value, getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber); + } + + /** + * Register inline condition of deliveryNumber. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryNumber. (Nullable) + */ + protected void registerInlineDeliveryNumber(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber); + } + + abstract protected ConditionValue getCValueDeliveryNumber(); + /** Column db name of lastModified. */ protected static final String COL_LAST_MODIFIED = "LAST_MODIFIED"; @@ -8714,125 +8872,6 @@ abstract protected ConditionValue getCValueCurrencyCode(); - /** Column db name of deliveryPrice. */ - protected static final String COL_DELIVERY_PRICE = "DELIVERY_PRICE"; - - /** Column java name of deliveryPrice. */ - protected static final String J_DeliveryPrice = "DeliveryPrice"; - - /** Column uncapitalised java name of deliveryPrice. */ - protected static final String UJ_deliveryPrice = "deliveryPrice"; - - /** - * Set the value of deliveryPrice using equal. { = } - * - * @param deliveryPrice The value of deliveryPrice as equal. - */ - public void setDeliveryPrice_Equal(java.math.BigDecimal deliveryPrice) { - registerDeliveryPrice(ConditionKey.CK_EQUAL, deliveryPrice); - } - - /** - * Set the value of deliveryPrice using notEqual. { != } - * - * @param deliveryPrice The value of deliveryPrice as notEqual. - */ - public void setDeliveryPrice_NotEqual(java.math.BigDecimal deliveryPrice) { - registerDeliveryPrice(ConditionKey.CK_NOT_EQUAL, deliveryPrice); - } - - /** - * Set the value of deliveryPrice using greaterThan. { > } - * - * @param deliveryPrice The value of deliveryPrice as greaterThan. - */ - public void setDeliveryPrice_GreaterThan(java.math.BigDecimal deliveryPrice) { - registerDeliveryPrice(ConditionKey.CK_GREATER_THAN, deliveryPrice); - } - - /** - * Set the value of deliveryPrice using lessThan. { < } - * - * @param deliveryPrice The value of deliveryPrice as lessThan. - */ - public void setDeliveryPrice_LessThan(java.math.BigDecimal deliveryPrice) { - registerDeliveryPrice(ConditionKey.CK_LESS_THAN, deliveryPrice); - } - - /** - * Set the value of deliveryPrice using greaterEqual. { >= } - * - * @param deliveryPrice The value of deliveryPrice as greaterEqual. - */ - public void setDeliveryPrice_GreaterEqual(java.math.BigDecimal deliveryPrice) { - registerDeliveryPrice(ConditionKey.CK_GREATER_EQUAL, deliveryPrice); - } - - /** - * Set the value of deliveryPrice using lessEqual. { <= } - * - * @param deliveryPrice The value of deliveryPrice as lessEqual. - */ - public void setDeliveryPrice_LessEqual(java.math.BigDecimal deliveryPrice) { - registerDeliveryPrice(ConditionKey.CK_LESS_EQUAL, deliveryPrice); - } - - /** - * Set the value of deliveryPrice using inScope. { in (a, b) } - * If the element in the list is null or empty-string, the condition-element is ignored. - * - * @param deliveryPriceList The value of deliveryPrice as inScope. - */ - public void setDeliveryPrice_InScope(java.util.List deliveryPriceList) { - registerDeliveryPrice(ConditionKey.CK_IN_SCOPE, deliveryPriceList); - } - - /** - * Set the value of deliveryPrice using notInScope. { not in (a, b) } - * If the element in the list is null or empty-string, the condition-element is ignored. - * - * @param deliveryPriceList The value of deliveryPrice as notInScope. - */ - public void setDeliveryPrice_NotInScope(java.util.List deliveryPriceList) { - registerDeliveryPrice(ConditionKey.CK_NOT_IN_SCOPE, deliveryPriceList); - } - - /** - * Set the value of deliveryPrice using isNull. { is null } - */ - public void setDeliveryPrice_IsNull() { - registerDeliveryPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); - } - - /** - * Set the value of deliveryPrice using isNotNull. { is not null } - */ - public void setDeliveryPrice_IsNotNull() { - registerDeliveryPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); - } - - /** - * Register condition of deliveryPrice. - * - * @param key Condition key. (NotNull) - * @param value The value of deliveryPrice. (Nullable) - */ - protected void registerDeliveryPrice(ConditionKey key, Object value) { - registerQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice); - } - - /** - * Register inline condition of deliveryPrice. - * - * @param key Condition key. (NotNull) - * @param value The value of deliveryPrice. (Nullable) - */ - protected void registerInlineDeliveryPrice(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice); - } - - abstract protected ConditionValue getCValueDeliveryPrice(); - /** Column db name of subTotalPrice. */ protected static final String COL_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE"; @@ -9071,6 +9110,244 @@ abstract protected ConditionValue getCValueTax(); + /** Column db name of deliveryPrice. */ + protected static final String COL_DELIVERY_PRICE = "DELIVERY_PRICE"; + + /** Column java name of deliveryPrice. */ + protected static final String J_DeliveryPrice = "DeliveryPrice"; + + /** Column uncapitalised java name of deliveryPrice. */ + protected static final String UJ_deliveryPrice = "deliveryPrice"; + + /** + * Set the value of deliveryPrice using equal. { = } + * + * @param deliveryPrice The value of deliveryPrice as equal. + */ + public void setDeliveryPrice_Equal(java.math.BigDecimal deliveryPrice) { + registerDeliveryPrice(ConditionKey.CK_EQUAL, deliveryPrice); + } + + /** + * Set the value of deliveryPrice using notEqual. { != } + * + * @param deliveryPrice The value of deliveryPrice as notEqual. + */ + public void setDeliveryPrice_NotEqual(java.math.BigDecimal deliveryPrice) { + registerDeliveryPrice(ConditionKey.CK_NOT_EQUAL, deliveryPrice); + } + + /** + * Set the value of deliveryPrice using greaterThan. { > } + * + * @param deliveryPrice The value of deliveryPrice as greaterThan. + */ + public void setDeliveryPrice_GreaterThan(java.math.BigDecimal deliveryPrice) { + registerDeliveryPrice(ConditionKey.CK_GREATER_THAN, deliveryPrice); + } + + /** + * Set the value of deliveryPrice using lessThan. { < } + * + * @param deliveryPrice The value of deliveryPrice as lessThan. + */ + public void setDeliveryPrice_LessThan(java.math.BigDecimal deliveryPrice) { + registerDeliveryPrice(ConditionKey.CK_LESS_THAN, deliveryPrice); + } + + /** + * Set the value of deliveryPrice using greaterEqual. { >= } + * + * @param deliveryPrice The value of deliveryPrice as greaterEqual. + */ + public void setDeliveryPrice_GreaterEqual(java.math.BigDecimal deliveryPrice) { + registerDeliveryPrice(ConditionKey.CK_GREATER_EQUAL, deliveryPrice); + } + + /** + * Set the value of deliveryPrice using lessEqual. { <= } + * + * @param deliveryPrice The value of deliveryPrice as lessEqual. + */ + public void setDeliveryPrice_LessEqual(java.math.BigDecimal deliveryPrice) { + registerDeliveryPrice(ConditionKey.CK_LESS_EQUAL, deliveryPrice); + } + + /** + * Set the value of deliveryPrice using inScope. { in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryPriceList The value of deliveryPrice as inScope. + */ + public void setDeliveryPrice_InScope(java.util.List deliveryPriceList) { + registerDeliveryPrice(ConditionKey.CK_IN_SCOPE, deliveryPriceList); + } + + /** + * Set the value of deliveryPrice using notInScope. { not in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param deliveryPriceList The value of deliveryPrice as notInScope. + */ + public void setDeliveryPrice_NotInScope(java.util.List deliveryPriceList) { + registerDeliveryPrice(ConditionKey.CK_NOT_IN_SCOPE, deliveryPriceList); + } + + /** + * Set the value of deliveryPrice using isNull. { is null } + */ + public void setDeliveryPrice_IsNull() { + registerDeliveryPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of deliveryPrice using isNotNull. { is not null } + */ + public void setDeliveryPrice_IsNotNull() { + registerDeliveryPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of deliveryPrice. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryPrice. (Nullable) + */ + protected void registerDeliveryPrice(ConditionKey key, Object value) { + registerQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice); + } + + /** + * Register inline condition of deliveryPrice. + * + * @param key Condition key. (NotNull) + * @param value The value of deliveryPrice. (Nullable) + */ + protected void registerInlineDeliveryPrice(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice); + } + + abstract protected ConditionValue getCValueDeliveryPrice(); + + /** Column db name of paymentFee. */ + protected static final String COL_PAYMENT_FEE = "PAYMENT_FEE"; + + /** Column java name of paymentFee. */ + protected static final String J_PaymentFee = "PaymentFee"; + + /** Column uncapitalised java name of paymentFee. */ + protected static final String UJ_paymentFee = "paymentFee"; + + /** + * Set the value of paymentFee using equal. { = } + * + * @param paymentFee The value of paymentFee as equal. + */ + public void setPaymentFee_Equal(java.math.BigDecimal paymentFee) { + registerPaymentFee(ConditionKey.CK_EQUAL, paymentFee); + } + + /** + * Set the value of paymentFee using notEqual. { != } + * + * @param paymentFee The value of paymentFee as notEqual. + */ + public void setPaymentFee_NotEqual(java.math.BigDecimal paymentFee) { + registerPaymentFee(ConditionKey.CK_NOT_EQUAL, paymentFee); + } + + /** + * Set the value of paymentFee using greaterThan. { > } + * + * @param paymentFee The value of paymentFee as greaterThan. + */ + public void setPaymentFee_GreaterThan(java.math.BigDecimal paymentFee) { + registerPaymentFee(ConditionKey.CK_GREATER_THAN, paymentFee); + } + + /** + * Set the value of paymentFee using lessThan. { < } + * + * @param paymentFee The value of paymentFee as lessThan. + */ + public void setPaymentFee_LessThan(java.math.BigDecimal paymentFee) { + registerPaymentFee(ConditionKey.CK_LESS_THAN, paymentFee); + } + + /** + * Set the value of paymentFee using greaterEqual. { >= } + * + * @param paymentFee The value of paymentFee as greaterEqual. + */ + public void setPaymentFee_GreaterEqual(java.math.BigDecimal paymentFee) { + registerPaymentFee(ConditionKey.CK_GREATER_EQUAL, paymentFee); + } + + /** + * Set the value of paymentFee using lessEqual. { <= } + * + * @param paymentFee The value of paymentFee as lessEqual. + */ + public void setPaymentFee_LessEqual(java.math.BigDecimal paymentFee) { + registerPaymentFee(ConditionKey.CK_LESS_EQUAL, paymentFee); + } + + /** + * Set the value of paymentFee using inScope. { in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param paymentFeeList The value of paymentFee as inScope. + */ + public void setPaymentFee_InScope(java.util.List paymentFeeList) { + registerPaymentFee(ConditionKey.CK_IN_SCOPE, paymentFeeList); + } + + /** + * Set the value of paymentFee using notInScope. { not in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param paymentFeeList The value of paymentFee as notInScope. + */ + public void setPaymentFee_NotInScope(java.util.List paymentFeeList) { + registerPaymentFee(ConditionKey.CK_NOT_IN_SCOPE, paymentFeeList); + } + + /** + * Set the value of paymentFee using isNull. { is null } + */ + public void setPaymentFee_IsNull() { + registerPaymentFee(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of paymentFee using isNotNull. { is not null } + */ + public void setPaymentFee_IsNotNull() { + registerPaymentFee(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of paymentFee. + * + * @param key Condition key. (NotNull) + * @param value The value of paymentFee. (Nullable) + */ + protected void registerPaymentFee(ConditionKey key, Object value) { + registerQuery(key, value, getCValuePaymentFee(), COL_PAYMENT_FEE, J_PaymentFee, UJ_paymentFee); + } + + /** + * Register inline condition of paymentFee. + * + * @param key Condition key. (NotNull) + * @param value The value of paymentFee. (Nullable) + */ + protected void registerInlinePaymentFee(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValuePaymentFee(), COL_PAYMENT_FEE, J_PaymentFee, UJ_paymentFee); + } + + abstract protected ConditionValue getCValuePaymentFee(); + /** Column db name of totalPrice. */ protected static final String COL_TOTAL_PRICE = "TOTAL_PRICE"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java 2007-10-13 22:48:08 UTC (rev 628) @@ -367,6 +367,111 @@ abstract protected ConditionValue getCValueCode(); + /** Column db name of fee. */ + protected static final String COL_FEE = "FEE"; + + /** Column java name of fee. */ + protected static final String J_Fee = "Fee"; + + /** Column uncapitalised java name of fee. */ + protected static final String UJ_fee = "fee"; + + /** + * Set the value of fee using equal. { = } + * + * @param fee The value of fee as equal. + */ + public void setFee_Equal(java.math.BigDecimal fee) { + registerFee(ConditionKey.CK_EQUAL, fee); + } + + /** + * Set the value of fee using notEqual. { != } + * + * @param fee The value of fee as notEqual. + */ + public void setFee_NotEqual(java.math.BigDecimal fee) { + registerFee(ConditionKey.CK_NOT_EQUAL, fee); + } + + /** + * Set the value of fee using greaterThan. { > } + * + * @param fee The value of fee as greaterThan. + */ + public void setFee_GreaterThan(java.math.BigDecimal fee) { + registerFee(ConditionKey.CK_GREATER_THAN, fee); + } + + /** + * Set the value of fee using lessThan. { < } + * + * @param fee The value of fee as lessThan. + */ + public void setFee_LessThan(java.math.BigDecimal fee) { + registerFee(ConditionKey.CK_LESS_THAN, fee); + } + + /** + * Set the value of fee using greaterEqual. { >= } + * + * @param fee The value of fee as greaterEqual. + */ + public void setFee_GreaterEqual(java.math.BigDecimal fee) { + registerFee(ConditionKey.CK_GREATER_EQUAL, fee); + } + + /** + * Set the value of fee using lessEqual. { <= } + * + * @param fee The value of fee as lessEqual. + */ + public void setFee_LessEqual(java.math.BigDecimal fee) { + registerFee(ConditionKey.CK_LESS_EQUAL, fee); + } + + /** + * Set the value of fee using inScope. { in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param feeList The value of fee as inScope. + */ + public void setFee_InScope(java.util.List feeList) { + registerFee(ConditionKey.CK_IN_SCOPE, feeList); + } + + /** + * Set the value of fee using notInScope. { not in (a, b) } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param feeList The value of fee as notInScope. + */ + public void setFee_NotInScope(java.util.List feeList) { + registerFee(ConditionKey.CK_NOT_IN_SCOPE, feeList); + } + + /** + * Register condition of fee. + * + * @param key Condition key. (NotNull) + * @param value The value of fee. (Nullable) + */ + protected void registerFee(ConditionKey key, Object value) { + registerQuery(key, value, getCValueFee(), COL_FEE, J_Fee, UJ_fee); + } + + /** + * Register inline condition of fee. + * + * @param key Condition key. (NotNull) + * @param value The value of fee. (Nullable) + */ + protected void registerInlineFee(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueFee(), COL_FEE, J_Fee, UJ_fee); + } + + abstract protected ConditionValue getCValueFee(); + /** Column db name of sortOrder. */ protected static final String COL_SORT_ORDER = "SORT_ORDER"; 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2007-10-13 22:48:08 UTC (rev 628) @@ -1009,6 +1009,24 @@ } /** + * Include select-column of deliveryNumber as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_DeliveryNumber() { + registerIncludedSelectColumn("DeliveryNumber", getRealColumnName("DELIVERY_NUMBER")); + } + + /** + * Include select-column of deliveryNumber as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_DeliveryNumber(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_NUMBER")); + } + + /** * Include select-column of lastModified as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -1117,24 +1135,6 @@ } /** - * Include select-column of deliveryPrice as mine. - * Alias name is java-name of this column. - * Be careful to whether your table have the same column. - */ - public void includeAsMine_DeliveryPrice() { - registerIncludedSelectColumn("DeliveryPrice", getRealColumnName("DELIVERY_PRICE")); - } - - /** - * Include select-column of deliveryPrice as mine. - * - * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) - */ - public void includeAsMine_DeliveryPrice(String aliasName) { - registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_PRICE")); - } - - /** * Include select-column of subTotalPrice as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -1171,6 +1171,42 @@ } /** + * Include select-column of deliveryPrice as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_DeliveryPrice() { + registerIncludedSelectColumn("DeliveryPrice", getRealColumnName("DELIVERY_PRICE")); + } + + /** + * Include select-column of deliveryPrice as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_DeliveryPrice(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_PRICE")); + } + + /** + * Include select-column of paymentFee as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_PaymentFee() { + registerIncludedSelectColumn("PaymentFee", getRealColumnName("PAYMENT_FEE")); + } + + /** + * Include select-column of paymentFee as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_PaymentFee(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("PAYMENT_FEE")); + } + + /** * Include select-column of totalPrice as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -3630,6 +3666,48 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_NUMBER] + // - - - - - - - - -/ + + /** The attribute of deliveryNumber. */ + protected ConditionValue _deliveryNumber; + + /** + * Get the value of deliveryNumber. + * + * @return The value of deliveryNumber. + */ + public ConditionValue getDeliveryNumber() { + if (_deliveryNumber == null) { + _deliveryNumber = new ConditionValue(); + } + return _deliveryNumber; + } + + protected ConditionValue getCValueDeliveryNumber() { + return getDeliveryNumber(); + } + + + /** + * Add order-by of deliveryNumber as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryNumber_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_NUMBER), null, true);return this; + } + + /** + * Add order-by of deliveryNumber as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryNumber_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_NUMBER), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [LAST_MODIFIED] // - - - - - - - - -/ @@ -3914,48 +3992,6 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [DELIVERY_PRICE] - // - - - - - - - - -/ - - /** The attribute of deliveryPrice. */ - protected ConditionValue _deliveryPrice; - - /** - * Get the value of deliveryPrice. - * - * @return The value of deliveryPrice. - */ - public ConditionValue getDeliveryPrice() { - if (_deliveryPrice == null) { - _deliveryPrice = new ConditionValue(); - } - return _deliveryPrice; - } - - protected ConditionValue getCValueDeliveryPrice() { - return getDeliveryPrice(); - } - - - /** - * Add order-by of deliveryPrice as ASC. - * - * @return this. (NotNull) - */ - public BsOrderFormCQ addOrderBy_DeliveryPrice_Asc() { - getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, true);return this; - } - - /** - * Add order-by of deliveryPrice as DESC. - * - * @return this. (NotNull) - */ - public BsOrderFormCQ addOrderBy_DeliveryPrice_Desc() { - getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, false);return this; - } - - // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SUB_TOTAL_PRICE] // - - - - - - - - -/ @@ -4040,6 +4076,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_PRICE] + // - - - - - - - - -/ + + /** The attribute of deliveryPrice. */ + protected ConditionValue _deliveryPrice; + + /** + * Get the value of deliveryPrice. + * + * @return The value of deliveryPrice. + */ + public ConditionValue getDeliveryPrice() { + if (_deliveryPrice == null) { + _deliveryPrice = new ConditionValue(); + } + return _deliveryPrice; + } + + protected ConditionValue getCValueDeliveryPrice() { + return getDeliveryPrice(); + } + + + /** + * Add order-by of deliveryPrice as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryPrice_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, true);return this; + } + + /** + * Add order-by of deliveryPrice as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_DeliveryPrice_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [PAYMENT_FEE] + // - - - - - - - - -/ + + /** The attribute of paymentFee. */ + protected ConditionValue _paymentFee; + + /** + * Get the value of paymentFee. + * + * @return The value of paymentFee. + */ + public ConditionValue getPaymentFee() { + if (_paymentFee == null) { + _paymentFee = new ConditionValue(); + } + return _paymentFee; + } + + protected ConditionValue getCValuePaymentFee() { + return getPaymentFee(); + } + + + /** + * Add order-by of paymentFee as ASC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_PaymentFee_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_PAYMENT_FEE), null, true);return this; + } + + /** + * Add order-by of paymentFee as DESC. + * + * @return this. (NotNull) + */ + public BsOrderFormCQ addOrderBy_PaymentFee_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_PAYMENT_FEE), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [TOTAL_PRICE] // - - - - - - - - -/ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java 2007-10-13 22:48:08 UTC (rev 628) @@ -91,6 +91,24 @@ } /** + * Include select-column of fee as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_Fee() { + registerIncludedSelectColumn("Fee", getRealColumnName("FEE")); + } + + /** + * Include select-column of fee as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_Fee(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("FEE")); + } + + /** * Include select-column of sortOrder as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -300,6 +318,48 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FEE] + // - - - - - - - - -/ + + /** The attribute of fee. */ + protected ConditionValue _fee; + + /** + * Get the value of fee. + * + * @return The value of fee. + */ + public ConditionValue getFee() { + if (_fee == null) { + _fee = new ConditionValue(); + } + return _fee; + } + + protected ConditionValue getCValueFee() { + return getFee(); + } + + + /** + * Add order-by of fee as ASC. + * + * @return this. (NotNull) + */ + public BsPaymentMethodCQ addOrderBy_Fee_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_FEE), null, true);return this; + } + + /** + * Add order-by of fee as DESC. + * + * @return this. (NotNull) + */ + public BsPaymentMethodCQ addOrderBy_Fee_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_FEE), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SORT_ORDER] // - - - - - - - - -/ 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2007-10-13 22:48:08 UTC (rev 628) @@ -558,6 +558,14 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_NUMBER] + // - - - - - - - - -/ + protected ConditionValue getCValueDeliveryNumber() { + return _myCQ.getDeliveryNumber(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [LAST_MODIFIED] // - - - - - - - - -/ protected ConditionValue getCValueLastModified() { @@ -614,14 +622,6 @@ // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [DELIVERY_PRICE] - // - - - - - - - - -/ - protected ConditionValue getCValueDeliveryPrice() { - return _myCQ.getDeliveryPrice(); - } - - - // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SUB_TOTAL_PRICE] // - - - - - - - - -/ protected ConditionValue getCValueSubTotalPrice() { @@ -638,6 +638,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [DELIVERY_PRICE] + // - - - - - - - - -/ + protected ConditionValue getCValueDeliveryPrice() { + return _myCQ.getDeliveryPrice(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [PAYMENT_FEE] + // - - - - - - - - -/ + protected ConditionValue getCValuePaymentFee() { + return _myCQ.getPaymentFee(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [TOTAL_PRICE] // - - - - - - - - -/ protected ConditionValue getCValueTotalPrice() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java 2007-10-13 22:48:08 UTC (rev 628) @@ -111,6 +111,14 @@ // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FEE] + // - - - - - - - - -/ + protected ConditionValue getCValueFee() { + return _myCQ.getFee(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SORT_ORDER] // - - - - - - - - -/ protected ConditionValue getCValueSortOrder() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2007-10-13 22:48:08 UTC (rev 628) @@ -7,6 +7,7 @@ import org.seasar.extension.dxo.annotation.ConversionRule; import org.seasar.extension.dxo.annotation.ExcludeNull; +import jp.sf.pal.pompei.entity.notification.order.Order; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.exentity.OrderCardInfo; @@ -101,4 +102,7 @@ public void convert(OrderCardInfo orderCardInfo, AbstractOrderEditPage orderEditPage); + + public Order convert(OrderForm orderForm); + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java 2007-10-13 22:48:08 UTC (rev 628) @@ -5,7 +5,9 @@ import java.util.Map; import org.seasar.extension.dxo.annotation.ConversionRule; +import org.seasar.extension.dxo.annotation.ExcludeNull; +import jp.sf.pal.pompei.exentity.OrderProduct; import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.exentity.ProductDescription; import jp.sf.pal.pompei.web.admin.product.ProductEditPage; @@ -17,11 +19,8 @@ Product convertProduct(ProductEditPage productEditPage); - @ConversionRule("productId : productId" - + ",code : code" - + ",model : model" - + ",price : price" - + ",status : status" + @ConversionRule("productId : productId" + ",code : code" + ",model : model" + + ",price : price" + ",status : status" + ",productDescriptionList : productDescriptionList" + ",manufacturerName : manufacturer.name" + ",dateAdded : dateAdded") @@ -53,4 +52,15 @@ + ",productsName : productsName") void convert(ProductDescription description, Map map); + @ExcludeNull + public void convert(ProductDescription productDescription, + jp.sf.pal.pompei.entity.notification.order.Product product); + + @ExcludeNull + public void convert(Product product, + jp.sf.pal.pompei.entity.notification.order.Product p); + + @ExcludeNull + public void convert(OrderProduct orderProduct, + jp.sf.pal.pompei.entity.notification.order.Product product); } Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,1106 @@ +package jp.sf.pal.pompei.entity.notification.order; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; + +public class Order implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 2324446618731867065L; + + private java.math.BigDecimal orderFormId; + + private String orderFormNumber; + + private java.math.BigDecimal customerId; + + private String customerGender; + + private String customerFirstname; + + private String customerLastname; + + private String customerFirstnameDescription; + + private String customerLastnameDescription; + + private java.util.Date customerDayOfBirth; + + private String customerEmailAddress; + + private String customerCompany; + + private String customerDepartment; + + private String customerStreetAddress; + + private String customerSuburb; + + private String customerCity; + + private String customerState; + + private String customerPostcode; + + private String customerCountryName; + + private String customerTelephone; + + private String customerLocaleName; + + private String deliveryCompany; + + private String deliveryDepartment; + + private String deliveryFirstname; + + private String deliveryLastname; + + private String deliveryFirstnameDescription; + + private String deliveryLastnameDescription; + + private String deliveryStreetAddress; + + private String deliverySuburb; + + private String deliveryCity; + + private String deliveryState; + + private String deliveryPostcode; + + private String deliveryCountryName; + + private String deliveryTelephone; + + private String deliveryLocaleName; + + private String billingCompany; + + private String billingDepartment; + + private String billingFirstname; + + private String billingLastname; + + private String billingFirstnameDescription; + + private String billingLastnameDescription; + + private String billingStreetAddress; + + private String billingSuburb; + + private String billingCity; + + private String billingState; + + private String billingPostcode; + + private String billingCountryName; + + private String billingTelephone; + + private String billingLocaleName; + + private java.math.BigDecimal paymentMethodId; + + private String paymentMethodCode; + + private java.math.BigDecimal orderCardInfoId; + + private java.math.BigDecimal deliveryMethodId; + + private String deliveryMethodCode; + + private java.sql.Timestamp lastModified; + + private java.math.BigDecimal orderStatusId; + + private java.sql.Timestamp purchasedDate; + + private java.sql.Timestamp finishedDate; + + private java.math.BigDecimal currencyId; + + private String currencyCode; + + private String deliveryNumber; + + private java.math.BigDecimal deliveryPrice; + + private java.math.BigDecimal subTotalPrice; + + private java.math.BigDecimal tax; + + private java.math.BigDecimal paymentFee; + + private java.math.BigDecimal totalPrice; + + private List products; + + public String formatPrice(BigDecimal price) { + if (price == null) { + return "0"; + } + //TODO i18n + DecimalFormat priceFormat = new DecimalFormat("###,###"); + return priceFormat.format(price); + } + + public String formatDate(Timestamp timestamp) { + if (timestamp == null) { + return ""; + } + //TODO i18n + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + return dateFormat.format(timestamp); + } + + /** + * @return the orderFormId + */ + public java.math.BigDecimal getOrderFormId() { + return orderFormId; + } + + /** + * @param orderFormId the orderFormId to set + */ + public void setOrderFormId(java.math.BigDecimal orderFormId) { + this.orderFormId = orderFormId; + } + + /** + * @return the orderFormNumber + */ + public String getOrderFormNumber() { + return orderFormNumber; + } + + /** + * @param orderFormNumber the orderFormNumber to set + */ + public void setOrderFormNumber(String orderFormNumber) { + this.orderFormNumber = orderFormNumber; + } + + /** + * @return the customerId + */ + public java.math.BigDecimal getCustomerId() { + return customerId; + } + + /** + * @param customerId the customerId to set + */ + public void setCustomerId(java.math.BigDecimal customerId) { + this.customerId = customerId; + } + + /** + * @return the customerGender + */ + public String getCustomerGender() { + return customerGender; + } + + /** + * @param customerGender the customerGender to set + */ + public void setCustomerGender(String customerGender) { + this.customerGender = customerGender; + } + + /** + * @return the customerFirstname + */ + public String getCustomerFirstname() { + return customerFirstname; + } + + /** + * @param customerFirstname the customerFirstname to set + */ + public void setCustomerFirstname(String customerFirstname) { + this.customerFirstname = customerFirstname; + } + + /** + * @return the customerLastname + */ + public String getCustomerLastname() { + return customerLastname; + } + + /** + * @param customerLastname the customerLastname to set + */ + public void setCustomerLastname(String customerLastname) { + this.customerLastname = customerLastname; + } + + /** + * @return the customerFirstnameDescription + */ + public String getCustomerFirstnameDescription() { + return customerFirstnameDescription; + } + + /** + * @param customerFirstnameDescription the customerFirstnameDescription to set + */ + public void setCustomerFirstnameDescription( + String customerFirstnameDescription) { + this.customerFirstnameDescription = customerFirstnameDescription; + } + + /** + * @return the customerLastnameDescription + */ + public String getCustomerLastnameDescription() { + return customerLastnameDescription; + } + + /** + * @param customerLastnameDescription the customerLastnameDescription to set + */ + public void setCustomerLastnameDescription( + String customerLastnameDescription) { + this.customerLastnameDescription = customerLastnameDescription; + } + + /** + * @return the customerDayOfBirth + */ + public java.util.Date getCustomerDayOfBirth() { + return customerDayOfBirth; + } + + /** + * @param customerDayOfBirth the customerDayOfBirth to set + */ + public void setCustomerDayOfBirth(java.util.Date customerDayOfBirth) { + this.customerDayOfBirth = customerDayOfBirth; + } + + /** + * @return the customerEmailAddress + */ + public String getCustomerEmailAddress() { + return customerEmailAddress; + } + + /** + * @param customerEmailAddress the customerEmailAddress to set + */ + public void setCustomerEmailAddress(String customerEmailAddress) { + this.customerEmailAddress = customerEmailAddress; + } + + /** + * @return the customerCompany + */ + public String getCustomerCompany() { + return customerCompany; + } + + /** + * @param customerCompany the customerCompany to set + */ + public void setCustomerCompany(String customerCompany) { + this.customerCompany = customerCompany; + } + + /** + * @return the customerDepartment + */ + public String getCustomerDepartment() { + return customerDepartment; + } + + /** + * @param customerDepartment the customerDepartment to set + */ + public void setCustomerDepartment(String customerDepartment) { + this.customerDepartment = customerDepartment; + } + + /** + * @return the customerStreetAddress + */ + public String getCustomerStreetAddress() { + return customerStreetAddress; + } + + /** + * @param customerStreetAddress the customerStreetAddress to set + */ + public void setCustomerStreetAddress(String customerStreetAddress) { + this.customerStreetAddress = customerStreetAddress; + } + + /** + * @return the customerSuburb + */ + public String getCustomerSuburb() { + return customerSuburb; + } + + /** + * @param customerSuburb the customerSuburb to set + */ + public void setCustomerSuburb(String customerSuburb) { + this.customerSuburb = customerSuburb; + } + + /** + * @return the customerCity + */ + public String getCustomerCity() { + return customerCity; + } + + /** + * @param customerCity the customerCity to set + */ + public void setCustomerCity(String customerCity) { + this.customerCity = customerCity; + } + + /** + * @return the customerState + */ + public String getCustomerState() { + return customerState; + } + + /** + * @param customerState the customerState to set + */ + public void setCustomerState(String customerState) { + this.customerState = customerState; + } + + /** + * @return the customerPostcode + */ + public String getCustomerPostcode() { + return customerPostcode; + } + + /** + * @param customerPostcode the customerPostcode to set + */ + public void setCustomerPostcode(String customerPostcode) { + this.customerPostcode = customerPostcode; + } + + /** + * @return the customerCountryName + */ + public String getCustomerCountryName() { + return customerCountryName; + } + + /** + * @param customerCountryName the customerCountryName to set + */ + public void setCustomerCountryName(String customerCountryName) { + this.customerCountryName = customerCountryName; + } + + /** + * @return the customerTelephone + */ + public String getCustomerTelephone() { + return customerTelephone; + } + + /** + * @param customerTelephone the customerTelephone to set + */ + public void setCustomerTelephone(String customerTelephone) { + this.customerTelephone = customerTelephone; + } + + /** + * @return the customerLocaleName + */ + public String getCustomerLocaleName() { + return customerLocaleName; + } + + /** + * @param customerLocaleName the customerLocaleName to set + */ + public void setCustomerLocaleName(String customerLocaleName) { + this.customerLocaleName = customerLocaleName; + } + + /** + * @return the deliveryCompany + */ + public String getDeliveryCompany() { + return deliveryCompany; + } + + /** + * @param deliveryCompany the deliveryCompany to set + */ + public void setDeliveryCompany(String deliveryCompany) { + this.deliveryCompany = deliveryCompany; + } + + /** + * @return the deliveryDepartment + */ + public String getDeliveryDepartment() { + return deliveryDepartment; + } + + /** + * @param deliveryDepartment the deliveryDepartment to set + */ + public void setDeliveryDepartment(String deliveryDepartment) { + this.deliveryDepartment = deliveryDepartment; + } + + /** + * @return the deliveryFirstname + */ + public String getDeliveryFirstname() { + return deliveryFirstname; + } + + /** + * @param deliveryFirstname the deliveryFirstname to set + */ + public void setDeliveryFirstname(String deliveryFirstname) { + this.deliveryFirstname = deliveryFirstname; + } + + /** + * @return the deliveryLastname + */ + public String getDeliveryLastname() { + return deliveryLastname; + } + + /** + * @param deliveryLastname the deliveryLastname to set + */ + public void setDeliveryLastname(String deliveryLastname) { + this.deliveryLastname = deliveryLastname; + } + + /** + * @return the deliveryFirstnameDescription + */ + public String getDeliveryFirstnameDescription() { + return deliveryFirstnameDescription; + } + + /** + * @param deliveryFirstnameDescription the deliveryFirstnameDescription to set + */ + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + this.deliveryFirstnameDescription = deliveryFirstnameDescription; + } + + /** + * @return the deliveryLastnameDescription + */ + public String getDeliveryLastnameDescription() { + return deliveryLastnameDescription; + } + + /** + * @param deliveryLastnameDescription the deliveryLastnameDescription to set + */ + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + this.deliveryLastnameDescription = deliveryLastnameDescription; + } + + /** + * @return the deliveryStreetAddress + */ + public String getDeliveryStreetAddress() { + return deliveryStreetAddress; + } + + /** + * @param deliveryStreetAddress the deliveryStreetAddress to set + */ + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + this.deliveryStreetAddress = deliveryStreetAddress; + } + + /** + * @return the deliverySuburb + */ + public String getDeliverySuburb() { + return deliverySuburb; + } + + /** + * @param deliverySuburb the deliverySuburb to set + */ + public void setDeliverySuburb(String deliverySuburb) { + this.deliverySuburb = deliverySuburb; + } + + /** + * @return the deliveryCity + */ + public String getDeliveryCity() { + return deliveryCity; + } + + /** + * @param deliveryCity the deliveryCity to set + */ + public void setDeliveryCity(String deliveryCity) { + this.deliveryCity = deliveryCity; + } + + /** + * @return the deliveryState + */ + public String getDeliveryState() { + return deliveryState; + } + + /** + * @param deliveryState the deliveryState to set + */ + public void setDeliveryState(String deliveryState) { + this.deliveryState = deliveryState; + } + + /** + * @return the deliveryPostcode + */ + public String getDeliveryPostcode() { + return deliveryPostcode; + } + + /** + * @param deliveryPostcode the deliveryPostcode to set + */ + public void setDeliveryPostcode(String deliveryPostcode) { + this.deliveryPostcode = deliveryPostcode; + } + + /** + * @return the deliveryCountryName + */ + public String getDeliveryCountryName() { + return deliveryCountryName; + } + + /** + * @param deliveryCountryName the deliveryCountryName to set + */ + public void setDeliveryCountryName(String deliveryCountryName) { + this.deliveryCountryName = deliveryCountryName; + } + + /** + * @return the deliveryTelephone + */ + public String getDeliveryTelephone() { + return deliveryTelephone; + } + + /** + * @param deliveryTelephone the deliveryTelephone to set + */ + public void setDeliveryTelephone(String deliveryTelephone) { + this.deliveryTelephone = deliveryTelephone; + } + + /** + * @return the deliveryLocaleName + */ + public String getDeliveryLocaleName() { + return deliveryLocaleName; + } + + /** + * @param deliveryLocaleName the deliveryLocaleName to set + */ + public void setDeliveryLocaleName(String deliveryLocaleName) { + this.deliveryLocaleName = deliveryLocaleName; + } + + /** + * @return the billingCompany + */ + public String getBillingCompany() { + return billingCompany; + } + + /** + * @param billingCompany the billingCompany to set + */ + public void setBillingCompany(String billingCompany) { + this.billingCompany = billingCompany; + } + + /** + * @return the billingDepartment + */ + public String getBillingDepartment() { + return billingDepartment; + } + + /** + * @param billingDepartment the billingDepartment to set + */ + public void setBillingDepartment(String billingDepartment) { + this.billingDepartment = billingDepartment; + } + + /** + * @return the billingFirstname + */ + public String getBillingFirstname() { + return billingFirstname; + } + + /** + * @param billingFirstname the billingFirstname to set + */ + public void setBillingFirstname(String billingFirstname) { + this.billingFirstname = billingFirstname; + } + + /** + * @return the billingLastname + */ + public String getBillingLastname() { + return billingLastname; + } + + /** + * @param billingLastname the billingLastname to set + */ + public void setBillingLastname(String billingLastname) { + this.billingLastname = billingLastname; + } + + /** + * @return the billingFirstnameDescription + */ + public String getBillingFirstnameDescription() { + return billingFirstnameDescription; + } + + /** + * @param billingFirstnameDescription the billingFirstnameDescription to set + */ + public void setBillingFirstnameDescription( + String billingFirstnameDescription) { + this.billingFirstnameDescription = billingFirstnameDescription; + } + + /** + * @return the billingLastnameDescription + */ + public String getBillingLastnameDescription() { + return billingLastnameDescription; + } + + /** + * @param billingLastnameDescription the billingLastnameDescription to set + */ + public void setBillingLastnameDescription(String billingLastnameDescription) { + this.billingLastnameDescription = billingLastnameDescription; + } + + /** + * @return the billingStreetAddress + */ + public String getBillingStreetAddress() { + return billingStreetAddress; + } + + /** + * @param billingStreetAddress the billingStreetAddress to set + */ + public void setBillingStreetAddress(String billingStreetAddress) { + this.billingStreetAddress = billingStreetAddress; + } + + /** + * @return the billingSuburb + */ + public String getBillingSuburb() { + return billingSuburb; + } + + /** + * @param billingSuburb the billingSuburb to set + */ + public void setBillingSuburb(String billingSuburb) { + this.billingSuburb = billingSuburb; + } + + /** + * @return the billingCity + */ + public String getBillingCity() { + return billingCity; + } + + /** + * @param billingCity the billingCity to set + */ + public void setBillingCity(String billingCity) { + this.billingCity = billingCity; + } + + /** + * @return the billingState + */ + public String getBillingState() { + return billingState; + } + + /** + * @param billingState the billingState to set + */ + public void setBillingState(String billingState) { + this.billingState = billingState; + } + + /** + * @return the billingPostcode + */ + public String getBillingPostcode() { + return billingPostcode; + } + + /** + * @param billingPostcode the billingPostcode to set + */ + public void setBillingPostcode(String billingPostcode) { + this.billingPostcode = billingPostcode; + } + + /** + * @return the billingCountryName + */ + public String getBillingCountryName() { + return billingCountryName; + } + + /** + * @param billingCountryName the billingCountryName to set + */ + public void setBillingCountryName(String billingCountryName) { + this.billingCountryName = billingCountryName; + } + + /** + * @return the billingTelephone + */ + public String getBillingTelephone() { + return billingTelephone; + } + + /** + * @param billingTelephone the billingTelephone to set + */ + public void setBillingTelephone(String billingTelephone) { + this.billingTelephone = billingTelephone; + } + + /** + * @return the billingLocaleName + */ + public String getBillingLocaleName() { + return billingLocaleName; + } + + /** + * @param billingLocaleName the billingLocaleName to set + */ + public void setBillingLocaleName(String billingLocaleName) { + this.billingLocaleName = billingLocaleName; + } + + /** + * @return the paymentMethodId + */ + public java.math.BigDecimal getPaymentMethodId() { + return paymentMethodId; + } + + /** + * @param paymentMethodId the paymentMethodId to set + */ + public void setPaymentMethodId(java.math.BigDecimal paymentMethodId) { + this.paymentMethodId = paymentMethodId; + } + + /** + * @return the paymentMethodCode + */ + public String getPaymentMethodCode() { + return paymentMethodCode; + } + + /** + * @param paymentMethodCode the paymentMethodCode to set + */ + public void setPaymentMethodCode(String paymentMethodCode) { + this.paymentMethodCode = paymentMethodCode; + } + + /** + * @return the orderCardInfoId + */ + public java.math.BigDecimal getOrderCardInfoId() { + return orderCardInfoId; + } + + /** + * @param orderCardInfoId the orderCardInfoId to set + */ + public void setOrderCardInfoId(java.math.BigDecimal orderCardInfoId) { + this.orderCardInfoId = orderCardInfoId; + } + + /** + * @return the deliveryMethodId + */ + public java.math.BigDecimal getDeliveryMethodId() { + return deliveryMethodId; + } + + /** + * @param deliveryMethodId the deliveryMethodId to set + */ + public void setDeliveryMethodId(java.math.BigDecimal deliveryMethodId) { + this.deliveryMethodId = deliveryMethodId; + } + + /** + * @return the deliveryMethodCode + */ + public String getDeliveryMethodCode() { + return deliveryMethodCode; + } + + /** + * @param deliveryMethodCode the deliveryMethodCode to set + */ + public void setDeliveryMethodCode(String deliveryMethodCode) { + this.deliveryMethodCode = deliveryMethodCode; + } + + /** + * @return the lastModified + */ + public java.sql.Timestamp getLastModified() { + return lastModified; + } + + /** + * @param lastModified the lastModified to set + */ + public void setLastModified(java.sql.Timestamp lastModified) { + this.lastModified = lastModified; + } + + /** + * @return the orderStatusId + */ + public java.math.BigDecimal getOrderStatusId() { + return orderStatusId; + } + + /** + * @param orderStatusId the orderStatusId to set + */ + public void setOrderStatusId(java.math.BigDecimal orderStatusId) { + this.orderStatusId = orderStatusId; + } + + /** + * @return the purchasedDate + */ + public java.sql.Timestamp getPurchasedDate() { + return purchasedDate; + } + + /** + * @param purchasedDate the purchasedDate to set + */ + public void setPurchasedDate(java.sql.Timestamp purchasedDate) { + this.purchasedDate = purchasedDate; + } + + /** + * @return the finishedDate + */ + public java.sql.Timestamp getFinishedDate() { + return finishedDate; + } + + /** + * @param finishedDate the finishedDate to set + */ + public void setFinishedDate(java.sql.Timestamp finishedDate) { + this.finishedDate = finishedDate; + } + + /** + * @return the currencyId + */ + public java.math.BigDecimal getCurrencyId() { + return currencyId; + } + + /** + * @param currencyId the currencyId to set + */ + public void setCurrencyId(java.math.BigDecimal currencyId) { + this.currencyId = currencyId; + } + + /** + * @return the currencyCode + */ + public String getCurrencyCode() { + return currencyCode; + } + + /** + * @param currencyCode the currencyCode to set + */ + public void setCurrencyCode(String currencyCode) { + this.currencyCode = currencyCode; + } + + /** + * @return the deliveryPrice + */ + public java.math.BigDecimal getDeliveryPrice() { + return deliveryPrice; + } + + /** + * @param deliveryPrice the deliveryPrice to set + */ + public void setDeliveryPrice(java.math.BigDecimal deliveryPrice) { + this.deliveryPrice = deliveryPrice; + } + + /** + * @return the subTotalPrice + */ + public java.math.BigDecimal getSubTotalPrice() { + return subTotalPrice; + } + + /** + * @param subTotalPrice the subTotalPrice to set + */ + public void setSubTotalPrice(java.math.BigDecimal subTotalPrice) { + this.subTotalPrice = subTotalPrice; + } + + /** + * @return the tax + */ + public java.math.BigDecimal getTax() { + return tax; + } + + /** + * @param tax the tax to set + */ + public void setTax(java.math.BigDecimal tax) { + this.tax = tax; + } + + /** + * @return the paymentFee + */ + public java.math.BigDecimal getPaymentFee() { + return paymentFee; + } + + /** + * @param paymentFee the paymentFee to set + */ + public void setPaymentFee(java.math.BigDecimal paymentFee) { + this.paymentFee = paymentFee; + } + + /** + * @return the totalPrice + */ + public java.math.BigDecimal getTotalPrice() { + return totalPrice; + } + + /** + * @param totalPrice the totalPrice to set + */ + public void setTotalPrice(java.math.BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + + /** + * @return the products + */ + public List getProducts() { + if (products == null) { + products = new ArrayList(); + } + return products; + } + + /** + * @param products the products to set + */ + public void setProducts(List products) { + this.products = products; + } + + public void addProduct(Product product) { + if (products == null) { + products = new ArrayList(); + } + products.add(product); + } + + /** + * @return the deliveryNumber + */ + public String getDeliveryNumber() { + return deliveryNumber; + } + + /** + * @param deliveryNumber the deliveryNumber to set + */ + public void setDeliveryNumber(String deliveryNumber) { + this.deliveryNumber = deliveryNumber; + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,428 @@ +package jp.sf.pal.pompei.entity.notification.order; + +import java.io.Serializable; + +public class Product implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1955114932729040595L; + + protected java.math.BigDecimal languageId; + + protected String name; + + protected String title; + + protected String description; + + protected String url; + + protected java.math.BigDecimal viewed; + + protected java.math.BigDecimal weight; + + protected String size; + + protected java.math.BigDecimal ordered; + + protected java.math.BigDecimal reviewed; + + protected java.math.BigDecimal rating; + + protected java.math.BigDecimal status; + + protected java.sql.Timestamp dateAdded; + + protected java.sql.Timestamp lastModified; + + protected java.sql.Timestamp dateAvailable; + + protected java.math.BigDecimal taxClassId; + + protected java.math.BigDecimal manufacturerId; + + protected java.math.BigDecimal orderProductId; + + protected java.math.BigDecimal orderFormId; + + protected java.math.BigDecimal productId; + + protected String code; + + protected String model; + + protected java.math.BigDecimal price; + + protected java.math.BigDecimal finalPrice; + + protected java.math.BigDecimal tax; + + protected java.math.BigDecimal quantity; + + /** + * @return the languageId + */ + public java.math.BigDecimal getLanguageId() { + return languageId; + } + + /** + * @param languageId the languageId to set + */ + public void setLanguageId(java.math.BigDecimal languageId) { + this.languageId = languageId; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * @param title the title to set + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @param description the description to set + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * @return the url + */ + public String getUrl() { + return url; + } + + /** + * @param url the url to set + */ + public void setUrl(String url) { + this.url = url; + } + + /** + * @return the viewed + */ + public java.math.BigDecimal getViewed() { + return viewed; + } + + /** + * @param viewed the viewed to set + */ + public void setViewed(java.math.BigDecimal viewed) { + this.viewed = viewed; + } + + /** + * @return the weight + */ + public java.math.BigDecimal getWeight() { + return weight; + } + + /** + * @param weight the weight to set + */ + public void setWeight(java.math.BigDecimal weight) { + this.weight = weight; + } + + /** + * @return the size + */ + public String getSize() { + return size; + } + + /** + * @param size the size to set + */ + public void setSize(String size) { + this.size = size; + } + + /** + * @return the ordered + */ + public java.math.BigDecimal getOrdered() { + return ordered; + } + + /** + * @param ordered the ordered to set + */ + public void setOrdered(java.math.BigDecimal ordered) { + this.ordered = ordered; + } + + /** + * @return the reviewed + */ + public java.math.BigDecimal getReviewed() { + return reviewed; + } + + /** + * @param reviewed the reviewed to set + */ + public void setReviewed(java.math.BigDecimal reviewed) { + this.reviewed = reviewed; + } + + /** + * @return the rating + */ + public java.math.BigDecimal getRating() { + return rating; + } + + /** + * @param rating the rating to set + */ + public void setRating(java.math.BigDecimal rating) { + this.rating = rating; + } + + /** + * @return the status + */ + public java.math.BigDecimal getStatus() { + return status; + } + + /** + * @param status the status to set + */ + public void setStatus(java.math.BigDecimal status) { + this.status = status; + } + + /** + * @return the dateAdded + */ + public java.sql.Timestamp getDateAdded() { + return dateAdded; + } + + /** + * @param dateAdded the dateAdded to set + */ + public void setDateAdded(java.sql.Timestamp dateAdded) { + this.dateAdded = dateAdded; + } + + /** + * @return the lastModified + */ + public java.sql.Timestamp getLastModified() { + return lastModified; + } + + /** + * @param lastModified the lastModified to set + */ + public void setLastModified(java.sql.Timestamp lastModified) { + this.lastModified = lastModified; + } + + /** + * @return the dateAvailable + */ + public java.sql.Timestamp getDateAvailable() { + return dateAvailable; + } + + /** + * @param dateAvailable the dateAvailable to set + */ + public void setDateAvailable(java.sql.Timestamp dateAvailable) { + this.dateAvailable = dateAvailable; + } + + /** + * @return the taxClassId + */ + public java.math.BigDecimal getTaxClassId() { + return taxClassId; + } + + /** + * @param taxClassId the taxClassId to set + */ + public void setTaxClassId(java.math.BigDecimal taxClassId) { + this.taxClassId = taxClassId; + } + + /** + * @return the manufacturerId + */ + public java.math.BigDecimal getManufacturerId() { + return manufacturerId; + } + + /** + * @param manufacturerId the manufacturerId to set + */ + public void setManufacturerId(java.math.BigDecimal manufacturerId) { + this.manufacturerId = manufacturerId; + } + + /** + * @return the orderProductId + */ + public java.math.BigDecimal getOrderProductId() { + return orderProductId; + } + + /** + * @param orderProductId the orderProductId to set + */ + public void setOrderProductId(java.math.BigDecimal orderProductId) { + this.orderProductId = orderProductId; + } + + /** + * @return the orderFormId + */ + public java.math.BigDecimal getOrderFormId() { + return orderFormId; + } + + /** + * @param orderFormId the orderFormId to set + */ + public void setOrderFormId(java.math.BigDecimal orderFormId) { + this.orderFormId = orderFormId; + } + + /** + * @return the productId + */ + public java.math.BigDecimal getProductId() { + return productId; + } + + /** + * @param productId the productId to set + */ + public void setProductId(java.math.BigDecimal productId) { + this.productId = productId; + } + + /** + * @return the code + */ + public String getCode() { + return code; + } + + /** + * @param code the code to set + */ + public void setCode(String code) { + this.code = code; + } + + /** + * @return the model + */ + public String getModel() { + return model; + } + + /** + * @param model the model to set + */ + public void setModel(String model) { + this.model = model; + } + + /** + * @return the price + */ + public java.math.BigDecimal getPrice() { + return price; + } + + /** + * @param price the price to set + */ + public void setPrice(java.math.BigDecimal price) { + this.price = price; + } + + /** + * @return the finalPrice + */ + public java.math.BigDecimal getFinalPrice() { + return finalPrice; + } + + /** + * @param finalPrice the finalPrice to set + */ + public void setFinalPrice(java.math.BigDecimal finalPrice) { + this.finalPrice = finalPrice; + } + + /** + * @return the tax + */ + public java.math.BigDecimal getTax() { + return tax; + } + + /** + * @param tax the tax to set + */ + public void setTax(java.math.BigDecimal tax) { + this.tax = tax; + } + + /** + * @return the quantity + */ + public java.math.BigDecimal getQuantity() { + return quantity; + } + + /** + * @param quantity the quantity to set + */ + public void setQuantity(java.math.BigDecimal quantity) { + this.quantity = quantity; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-13 22:48:08 UTC (rev 628) @@ -12,6 +12,7 @@ import jp.sf.pal.pompei.exentity.DeliveryMethod; import jp.sf.pal.pompei.exentity.OrderCardInfo; import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderNotification; import jp.sf.pal.pompei.exentity.OrderProduct; import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.exentity.OrderStatusDescription; @@ -36,9 +37,9 @@ AddressBook customerAddressBook, AddressBook deliveryAddressBook, AddressBook billingAddressBook, PaymentMethod paymentMethod, DeliveryMethod deliveryMethod, OrderCardInfo orderCardInfo, - Currency currency, BigDecimal subTotalPrice, - BigDecimal deliveryPrice, BigDecimal tax, BigDecimal totalPrice) - throws CommonException; + Currency currency, BigDecimal subTotalPrice, BigDecimal tax, + BigDecimal deliveryPrice, BigDecimal paymentFee, + BigDecimal totalPrice) throws CommonException; public Currency getCurrency(BigDecimal currencyId); @@ -53,4 +54,12 @@ public List getOrderProductListByOrderFormId( BigDecimal orderFormId); + + public List getOrderNotificationListByOrderFormId( + BigDecimal orderFormId); + + public void sendOrderNotifications(BigDecimal orderFormId, + BigDecimal[] orderNotificationIds) throws CommonException; + + public OrderNotification getOrderNotification(BigDecimal orderNotificationId); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-13 22:48:08 UTC (rev 628) @@ -1,10 +1,19 @@ package jp.sf.pal.pompei.service.impl; +import java.io.StringWriter; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Properties; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; + import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; @@ -13,18 +22,23 @@ import jp.sf.pal.pompei.cbean.OrderCardInfoCB; import jp.sf.pal.pompei.cbean.OrderCommentCB; import jp.sf.pal.pompei.cbean.OrderFormCB; +import jp.sf.pal.pompei.cbean.OrderNotificationCB; import jp.sf.pal.pompei.cbean.OrderProductAttributeCB; import jp.sf.pal.pompei.cbean.OrderProductCB; import jp.sf.pal.pompei.cbean.OrderProductDownloadCB; import jp.sf.pal.pompei.cbean.OrderStatusCB; import jp.sf.pal.pompei.cbean.OrderStatusDescriptionCB; import jp.sf.pal.pompei.cbean.OrderStatusHistoryCB; +import jp.sf.pal.pompei.cbean.ProductDescriptionCB; import jp.sf.pal.pompei.dxo.OrderFormDxo; +import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.entity.notification.order.Order; import jp.sf.pal.pompei.exbhv.CurrencyBhv; import jp.sf.pal.pompei.exbhv.CustomerBasketBhv; import jp.sf.pal.pompei.exbhv.OrderCardInfoBhv; import jp.sf.pal.pompei.exbhv.OrderCommentBhv; import jp.sf.pal.pompei.exbhv.OrderFormBhv; +import jp.sf.pal.pompei.exbhv.OrderNotificationBhv; import jp.sf.pal.pompei.exbhv.OrderProductAttributeBhv; import jp.sf.pal.pompei.exbhv.OrderProductBhv; import jp.sf.pal.pompei.exbhv.OrderProductDownloadBhv; @@ -32,6 +46,7 @@ import jp.sf.pal.pompei.exbhv.OrderStatusDescriptionBhv; import jp.sf.pal.pompei.exbhv.OrderStatusHistoryBhv; import jp.sf.pal.pompei.exbhv.ProductBhv; +import jp.sf.pal.pompei.exbhv.ProductDescriptionBhv; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Currency; import jp.sf.pal.pompei.exentity.Customer; @@ -40,6 +55,7 @@ import jp.sf.pal.pompei.exentity.OrderCardInfo; import jp.sf.pal.pompei.exentity.OrderComment; import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderNotification; import jp.sf.pal.pompei.exentity.OrderProduct; import jp.sf.pal.pompei.exentity.OrderProductAttribute; import jp.sf.pal.pompei.exentity.OrderProductDownload; @@ -48,9 +64,19 @@ import jp.sf.pal.pompei.exentity.OrderStatusHistory; import jp.sf.pal.pompei.exentity.PaymentMethod; import jp.sf.pal.pompei.exentity.Product; +import jp.sf.pal.pompei.exentity.ProductDescription; import jp.sf.pal.pompei.pager.OrderFormPager; +import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.service.OrderService; +import jp.sf.pal.pompei.util.SystemUtil; +import jp.sf.pal.pompei.util.VelocityUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.seasar.framework.log.Logger; + public class OrderServiceImpl implements OrderService { /** @@ -58,6 +84,12 @@ */ private static final long serialVersionUID = -6452405711117279851L; + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(OrderServiceImpl.class); + private transient OrderFormBhv orderFormBhv; private transient CurrencyBhv currencyBhv; @@ -70,6 +102,8 @@ private transient ProductBhv productBhv; + private transient ProductDescriptionBhv productDescriptionBhv; + private transient OrderStatusDescriptionBhv orderStatusDescriptionBhv; private transient OrderStatusBhv orderStatusBhv; @@ -82,8 +116,141 @@ private transient OrderCommentBhv orderCommentBhv; + private transient OrderNotificationBhv orderNotificationBhv; + private OrderFormDxo orderFormDxo; + private LanguageService languageService; + + private ProductDxo productDxo; + + public void sendOrderNotifications(BigDecimal orderFormId, + BigDecimal[] orderNotificationIds) throws CommonException { + if (orderFormId == null) { + throw new CommonException("orderFormId.is.null.in.notification"); + } + OrderForm orderForm = getOrderForm(orderFormId); + if (orderForm == null) { + throw new CommonException( + "could.not.find.orderformid.in.notification"); + } + List errors = new ArrayList(); + for (BigDecimal orderNotificationId : orderNotificationIds) { + OrderNotification orderNotification = getOrderNotification(orderNotificationId); + if (orderNotification != null) { + String to = orderNotification.getEmailAddress(); + if (to == null || "".equals(to)) { + to = orderForm.getCustomerEmailAddress(); + } + try { + sendOrderNotification(orderForm, to, SystemUtil + .getAdministratorEmail(), orderNotification + .getTemplateName()); + } catch (Exception e) { + logger.log("EPA0004", new Object[] {}, e); + errors.add(orderNotification.getTemplateName() + "(" + to + + ")"); + } + } + } + if (!errors.isEmpty()) { + String templates = StringUtils.join(errors.toArray(), ", "); + throw new CommonException("failed.to.send.some.order.notification", + new String[] { templates }); + } + } + + private ProductDescription getProdcutDescription(BigDecimal id) { + return getProdcutDescription(id, getLanguageService() + .getCurrentLanguage().getLanguageId()); + } + + private ProductDescription getProdcutDescription(BigDecimal id, + BigDecimal languagesId) { + ProductDescriptionCB cb = new ProductDescriptionCB(); + cb.setupSelect_Product(); + + cb.query().setLanguageId_Equal(languagesId); + cb.query().setProductId_Equal(id); + return productDescriptionBhv.selectEntity(cb); + } + + private void sendOrderNotification(OrderForm orderForm, String to, + String from, String templateName) throws CommonException { + try { + Order order = getOrderFormDxo().convert(orderForm); + List orderProductList = getOrderProductListByOrderFormId(orderForm + .getOrderFormId()); + for (OrderProduct orderProduct : orderProductList) { + //TODO i18n: pass language id + ProductDescription productDescription = getProdcutDescription(orderProduct + .getProductId()); + jp.sf.pal.pompei.entity.notification.order.Product product = new jp.sf.pal.pompei.entity.notification.order.Product(); + getProductDxo().convert(productDescription, product); + getProductDxo().convert(productDescription.getProduct(), + product); + getProductDxo().convert(orderProduct, product); + order.addProduct(product); + } + + // set velocity context + VelocityContext context = new VelocityContext(); + context.put("order", order); + + VelocityUtil.init(); + StringWriter sw = new StringWriter(); + String templatePath = SystemUtil + .getOrderNotificationTemplatePath(templateName); + // TODO i18n: encoding + Template template = VelocityUtil.getTemplate(templatePath, "UTF-8"); + + template.merge(context, sw); + + String content = sw.toString(); + if (content == null) { + throw new CommonException("notification.content.is.null"); + } + int index = content.indexOf("\n"); + String subject = null; + String body = null; + if (index != -1) { + subject = content.substring(0, index); + body = content.substring(index); + } else { + // TODO should throw exception? + subject = content; + body = content; + } + + Properties props = System.getProperties(); + // set smtp server + props.put("mail.smtp.host", SystemUtil.getSmtpHost()); + Session session = Session.getDefaultInstance(props, null); + MimeMessage mimeMessage = new MimeMessage(session); + mimeMessage.setFrom(new InternetAddress(from)); + mimeMessage.setRecipients(Message.RecipientType.TO, to); + //TODO i18n: encoding + mimeMessage.setSubject(subject, "iso-2022-jp"); + //TODO i18n: encoding + mimeMessage.setText(body, "iso-2022-jp"); + mimeMessage.setHeader("Content-Type", "text/plain"); + mimeMessage.setSentDate(new Date()); + + Transport.send(mimeMessage); + } catch (Exception e) { + throw new CommonException("faild.to.send.order.notification", e); + } + + } + + public OrderNotification getOrderNotification(BigDecimal orderNotificationId) { + OrderNotificationCB cb = new OrderNotificationCB(); + //TODO needed? + cb.setupSelect_OrderStatus(); + cb.query().setOrderNotificationId_Equal(orderNotificationId); + return getOrderNotificationBhv().selectEntity(cb); + } + public void deleteOrderForm(OrderForm orderForm) { BigDecimal orderFormId = orderForm.getOrderFormId(); @@ -323,9 +490,9 @@ AddressBook customerAddressBook, AddressBook deliveryAddressBook, AddressBook billingAddressBook, PaymentMethod paymentMethod, DeliveryMethod deliveryMethod, OrderCardInfo orderCardInfo, - Currency currency, BigDecimal subTotalPrice, - BigDecimal deliveryPrice, BigDecimal tax, BigDecimal totalPrice) - throws CommonException { + Currency currency, BigDecimal subTotalPrice, BigDecimal tax, + BigDecimal deliveryPrice, BigDecimal paymentFee, + BigDecimal totalPrice) throws CommonException { String orderFormNumber = null; if (customer == null || customerBasketIdList == null || customerAddressBook == null || deliveryAddressBook == null @@ -377,8 +544,9 @@ orderForm.setCurrencyCode(currency.getCode()); // price orderForm.setSubTotalPrice(subTotalPrice); + orderForm.setTax(tax); orderForm.setDeliveryPrice(deliveryPrice); - orderForm.setTax(tax); + orderForm.setPaymentFee(paymentFee); orderForm.setTotalPrice(totalPrice); getOrderFormBhv().insert(orderForm); @@ -458,6 +626,22 @@ return getCurrencyBhv().selectEntity(cb); } + public List getOrderNotificationListByOrderFormId( + BigDecimal orderFormId) { + OrderForm of = getOrderForm(orderFormId); + if (of == null) { + return new ArrayList(); + } + + OrderNotificationCB cb = new OrderNotificationCB(); + //TODO needed? + cb.setupSelect_OrderStatus(); + cb.query().queryOrderStatus().setOrderStatusId_Equal( + of.getOrderStatusId()); + + return getOrderNotificationBhv().selectList(cb); + } + public OrderFormBhv getOrderFormBhv() { return orderFormBhv; } @@ -638,4 +822,62 @@ this.orderStatusBhv = orderStatusBhv; } + /** + * @return the orderNotificationBhv + */ + public OrderNotificationBhv getOrderNotificationBhv() { + return orderNotificationBhv; + } + + /** + * @param orderNotificationBhv the orderNotificationBhv to set + */ + public void setOrderNotificationBhv( + OrderNotificationBhv orderNotificationBhv) { + this.orderNotificationBhv = orderNotificationBhv; + } + + /** + * @return the productDescriptionBhv + */ + public ProductDescriptionBhv getProductDescriptionBhv() { + return productDescriptionBhv; + } + + /** + * @param productDescriptionBhv the productDescriptionBhv to set + */ + public void setProductDescriptionBhv( + ProductDescriptionBhv productDescriptionBhv) { + this.productDescriptionBhv = productDescriptionBhv; + } + + /** + * @return the languageService + */ + public LanguageService getLanguageService() { + return languageService; + } + + /** + * @param languageService the languageService to set + */ + public void setLanguageService(LanguageService languageService) { + this.languageService = languageService; + } + + /** + * @return the productDxo + */ + public ProductDxo getProductDxo() { + return productDxo; + } + + /** + * @param productDxo the productDxo to set + */ + public void setProductDxo(ProductDxo productDxo) { + this.productDxo = productDxo; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-13 22:48:08 UTC (rev 628) @@ -10,6 +10,7 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; +import org.apache.commons.lang.StringUtils; import org.apache.jetspeed.administration.PortalAdministration; import org.apache.jetspeed.page.PageManager; import org.apache.jetspeed.security.UserManager; @@ -30,10 +31,38 @@ .getRequestMap().get(name); } + public static String getAdministratorEmail() { + String url = getPortletConfig().getInitParameter( + PompeiConstants.ADMINISTRATOR_EMAIL); + if (url == null) { + return PompeiConstants.DEFAULT_ADMINISTRATOR_EMAIL; + } + return url; + } + + public static String getSmtpHost() { + String url = getPortletConfig().getInitParameter( + PompeiConstants.SMTP_HOST); + if (url == null) { + return PompeiConstants.DEFAULT_SMTP_HOST; + } + return url; + } + public static String getContextRealPath(String path) { return getPortletConfig().getPortletContext().getRealPath(path); } + public static String getOrderNotificationTemplatePath(String templateName) { + String path = getPortletConfig().getInitParameter( + PompeiConstants.ORDER_NOTIFICATION_PATH); + if (path == null) { + path = PompeiConstants.DEFAULT_ORDER_NOTIFICATION_PATH; + } + // TODO i18n locale fallback + return path + templateName; + } + public static String getMessageDigest(String str) throws CommonException { if (str == null) { str = ""; Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,233 @@ +package jp.sf.pal.pompei.util; + +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.util.Properties; + +import jp.sf.pal.pompei.PompeiConstants; + +import org.apache.commons.collections.ExtendedProperties; +import org.apache.velocity.Template; +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.context.Context; +import org.apache.velocity.exception.MethodInvocationException; +import org.apache.velocity.exception.ParseErrorException; +import org.apache.velocity.exception.ResourceNotFoundException; +import org.apache.velocity.runtime.log.Log; + +public class VelocityUtil { + private static VelocityEngine velocityEngine; + + public static void init() throws Exception { + if (velocityEngine == null) { + velocityEngine = new VelocityEngine(); + + Properties props = new Properties(); + props.setProperty("resource.loader", "FILE"); + props + .setProperty("FILE.resource.loader.class", + "org.apache.velocity.runtime.resource.loader.FileResourceLoader"); + props.setProperty("FILE.resource.loader.cache", "true"); + props.setProperty("FILE.resource.loader.modificationCheckInterval", + "60"); + //TODO move to config file? + props.setProperty("FILE.resource.loader.path", SystemUtil + .getContextRealPath(PompeiConstants.DEFAULT_TEMPLATE_PATH)); + velocityEngine.init(props); + } + } + + /** + * @param key + * @param value + * @see org.apache.velocity.app.VelocityEngine#addProperty(java.lang.String, java.lang.Object) + */ + public static void addProperty(String key, Object value) { + velocityEngine.addProperty(key, value); + } + + /** + * @param key + * @see org.apache.velocity.app.VelocityEngine#clearProperty(java.lang.String) + */ + public static void clearProperty(String key) { + velocityEngine.clearProperty(key); + } + + /** + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + * @return + * @throws ParseErrorException + * @throws MethodInvocationException + * @throws ResourceNotFoundException + * @throws IOException + * @see org.apache.velocity.app.VelocityEngine#evaluate(org.apache.velocity.context.Context, java.io.Writer, java.lang.String, java.io.Reader) + */ + public static boolean evaluate(Context arg0, Writer arg1, String arg2, + Reader arg3) throws ParseErrorException, MethodInvocationException, + ResourceNotFoundException, IOException { + return velocityEngine.evaluate(arg0, arg1, arg2, arg3); + } + + /** + * @param context + * @param out + * @param logTag + * @param instring + * @return + * @throws ParseErrorException + * @throws MethodInvocationException + * @throws ResourceNotFoundException + * @throws IOException + * @see org.apache.velocity.app.VelocityEngine#evaluate(org.apache.velocity.context.Context, java.io.Writer, java.lang.String, java.lang.String) + */ + public static boolean evaluate(Context context, Writer out, String logTag, + String instring) throws ParseErrorException, + MethodInvocationException, ResourceNotFoundException, IOException { + return velocityEngine.evaluate(context, out, logTag, instring); + } + + /** + * @param key + * @return + * @see org.apache.velocity.app.VelocityEngine#getApplicationAttribute(java.lang.Object) + */ + public static Object getApplicationAttribute(Object key) { + return velocityEngine.getApplicationAttribute(key); + } + + /** + * @return + * @see org.apache.velocity.app.VelocityEngine#getLog() + */ + public static Log getLog() { + return velocityEngine.getLog(); + } + + /** + * @param key + * @return + * @see org.apache.velocity.app.VelocityEngine#getProperty(java.lang.String) + */ + public static Object getProperty(String key) { + return velocityEngine.getProperty(key); + } + + /** + * @param name + * @param encoding + * @return + * @throws ResourceNotFoundException + * @throws ParseErrorException + * @throws Exception + * @see org.apache.velocity.app.VelocityEngine#getTemplate(java.lang.String, java.lang.String) + */ + public static Template getTemplate(String name, String encoding) + throws ResourceNotFoundException, ParseErrorException, Exception { + return velocityEngine.getTemplate(name, encoding); + } + + /** + * @param name + * @return + * @throws ResourceNotFoundException + * @throws ParseErrorException + * @throws Exception + * @see org.apache.velocity.app.VelocityEngine#getTemplate(java.lang.String) + */ + public static Template getTemplate(String name) + throws ResourceNotFoundException, ParseErrorException, Exception { + return velocityEngine.getTemplate(name); + } + + /** + * @param arg0 + * @param arg1 + * @param arg2 + * @param arg3 + * @param arg4 + * @return + * @throws Exception + * @see org.apache.velocity.app.VelocityEngine#invokeVelocimacro(java.lang.String, java.lang.String, java.lang.String[], org.apache.velocity.context.Context, java.io.Writer) + */ + public static boolean invokeVelocimacro(String arg0, String arg1, + String[] arg2, Context arg3, Writer arg4) throws Exception { + return velocityEngine.invokeVelocimacro(arg0, arg1, arg2, arg3, arg4); + } + + /** + * @param templateName + * @param context + * @param writer + * @return + * @throws ResourceNotFoundException + * @throws ParseErrorException + * @throws MethodInvocationException + * @throws Exception + * @see org.apache.velocity.app.VelocityEngine#mergeTemplate(java.lang.String, org.apache.velocity.context.Context, java.io.Writer) + */ + public static boolean mergeTemplate(String templateName, Context context, + Writer writer) throws ResourceNotFoundException, + ParseErrorException, MethodInvocationException, Exception { + return velocityEngine.mergeTemplate(templateName, context, writer); + } + + /** + * @param templateName + * @param encoding + * @param context + * @param writer + * @return + * @throws ResourceNotFoundException + * @throws ParseErrorException + * @throws MethodInvocationException + * @throws Exception + * @see org.apache.velocity.app.VelocityEngine#mergeTemplate(java.lang.String, java.lang.String, org.apache.velocity.context.Context, java.io.Writer) + */ + public static boolean mergeTemplate(String templateName, String encoding, + Context context, Writer writer) throws ResourceNotFoundException, + ParseErrorException, MethodInvocationException, Exception { + return velocityEngine.mergeTemplate(templateName, encoding, context, + writer); + } + + /** + * @param resourceName + * @return + * @see org.apache.velocity.app.VelocityEngine#resourceExists(java.lang.String) + */ + public static boolean resourceExists(String resourceName) { + return velocityEngine.resourceExists(resourceName); + } + + /** + * @param key + * @param value + * @see org.apache.velocity.app.VelocityEngine#setApplicationAttribute(java.lang.Object, java.lang.Object) + */ + public static void setApplicationAttribute(Object key, Object value) { + velocityEngine.setApplicationAttribute(key, value); + } + + /** + * @param configuration + * @see org.apache.velocity.app.VelocityEngine#setExtendedProperties(org.apache.commons.collections.ExtendedProperties) + */ + public static void setExtendedProperties(ExtendedProperties configuration) { + velocityEngine.setExtendedProperties(configuration); + } + + /** + * @param key + * @param value + * @see org.apache.velocity.app.VelocityEngine#setProperty(java.lang.String, java.lang.Object) + */ + public static void setProperty(String key, Object value) { + velocityEngine.setProperty(key, value); + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2007-10-13 22:48:08 UTC (rev 628) @@ -120,6 +120,8 @@ private String deliveryTelephone; + private String deliveryNumber; + @DateTimeConverter(pattern = "yyyy/MM/dd") private Date finishedDate; @@ -138,6 +140,8 @@ private BigDecimal paymentMethodId; + private BigDecimal paymentFee; + @DateTimeConverter(pattern = "yyyy/MM/dd") private Date purchasedDate; @@ -862,4 +866,32 @@ this.deliveryLastnameDescription = deliveryLastnameDescription; } + /** + * @return the deliveryNumber + */ + public String getDeliveryNumber() { + return deliveryNumber; + } + + /** + * @param deliveryNumber the deliveryNumber to set + */ + public void setDeliveryNumber(String deliveryNumber) { + this.deliveryNumber = deliveryNumber; + } + + /** + * @return the paymentFee + */ + public BigDecimal getPaymentFee() { + return paymentFee; + } + + /** + * @param paymentFee the paymentFee to set + */ + public void setPaymentFee(BigDecimal paymentFee) { + this.paymentFee = paymentFee; + } + } \ No newline at end of file Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2007-10-13 22:48:08 UTC (rev 628) @@ -8,10 +8,14 @@ import jp.sf.pal.pompei.dxo.OrderFormDxo; import jp.sf.pal.pompei.exentity.OrderCardInfo; import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderNotification; import jp.sf.pal.pompei.exentity.OrderStatusDescription; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.service.OrderService; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; + public class OrderConfirmAction implements Serializable { /** @@ -81,7 +85,8 @@ } } - public Class doFinish() { + @TakeOver(type = TakeOverType.INCLUDE, properties = "orderFormId") + public Class doUpdate() { if (isUpdate()) { // order form OrderForm orderForm = getOrderService().getOrderForm( @@ -111,7 +116,16 @@ FacesMessageUtil .addInfoMessage("updated.order.info.in.orderconfirm"); - return OrderListPage.class; + + List orderNotificationList = getOrderService() + .getOrderNotificationListByOrderFormId( + getOrderConfirmPage().getOrderFormId()); + if (orderNotificationList != null + && !orderNotificationList.isEmpty()) { + return OrderNotificationSelectPage.class; + } else { + return OrderListPage.class; + } } else if (isDelete()) { // order form OrderForm orderForm = getOrderService().getOrderForm( Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,122 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderNotification; +import jp.sf.pal.pompei.service.OrderService; + +public class OrderNotificationSelectAction implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -8099143241154630299L; + + /** + * + */ + private OrderNotificationSelectPage orderNotificationSelectPage; + + private OrderService orderService; + + public Class initialize() { + return null; + } + + public Class prerender() { + if (getOrderNotificationSelectPage().getOrderFormId() == null) { + FacesMessageUtil.addErrorMessage("orderformid.is.null"); + return OrderListPage.class; + } + OrderForm orderForm = getOrderService().getOrderForm( + getOrderNotificationSelectPage().getOrderFormId()); + if (orderForm == null) { + FacesMessageUtil.addErrorMessage("could.not.find.orderformid"); + return OrderListPage.class; + } + + List orderNotificationList = getOrderService() + .getOrderNotificationListByOrderFormId( + orderForm.getOrderFormId()); + List> orderNotificationIdsItems = new ArrayList>(); + for (OrderNotification orderNotification : orderNotificationList) { + Map map = new HashMap(); + StringBuilder sb = new StringBuilder(); + //TODO alignment? + sb.append(orderNotification.getTemplateName()).append(" ("); + if (orderNotification.getEmailAddress() != null) { + sb.append(orderNotification.getEmailAddress()); + } else { + sb.append(getOrderNotificationSelectPage().getLabelHelper() + .getLabelValue("to_customer")); + } + sb.append(")"); + map.put(PompeiConstants.LABEL, sb.toString()); + map.put(PompeiConstants.VALUE, orderNotification + .getOrderNotificationId().toString()); + orderNotificationIdsItems.add(map); + } + getOrderNotificationSelectPage().setOrderNotificationIdsItems( + orderNotificationIdsItems); + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + public Class doSend() { + try { + getOrderService().sendOrderNotifications( + getOrderNotificationSelectPage().getOrderFormId(), + getOrderNotificationSelectPage().getOrderNotificationIds()); + FacesMessageUtil.addInfoMessage("sent.order.notifications"); + //TODO test + // return OrderListPage.class; + } catch (CommonException e) { + if (e.getArgs() != null) { + FacesMessageUtil.addErrorMessage(e.getMessageId(), e.getArgs()); + } else { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + } + } + return null; + } + + /** + * @return the orderNotificationSelectPage + */ + public OrderNotificationSelectPage getOrderNotificationSelectPage() { + return orderNotificationSelectPage; + } + + /** + * @param orderNotificationSelectPage the orderNotificationSelectPage to set + */ + public void setOrderNotificationSelectPage( + OrderNotificationSelectPage orderNotificationSelectPage) { + this.orderNotificationSelectPage = orderNotificationSelectPage; + } + + /** + * @return the orderService + */ + public OrderService getOrderService() { + return orderService; + } + + /** + * @param orderService the orderService to set + */ + public void setOrderService(OrderService orderService) { + this.orderService = orderService; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,70 @@ +package jp.sf.pal.pompei.web.admin.order; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import org.seasar.teeda.extension.util.LabelHelper; + +public class OrderNotificationSelectPage implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1490863696155845975L; + + private LabelHelper labelHelper; + + private BigDecimal orderFormId; + + private BigDecimal[] orderNotificationIds; + + private List> orderNotificationIdsItems; + + public BigDecimal getOrderFormId() { + return orderFormId; + } + + public void setOrderFormId(BigDecimal orderFormId) { + this.orderFormId = orderFormId; + } + + public List> getOrderNotificationIdsItems() { + return orderNotificationIdsItems; + } + + public void setOrderNotificationIdsItems( + List> orderNotificationIdsItems) { + this.orderNotificationIdsItems = orderNotificationIdsItems; + } + + /** + * @return the orderNotificationIds + */ + public BigDecimal[] getOrderNotificationIds() { + return orderNotificationIds; + } + + /** + * @param orderNotificationIds the orderNotificationIds to set + */ + public void setOrderNotificationIds(BigDecimal[] orderNotificationIds) { + this.orderNotificationIds = orderNotificationIds; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java ___________________________________________________________________ Name: svn:eol-style + native 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2007-10-13 22:48:08 UTC (rev 628) @@ -195,6 +195,13 @@ } getCheckoutConfirmPage().setPaymentMethodName(pmd.getName()); + // payment fee + BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE; + if (pmd.getPaymentMethod().getFee() != null) { + paymentFee = pmd.getPaymentMethod().getFee(); + } + getCheckoutConfirmPage().setPaymentFee(paymentFee); + // deliveryMethod BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap .get(PompeiConstants.DELIVERY_METHOD_ID); @@ -237,7 +244,7 @@ // total getCheckoutConfirmPage().setTotalPrice( - subTotalPrice.add(tax).add(deliveryPrice)); + subTotalPrice.add(tax).add(deliveryPrice).add(paymentFee)); // render FacesMessages FacesMessageUtil.renderMessages(); @@ -322,8 +329,9 @@ pmd.getPaymentMethod(), dmd.getDeliveryMethod(), orderCardInfo, currency, getCheckoutConfirmPage().getSubTotalPrice(), + getCheckoutConfirmPage().getTax(), getCheckoutConfirmPage().getDeliveryPrice(), - getCheckoutConfirmPage().getTax(), + getCheckoutConfirmPage().getPaymentFee(), getCheckoutConfirmPage().getTotalPrice()); getCheckoutConfirmPage().setOrderFormNumber(orderFormNumber); } catch (CommonException e) { 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-10-13 22:48:08 UTC (rev 628) @@ -25,6 +25,10 @@ @BigDecimalConverter(pattern = "###,###") private BigDecimal deliveryPrice; + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + private BigDecimal paymentFee; + private String cellphone; private String city; @@ -323,4 +327,18 @@ public void setDepartment(String department) { this.department = department; } + + /** + * @return the paymentFee + */ + public BigDecimal getPaymentFee() { + return paymentFee; + } + + /** + * @param paymentFee the paymentFee to set + */ + public void setPaymentFee(BigDecimal paymentFee) { + this.paymentFee = paymentFee; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-10-13 22:48:08 UTC (rev 628) @@ -128,13 +128,13 @@ } } catch (UnsupportedEncodingException e) { FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); - logger.log("EPA0004", new Object[] { this.toString() }, e); + logger.log("EPC0001", new Object[] { this.toString() }, e); } catch (FileNotFoundException e) { FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); - logger.log("EPA0004", new Object[] { this.toString() }, e); + logger.log("EPC0002", new Object[] { this.toString() }, e); } catch (IOException e) { FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); - logger.log("EPA0004", new Object[] { this.toString() }, e); + logger.log("EPC0003", new Object[] { this.toString() }, e); } finally { if (reader != null) { try { Added: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,4 @@ +EPA0001=Could not read a term of service. +EPA0002=Could not read a term of service. +EPA0003=Could not read a term of service. +EPA0004=Could not send order notification. Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-13 22:48:08 UTC (rev 628) @@ -144,3 +144,13 @@ could.not.create.user.by.system.error=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.insert.customer.data=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +# OrderNotificationSelect.java +orderformid.is.null=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587ID\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.orderformid=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +orderFormId.is.null.in.notification=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587ID\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.orderformid.in.notification=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +notification.content.is.null=\u6ce8\u6587\u901a\u77e5\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +faild.to.send.order.notification=\u6ce8\u6587\u901a\u77e5\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.send.some.order.notification=\u6b21\u306e\u6ce8\u6587\u901a\u77e5\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} +sent.order.notifications=\u6ce8\u6587\u901a\u77e5\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002 + Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 2007-10-13 22:48:08 UTC (rev 628) @@ -5,3 +5,6 @@ M=\u7537\u6027 F=\u5973\u6027 state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c, + +none=\u306a\u3057 +to_customer=\u9867\u5ba2\u5b9b \ No newline at end of file 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-13 22:48:08 UTC (rev 628) @@ -95,6 +95,7 @@ CREATE TABLE PAYMENT_METHOD ( PAYMENT_METHOD_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1) , CODE VARCHAR(16) NOT NULL + , FEE DECIMAL(14, 6) NOT NULL , SORT_ORDER INTEGER NOT NULL , DATE_ADDED TIMESTAMP NOT NULL , LAST_MODIFIED TIMESTAMP NOT NULL @@ -182,15 +183,17 @@ , ORDER_CARD_INFO_ID BIGINT , DELIVERY_METHOD_ID INTEGER , DELIVERY_METHOD_CODE VARCHAR(16) NOT NULL + , DELIVERY_NUMBER VARCHAR(32) , LAST_MODIFIED TIMESTAMP NOT NULL , ORDER_STATUS_ID INTEGER NOT NULL , PURCHASED_DATE TIMESTAMP NOT NULL , FINISHED_DATE TIMESTAMP , CURRENCY_ID INTEGER , CURRENCY_CODE CHAR(3) NOT NULL - , DELIVERY_PRICE DECIMAL(14, 6) , SUB_TOTAL_PRICE DECIMAL(14, 6) , TAX DECIMAL(14, 6) + , DELIVERY_PRICE DECIMAL(14, 6) + , PAYMENT_FEE DECIMAL(14, 6) , TOTAL_PRICE DECIMAL(14, 6) NOT NULL , PRIMARY KEY (ORDER_FORM_ID) ); Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-10-13 22:48:08 UTC (rev 628) @@ -20,6 +20,11 @@ INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 5, 1, '出荷完了',''); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 6, 1, '保留',''); +INSERT INTO ORDER_NOTIFICATION VALUES ( 1, 1, null, 'new-order-to-customer.vm',1); +INSERT INTO ORDER_NOTIFICATION VALUES ( 2, 5, null, 'completed-order-to-customer.vm',1); +--INSERT INTO ORDER_NOTIFICATION VALUES ( 3, 1, '', 'new-order-to-admin.vm',1); +--INSERT INTO ORDER_NOTIFICATION VALUES ( 4, 1, '', 'completed-order-to-admin.vm',1); + INSERT INTO ZONE VALUES (130,107,'JP','Japan'); INSERT INTO TAX_CLASS VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,47 @@ +【Pompei】ご注文商品発送のお知らせ (管理用) +${order.customerLastname} ${order.customerFirstname} 様 + +#if(${order.paymentMethodCode} == 'BANK')ご入金いただきましてありがとうございました。#end +Pompei 商品をご注文いただき、誠にありがとうございました。 + +ご注文商品を発送させていただきましたのでご連絡させていただきます。 +商品到着まで、もうしばらくお待ち下さい。 + +【ご注文内容】 +--------------------------------------------------------------- +・ご注文番号 ${order.orderFormNumber} +・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様 +・ご注文日 ${order.formatDate(${order.purchasedDate})} + +・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様 +・商品のお届け先 + 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity} + ${order.deliveryStreetAddress} + + +【発送させていただいた商品】 +--------------------------------------------------------------- +#foreach($product in ${order.products}) +商品名 ${product.name} +数量 ${product.quantity} 個 + +#end + +【配送について】  +---------------------------------------------------------------   +商品は「Pompei急便」が配送させていただきます。 +商品の配送状況は、Pompei急便のホームページでご確認いただけます。 + +お問い合わせNo. ${order.deliveryNumber} +http://pal.sourceforge.jp/ + + +今後とも Pompei をご利用いただけますようお願い申し上げます。 +本日はご注文いただきありがとうございました。 + +このメールの内容についてのお問い合わせは、 +下記の連絡先までお願いします。 + +-- +Pompei Project +http://pal.sourceforge.jp/ Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,47 @@ +【Pompei】ご注文商品発送のお知らせ +${order.customerLastname} ${order.customerFirstname} 様 + +#if(${order.paymentMethodCode} == 'BANK')ご入金いただきましてありがとうございました。#end +Pompei 商品をご注文いただき、誠にありがとうございました。 + +ご注文商品を発送させていただきましたのでご連絡させていただきます。 +商品到着まで、もうしばらくお待ち下さい。 + +【ご注文内容】 +--------------------------------------------------------------- +・ご注文番号 ${order.orderFormNumber} +・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様 +・ご注文日 ${order.formatDate(${order.purchasedDate})} + +・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様 +・商品のお届け先 + 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity} + ${order.deliveryStreetAddress} + + +【発送させていただいた商品】 +--------------------------------------------------------------- +#foreach($product in ${order.products}) +商品名 ${product.name} +数量 ${product.quantity} 個 + +#end + +【配送について】  +---------------------------------------------------------------   +商品は「Pompei急便」が配送させていただきます。 +商品の配送状況は、Pompei急便のホームページでご確認いただけます。 + +お問い合わせNo. ${order.deliveryNumber} +http://pal.sourceforge.jp/ + + +今後とも Pompei をご利用いただけますようお願い申し上げます。 +本日はご注文いただきありがとうございました。 + +このメールの内容についてのお問い合わせは、 +下記の連絡先までお願いします。 + +-- +Pompei Project +http://pal.sourceforge.jp/ Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,73 @@ +【Pompei】ご注文確認メール (管理用) +${order.customerLastname} ${order.customerFirstname} 様 + +Pompei 商品をご注文いただき、誠にありがとうございます。 + +下記の内容でご注文を承りました。 +ご注文内容をご確認ください。 + +【ご注文内容】 +--------------------------------------------------------------- +・ご注文番号 ${order.orderFormNumber} +・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様 +・ご注文日 ${order.formatDate(${order.purchasedDate})} + +・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様 +・商品のお届け先 + 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity} + ${order.deliveryStreetAddress} + + +#if(${order.paymentMethodCode} == 'BANK') +【お支払い方法】 銀行振込み +--------------------------------------------------------------- +下記口座までお振込み下さい。入金確認後、商品を発送させていただきます。 +なお、恐れ入りますが振込み手数料はお客様負担とさせていただきます。 + +ポンペイ銀行 本店事業部 普通 1234567 +#end +#if(${order.paymentMethodCode} == 'COD') +【お支払い方法】  代引き +--------------------------------------------------------------- +代金は、商品と引き換えに運送会社の担当者にお支払い下さい。 +#end + + +【ご注文商品】 +--------------------------------------------------------------- +#foreach($product in ${order.products}) +商品名 ${product.name} +数量 ${product.quantity} 個 +価格 ${order.formatPrice(${product.finalPrice})} 円 + +#end + +【ご注文金額】 合計お支払い金額 +--------------------------------------------------------------- +・商品の合計金額 ${order.formatPrice(${order.subTotalPrice})} 円 +・消費税 ${order.formatPrice(${order.tax})} 円 +・配送料 ${order.formatPrice(${order.deliveryPrice})} 円 +#if(${order.paymentMethodCode} == 'COD')・代引手数料 ${order.formatPrice(${order.paymentFee})} 円 +#end・ご注文金額合計 ${order.formatPrice(${order.totalPrice})} 円 + + +ご注文いただいた商品は、取次ぎ会社、または、製造元における +在庫切れのため、お届けできない場合がございます。 +在庫切れとなりました場合は、やむを得ず、在庫切れとなった商品を +キャンセルとさせていただきます。 +出荷及び在庫切れのご連絡につきましては、改めてメールにて +ご案内させていただきます。 + +また、ご注文のみでは、契約が確定したわけではございません。 +出荷が確定した時点で、契約完了となります。 +恐れ入りますが、あわせてご了承くださいますようお願い申し上げます。 + +今後とも Pompei をご利用いただけますようお願い申し上げます。 +本日はご注文いただきありがとうございました。 + +このメールの内容についてのお問い合わせは、 +下記の連絡先までお願いします。 + +-- +Pompei Project +http://pal.sourceforge.jp/ Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,73 @@ +【Pompei】ご注文確認メール +${order.customerLastname} ${order.customerFirstname} 様 + +Pompei 商品をご注文いただき、誠にありがとうございます。 + +下記の内容でご注文を承りました。 +ご注文内容をご確認ください。 + +【ご注文内容】 +--------------------------------------------------------------- +・ご注文番号 ${order.orderFormNumber} +・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様 +・ご注文日 ${order.formatDate(${order.purchasedDate})} + +・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様 +・商品のお届け先 + 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity} + ${order.deliveryStreetAddress} + + +#if(${order.paymentMethodCode} == 'BANK') +【お支払い方法】 銀行振込み +--------------------------------------------------------------- +下記口座までお振込み下さい。入金確認後、商品を発送させていただきます。 +なお、恐れ入りますが振込み手数料はお客様負担とさせていただきます。 + +ポンペイ銀行 本店事業部 普通 1234567 +#end +#if(${order.paymentMethodCode} == 'COD') +【お支払い方法】  代引き +--------------------------------------------------------------- +代金は、商品と引き換えに運送会社の担当者にお支払い下さい。 +#end + + +【ご注文商品】 +--------------------------------------------------------------- +#foreach($product in ${order.products}) +商品名 ${product.name} +数量 ${product.quantity} 個 +価格 ${order.formatPrice(${product.finalPrice})} 円 + +#end + +【ご注文金額】 合計お支払い金額 +--------------------------------------------------------------- +・商品の合計金額 ${order.formatPrice(${order.subTotalPrice})} 円 +・消費税 ${order.formatPrice(${order.tax})} 円 +・配送料 ${order.formatPrice(${order.deliveryPrice})} 円 +#if(${order.paymentMethodCode} == 'COD')・代引手数料 ${order.formatPrice(${order.paymentFee})} 円 +#end・ご注文金額合計 ${order.formatPrice(${order.totalPrice})} 円 + + +ご注文いただいた商品は、取次ぎ会社、または、製造元における +在庫切れのため、お届けできない場合がございます。 +在庫切れとなりました場合は、やむを得ず、在庫切れとなった商品を +キャンセルとさせていただきます。 +出荷及び在庫切れのご連絡につきましては、改めてメールにて +ご案内させていただきます。 + +また、ご注文のみでは、契約が確定したわけではございません。 +出荷が確定した時点で、契約完了となります。 +恐れ入りますが、あわせてご了承くださいますようお願い申し上げます。 + +今後とも Pompei をご利用いただけますようお願い申し上げます。 +本日はご注文いただきありがとうございました。 + +このメールの内容についてのお問い合わせは、 +下記の連絡先までお願いします。 + +-- +Pompei Project +http://pal.sourceforge.jp/ Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-13 22:48:08 UTC (rev 628) @@ -57,9 +57,9 @@
    - + @@ -75,6 +75,18 @@ + + + + + + + + - + @@ -77,6 +77,18 @@ + + + + + + + + Added: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html 2007-10-13 22:48:08 UTC (rev 628) @@ -0,0 +1,44 @@ + + + + + + 注文通知選択 + + + + +
    +
    +
    +
    + +
    +
    +
    1. 送信する通知を選択してください
    +
    配送料金:配送お問い合わせ番号: - abc + abc
    配送料金: + abc +
    代引き手数料: + abc +
    合計: abc  @@ -475,7 +487,7 @@

    - +
    Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-13 22:48:08 UTC (rev 628) @@ -59,9 +59,9 @@
    配送料金:配送お問い合わせ番号: - +
    配送料金: + +
    代引手数料: + +
    合計: Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-13 22:48:08 UTC (rev 628) @@ -247,6 +247,7 @@ 2000/01/01 + 通知 編集 削除
    + + + + + +
      + + + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html ___________________________________________________________________ Name: svn:eol-style + native 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-10-13 22:41:36 UTC (rev 627) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-13 22:48:08 UTC (rev 628) @@ -86,6 +86,13 @@ + 消費税 + + 50 + + + + 送料 1000 @@ -93,10 +100,10 @@ - 消費税 + 代引手数料 - 50 - + 1000 + From svnnotify @ sourceforge.jp Sun Oct 14 22:13:01 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 14 Oct 2007 22:13:01 +0900 Subject: [pal-cvs 2885] [629] replaced email notification feature. Message-ID: <1192367581.088467.21858.nullmailer@users.sourceforge.jp> Revision: 629 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=629 Author: shinsuke Date: 2007-10-14 22:13:00 +0900 (Sun, 14 Oct 2007) Log Message: ----------- replaced email notification feature. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.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/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/signup/ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/signup/user-signup.vm Removed Paths: ------------- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-14 13:13:00 UTC (rev 629) @@ -238,8 +238,6 @@ public static final String USER_SECRET_ANSWER = "user.secret.answer"; - public static final String EMAIL_SUBJECT_USER_REGISTRATION = "email.subject.registration"; - public static final String ADMINISTRATOR_EMAIL = "administratorEmail"; public static final String DEFAULT_ADMINISTRATOR_EMAIL = "root @ pal.sourceforge.jp"; @@ -248,6 +246,10 @@ public static final String DEFAULT_ORDER_NOTIFICATION_PATH = "/notification/order/"; + public static final String SIGNUP_NOTIFICATION_PATH = "signupNotificationPath"; + + public static final String DEFAULT_SIGNUP_NOTIFICATION_PATH = "/notification/signup/"; + public static final String DEFAULT_TEMPLATE_PATH = "/WEB-INF/template/"; public static final String SMTP_HOST = "smtpHost"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/filter/UserRegistrationFilter.java 2007-10-14 13:13:00 UTC (rev 629) @@ -100,37 +100,6 @@ // user params userRegistrationParams = new HashMap(); - String templateLocation = portletConfig - .getInitParameter(PompeiConstants.EMAIL_TEMPLATE_LOCATION); - if (templateLocation == null) { - templateLocation = PompeiConstants.DEFAULT_TEMPLATE_LOCATION; - } - templateLocation = portletContext.getRealPath(templateLocation); - userRegistrationParams.put(PompeiConstants.EMAIL_TEMPLATE_LOCATION, - templateLocation); - - String templateName = portletConfig - .getInitParameter(PompeiConstants.EMAIL_TEMPLATE_NAME); - if (templateName == null) { - templateName = PompeiConstants.DEFAULT_TEMPLATE_NAME; - } - userRegistrationParams.put(PompeiConstants.EMAIL_TEMPLATE_NAME, - templateName); - - ArrayList roots = new ArrayList(1); - roots.add(templateLocation); - - try { - JetspeedTemplateLocator templateLocator = new JetspeedTemplateLocator( - roots, "email", portletContext.getRealPath("/")); - templateLocator.start(); - userRegistrationParams.put(PompeiConstants.TEMPLATE_LOCATOR, - templateLocator); - } catch (FileNotFoundException e) { - throw new PortletException("Could not start the template locator.", - e); - } - // roles List roles = getInitParameterList(portletConfig, PompeiConstants.ROLES); 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-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2007-10-14 13:13:00 UTC (rev 629) @@ -1,14 +1,21 @@ package jp.sf.pal.pompei.service.impl; +import java.io.StringWriter; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Properties; import java.util.StringTokenizer; import javax.faces.context.FacesContext; -import javax.portlet.PortletConfig; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; @@ -30,6 +37,7 @@ import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.util.SystemUtil; import jp.sf.pal.pompei.util.UserRegistrationUtil; +import jp.sf.pal.pompei.util.VelocityUtil; import org.apache.jetspeed.JetspeedActions; import org.apache.jetspeed.PortalReservedParameters; @@ -43,6 +51,8 @@ import org.apache.jetspeed.page.PageManager; import org.apache.jetspeed.request.RequestContext; import org.apache.jetspeed.security.User; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; public class CustomerServiceImpl implements CustomerService { @@ -173,8 +183,6 @@ String password = userInfo.remove(PompeiConstants.USER_PASSWORD); String verifyPassword = userInfo .remove(PompeiConstants.USER_VERIFY_PASSWORD); - String emailSubject = userInfo - .remove(PompeiConstants.EMAIL_SUBJECT_USER_REGISTRATION); if (!UserRegistrationUtil .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) { if (password == null || password.equals("")) { @@ -304,25 +312,29 @@ try { // template - String templ = getTemplatePath(FacesContext - .getCurrentInstance()); - - if (templ == null) { - cancelToAddCustomer(userInfo, customer, addressBook); - throw new CommonException( - "error.registration_completed_but_could_not_find_template", - "Email template is not available."); - } - SystemUtil - .getPortalAdministration() - .sendEmail( - (PortletConfig) FacesContext - .getCurrentInstance() - .getExternalContext().getRequestMap() - .get("javax.portlet.PortletConfig"), - userInfo - .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), - emailSubject, templ, userInfo); + // String templ = getTemplatePath(FacesContext + // .getCurrentInstance()); + // + // if (templ == null) { + // cancelToAddCustomer(userInfo, customer, addressBook); + // throw new CommonException( + // "error.registration_completed_but_could_not_find_template", + // "Email template is not available."); + // } + // SystemUtil + // .getPortalAdministration() + // .sendEmail( + // (PortletConfig) FacesContext + // .getCurrentInstance() + // .getExternalContext().getRequestMap() + // .get("javax.portlet.PortletConfig"), + // userInfo + // .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), + // emailSubject, templ, userInfo); + //TODO move user-signup.vm to init-param + sendSignupMail(userInfo, userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), + SystemUtil.getAdministratorEmail(), "user-signup.vm"); } catch (Exception e) { cancelToAddCustomer(userInfo, customer, addressBook); throw new CommonException( @@ -333,6 +345,55 @@ } + private void sendSignupMail(Map userInfo, String to, + String from, String templateName) throws Exception { + // set velocity context + VelocityContext context = new VelocityContext(); + context.put("map", userInfo); + + VelocityUtil.init(); + StringWriter sw = new StringWriter(); + String templatePath = SystemUtil + .getSignupNotificationTemplatePath(templateName); + // TODO i18n: encoding + Template template = VelocityUtil.getTemplate(templatePath, "UTF-8"); + + template.merge(context, sw); + + String content = sw.toString(); + if (content == null) { + throw new CommonException("signup.content.is.null"); + } + int index = content.indexOf("\n"); + String subject = null; + String body = null; + if (index != -1) { + subject = content.substring(0, index); + body = content.substring(index); + } else { + // TODO should throw exception? + subject = content; + body = content; + } + + Properties props = System.getProperties(); + // set smtp server + props.put("mail.smtp.host", SystemUtil.getSmtpHost()); + Session session = Session.getDefaultInstance(props, null); + MimeMessage mimeMessage = new MimeMessage(session); + mimeMessage.setFrom(new InternetAddress(from)); + mimeMessage.setRecipients(Message.RecipientType.TO, to); + //TODO i18n: encoding + mimeMessage.setSubject(subject, "iso-2022-jp"); + //TODO i18n: encoding + mimeMessage.setText(body, "iso-2022-jp"); + mimeMessage.setHeader("Content-Type", "text/plain"); + mimeMessage.setSentDate(new Date()); + + Transport.send(mimeMessage); + + } + protected void cancelToAddCustomer(Map userInfo, Customer customer, AddressBook addressBook) { try { @@ -361,38 +422,6 @@ } } - private String getTemplatePath(FacesContext facesContext) { - JetspeedTemplateLocator templateLocator = UserRegistrationUtil - .getTemplateLocator(); - String templateLocation = UserRegistrationUtil - .getString(PompeiConstants.EMAIL_TEMPLATE_LOCATION); - String templateName = UserRegistrationUtil - .getString(PompeiConstants.EMAIL_TEMPLATE_NAME); - if (templateLocator == null) { - return templateLocation + PATH_SEPARATOR + templateName; - } - - RequestContext requestContext = (RequestContext) facesContext - .getExternalContext().getRequestMap().get( - PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); - Locale locale = facesContext.getViewRoot().getLocale(); - - try { - LocatorDescriptor locator = templateLocator - .createLocatorDescriptor("email"); - locator.setName(templateName); - locator.setMediaType(requestContext.getMediaType()); - locator.setLanguage(locale.getLanguage()); - locator.setCountry(locale.getCountry()); - TemplateDescriptor template = templateLocator - .locateTemplate(locator); - - return template.getAppRelativePath(); - } catch (TemplateLocatorException e) { - return templateLocation + PATH_SEPARATOR + templateName; - } - } - private List parseCSVList(String csv) { List csvList = new ArrayList(); if (csv != null) { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-14 13:13:00 UTC (rev 629) @@ -63,6 +63,16 @@ return path + templateName; } + public static String getSignupNotificationTemplatePath(String templateName) { + String path = getPortletConfig().getInitParameter( + PompeiConstants.SIGNUP_NOTIFICATION_PATH); + if (path == null) { + path = PompeiConstants.DEFAULT_SIGNUP_NOTIFICATION_PATH; + } + // TODO i18n locale fallback + return path + templateName; + } + public static String getMessageDigest(String str) throws CommonException { if (str == null) { str = ""; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-10-14 13:13:00 UTC (rev 629) @@ -146,11 +146,6 @@ userInfo.put("user.bdate", convertNotNull(getSignupConfirmPage() .getDayOfBirth().toString())); - // set email title - userInfo.put(PompeiConstants.EMAIL_SUBJECT_USER_REGISTRATION, - getSignupConfirmPage().getLabelHelper().getLabelValue( - PompeiConstants.EMAIL_SUBJECT_USER_REGISTRATION)); - try { getCustomerService().addCustomer(userInfo, customer, addressBook); } catch (CommonException e) { Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-14 13:13:00 UTC (rev 629) @@ -143,6 +143,7 @@ error.registration_completed_but_could_not_find_template=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.create.user.by.system.error=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.insert.customer.data=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +signup.content.is.null=\u4f1a\u54e1\u767b\u9332\u901a\u77e5\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # OrderNotificationSelect.java orderformid.is.null=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587ID\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 Copied: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/signup/user-signup.vm (from rev 628, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm) =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/signup/user-signup.vm 2007-10-14 13:13:00 UTC (rev 629) @@ -0,0 +1,16 @@ +【Pompei】会員登録確認メール +$!{map.get("user.name.family")} $!{map.get("user.name.given")} 様 + +Pompei ポータルに登録していただきありがとうございます。 + +ユーザー名: $!{map.get("user.name")} +パスワード: $!{map.get("password")} + +パスワードは、ログインして変更できます。 + +以上をよろしくお願いいたします。 + +-- +Pompei ポータル +http://pal.sourceforge.jp/ + Deleted: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm 2007-10-13 22:48:08 UTC (rev 628) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm 2007-10-14 13:13:00 UTC (rev 629) @@ -1,15 +0,0 @@ -こんにちは、$!{map.get("user.name.family")} $!{map.get("user.name.given")} さん - -Pompei ポータルに登録していただきありがとうございます。 - -ユーザー名: $!{map.get("user.name")} -パスワード: $!{map.get("password")} - -パスワードは、ログインして変更できます。 - -以上をよろしくお願いいたします。 - ---- -Pompei ポータル -http://sourceforge.jp/projects/pal/ - From svnnotify @ sourceforge.jp Tue Oct 16 16:54:33 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 16 Oct 2007 16:54:33 +0900 Subject: [pal-cvs 2886] [630] send order notification mail. Message-ID: <1192521273.918514.25880.nullmailer@users.sourceforge.jp> Revision: 630 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=630 Author: shinsuke Date: 2007-10-16 16:54:33 +0900 (Tue, 16 Oct 2007) Log Message: ----------- send order notification mail. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-14 13:13:00 UTC (rev 629) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-16 07:54:33 UTC (rev 630) @@ -74,7 +74,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; import org.seasar.framework.log.Logger; public class OrderServiceImpl implements OrderService { @@ -147,7 +146,7 @@ .getAdministratorEmail(), orderNotification .getTemplateName()); } catch (Exception e) { - logger.log("EPA0004", new Object[] {}, e); + logger.log("EPC0004", new Object[] {}, e); errors.add(orderNotification.getTemplateName() + "(" + to + ")"); } @@ -615,7 +614,36 @@ getCustomerBasketBhv().delete(customerBasket); } - // TODO send mail + // send mail + OrderStatus orderStatus = getOrderStatus(orderForm.getOrderStatusId()); + if (orderStatus != null + && PompeiConstants.NEW_ORDER_STATUS_TYPE.equals(orderStatus + .getType())) { + OrderNotificationCB cb = new OrderNotificationCB(); + cb.setupSelect_OrderStatus(); + cb.query().queryOrderStatus().setOrderStatusId_Equal( + orderStatus.getOrderStatusId()); + List orderNotificationList = getOrderNotificationBhv() + .selectList(cb); + if (orderNotificationList != null + && !orderNotificationList.isEmpty()) { + BigDecimal[] orderNotificationIds = new BigDecimal[orderNotificationList + .size()]; + int count = 0; + for (OrderNotification orderNotification : orderNotificationList) { + orderNotificationIds[count] = orderNotification + .getOrderNotificationId(); + count++; + } + try { + sendOrderNotifications(orderForm.getOrderFormId(), + orderNotificationIds); + } catch (Exception e) { + // TODO should throw it to page? + logger.log("EPC0005", new Object[] {}, e); + } + } + } return orderFormNumber; } Modified: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2007-10-14 13:13:00 UTC (rev 629) +++ pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2007-10-16 07:54:33 UTC (rev 630) @@ -1,4 +1,5 @@ -EPA0001=Could not read a term of service. -EPA0002=Could not read a term of service. -EPA0003=Could not read a term of service. -EPA0004=Could not send order notification. +EPC0001=Could not read a term of service. +EPC0002=Could not read a term of service. +EPC0003=Could not read a term of service. +EPC0004=Could not send order notification. +EPC0005=Could not send order notification when order occurs. \ No newline at end of file From svnnotify @ sourceforge.jp Tue Oct 16 22:49:35 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 16 Oct 2007 22:49:35 +0900 Subject: [pal-cvs 2887] [631] added calculator for payment, and hide creditcard view. Message-ID: <1192542575.296433.2790.nullmailer@users.sourceforge.jp> Revision: 631 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=631 Author: shinsuke Date: 2007-10-16 22:49:34 +0900 (Tue, 16 Oct 2007) Log Message: ----------- added calculator for payment, and hide creditcard view. Modified Paths: -------------- 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/BsPaymentMethodBhv.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.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/resources/appMessages.properties pompei/portlets/pompei-core/trunk/src/main/resources/fee.dicon pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java Removed Paths: ------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/DeliveryMethodCalculator.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml =================================================================== --- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-16 13:49:34 UTC (rev 631) @@ -705,9 +705,11 @@ primaryKey="true" required="true" type="INTEGER"/> - + + Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-16 13:49:34 UTC (rev 631) @@ -3998,7 +3998,7 @@ - + @@ -4020,20 +4020,26 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + + 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-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-16 13:49:34 UTC (rev 631) @@ -255,4 +255,8 @@ public static final String SMTP_HOST = "smtpHost"; public static final String DEFAULT_SMTP_HOST = "localhost"; + + public static final String SUB_TOTAL_PRICE = PREFIX + "SubTotalPrice"; + + public static final String TAX = PREFIX + "Tax"; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java 2007-10-16 13:49:34 UTC (rev 631) @@ -30,7 +30,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -934,7 +934,8 @@ if (names.contains("paymentMethodId")) { destinationMyEntity.setPaymentMethodId(sourceMyEntity.getPaymentMethodId()); } if (names.contains("code")) { destinationMyEntity.setCode(sourceMyEntity.getCode()); } - if (names.contains("fee")) { destinationMyEntity.setFee(sourceMyEntity.getFee()); } + if (names.contains("objectName")) { destinationMyEntity.setObjectName(sourceMyEntity.getObjectName()); } + if (names.contains("status")) { destinationMyEntity.setStatus(sourceMyEntity.getStatus()); } if (names.contains("sortOrder")) { destinationMyEntity.setSortOrder(sourceMyEntity.getSortOrder()); } if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); } if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java 2007-10-16 13:49:34 UTC (rev 631) @@ -11,7 +11,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -51,7 +51,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD"; + public static final String getListAll_SQL = "select PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD"; /** * Get list as all. @@ -61,7 +61,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD where PAYMENT_METHOD.PAYMENT_METHOD_ID = /*paymentMethodId*/null"; + public static final String getEntity_SQL = "select PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD where PAYMENT_METHOD.PAYMENT_METHOD_ID = /*paymentMethodId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "paymentMethodId"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2007-10-16 13:49:34 UTC (rev 631) @@ -14,7 +14,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -63,9 +63,12 @@ /** The value of code. VARCHAR(16) : NotNull */ protected String _code; - /** The value of fee. DECIMAL(14) : NotNull */ - protected java.math.BigDecimal _fee; + /** The value of objectName. VARCHAR(128) : NotNull */ + protected String _objectName; + /** The value of status. INTEGER : NotNull */ + protected java.math.BigDecimal _status; + /** The value of sortOrder. INTEGER : NotNull */ protected java.math.BigDecimal _sortOrder; @@ -188,31 +191,55 @@ this._code = code; } - /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */ - public static final String fee_COLUMN = "FEE"; + /** Column Annotation for S2Dao. VARCHAR(128) : NotNull */ + public static final String objectName_COLUMN = "OBJECT_NAME"; /** - * Get the value of fee.
    - * {DECIMAL(14) : NotNull} + * Get the value of objectName.
    + * {VARCHAR(128) : NotNull} * - * @return The value of fee. (Nullable) + * @return The value of objectName. (Nullable) */ - public java.math.BigDecimal getFee() { - return _fee; + public String getObjectName() { + return _objectName; } /** - * Set the value of fee.
    - * {DECIMAL(14) : NotNull} + * Set the value of objectName.
    + * {VARCHAR(128) : NotNull} * - * @param fee The value of fee. (Nullable) + * @param objectName The value of objectName. (Nullable) */ - public void setFee(java.math.BigDecimal fee) { - _modifiedProperties.addPropertyName("fee"); - this._fee = fee; + public void setObjectName(String objectName) { + _modifiedProperties.addPropertyName("objectName"); + this._objectName = objectName; } /** Column Annotation for S2Dao. INTEGER : NotNull */ + public static final String status_COLUMN = "STATUS"; + + /** + * Get the value of status.
    + * {INTEGER : NotNull} + * + * @return The value of status. (Nullable) + */ + public java.math.BigDecimal getStatus() { + return _status; + } + + /** + * Set the value of status.
    + * {INTEGER : NotNull} + * + * @param status The value of status. (Nullable) + */ + public void setStatus(java.math.BigDecimal status) { + _modifiedProperties.addPropertyName("status"); + this._status = status; + } + + /** Column Annotation for S2Dao. INTEGER : NotNull */ public static final String sortOrder_COLUMN = "SORT_ORDER"; /** @@ -288,16 +315,16 @@ // =================================================================================== // Classify Method // =============== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Getter // ===================== - + // =================================================================================== // Foreign Table @@ -464,7 +491,8 @@ sb.append(delimiter).append(getPaymentMethodId()); sb.append(delimiter).append(getCode()); - sb.append(delimiter).append(getFee()); + sb.append(delimiter).append(getObjectName()); + sb.append(delimiter).append(getStatus()); sb.append(delimiter).append(getSortOrder()); sb.append(delimiter).append(getDateAdded()); sb.append(delimiter).append(getLastModified()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2007-10-16 13:49:34 UTC (rev 631) @@ -16,7 +16,7 @@ * PAYMENT_METHOD_ID * * [column-property] - * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED + * PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED * * [foreign-property] * @@ -97,8 +97,10 @@ public static final String DB_NAME_PAYMENT_METHOD_ID = "PAYMENT_METHOD_ID"; /** Db-name of CODE. VARCHAR(16) : NotNull */ public static final String DB_NAME_CODE = "CODE"; - /** Db-name of FEE. DECIMAL(14) : NotNull */ - public static final String DB_NAME_FEE = "FEE"; + /** Db-name of OBJECT_NAME. VARCHAR(128) : NotNull */ + public static final String DB_NAME_OBJECT_NAME = "OBJECT_NAME"; + /** Db-name of STATUS. INTEGER : NotNull */ + public static final String DB_NAME_STATUS = "STATUS"; /** Db-name of SORT_ORDER. INTEGER : NotNull */ public static final String DB_NAME_SORT_ORDER = "SORT_ORDER"; /** Db-name of DATE_ADDED. TIMESTAMP : NotNull */ @@ -110,8 +112,10 @@ public static final String COLUMN_DB_NAME_OF_PaymentMethodId = "PAYMENT_METHOD_ID"; /** @deprecated Deprecated! So use DB_NAME_Code. */ public static final String COLUMN_DB_NAME_OF_Code = "CODE"; - /** @deprecated Deprecated! So use DB_NAME_Fee. */ - public static final String COLUMN_DB_NAME_OF_Fee = "FEE"; + /** @deprecated Deprecated! So use DB_NAME_ObjectName. */ + public static final String COLUMN_DB_NAME_OF_ObjectName = "OBJECT_NAME"; + /** @deprecated Deprecated! So use DB_NAME_Status. */ + public static final String COLUMN_DB_NAME_OF_Status = "STATUS"; /** @deprecated Deprecated! So use DB_NAME_SortOrder. */ public static final String COLUMN_DB_NAME_OF_SortOrder = "SORT_ORDER"; /** @deprecated Deprecated! So use DB_NAME_DateAdded. */ @@ -126,8 +130,10 @@ public static final String PROPERTY_NAME_paymentMethodId = "paymentMethodId"; /** Prop-name(JavaBeansRule) of code. VARCHAR(16) : NotNull */ public static final String PROPERTY_NAME_code = "code"; - /** Prop-name(JavaBeansRule) of fee. DECIMAL(14) : NotNull */ - public static final String PROPERTY_NAME_fee = "fee"; + /** Prop-name(JavaBeansRule) of objectName. VARCHAR(128) : NotNull */ + public static final String PROPERTY_NAME_objectName = "objectName"; + /** Prop-name(JavaBeansRule) of status. INTEGER : NotNull */ + public static final String PROPERTY_NAME_status = "status"; /** Prop-name(JavaBeansRule) of sortOrder. INTEGER : NotNull */ public static final String PROPERTY_NAME_sortOrder = "sortOrder"; /** Prop-name(JavaBeansRule) of dateAdded. TIMESTAMP : NotNull */ @@ -142,8 +148,10 @@ public static final String CAP_PROP_NAME_PaymentMethodId = "PaymentMethodId"; /** Cap-prop-name of code. VARCHAR(16) : NotNull */ public static final String CAP_PROP_NAME_Code = "Code"; - /** Cap-prop-name of fee. DECIMAL(14) : NotNull */ - public static final String CAP_PROP_NAME_Fee = "Fee"; + /** Cap-prop-name of objectName. VARCHAR(128) : NotNull */ + public static final String CAP_PROP_NAME_ObjectName = "ObjectName"; + /** Cap-prop-name of status. INTEGER : NotNull */ + public static final String CAP_PROP_NAME_Status = "Status"; /** Cap-prop-name of sortOrder. INTEGER : NotNull */ public static final String CAP_PROP_NAME_SortOrder = "SortOrder"; /** Cap-prop-name of dateAdded. TIMESTAMP : NotNull */ @@ -155,8 +163,10 @@ public static final String COLUMN_CAP_PROP_NAME_OF_PaymentMethodId = "PaymentMethodId"; /** @deprecated Deprecated! So use CAP_PROP_NAME_Code. */ public static final String COLUMN_CAP_PROP_NAME_OF_Code = "Code"; - /** @deprecated Deprecated! So use CAP_PROP_NAME_Fee. */ - public static final String COLUMN_CAP_PROP_NAME_OF_Fee = "Fee"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_ObjectName. */ + public static final String COLUMN_CAP_PROP_NAME_OF_ObjectName = "ObjectName"; + /** @deprecated Deprecated! So use CAP_PROP_NAME_Status. */ + public static final String COLUMN_CAP_PROP_NAME_OF_Status = "Status"; /** @deprecated Deprecated! So use CAP_PROP_NAME_SortOrder. */ public static final String COLUMN_CAP_PROP_NAME_OF_SortOrder = "SortOrder"; /** @deprecated Deprecated! So use CAP_PROP_NAME_DateAdded. */ @@ -171,8 +181,10 @@ public static final String UNCAP_PROP_NAME_paymentMethodId = "paymentMethodId"; /** Uncap-prop-name of code. VARCHAR(16) : NotNull */ public static final String UNCAP_PROP_NAME_code = "code"; - /** Uncap-prop-name of fee. DECIMAL(14) : NotNull */ - public static final String UNCAP_PROP_NAME_fee = "fee"; + /** Uncap-prop-name of objectName. VARCHAR(128) : NotNull */ + public static final String UNCAP_PROP_NAME_objectName = "objectName"; + /** Uncap-prop-name of status. INTEGER : NotNull */ + public static final String UNCAP_PROP_NAME_status = "status"; /** Uncap-prop-name of sortOrder. INTEGER : NotNull */ public static final String UNCAP_PROP_NAME_sortOrder = "sortOrder"; /** Uncap-prop-name of dateAdded. TIMESTAMP : NotNull */ @@ -184,8 +196,10 @@ public static final String COLUMN_UNCAP_PROP_NAME_OF_PaymentMethodId = "paymentMethodId"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Code. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_Code = "code"; - /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Fee. */ - public static final String COLUMN_UNCAP_PROP_NAME_OF_Fee = "fee"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ObjectName. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_ObjectName = "objectName"; + /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Status. */ + public static final String COLUMN_UNCAP_PROP_NAME_OF_Status = "status"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_SortOrder. */ public static final String COLUMN_UNCAP_PROP_NAME_OF_SortOrder = "sortOrder"; /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DateAdded. */ @@ -226,7 +240,8 @@ map.put(DB_NAME_PAYMENT_METHOD_ID.toLowerCase(), PROPERTY_NAME_paymentMethodId); map.put(DB_NAME_CODE.toLowerCase(), PROPERTY_NAME_code); - map.put(DB_NAME_FEE.toLowerCase(), PROPERTY_NAME_fee); + map.put(DB_NAME_OBJECT_NAME.toLowerCase(), PROPERTY_NAME_objectName); + map.put(DB_NAME_STATUS.toLowerCase(), PROPERTY_NAME_status); map.put(DB_NAME_SORT_ORDER.toLowerCase(), PROPERTY_NAME_sortOrder); map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded); map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified); @@ -246,7 +261,8 @@ map.put(PROPERTY_NAME_paymentMethodId.toLowerCase(), DB_NAME_PAYMENT_METHOD_ID); map.put(PROPERTY_NAME_code.toLowerCase(), DB_NAME_CODE); - map.put(PROPERTY_NAME_fee.toLowerCase(), DB_NAME_FEE); + map.put(PROPERTY_NAME_objectName.toLowerCase(), DB_NAME_OBJECT_NAME); + map.put(PROPERTY_NAME_status.toLowerCase(), DB_NAME_STATUS); map.put(PROPERTY_NAME_sortOrder.toLowerCase(), DB_NAME_SORT_ORDER); map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED); map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED); @@ -268,7 +284,8 @@ map.put(DB_NAME_PAYMENT_METHOD_ID, CAP_PROP_NAME_PaymentMethodId); map.put(DB_NAME_CODE, CAP_PROP_NAME_Code); - map.put(DB_NAME_FEE, CAP_PROP_NAME_Fee); + map.put(DB_NAME_OBJECT_NAME, CAP_PROP_NAME_ObjectName); + map.put(DB_NAME_STATUS, CAP_PROP_NAME_Status); map.put(DB_NAME_SORT_ORDER, CAP_PROP_NAME_SortOrder); map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded); map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified); @@ -290,7 +307,8 @@ map.put(DB_NAME_PAYMENT_METHOD_ID, UNCAP_PROP_NAME_paymentMethodId); map.put(DB_NAME_CODE, UNCAP_PROP_NAME_code); - map.put(DB_NAME_FEE, UNCAP_PROP_NAME_fee); + map.put(DB_NAME_OBJECT_NAME, UNCAP_PROP_NAME_objectName); + map.put(DB_NAME_STATUS, UNCAP_PROP_NAME_status); map.put(DB_NAME_SORT_ORDER, UNCAP_PROP_NAME_sortOrder); map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded); map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified); @@ -312,7 +330,8 @@ map.put(CAP_PROP_NAME_PaymentMethodId, DB_NAME_PAYMENT_METHOD_ID); map.put(CAP_PROP_NAME_Code, DB_NAME_CODE); - map.put(CAP_PROP_NAME_Fee, DB_NAME_FEE); + map.put(CAP_PROP_NAME_ObjectName, DB_NAME_OBJECT_NAME); + map.put(CAP_PROP_NAME_Status, DB_NAME_STATUS); map.put(CAP_PROP_NAME_SortOrder, DB_NAME_SORT_ORDER); map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED); map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED); @@ -334,7 +353,8 @@ map.put(CAP_PROP_NAME_PaymentMethodId, UNCAP_PROP_NAME_paymentMethodId); map.put(CAP_PROP_NAME_Code, UNCAP_PROP_NAME_code); - map.put(CAP_PROP_NAME_Fee, UNCAP_PROP_NAME_fee); + map.put(CAP_PROP_NAME_ObjectName, UNCAP_PROP_NAME_objectName); + map.put(CAP_PROP_NAME_Status, UNCAP_PROP_NAME_status); map.put(CAP_PROP_NAME_SortOrder, UNCAP_PROP_NAME_sortOrder); map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded); map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified); @@ -356,7 +376,8 @@ map.put(UNCAP_PROP_NAME_paymentMethodId, DB_NAME_PAYMENT_METHOD_ID); map.put(UNCAP_PROP_NAME_code, DB_NAME_CODE); - map.put(UNCAP_PROP_NAME_fee, DB_NAME_FEE); + map.put(UNCAP_PROP_NAME_objectName, DB_NAME_OBJECT_NAME); + map.put(UNCAP_PROP_NAME_status, DB_NAME_STATUS); map.put(UNCAP_PROP_NAME_sortOrder, DB_NAME_SORT_ORDER); map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED); map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED); @@ -378,7 +399,8 @@ map.put(UNCAP_PROP_NAME_paymentMethodId, CAP_PROP_NAME_PaymentMethodId); map.put(UNCAP_PROP_NAME_code, CAP_PROP_NAME_Code); - map.put(UNCAP_PROP_NAME_fee, CAP_PROP_NAME_Fee); + map.put(UNCAP_PROP_NAME_objectName, CAP_PROP_NAME_ObjectName); + map.put(UNCAP_PROP_NAME_status, CAP_PROP_NAME_Status); map.put(UNCAP_PROP_NAME_sortOrder, CAP_PROP_NAME_SortOrder); map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded); map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified); @@ -592,7 +614,8 @@ final java.util.List columnInfoList = new java.util.ArrayList(); columnInfoList.add(columnPaymentMethodId()); columnInfoList.add(columnCode()); - columnInfoList.add(columnFee()); + columnInfoList.add(columnObjectName()); + columnInfoList.add(columnStatus()); columnInfoList.add(columnSortOrder()); columnInfoList.add(columnDateAdded()); columnInfoList.add(columnLastModified()); @@ -651,7 +674,7 @@ * @deprecated Please use getColumnInfoList() */ public String getColumnDbNameCommaString() { - return "PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED"; + return "PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED"; } /** @@ -667,12 +690,18 @@ return new ColumnInfo(this, "CODE", "code", String.class, false); } /** - * @return Column information of fee. (NotNull) + * @return Column information of objectName. (NotNull) */ - public ColumnInfo columnFee() { - return new ColumnInfo(this, "FEE", "fee", java.math.BigDecimal.class, false); + public ColumnInfo columnObjectName() { + return new ColumnInfo(this, "OBJECT_NAME", "objectName", String.class, false); } /** + * @return Column information of status. (NotNull) + */ + public ColumnInfo columnStatus() { + return new ColumnInfo(this, "STATUS", "status", java.math.BigDecimal.class, false); + } + /** * @return Column information of sortOrder. (NotNull) */ public ColumnInfo columnSortOrder() { @@ -832,7 +861,8 @@ public RelationTrace columnPaymentMethodId() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnPaymentMethodId()); } public RelationTrace columnCode() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnCode()); } - public RelationTrace columnFee() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnFee()); } + public RelationTrace columnObjectName() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnObjectName()); } + public RelationTrace columnStatus() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnStatus()); } public RelationTrace columnSortOrder() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnSortOrder()); } public RelationTrace columnDateAdded() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnDateAdded()); } public RelationTrace columnLastModified() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnLastModified()); } @@ -908,7 +938,8 @@ if (analyzer.init("PAYMENT_METHOD_ID", "paymentMethodId", "paymentMethodId")) { myEntity.setPaymentMethodId(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("CODE", "code", "code")) { myEntity.setCode(analyzer.analyzeString(String.class)); }; - if (analyzer.init("FEE", "fee", "fee")) { myEntity.setFee(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; + if (analyzer.init("OBJECT_NAME", "objectName", "objectName")) { myEntity.setObjectName(analyzer.analyzeString(String.class)); }; + if (analyzer.init("STATUS", "status", "status")) { myEntity.setStatus(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("SORT_ORDER", "sortOrder", "sortOrder")) { myEntity.setSortOrder(analyzer.analyzeNumber(java.math.BigDecimal.class)); }; if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); }; if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); }; @@ -986,7 +1017,8 @@ final StringBuffer sb = new StringBuffer(); helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_METHOD_ID", myEntity.getPaymentMethodId()); helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode()); - helpAppendingColumnValueString(sb, delimiter, equal, "FEE", myEntity.getFee()); + helpAppendingColumnValueString(sb, delimiter, equal, "OBJECT_NAME", myEntity.getObjectName()); + helpAppendingColumnValueString(sb, delimiter, equal, "STATUS", myEntity.getStatus()); helpAppendingColumnValueString(sb, delimiter, equal, "SORT_ORDER", myEntity.getSortOrder()); helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded()); helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified()); @@ -1046,7 +1078,8 @@ final java.util.Map valueMap = new java.util.LinkedHashMap(); valueMap.put("PAYMENT_METHOD_ID", myEntity.getPaymentMethodId()); valueMap.put("CODE", myEntity.getCode()); - valueMap.put("FEE", myEntity.getFee()); + valueMap.put("OBJECT_NAME", myEntity.getObjectName()); + valueMap.put("STATUS", myEntity.getStatus()); valueMap.put("SORT_ORDER", myEntity.getSortOrder()); valueMap.put("DATE_ADDED", myEntity.getDateAdded()); valueMap.put("LAST_MODIFIED", myEntity.getLastModified()); @@ -1074,7 +1107,8 @@ final java.util.Map valueMap = new java.util.LinkedHashMap(); valueMap.put("PAYMENT_METHOD_ID", helpGettingColumnStringValue(myEntity.getPaymentMethodId())); valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode())); - valueMap.put("FEE", helpGettingColumnStringValue(myEntity.getFee())); + valueMap.put("OBJECT_NAME", helpGettingColumnStringValue(myEntity.getObjectName())); + valueMap.put("STATUS", helpGettingColumnStringValue(myEntity.getStatus())); valueMap.put("SORT_ORDER", helpGettingColumnStringValue(myEntity.getSortOrder())); valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded())); valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified())); @@ -1102,9 +1136,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? , ? )"; } - return "insert into PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? )"; + return "insert into PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, OBJECT_NAME, STATUS, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java 2007-10-16 13:49:34 UTC (rev 631) @@ -367,110 +367,254 @@ abstract protected ConditionValue getCValueCode(); - /** Column db name of fee. */ - protected static final String COL_FEE = "FEE"; + /** Column db name of objectName. */ + protected static final String COL_OBJECT_NAME = "OBJECT_NAME"; - /** Column java name of fee. */ - protected static final String J_Fee = "Fee"; + /** Column java name of objectName. */ + protected static final String J_ObjectName = "ObjectName"; - /** Column uncapitalised java name of fee. */ - protected static final String UJ_fee = "fee"; + /** Column uncapitalised java name of objectName. */ + protected static final String UJ_objectName = "objectName"; + + /** + * Set the value of objectName using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param objectName The value of objectName as equal. + */ + public void setObjectName_Equal(String objectName) { + registerObjectName(ConditionKey.CK_EQUAL, filterRemoveEmptyString(objectName)); + } + + /** + * Set the value of objectName using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param objectName The value of objectName as notEqual. + */ + public void setObjectName_NotEqual(String objectName) { + registerObjectName(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(objectName)); + } /** - * Set the value of fee using equal. { = } + * Set the value of objectName using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. * - * @param fee The value of fee as equal. + * @param objectName The value of objectName as greaterThan. */ - public void setFee_Equal(java.math.BigDecimal fee) { - registerFee(ConditionKey.CK_EQUAL, fee); + public void setObjectName_GreaterThan(String objectName) { + registerObjectName(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(objectName)); } /** - * Set the value of fee using notEqual. { != } + * Set the value of objectName using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. * - * @param fee The value of fee as notEqual. + * @param objectName The value of objectName as lessThan. */ - public void setFee_NotEqual(java.math.BigDecimal fee) { - registerFee(ConditionKey.CK_NOT_EQUAL, fee); + public void setObjectName_LessThan(String objectName) { + registerObjectName(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(objectName)); } /** - * Set the value of fee using greaterThan. { > } + * Set the value of objectName using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. * - * @param fee The value of fee as greaterThan. + * @param objectName The value of objectName as greaterEqual. */ - public void setFee_GreaterThan(java.math.BigDecimal fee) { - registerFee(ConditionKey.CK_GREATER_THAN, fee); + public void setObjectName_GreaterEqual(String objectName) { + registerObjectName(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(objectName)); } /** - * Set the value of fee using lessThan. { < } + * Set the value of objectName using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. * - * @param fee The value of fee as lessThan. + * @param objectName The value of objectName as lessEqual. */ - public void setFee_LessThan(java.math.BigDecimal fee) { - registerFee(ConditionKey.CK_LESS_THAN, fee); + public void setObjectName_LessEqual(String objectName) { + registerObjectName(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(objectName)); } /** - * Set the value of fee using greaterEqual. { >= } + * Set the value of objectName using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. * - * @param fee The value of fee as greaterEqual. + * @param objectName The value of objectName as prefixSearch. */ - public void setFee_GreaterEqual(java.math.BigDecimal fee) { - registerFee(ConditionKey.CK_GREATER_EQUAL, fee); + public void setObjectName_PrefixSearch(String objectName) { + registerObjectName(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(objectName)); } /** - * Set the value of fee using lessEqual. { <= } + * Set the value of objectName using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. * - * @param fee The value of fee as lessEqual. + * @param objectName The value of objectName as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) */ - public void setFee_LessEqual(java.math.BigDecimal fee) { - registerFee(ConditionKey.CK_LESS_EQUAL, fee); + public void setObjectName_LikeSearch(String objectName, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(objectName), getCValueObjectName(), COL_OBJECT_NAME, J_ObjectName, UJ_objectName, likeSearchOption); } + + /** + * Set the value of objectName using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param objectNameList The value of objectName as inScope. + */ + public void setObjectName_InScope(java.util.List objectNameList) { + registerObjectName(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(objectNameList)); + } + + /** + * Set the value of objectName using inScope. { in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param objectName The value of objectName as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setObjectName_InScope(String objectName, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(objectName), getCValueObjectName(), COL_OBJECT_NAME, J_ObjectName, UJ_objectName, inScopeOption); + } + + /** + * Set the value of objectName using notInScope. { not in ('a', 'b') } + * If the element in the list is null or empty-string, the condition-element is ignored. + * + * @param objectNameList The value of objectName as notInScope. + */ + public void setObjectName_NotInScope(java.util.List objectNameList) { + registerObjectName(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(objectNameList)); + } + + /** + * Register condition of objectName. + * + * @param key Condition key. (NotNull) + * @param value The value of objectName. (Nullable) + */ + protected void registerObjectName(ConditionKey key, Object value) { + registerQuery(key, value, getCValueObjectName(), COL_OBJECT_NAME, J_ObjectName, UJ_objectName); + } + + /** + * Register inline condition of objectName. + * + * @param key Condition key. (NotNull) + * @param value The value of objectName. (Nullable) + */ + protected void registerInlineObjectName(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueObjectName(), COL_OBJECT_NAME, J_ObjectName, UJ_objectName); + } + + abstract protected ConditionValue getCValueObjectName(); + + /** Column db name of status. */ + protected static final String COL_STATUS = "STATUS"; + + /** Column java name of status. */ + protected static final String J_Status = "Status"; + + /** Column uncapitalised java name of status. */ + protected static final String UJ_status = "status"; + + /** + * Set the value of status using equal. { = } + * + * @param status The value of status as equal. + */ + public void setStatus_Equal(java.math.BigDecimal status) { + registerStatus(ConditionKey.CK_EQUAL, status); + } + + /** + * Set the value of status using notEqual. { != } + * + * @param status The value of status as notEqual. + */ + public void setStatus_NotEqual(java.math.BigDecimal status) { + registerStatus(ConditionKey.CK_NOT_EQUAL, status); + } + + /** + * Set the value of status using greaterThan. { > } + * + * @param status The value of status as greaterThan. + */ + public void setStatus_GreaterThan(java.math.BigDecimal status) { + registerStatus(ConditionKey.CK_GREATER_THAN, status); + } + + /** + * Set the value of status using lessThan. { < } + * + * @param status The value of status as lessThan. + */ + public void setStatus_LessThan(java.math.BigDecimal status) { + registerStatus(ConditionKey.CK_LESS_THAN, status); + } + + /** + * Set the value of status using greaterEqual. { >= } + * + * @param status The value of status as greaterEqual. + */ + public void setStatus_GreaterEqual(java.math.BigDecimal status) { + registerStatus(ConditionKey.CK_GREATER_EQUAL, status); + } + + /** + * Set the value of status using lessEqual. { <= } + * + * @param status The value of status as lessEqual. + */ + public void setStatus_LessEqual(java.math.BigDecimal status) { + registerStatus(ConditionKey.CK_LESS_EQUAL, status); + } /** - * Set the value of fee using inScope. { in (a, b) } + * Set the value of status using inScope. { in (a, b) } * If the element in the list is null or empty-string, the condition-element is ignored. * - * @param feeList The value of fee as inScope. + * @param statusList The value of status as inScope. */ - public void setFee_InScope(java.util.List feeList) { - registerFee(ConditionKey.CK_IN_SCOPE, feeList); + public void setStatus_InScope(java.util.List statusList) { + registerStatus(ConditionKey.CK_IN_SCOPE, statusList); } /** - * Set the value of fee using notInScope. { not in (a, b) } + * Set the value of status using notInScope. { not in (a, b) } * If the element in the list is null or empty-string, the condition-element is ignored. * - * @param feeList The value of fee as notInScope. + * @param statusList The value of status as notInScope. */ - public void setFee_NotInScope(java.util.List feeList) { - registerFee(ConditionKey.CK_NOT_IN_SCOPE, feeList); + public void setStatus_NotInScope(java.util.List statusList) { + registerStatus(ConditionKey.CK_NOT_IN_SCOPE, statusList); } /** - * Register condition of fee. + * Register condition of status. * * @param key Condition key. (NotNull) - * @param value The value of fee. (Nullable) + * @param value The value of status. (Nullable) */ - protected void registerFee(ConditionKey key, Object value) { - registerQuery(key, value, getCValueFee(), COL_FEE, J_Fee, UJ_fee); + protected void registerStatus(ConditionKey key, Object value) { + registerQuery(key, value, getCValueStatus(), COL_STATUS, J_Status, UJ_status); } /** - * Register inline condition of fee. + * Register inline condition of status. * * @param key Condition key. (NotNull) - * @param value The value of fee. (Nullable) + * @param value The value of status. (Nullable) */ - protected void registerInlineFee(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueFee(), COL_FEE, J_Fee, UJ_fee); + protected void registerInlineStatus(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueStatus(), COL_STATUS, J_Status, UJ_status); } - abstract protected ConditionValue getCValueFee(); + abstract protected ConditionValue getCValueStatus(); /** Column db name of sortOrder. */ protected static final String COL_SORT_ORDER = "SORT_ORDER"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java 2007-10-16 13:49:34 UTC (rev 631) @@ -91,24 +91,42 @@ } /** - * Include select-column of fee as mine. + * Include select-column of objectName as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. */ - public void includeAsMine_Fee() { - registerIncludedSelectColumn("Fee", getRealColumnName("FEE")); + public void includeAsMine_ObjectName() { + registerIncludedSelectColumn("ObjectName", getRealColumnName("OBJECT_NAME")); } /** - * Include select-column of fee as mine. + * Include select-column of objectName as mine. * * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) */ - public void includeAsMine_Fee(String aliasName) { - registerIncludedSelectColumn(aliasName, getRealColumnName("FEE")); + public void includeAsMine_ObjectName(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("OBJECT_NAME")); } /** + * Include select-column of status as mine. + * Alias name is java-name of this column. + * Be careful to whether your table have the same column. + */ + public void includeAsMine_Status() { + registerIncludedSelectColumn("Status", getRealColumnName("STATUS")); + } + + /** + * Include select-column of status as mine. + * + * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull) + */ + public void includeAsMine_Status(String aliasName) { + registerIncludedSelectColumn(aliasName, getRealColumnName("STATUS")); + } + + /** * Include select-column of sortOrder as mine. * Alias name is java-name of this column. * Be careful to whether your table have the same column. @@ -318,48 +336,90 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [FEE] + // Column = [OBJECT_NAME] // - - - - - - - - -/ - /** The attribute of fee. */ - protected ConditionValue _fee; + /** The attribute of objectName. */ + protected ConditionValue _objectName; /** - * Get the value of fee. + * Get the value of objectName. * - * @return The value of fee. + * @return The value of objectName. */ - public ConditionValue getFee() { - if (_fee == null) { - _fee = new ConditionValue(); + public ConditionValue getObjectName() { + if (_objectName == null) { + _objectName = new ConditionValue(); } - return _fee; + return _objectName; } - protected ConditionValue getCValueFee() { - return getFee(); + protected ConditionValue getCValueObjectName() { + return getObjectName(); } /** - * Add order-by of fee as ASC. + * Add order-by of objectName as ASC. * * @return this. (NotNull) */ - public BsPaymentMethodCQ addOrderBy_Fee_Asc() { - getSqlClause().registerOrderBy(getRealColumnName(COL_FEE), null, true);return this; + public BsPaymentMethodCQ addOrderBy_ObjectName_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_OBJECT_NAME), null, true);return this; } /** - * Add order-by of fee as DESC. + * Add order-by of objectName as DESC. * * @return this. (NotNull) */ - public BsPaymentMethodCQ addOrderBy_Fee_Desc() { - getSqlClause().registerOrderBy(getRealColumnName(COL_FEE), null, false);return this; + public BsPaymentMethodCQ addOrderBy_ObjectName_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_OBJECT_NAME), null, false);return this; } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [STATUS] + // - - - - - - - - -/ + + /** The attribute of status. */ + protected ConditionValue _status; + + /** + * Get the value of status. + * + * @return The value of status. + */ + public ConditionValue getStatus() { + if (_status == null) { + _status = new ConditionValue(); + } + return _status; + } + + protected ConditionValue getCValueStatus() { + return getStatus(); + } + + + /** + * Add order-by of status as ASC. + * + * @return this. (NotNull) + */ + public BsPaymentMethodCQ addOrderBy_Status_Asc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_STATUS), null, true);return this; + } + + /** + * Add order-by of status as DESC. + * + * @return this. (NotNull) + */ + public BsPaymentMethodCQ addOrderBy_Status_Desc() { + getSqlClause().registerOrderBy(getRealColumnName(COL_STATUS), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SORT_ORDER] // - - - - - - - - -/ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java 2007-10-16 13:49:34 UTC (rev 631) @@ -111,14 +111,22 @@ // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [FEE] + // Column = [OBJECT_NAME] // - - - - - - - - -/ - protected ConditionValue getCValueFee() { - return _myCQ.getFee(); + protected ConditionValue getCValueObjectName() { + return _myCQ.getObjectName(); } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [STATUS] + // - - - - - - - - -/ + protected ConditionValue getCValueStatus() { + return _myCQ.getStatus(); + } + + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SORT_ORDER] // - - - - - - - - -/ protected ConditionValue getCValueSortOrder() { Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/DeliveryMethodCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/DeliveryMethodCalculator.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/DeliveryMethodCalculator.java 2007-10-16 13:49:34 UTC (rev 631) @@ -1,13 +0,0 @@ -package jp.sf.pal.pompei.fee; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.CustomerBasket; - -public interface DeliveryMethodCalculator extends Serializable { - public BigDecimal calculate(List list, - AddressBook deliveryAddressBook); -} Copied: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java (from rev 581, pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/DeliveryMethodCalculator.java) =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/DeliveryMethodCalculator.java 2007-09-25 05:33:00 UTC (rev 581) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java 2007-10-16 13:49:34 UTC (rev 631) @@ -0,0 +1,14 @@ +package jp.sf.pal.pompei.fee; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.CustomerBasket; + +public interface FeeCalculator extends Serializable { + public BigDecimal calculate(List list, + AddressBook deliveryAddressBook, Map informationMap); +} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java 2007-10-16 13:49:34 UTC (rev 631) @@ -0,0 +1,23 @@ +package jp.sf.pal.pompei.fee.impl; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.fee.FeeCalculator; + +public class BankPaymentCalculator implements FeeCalculator { + + /** + * + */ + private static final long serialVersionUID = 2210867873710022790L; + + public BigDecimal calculate(List list, + AddressBook deliveryAddressBook, Map informationMap) { + return new BigDecimal(0); + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java 2007-10-16 13:49:34 UTC (rev 631) @@ -0,0 +1,23 @@ +package jp.sf.pal.pompei.fee.impl; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.fee.FeeCalculator; + +public class CashOnDeliveryPaymentCalculator implements FeeCalculator { + + /** + * + */ + private static final long serialVersionUID = 2769660903440943706L; + + public BigDecimal calculate(List list, + AddressBook deliveryAddressBook, Map informationMap) { + return new BigDecimal(300); + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java 2007-10-16 13:49:34 UTC (rev 631) @@ -2,13 +2,13 @@ import java.math.BigDecimal; import java.util.List; +import java.util.Map; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.CustomerBasket; -import jp.sf.pal.pompei.fee.DeliveryMethodCalculator; +import jp.sf.pal.pompei.fee.FeeCalculator; -public class DefaultDeliveryMethodCalculator implements - DeliveryMethodCalculator { +public class DefaultDeliveryMethodCalculator implements FeeCalculator { /** * @@ -16,8 +16,8 @@ private static final long serialVersionUID = 4448477278188463956L; public BigDecimal calculate(List list, - AddressBook deliveryAddressBook) { - // TODO 自動生成されたメソッド・スタブ + AddressBook deliveryAddressBook, Map informationMap) { + // TODO return new BigDecimal(1000); } 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-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2007-10-16 13:49:34 UTC (rev 631) @@ -24,7 +24,7 @@ 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; +import jp.sf.pal.pompei.fee.FeeCalculator; import jp.sf.pal.pompei.service.CartService; import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.DeliveryMethodSerivce; @@ -178,6 +178,10 @@ new BigDecimal(100)); getCheckoutConfirmPage().setTax(tax); + Map informationMap = new HashMap(); + informationMap.put(PompeiConstants.SUB_TOTAL_PRICE, subTotalPrice); + informationMap.put(PompeiConstants.TAX, tax); + // payment BigDecimal paymentMethodId = (BigDecimal) orderProcessMap .get(PompeiConstants.PAYMENT_METHOD_ID); @@ -196,11 +200,30 @@ getCheckoutConfirmPage().setPaymentMethodName(pmd.getName()); // payment fee + String paymentMethodObjectName = pmd.getPaymentMethod().getObjectName(); BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE; - if (pmd.getPaymentMethod().getFee() != null) { - paymentFee = pmd.getPaymentMethod().getFee(); + try { + FeeCalculator pmc = (FeeCalculator) getContainer().getComponent( + paymentMethodObjectName); + paymentFee = pmc.calculate(baskets, deliveryAddressBook, + informationMap); + getCheckoutConfirmPage().setPaymentFee(paymentFee); + } catch (ComponentNotFoundRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.payment.fee.1"); + //TODO logger + return UserInfoEditPage.class; + } catch (TooManyRegistrationRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.payment.fee.2"); + //TODO logger + return UserInfoEditPage.class; + } catch (CyclicReferenceRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.payment.fee.3"); + //TODO logger + return UserInfoEditPage.class; } - getCheckoutConfirmPage().setPaymentFee(paymentFee); // deliveryMethod BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap @@ -224,20 +247,24 @@ .getObjectName(); BigDecimal deliveryPrice = PompeiConstants.DEFAULT_DELIVERY_PRICE; try { - DeliveryMethodCalculator dmc = (DeliveryMethodCalculator) getContainer() - .getComponent(deliveryMethodObjectName); - deliveryPrice = dmc.calculate(baskets, deliveryAddressBook); + FeeCalculator dmc = (FeeCalculator) getContainer().getComponent( + deliveryMethodObjectName); + deliveryPrice = dmc.calculate(baskets, deliveryAddressBook, + informationMap); getCheckoutConfirmPage().setDeliveryPrice(deliveryPrice); } catch (ComponentNotFoundRuntimeException e) { - FacesMessageUtil.addErrorMessage("could.not.calculate.tax.1"); + FacesMessageUtil + .addErrorMessage("could.not.calculate.delivery.price.1"); //TODO logger return UserInfoEditPage.class; } catch (TooManyRegistrationRuntimeException e) { - FacesMessageUtil.addErrorMessage("could.not.calculate.tax.2"); + FacesMessageUtil + .addErrorMessage("could.not.calculate.delivery.price.2"); //TODO logger return UserInfoEditPage.class; } catch (CyclicReferenceRuntimeException e) { - FacesMessageUtil.addErrorMessage("could.not.calculate.tax.3"); + FacesMessageUtil + .addErrorMessage("could.not.calculate.delivery.price.3"); //TODO logger return UserInfoEditPage.class; } 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-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-10-16 13:49:34 UTC (rev 631) @@ -112,6 +112,16 @@ getPaymentSelectPage().setPaymentMethodItems( getPaymentMethodDxo().convert(pmd)); + // check credit card + getPaymentSelectPage().setCreditcard(false); + for (PaymentMethodDescription paymentMethodDescription : pmd) { + if (PompeiConstants.CREDITCARD_PAYMENT_METHOD + .equals(paymentMethodDescription.getPaymentMethod() + .getCode())) { + getPaymentSelectPage().setCreditcard(true); + } + } + // set card type List ctd = getCardTypeService() .getCardTypeDescriptionList(); 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-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java 2007-10-16 13:49:34 UTC (rev 631) @@ -58,6 +58,8 @@ private String description; + private boolean creditcard; + /** * @return orderProcessId */ @@ -304,7 +306,8 @@ /** * @param ccExpiresMonthItems 設定する ccExpiresMonthItems */ - public void setCcExpiresMonthItems(List> ccExpiresMonthItems) { + public void setCcExpiresMonthItems( + List> ccExpiresMonthItems) { this.ccExpiresMonthItems = ccExpiresMonthItems; } @@ -318,8 +321,23 @@ /** * @param ccExpiresYearItems 設定する ccExpiresYearItems */ - public void setCcExpiresYearItems(List> ccExpiresYearItems) { + public void setCcExpiresYearItems( + List> ccExpiresYearItems) { this.ccExpiresYearItems = ccExpiresYearItems; } + /** + * @return the credit card + */ + public boolean isCreditcard() { + return creditcard; + } + + /** + * @param creditcard the credit card to set + */ + public void setCreditcard(boolean creditcard) { + this.creditcard = creditcard; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-16 13:49:34 UTC (rev 631) @@ -83,9 +83,12 @@ could.not.find.payment.method.in.checkoutconfirm=\u6307\u5b9a\u3055\u308c\u305f\u652f\u6255\u3044\u65b9\u6cd5\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.delivery.method.id.in.checkoutconfirm=\u6307\u5b9a\u3055\u308c\u305f\u914d\u9054\u65b9\u6cd5\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.delivery.method.in.checkoutconfirm=\u6307\u5b9a\u3055\u308c\u305f\u914d\u9054\u65b9\u6cd5\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -could.not.calculate.tax.1=\u6d88\u8cbb\u7a0e\u3092\u6d88\u8cbb\u7a0e\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -could.not.calculate.tax.2=\u6d88\u8cbb\u7a0e\u3092\u6d88\u8cbb\u7a0e\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -could.not.calculate.tax.3=\u6d88\u8cbb\u7a0e\u3092\u6d88\u8cbb\u7a0e\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.calculate.payment.fee.1=\u4ee3\u91d1\u5f15\u63db\u6599\u91d1\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.calculate.payment.fee.2=\u4ee3\u91d1\u5f15\u63db\u6599\u91d1\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.calculate.payment.fee.3=\u4ee3\u91d1\u5f15\u63db\u6599\u91d1\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.calculate.delivery.price.1=\u914d\u9001\u6599\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.calculate.delivery.price.2=\u914d\u9001\u6599\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.calculate.delivery.price.3=\u914d\u9001\u6599\u3092\u8a08\u7b97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 expire.order.process.in.checkoutconfirm.for.confirm=\u6ce8\u6587\u30d7\u30ed\u30bb\u30b9\u306e\u6709\u52b9\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.cart.info.in.checkoutconfirm=\u30ab\u30fc\u30c8\u5185\u306e\u5546\u54c1\u60c5\u5831\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30ab\u30fc\u30c8\u306e\u671f\u9650\u304c\u5207\u308c\u305f\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.store.order=\u6ce8\u6587\u78ba\u5b9a\u51e6\u7406\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 Modified: pompei/portlets/pompei-core/trunk/src/main/resources/fee.dicon =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/fee.dicon 2007-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/resources/fee.dicon 2007-10-16 13:49:34 UTC (rev 631) @@ -2,4 +2,6 @@ + + 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-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-16 13:49:34 UTC (rev 631) @@ -95,7 +95,8 @@ CREATE TABLE PAYMENT_METHOD ( PAYMENT_METHOD_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1) , CODE VARCHAR(16) NOT NULL - , FEE DECIMAL(14, 6) NOT NULL + , OBJECT_NAME VARCHAR(128) NOT NULL + , STATUS INTEGER NOT NULL , SORT_ORDER INTEGER NOT NULL , DATE_ADDED TIMESTAMP NOT NULL , LAST_MODIFIED TIMESTAMP NOT NULL 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-10-16 07:54:33 UTC (rev 630) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-10-16 13:49:34 UTC (rev 631) @@ -112,6 +112,7 @@

    +
    3-3. クレジットカード情報を入力してください (カード払いの場合のみ)
    @@ -173,6 +174,7 @@

    +

    From svnnotify @ sourceforge.jp Thu Oct 18 06:17:05 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 06:17:05 +0900 Subject: [pal-cvs 2888] [632] create helloworld Message-ID: <1192655825.269669.13745.nullmailer@users.sourceforge.jp> Revision: 632 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=632 Author: shinsuke Date: 2007-10-18 06:17:05 +0900 (Thu, 18 Oct 2007) Log Message: ----------- create helloworld Added Paths: ----------- helloworld/ -------------- next part -------------- From svnnotify @ sourceforge.jp Thu Oct 18 06:17:21 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 06:17:21 +0900 Subject: [pal-cvs 2889] [633] create trunk Message-ID: <1192655841.707788.13823.nullmailer@users.sourceforge.jp> Revision: 633 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=633 Author: shinsuke Date: 2007-10-18 06:17:21 +0900 (Thu, 18 Oct 2007) Log Message: ----------- create trunk Added Paths: ----------- helloworld/trunk/ -------------- next part -------------- From svnnotify @ sourceforge.jp Thu Oct 18 06:19:58 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 06:19:58 +0900 Subject: [pal-cvs 2890] [634] added helloworld. Message-ID: <1192655998.735129.15125.nullmailer@users.sourceforge.jp> Revision: 634 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=634 Author: shinsuke Date: 2007-10-18 06:19:58 +0900 (Thu, 18 Oct 2007) Log Message: ----------- added helloworld. Added Paths: ----------- helloworld/trunk/.classpath helloworld/trunk/.project helloworld/trunk/.settings/ helloworld/trunk/.settings/org.eclipse.jdt.core.prefs helloworld/trunk/.settings/org.eclipse.jdt.ui.prefs helloworld/trunk/pom.xml helloworld/trunk/src/ helloworld/trunk/src/main/ helloworld/trunk/src/main/java/ helloworld/trunk/src/main/java/jp/ helloworld/trunk/src/main/java/jp/sf/ helloworld/trunk/src/main/java/jp/sf/pal/ helloworld/trunk/src/main/java/jp/sf/pal/helloworld/ helloworld/trunk/src/main/java/jp/sf/pal/helloworld/HelloWorldPortlet.java helloworld/trunk/src/main/resources/ helloworld/trunk/src/main/resources/jp/ helloworld/trunk/src/main/resources/jp/sf/ helloworld/trunk/src/main/resources/jp/sf/pal/ helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/ helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/ helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources.properties helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources_ja.properties helloworld/trunk/src/main/webapp/ helloworld/trunk/src/main/webapp/WEB-INF/ helloworld/trunk/src/main/webapp/WEB-INF/jsp/ helloworld/trunk/src/main/webapp/WEB-INF/jsp/helloworld.jsp helloworld/trunk/src/main/webapp/WEB-INF/portlet.xml helloworld/trunk/src/main/webapp/WEB-INF/web.xml -------------- next part -------------- Added: helloworld/trunk/.classpath =================================================================== --- helloworld/trunk/.classpath 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/.classpath 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file Property changes on: helloworld/trunk/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/.project =================================================================== --- helloworld/trunk/.project 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/.project 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,14 @@ + + helloworld + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file Property changes on: helloworld/trunk/.project ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- helloworld/trunk/.settings/org.eclipse.jdt.core.prefs 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/.settings/org.eclipse.jdt.core.prefs 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,259 @@ +#Sat Oct 13 05:55:20 JST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.source=1.4 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true Added: helloworld/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- helloworld/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,4 @@ +#Sat Oct 13 05:55:20 JST 2007 +eclipse.preferences.version=1 +formatter_profile=_Seasar +formatter_settings_version=11 Added: helloworld/trunk/pom.xml =================================================================== --- helloworld/trunk/pom.xml 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/pom.xml 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,46 @@ + + + 4.0.0 + jp.sf.pal + helloworld + 1.3-SNAPSHOT + war + Helloworld Portlet + + http://pal.sourceforge.jp/ + + helloworld + + + maven-compiler-plugin + + 1.4 + 1.4 + + + + + + + portlet-api + portlet-api + 1.0 + provided + + + jstl + jstl + 1.1.2 + + + taglibs + standard + 1.1.2 + + + commons-logging + commons-logging + 1.0.4 + + + Property changes on: helloworld/trunk/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/src/main/java/jp/sf/pal/helloworld/HelloWorldPortlet.java =================================================================== --- helloworld/trunk/src/main/java/jp/sf/pal/helloworld/HelloWorldPortlet.java 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/src/main/java/jp/sf/pal/helloworld/HelloWorldPortlet.java 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,122 @@ +/* + * Copyright 2000-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.helloworld; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletConfig; +import javax.portlet.PortletContext; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletSession; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +/** + * HelloWorldPortlet is a portlet to say "Hello!" + * + * @author Shinsuke Sugaya + */ +public class HelloWorldPortlet extends GenericPortlet { + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(HelloWorldPortlet.class); + + public static final String YOUR_NAME_KEY = "yourName"; + + public static final String COUNT_KEY = "count"; + + /* (non-Javadoc) + * @see javax.portlet.Portlet#init(javax.portlet.PortletConfig) + */ + public void init(PortletConfig config) throws PortletException { + if (log.isDebugEnabled()) { + log.debug("init() - HelloWorldPortlet: init()"); + } + super.init(config); + } + + /* (non-Javadoc) + * @see javax.portlet.GenericPortlet#doView(javax.portlet.RenderRequest, javax.portlet.RenderResponse) + */ + protected void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + + if (log.isDebugEnabled()) { + log.debug("doView() - HelloWorldPortlet: doView()"); + } + PortletContext context = getPortletContext(); + + String yourName = request.getParameter(YOUR_NAME_KEY); + if (log.isDebugEnabled()) { + log.debug("doView() - yourName=" + yourName); + } + if (yourName == null) { + yourName = ""; + } + request.setAttribute(YOUR_NAME_KEY, yourName); + + PortletRequestDispatcher rd = context + .getRequestDispatcher("/WEB-INF/jsp/helloworld.jsp"); + rd.include(request, response); + } + + /* (non-Javadoc) + * @see javax.portlet.Portlet#processAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse) + */ + public void processAction(ActionRequest request, ActionResponse response) + throws PortletException, IOException { + if (log.isDebugEnabled()) { + log.debug("processAction() - HelloWorldPortlet: processAction()"); + } + PortletSession session = request.getPortletSession(); + String yourName = request.getParameter(YOUR_NAME_KEY); + + if (yourName != null) { + Integer count = (Integer) session.getAttribute(COUNT_KEY); + if (count != null) { + count = new Integer(count.intValue() + 1); + } else { + count = new Integer(1); + } + if (log.isDebugEnabled()) { + log.debug("processAction() - HelloWorldPortlet: yourName = " + + yourName + ", count = " + count); + } + + session.setAttribute(COUNT_KEY, count); + response.setRenderParameter(YOUR_NAME_KEY, yourName); + } + + return; + } + + /* (non-Javadoc) + * @see javax.portlet.GenericPortlet#destroy() + */ + public void destroy() { + super.destroy(); + } + +} Property changes on: helloworld/trunk/src/main/java/jp/sf/pal/helloworld/HelloWorldPortlet.java ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources.properties =================================================================== --- helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources.properties 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources.properties 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,21 @@ +# Copyright 2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# $Id: HelloWorldResources.properties,v 1.1 2006/11/11 01:06:56 shinsuke Exp $ +# + +# helloworld.jsp +helloworld.lable.Hello=Hello! +helloworld.lable.YourName=Your Name: +helloworld.lable.Submit=Submit Property changes on: helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources.properties ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources_ja.properties =================================================================== --- helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources_ja.properties 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources_ja.properties 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,26 @@ +# Copyright 2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# $Id: HelloWorldResources_ja.properties,v 1.1 2006/11/11 01:06:56 shinsuke Exp $ +# + +# portlet info +javax.portlet.title=\u30cf\u30ed\u30fc\u30ef\u30fc\u30eb\u30c9 +javax.portlet.short-title=\u30cf\u30ed\u30fc +javax.portlet.keywords=\u30c6\u30b9\u30c8,\u30cf\u30ed\u30fc + +# helloworld.jsp +helloworld.lable.Hello=\u3053\u3093\u306b\u3061\u306f\u3001 +helloworld.lable.YourName=\u540d\u524d: +helloworld.lable.Submit=\u9001\u4fe1 Property changes on: helloworld/trunk/src/main/resources/jp/sf/pal/helloworld/resources/HelloWorldResources_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/src/main/webapp/WEB-INF/jsp/helloworld.jsp =================================================================== --- helloworld/trunk/src/main/webapp/WEB-INF/jsp/helloworld.jsp 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/src/main/webapp/WEB-INF/jsp/helloworld.jsp 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,32 @@ +<%-- +Copyright 2004 The Apache Software Foundation +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--%> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> + + + +
    + + + + + + + + + + + + +
    <%= request.getAttribute("yourName") %>
    "/>
    +
    Property changes on: helloworld/trunk/src/main/webapp/WEB-INF/jsp/helloworld.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- helloworld/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,37 @@ + + + + + HelloWorld is a portlet for testing + HelloWorld + Hello World + jp.sf.pal.helloworld.HelloWorldPortlet + -1 + + text/html + VIEW + + en + ja + jp.sf.pal.helloworld.resources.HelloWorldResources + + Hello World + Hello + Hello,Test + + + Property changes on: helloworld/trunk/src/main/webapp/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Added: helloworld/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- helloworld/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-17 21:17:21 UTC (rev 633) +++ helloworld/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-17 21:19:58 UTC (rev 634) @@ -0,0 +1,21 @@ + + + + + HelloWorld Portlet + HelloWorld Portlet + Property changes on: helloworld/trunk/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Thu Oct 18 09:17:49 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 09:17:49 +0900 Subject: [pal-cvs 2891] [635] added advertising portlet Message-ID: <1192666669.861973.4112.nullmailer@users.sourceforge.jp> Revision: 635 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=635 Author: shinsuke Date: 2007-10-18 09:17:49 +0900 (Thu, 18 Oct 2007) Log Message: ----------- added advertising portlet Added Paths: ----------- advertising/ -------------- next part -------------- From svnnotify @ sourceforge.jp Thu Oct 18 09:18:12 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 09:18:12 +0900 Subject: [pal-cvs 2892] [636] created trunk Message-ID: <1192666692.607731.4844.nullmailer@users.sourceforge.jp> Revision: 636 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=636 Author: shinsuke Date: 2007-10-18 09:18:12 +0900 (Thu, 18 Oct 2007) Log Message: ----------- created trunk Added Paths: ----------- advertising/trunk/ -------------- next part -------------- From svnnotify @ sourceforge.jp Thu Oct 18 09:22:30 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 09:22:30 +0900 Subject: [pal-cvs 2893] [637] added advertising portlet. Message-ID: <1192666950.913771.7137.nullmailer@users.sourceforge.jp> Revision: 637 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=637 Author: shinsuke Date: 2007-10-18 09:22:30 +0900 (Thu, 18 Oct 2007) Log Message: ----------- added advertising portlet. Added Paths: ----------- advertising/trunk/.classpath advertising/trunk/.project advertising/trunk/.settings/ advertising/trunk/.settings/org.eclipse.jdt.core.prefs advertising/trunk/.settings/org.eclipse.jdt.ui.prefs advertising/trunk/pom.xml advertising/trunk/src/ advertising/trunk/src/main/ advertising/trunk/src/main/java/ advertising/trunk/src/main/java/jp/ advertising/trunk/src/main/java/jp/sf/ advertising/trunk/src/main/java/jp/sf/pal/ advertising/trunk/src/main/java/jp/sf/pal/advertising/ advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/ advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/Advertising.java advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/AdvertisingList.java advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/ advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java advertising/trunk/src/main/resources/ advertising/trunk/src/main/resources/jp/ advertising/trunk/src/main/resources/jp/sf/ advertising/trunk/src/main/resources/jp/sf/pal/ advertising/trunk/src/main/resources/jp/sf/pal/advertising/ advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/ advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources.properties advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources_ja.properties advertising/trunk/src/main/webapp/ advertising/trunk/src/main/webapp/WEB-INF/ advertising/trunk/src/main/webapp/WEB-INF/ads/ advertising/trunk/src/main/webapp/WEB-INF/ads/default/ advertising/trunk/src/main/webapp/WEB-INF/ads/test/ advertising/trunk/src/main/webapp/WEB-INF/ads/test/test1.html advertising/trunk/src/main/webapp/WEB-INF/ads/test/test2.html advertising/trunk/src/main/webapp/WEB-INF/ads/test/test3.html advertising/trunk/src/main/webapp/WEB-INF/portlet.xml advertising/trunk/src/main/webapp/WEB-INF/web.xml -------------- next part -------------- Added: advertising/trunk/.classpath =================================================================== --- advertising/trunk/.classpath 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/.classpath 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file Property changes on: advertising/trunk/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/.project =================================================================== --- advertising/trunk/.project 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/.project 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,14 @@ + + advertising + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file Property changes on: advertising/trunk/.project ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- advertising/trunk/.settings/org.eclipse.jdt.core.prefs 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/.settings/org.eclipse.jdt.core.prefs 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,259 @@ +#Thu Oct 18 06:50:26 JST 2007 +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +eclipse.preferences.version=1 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert Added: advertising/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- advertising/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,4 @@ +#Sat Oct 13 05:55:20 JST 2007 +eclipse.preferences.version=1 +formatter_profile=_Seasar +formatter_settings_version=11 Added: advertising/trunk/pom.xml =================================================================== --- advertising/trunk/pom.xml 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/pom.xml 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,64 @@ + + + 4.0.0 + jp.sf.pal + advertising + 1.0-SNAPSHOT + war + Advertising Portlet + + http://pal.sourceforge.jp/ + 2005 + + + shinsuke + Shinsuke Sugaya + shinsuke_at_yahoo.co.jp + http://d.hatena.ne.jp/shinsuke_sugaya/ + + + +9 + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:cvs:pserver:anonymous @ cvs.sourceforge.jp:/cvsroot/pal:advertising + scm:cvs:pserver:anonymous @ cvs.sourceforge.jp:/cvsroot/pal:advertising + http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/advertising + + + Portal Application Laboratory + http://pal.sourceforge.jp/ + + + advertising + + + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + portlet-api + portlet-api + 1.0 + provided + + + commons-logging + commons-logging + 1.0.4 + + + Property changes on: advertising/trunk/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/Advertising.java =================================================================== --- advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/Advertising.java 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/Advertising.java 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,101 @@ +/* + * Copyright 2005-2007 The Portal Application Laboratory. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.advertising.entity; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class Advertising implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -2388949077430190511L; + + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(Advertising.class); + + private File advertisingFile; + + private String content; + + public Advertising(File advertisingFile) { + if (advertisingFile == null || !advertisingFile.isFile()) { + throw new IllegalArgumentException("The target file is invalid: " + + advertisingFile); + } + + this.advertisingFile = advertisingFile; + this.content = null; + } + + public String getContent() { + if (content == null) { + loadContent(); + } + return content; + } + + protected void loadContent() { + BufferedReader br = null; + try { + br = new BufferedReader(new InputStreamReader(new FileInputStream( + advertisingFile), "UTF-8")); + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line).append("\n"); + } + content = sb.toString(); + } catch (UnsupportedEncodingException e) { + if (log.isDebugEnabled()) { + log.debug("Could not load the content: " + advertisingFile, e); + } + content = ""; + } catch (FileNotFoundException e) { + if (log.isDebugEnabled()) { + log.debug("Could not load the content: " + advertisingFile, e); + } + content = ""; + } catch (IOException e) { + if (log.isDebugEnabled()) { + log.debug("Could not load the content: " + advertisingFile, e); + } + content = ""; + } finally { + if (br != null) { + try { + br.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + + } +} Property changes on: advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/Advertising.java ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/AdvertisingList.java =================================================================== --- advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/AdvertisingList.java 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/AdvertisingList.java 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,94 @@ +/* + * Copyright 2005-2007 The Portal Application Laboratory. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.advertising.entity; + +import java.io.File; +import java.io.FilenameFilter; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class AdvertisingList implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -3356953092082874454L; + + private List advertisingList; + + private File advertisingDirectory; + + private long lastUpdated; + + private long refreshTime; + + private int position; + + public AdvertisingList(String advertisingPath, long refreshTime) { + advertisingDirectory = new File(advertisingPath); + if (!advertisingDirectory.isDirectory()) { + throw new IllegalArgumentException( + "Could not find the target directory: " + advertisingPath); + } + + // set timeout + this.refreshTime = refreshTime; + this.position = 0; + + // load ads + load(); + } + + public void load() { + long now = new Date().getTime(); + if (now - lastUpdated > refreshTime * 1000) { + advertisingList = new ArrayList(); + for (File adsFile : advertisingDirectory + .listFiles(new AdvertisingFilenameFilter())) { + advertisingList.add(new Advertising(adsFile)); + } + + // udpate date + lastUpdated = now; + } + } + + public Advertising getAdvertising() { + int size = advertisingList.size(); + if (size > 0) { + Advertising ad = advertisingList.get(position); + position++; + if (position >= size) { + position = 0; + } + return ad; + } + return null; + } + + protected class AdvertisingFilenameFilter implements FilenameFilter { + + public boolean accept(File dir, String name) { + if (name.endsWith(".html")) { + return true; + } + return false; + } + + } +} Property changes on: advertising/trunk/src/main/java/jp/sf/pal/advertising/entity/AdvertisingList.java ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java =================================================================== --- advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,138 @@ +/* + * Copyright 2005-2007 The Portal Application Laboratory. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.advertising.portlet; + +import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletConfig; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import jp.sf.pal.advertising.entity.AdvertisingList; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * AdvertisingPortlet is a portlet to display Ads. + * + * @author Shinsuke Sugaya + */ +public class AdvertisingPortlet extends GenericPortlet { + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(AdvertisingPortlet.class); + + public static final String SCOPE_PREFIX = "jp.sf.pal.advertising.Scope_"; + + public static final String ADVERTISING_SCOPE = "advertisingScope"; + + public static final String ADVERTISING_PATH = "advertisingPath"; + + public static final String REFRESH_TIME = "refreshTime"; + + public static final String DEFAULT_ADVERTISING_SCOPE = "default"; + + public static final String DEFAULT_ADVERTISING_PATH = "/WEB-INF/ads/"; + + public static final long DEFAULT_REFRESH_TIME = 60; // sec + + private String advertisingScope; + + /* (non-Javadoc) + * @see javax.portlet.Portlet#init(javax.portlet.PortletConfig) + */ + public void init(PortletConfig config) throws PortletException { + if (log.isDebugEnabled()) { + log.debug("init() - AdvertisingPortlet: init()"); + } + super.init(config); + + // set scope + advertisingScope = config.getInitParameter(ADVERTISING_SCOPE); + if (advertisingScope == null) { + advertisingScope = DEFAULT_ADVERTISING_SCOPE; + } + + // set path + String advertisingPath = config.getInitParameter(ADVERTISING_PATH); + if (advertisingPath == null) { + advertisingPath = getPortletContext().getRealPath( + DEFAULT_ADVERTISING_PATH + advertisingScope); + } else if (!advertisingPath.endsWith("/")) { + advertisingPath = advertisingPath + "/"; + } + + // set refresh time + long refreshTime = DEFAULT_REFRESH_TIME; + String refreshTimeString = config.getInitParameter(REFRESH_TIME); + if (refreshTimeString != null) { + refreshTime = Long.parseLong(refreshTimeString); + } + + // set advertising list + getPortletContext().setAttribute(SCOPE_PREFIX + advertisingScope, + new AdvertisingList(advertisingPath, refreshTime)); + } + + /* (non-Javadoc) + * @see javax.portlet.GenericPortlet#doView(javax.portlet.RenderRequest, javax.portlet.RenderResponse) + */ + protected void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + //TODO content type? + response.setContentType("text/html"); + + if (log.isDebugEnabled()) { + log.debug("doView() - AdvertisingPortlet: doView()"); + } + + AdvertisingList advertisingList = (AdvertisingList) getPortletContext() + .getAttribute(SCOPE_PREFIX + advertisingScope); + advertisingList.load(); + response.getWriter().print( + advertisingList.getAdvertising().getContent()); + response.getWriter().flush(); + response.getWriter().close(); + } + + /* (non-Javadoc) + * @see javax.portlet.Portlet#processAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse) + */ + public void processAction(ActionRequest request, ActionResponse response) + throws PortletException, IOException { + if (log.isDebugEnabled()) { + log.debug("processAction() - AdvertisingPortlet: processAction()"); + } + + // nothing to do.. + + return; + } + + /* (non-Javadoc) + * @see javax.portlet.GenericPortlet#destroy() + */ + public void destroy() { + super.destroy(); + } + +} Property changes on: advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources.properties =================================================================== --- advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources.properties 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources.properties 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,18 @@ +# 2005-2007 The Portal Application Laboratory. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# $Id: HelloWorldResources.properties,v 1.1 2006/11/11 01:06:56 shinsuke Exp $ +# + + Property changes on: advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources.properties ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources_ja.properties =================================================================== --- advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources_ja.properties 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources_ja.properties 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,23 @@ +# 2005-2007 The Portal Application Laboratory. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# $Id: HelloWorldResources_ja.properties,v 1.1 2006/11/11 01:06:56 shinsuke Exp $ +# + +# portlet info +javax.portlet.title=\u5e83\u544a +javax.portlet.short-title=\u5e83\u544a +javax.portlet.keywords=\u5e83\u544a + + Property changes on: advertising/trunk/src/main/resources/jp/sf/pal/advertising/resources/AdvertisingResources_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/webapp/WEB-INF/ads/test/test1.html =================================================================== --- advertising/trunk/src/main/webapp/WEB-INF/ads/test/test1.html 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/webapp/WEB-INF/ads/test/test1.html 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,2 @@ +Advertising 1 + Property changes on: advertising/trunk/src/main/webapp/WEB-INF/ads/test/test1.html ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/webapp/WEB-INF/ads/test/test2.html =================================================================== --- advertising/trunk/src/main/webapp/WEB-INF/ads/test/test2.html 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/webapp/WEB-INF/ads/test/test2.html 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,2 @@ +Advertising 2 + Property changes on: advertising/trunk/src/main/webapp/WEB-INF/ads/test/test2.html ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/webapp/WEB-INF/ads/test/test3.html =================================================================== --- advertising/trunk/src/main/webapp/WEB-INF/ads/test/test3.html 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/webapp/WEB-INF/ads/test/test3.html 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,2 @@ +Advertising 3 + Property changes on: advertising/trunk/src/main/webapp/WEB-INF/ads/test/test3.html ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- advertising/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,41 @@ + + + + + This portlet displays advertisings for testing. + AdvertisingTestPortlet + Advertising for Test + jp.sf.pal.advertising.portlet.AdvertisingPortlet + + advertisingScope + test + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.advertising.resources.AdvertisingResources + + Advertising + Advertising + Advertising + + + Property changes on: advertising/trunk/src/main/webapp/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Added: advertising/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- advertising/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-18 00:18:12 UTC (rev 636) +++ advertising/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-18 00:22:30 UTC (rev 637) @@ -0,0 +1,21 @@ + + + + + Advertising Portlet + Advertising Portlet + Property changes on: advertising/trunk/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Thu Oct 18 13:29:24 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 13:29:24 +0900 Subject: [pal-cvs 2894] [638] modified advertisingPath. Message-ID: <1192681764.665687.8458.nullmailer@users.sourceforge.jp> Revision: 638 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=638 Author: shinsuke Date: 2007-10-18 13:29:24 +0900 (Thu, 18 Oct 2007) Log Message: ----------- modified advertisingPath. Modified Paths: -------------- advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java -------------- next part -------------- Modified: advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java =================================================================== --- advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java 2007-10-18 00:22:30 UTC (rev 637) +++ advertising/trunk/src/main/java/jp/sf/pal/advertising/portlet/AdvertisingPortlet.java 2007-10-18 04:29:24 UTC (rev 638) @@ -77,8 +77,11 @@ if (advertisingPath == null) { advertisingPath = getPortletContext().getRealPath( DEFAULT_ADVERTISING_PATH + advertisingScope); - } else if (!advertisingPath.endsWith("/")) { - advertisingPath = advertisingPath + "/"; + } else { + if (!advertisingPath.endsWith("/")) { + advertisingPath = advertisingPath + "/"; + } + advertisingPath = advertisingPath + advertisingScope; } // set refresh time From svnnotify @ sourceforge.jp Thu Oct 18 14:00:17 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 18 Oct 2007 14:00:17 +0900 Subject: [pal-cvs 2895] [639] removed unneede patch. Message-ID: <1192683617.582163.28634.nullmailer@users.sourceforge.jp> Revision: 639 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=639 Author: shinsuke Date: 2007-10-18 14:00:16 +0900 (Thu, 18 Oct 2007) Log Message: ----------- removed unneede patch. updated version. added some layouts. Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml Removed Paths: ------------- pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-10-18 04:29:24 UTC (rev 638) +++ pal-portal/trunk/build.properties 2007-10-18 05:00:16 UTC (rev 639) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=0 +container.version.minor=0.1-dev container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build @@ -67,7 +67,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.revision=574906 +jetspeed2.revision=584942 # Dependencies for Jetspeed jetspeed.version=2.1.2_pal-${portal.version} @@ -169,7 +169,6 @@ components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\ components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties,\ components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java,\ -components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java,\ components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java,\ components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java,\ components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java,\ Deleted: pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java =================================================================== --- pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java 2007-10-18 04:29:24 UTC (rev 638) +++ pal-portal/trunk/portal/patches/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java 2007-10-18 05:00:16 UTC (rev 639) @@ -1,13 +0,0 @@ -Index: components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java -=================================================================== ---- components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (リビジョン 569682) -+++ components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapMemberShipDaoImpl.java (作業コピー) -@@ -57,7 +57,7 @@ - */ - public String[] searchGroupMemberShipByGroup(final String userPrincipalUid, SearchControls cons) throws NamingException { - -- String query = "(&(" + getGroupMembershipAttribute() + "=" + userPrincipalUid + ")" + getGroupFilter() + ")"; -+ String query = "(&(" + getGroupMembershipAttribute() + "=" + getUserDN(userPrincipalUid) + ")" + getGroupFilter() + ")"; - - if (logger.isDebugEnabled()) - { Modified: pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml =================================================================== --- pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 2007-10-18 04:29:24 UTC (rev 638) +++ pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/portlet.xml 2007-10-18 05:00:16 UTC (rev 639) @@ -1,8 +1,8 @@ Index: layout-portlets/src/webapp/WEB-INF/portlet.xml =================================================================== ---- layout-portlets/src/webapp/WEB-INF/portlet.xml (リビジョン 569682) +--- layout-portlets/src/webapp/WEB-INF/portlet.xml (リビジョン 574906) +++ layout-portlets/src/webapp/WEB-INF/portlet.xml (作業コピー) -@@ -18,38 +18,10 @@ +@@ -18,12 +18,11 @@ @@ -12,45 +12,138 @@ - SimpleLayout - Simple readonly fixed Layout - -- ViewPage -- columns -- -- -- MaxPage -- maximized -- ++ ++ VelocityOneColumn ++ One Column Layout ++ 1 列レイアウト ++ + ViewPage + columns + +@@ -31,26 +30,42 @@ + MaxPage + maximized + - org.apache.jetspeed.portlets.layout.LayoutPortlet -- org.apache.jetspeed.portlets.layout.resources.LayoutResource -- 0 -- -- text/html -- view -- -- ++ ++ columns ++ 1 ++ ++ ++ sizes ++ 100% ++ ++ ++ layoutType ++ OneColumn ++ ++ org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource + 0 + + text/html + view ++ edit ++ help + ++ ++ text/vnd.wap.wml ++ view ++ + - SimpleLayoutPortlet - SimpleLayout -- ++ VelocityOneColumn ++ OneColumn + - - - -+ - VelocityOneColumn +- VelocityOneColumn - One Column - Velocityを利用した 1 列レイアウト - 基于Velocity的?列布局 - 基於Velocity的單列佈局 -+ One Column Layout -+ 1 列レイアウト - +- ++ ++ ++ ++ VelocityTwoColumns ++ Two Columns Layout(50/50) ++ 2 列レイアウト(50/50) ++ ViewPage columns -@@ -84,58 +56,15 @@ - view + +@@ -60,15 +75,15 @@ + + + columns +- 1 ++ 2 + + + sizes +- 100% ++ 50%,50% + + + layoutType +- OneColumn ++ TwoColumns + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +@@ -79,25 +94,58 @@ + edit + help ++ ++ VelocityTwoColumns ++ TwoColumns ++ ++ ++ ++ ++ VelocityTwoColumns3366 ++ Two Columns Layout(33/66) ++ 2 列レイアウト(33/66) ++ ++ ViewPage ++ columns ++ ++ ++ MaxPage ++ maximized ++ ++ ++ columns ++ 2 ++ ++ ++ sizes ++ 33%,66% ++ ++ ++ layoutType ++ TwoColumns ++ ++ org.apache.jetspeed.portlets.layout.MultiColumnPortlet ++ org.apache.jetspeed.portlets.layout.resources.LayoutResource ++ 0 + +- text/vnd.wap.wml +- view ++ text/html ++ view ++ edit ++ help + - One Column -+ VelocityOneColumn - OneColumn +- OneColumn ++ VelocityTwoColumns ++ TwoColumns @@ -60,53 +153,72 @@ - Velocity とテーブルを利用した 1 列レイアウト - 基于Velocity表格的?列布局 - 基於Velocity表格的單列佈局 -- -- ViewPage ++ ++ VelocityTwoColumns2575 ++ Two Columns Layout(25/75) ++ 2 列レイアウト(25/75) + + ViewPage - tcolumns -- -- -- MaxPage -- maximized -- -- -- columns ++ columns + + + MaxPage +@@ -105,15 +153,15 @@ + + + columns - 1 -- -- -- sizes ++ 2 + + + sizes - 100% -- -- -- layoutType ++ 25%,75% + + + layoutType - OneColumn -- -- org.apache.jetspeed.portlets.layout.MultiColumnPortlet -- org.apache.jetspeed.portlets.layout.resources.LayoutResource -- 0 -- -- text/html -- view -- edit ++ TwoColumns + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +@@ -122,20 +170,18 @@ + text/html + view + edit - help -- -- ++ help + + - One Column with Tables - OneColumnTable -- -- -- - - VelocityTwoColumns ++ VelocityTwoColumns ++ TwoColumns + + + +- +- VelocityTwoColumns - Two Columns - Velocity を利用した 2 列レイアウト - 基于Velocity的双列布局 - 基於Velocity的雙列佈局 -+ Two Columns Layout(50/50) -+ 2 列レイアウト(50/50) ++ ++ VelocityTwoColumns2080 ++ Two Columns Layout(20/80) ++ 2 列レイアウト(20/80) ViewPage columns -@@ -156,10 +85,6 @@ +@@ -150,16 +196,12 @@ + + + sizes +- 50%,50% ++ 20%,80% + + layoutType TwoColumns @@ -117,8 +229,12 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource 0 -@@ -170,17 +95,15 @@ - help +@@ -167,20 +209,18 @@ + text/html + view + edit +- help ++ help - Two Columns @@ -133,23 +249,14 @@ - Velocity を利用した左側にナビゲーションコントロール用の小さな列を持つ 2 列 - 基于Velocity,?航??窄的双列布局 - 基於Velocity,導航欄較窄的雙列佈局 -+ -+ VelocityTwoColumns2575 -+ Two Columns Layout(25/75) -+ 2 列レイアウト(25/75) ++ ++ VelocityTwoColumns1585 ++ Two Columns Layout(15/85) ++ 2 列レイアウト(15/85) ViewPage columns -@@ -195,7 +118,7 @@ - - - sizes -- 15%,85% -+ 25%,75% - - - layoutType -@@ -208,21 +131,18 @@ +@@ -208,21 +248,57 @@ text/html view edit @@ -164,21 +271,59 @@ -- ++ ++ VelocityTwoColumns1090 ++ Two Columns Layout(10/90) ++ 2 列レイアウト(10/90) ++ ++ ViewPage ++ columns ++ ++ ++ MaxPage ++ maximized ++ ++ ++ columns ++ 2 ++ ++ ++ sizes ++ 10%,90% ++ ++ ++ layoutType ++ TwoColumns ++ ++ org.apache.jetspeed.portlets.layout.MultiColumnPortlet ++ org.apache.jetspeed.portlets.layout.resources.LayoutResource ++ 0 ++ ++ text/html ++ view ++ edit ++ help ++ ++ ++ VelocityTwoColumns ++ TwoColumns ++ ++ + - - VelocityThreeColumns - Three Columns - Velocity を利用した 3 列レイアウト - 基于Velocity的3列布局 - 基於Velocity的3列佈局 -+ -+ VelocityTwoColumns3366 -+ Two Columns Layout(33/66) -+ 2 列レイアウト(33/66) ++ ++ VelocityTwoColumns595 ++ Two Columns Layout(5/95) ++ 2 列レイアウト(5/95) ViewPage columns -@@ -233,15 +153,15 @@ +@@ -233,15 +309,15 @@ columns @@ -188,7 +333,7 @@ sizes - 33%,33%,33% -+ 33%,66% ++ 5%,95% layoutType @@ -197,7 +342,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -250,23 +170,21 @@ +@@ -250,23 +326,21 @@ text/html view edit @@ -229,7 +374,7 @@ MaxPage -@@ -274,15 +192,15 @@ +@@ -274,15 +348,15 @@ columns @@ -248,7 +393,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -291,20 +209,18 @@ +@@ -291,20 +365,18 @@ text/html view edit @@ -276,7 +421,7 @@ ViewPage columns -@@ -315,15 +231,15 @@ +@@ -315,15 +387,15 @@ columns @@ -295,7 +440,7 @@ org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -335,19 +251,19 @@ +@@ -335,19 +407,19 @@ text/vnd.wap.wml view @@ -316,44 +461,37 @@ - ページアクションのない Velocity を利用した 2 列レイアウト - 没有?面状?、基于Velocity的双列布局 - 沒有頁面?態、基於Velocity的雙列佈局 -+ -+ VelocityThreeColumns -+ Three Columns Layout(33/33/33) -+ 3 列レイアウト(33/33/33) ++ ++ VelocityTwoColumns8020 ++ Two Columns Layout(80/20) ++ 2 列レイアウト(80/20) ViewPage columns -@@ -358,15 +274,15 @@ +@@ -362,7 +434,7 @@ - columns -- 2 -+ 3 - - sizes - 50%,50% -+ 33%,33%,33% ++ 80%,20% layoutType -- TwoColumns -+ ThreeColumns - - org.apache.jetspeed.portlets.layout.MultiColumnPortlet - org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -374,19 +290,19 @@ - +@@ -375,18 +447,22 @@ text/html view + ++ ++ text/vnd.wap.wml ++ view + edit -+ help - ++ help ++ - Two Columns - No Actions - TwoColumnsNoActions -+ VelocityThreeColumns -+ ThreeColumns ++ VelocityTwoColumns ++ TwoColumns @@ -363,34 +501,47 @@ - ページアクションのない Velocity を利用した 3 列レイアウト - 没有?面状?、基于Velocity的3列布局 - 沒有頁面?態、基於Velocity的3列佈局 -+ -+ VelocityThreeColumns206020 -+ Three Columns Layout(20/60/20) -+ 3 列レイアウト(20/60/20) ++ ++ VelocityTwoColumns8515 ++ Two Columns Layout(85/15) ++ 2 列レイアウト(85/15) ViewPage columns -@@ -401,7 +317,7 @@ +@@ -397,15 +473,15 @@ + columns +- 3 ++ 2 + + sizes - 33%,33%,33% -+ 20%,60%,20% ++ 85%,15% layoutType -@@ -413,18 +329,19 @@ - +- ThreeColumns ++ TwoColumns + + org.apache.jetspeed.portlets.layout.MultiColumnPortlet + org.apache.jetspeed.portlets.layout.resources.LayoutResource +@@ -414,17 +490,22 @@ text/html view + ++ ++ text/vnd.wap.wml ++ view + edit + help - ++ - Three Columns - No Actions - ThreeColumnsNoActions -+ VelocityThreeColumns -+ ThreeColumns ++ VelocityTwoColumns ++ TwoColumns - @@ -400,89 +551,119 @@ - 没有?面状?、基于Velocity的双列布局 - 沒有頁面?態、基於Velocity的雙列佈局 + -+ -+ VelocityFourColumns -+ Four Layout -+ 4 列レイアウト ++ ++ VelocityTwoColumns9010 ++ Two Columns Layout(90/10) ++ 2 列レイアウト(90/10) ViewPage columns -@@ -435,15 +352,15 @@ +@@ -439,7 +520,7 @@ - columns -- 2 -+ 4 - - sizes - 25%,75% -+ 20%,30%,30%,20% ++ 90%,10% layoutType -- TwoColumns -+ FourColumns - - org.apache.jetspeed.portlets.layout.MultiColumnPortlet - org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -451,22 +368,22 @@ - +@@ -452,18 +533,22 @@ text/html view + ++ ++ text/vnd.wap.wml ++ view + edit -+ help - ++ help ++ - Two Columns (25%/75%) No Actions - VelocityTwoColumns2575NoActions -+ VelocityFourColumns -+ FourColumns ++ VelocityTwoColumns ++ TwoColumns -- + - - VelocityTwoColumns2575 - Two Columns (25%/75%) - Velocity を利用した 25/75 の 2 列レイアウト - 基于Velocity的双列布局 - 基於Velocity的雙列佈局 -+ -+ + - - VelocityTwoColumnsSmallLeftNoActions @@ -490,40 +671,44 @@ - アクションのない Velocity を利用した左側にナビゲーションコントロール用の小さな列を持つ 2 列 - 没有?面状?、基于Velocity,?航??窄的?列布局 - 沒有頁面?態、基於Velocity,導航欄較窄的雙列佈局 -+ -+ VelocityOneColumnNoActions -+ One Column Layout with No Page Actions allowed -+ ページアクションのない 1 列レイアウト ++ ++ VelocityThreeColumns206020 ++ Three Columns Layout(20/60/20) ++ 3 列レイアウト(20/60/20) ViewPage columns -@@ -515,15 +428,15 @@ +@@ -515,15 +641,15 @@ columns - 2 -+ 1 ++ 3 sizes - 15%,85% -+ 100% ++ 20%,60%,20% layoutType - TwoColumns -+ OneColumn ++ ThreeColumns org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -533,20 +446,18 @@ +@@ -531,22 +657,22 @@ + + text/html view ++ edit ++ help - Two Columns (15%,85%) No Actions - 2 Columns 15,85 No Actions -+ VelocityOneColumn -+ OneColumn ++ VelocityThreeColumns ++ ThreeColumns @@ -533,10 +718,10 @@ - Velocity とテーブルを利用した 2 列レイアウト - 基于Velocity表格的双列布局 - 基於Velocity表格的雙列佈局 -+ -+ VelocityTwoColumnsNoActions -+ Two Columns Layout with No Page Actions allowed -+ ページアクションのない 2 列レイアウト ++ ++ VelocityThreeColumns157015 ++ Three Columns Layout(15/70/15) ++ 3 列レイアウト(15/70/15) ViewPage - tcolumns @@ -544,68 +729,208 @@ MaxPage -@@ -570,20 +481,17 @@ - - text/html - view -- edit -- help - - -- Two Columns with Tables -- Two Columns Tables -+ VelocityTwoColumns -+ TwoColumns - - - -- -- VelocityFourColumns -- Four Columns -- 基于Velocity表格的4列布局 -- 基於Velocity表格的4列佈局 -+ -+ VelocityThreeColumnsNoActions -+ Three Columns Layout with No Actions allowed -+ ページアクションのない 3 列レイアウト - - ViewPage - columns -@@ -594,15 +502,15 @@ +@@ -554,15 +680,15 @@ columns -- 4 +- 2 + 3 sizes -- 20%,30%,30%,20% -+ 33%,33%,33% +- 50%,50% ++ 15%,70%,15% layoutType -- FourColumns +- TwoColumns + ThreeColumns org.apache.jetspeed.portlets.layout.MultiColumnPortlet org.apache.jetspeed.portlets.layout.resources.LayoutResource -@@ -610,14 +518,13 @@ - +@@ -571,19 +697,18 @@ text/html view -- edit + edit - help ++ help -- Four Columns -- FourColumns +- Two Columns with Tables +- Two Columns Tables + VelocityThreeColumns + ThreeColumns -- + + + VelocityFourColumns +- Four Columns +- 基于Velocity表格的4列布局 +- 基於Velocity表格的4列佈局 ++ Four Layout ++ 4 列レイアウト + + ViewPage + columns +@@ -614,10 +739,159 @@ + help + + +- Four Columns ++ VelocityFourColumns + FourColumns + + + ++ + ++ ++ VelocityOneColumnNoActions ++ One Column Layout with No Page Actions allowed ++ ページアクションのない 1 列レイアウト ++ ++ ViewPage ++ columns ++ ++ ++ MaxPage ++ maximized ++ ++ ++ columns ++ 1 ++ ++ ++ sizes ++ 100% ++ ++ ++ layoutType ++ OneColumn ++ ++ org.apache.jetspeed.portlets.layout.MultiColumnPortlet ++ org.apache.jetspeed.portlets.layout.resources.LayoutResource ++ 0 ++ ++ text/html ++ view ++ ++ ++ VelocityOneColumn ++ OneColumn ++ ++ + ++ ++ VelocityTwoColumnsNoActions ++ Two Columns Layout with No Page Actions allowed ++ ページアクションのない 2 列レイアウト ++ ++ ViewPage ++ columns ++ ++ ++ MaxPage ++ maximized ++ ++ ++ columns ++ 2 ++ ++ ++ sizes ++ 50%,50% ++ ++ ++ layoutType ++ TwoColumns ++ ++ org.apache.jetspeed.portlets.layout.MultiColumnPortlet ++ org.apache.jetspeed.portlets.layout.resources.LayoutResource ++ 0 ++ ++ text/html ++ view ++ ++ ++ VelocityTwoColumns ++ TwoColumns ++ ++ ++ ++ ++ VelocityThreeColumnsNoActions ++ Three Columns Layout with No Actions allowed ++ ページアクションのない 3 列レイアウト ++ ++ ViewPage ++ columns ++ ++ ++ MaxPage ++ maximized ++ ++ ++ columns ++ 3 ++ ++ ++ sizes ++ 33%,33%,33% ++ ++ ++ layoutType ++ ThreeColumns ++ ++ org.apache.jetspeed.portlets.layout.MultiColumnPortlet ++ org.apache.jetspeed.portlets.layout.resources.LayoutResource ++ 0 ++ ++ text/html ++ view ++ ++ ++ VelocityThreeColumns ++ ThreeColumns ++ ++ ++ ++ Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-10-18 04:29:24 UTC (rev 638) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-10-18 05:00:16 UTC (rev 639) @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== ---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 574906) +--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 584942) +++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー) -@@ -418,6 +418,7 @@ +@@ -419,6 +419,7 @@ From svnnotify @ sourceforge.jp Fri Oct 19 16:02:28 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 19 Oct 2007 16:02:28 +0900 Subject: [pal-cvs 2896] [640] added security constraint. Message-ID: <1192777348.838742.20451.nullmailer@users.sourceforge.jp> Revision: 640 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=640 Author: shinsuke Date: 2007-10-19 16:02:28 +0900 (Fri, 19 Oct 2007) Log Message: ----------- added security constraint. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/web.xml -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-18 05:00:16 UTC (rev 639) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-19 07:02:28 UTC (rev 640) @@ -180,4 +180,20 @@ index.html /view/index.html + + + User Auth + /view/* + + + manager + + + + BASIC + User Auth + + + manager + From svnnotify @ sourceforge.jp Fri Oct 19 16:03:12 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 19 Oct 2007 16:03:12 +0900 Subject: [pal-cvs 2897] [641] replaced with signup. Message-ID: <1192777392.196212.20665.nullmailer@users.sourceforge.jp> Revision: 641 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=641 Author: shinsuke Date: 2007-10-19 16:03:11 +0900 (Fri, 19 Oct 2007) Log Message: ----------- replaced with signup. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-19 07:02:28 UTC (rev 640) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-19 07:03:11 UTC (rev 641) @@ -33,7 +33,7 @@ public static final String ORDER_URL = "orderUrl"; - public static final String REGISTER_URL = "registerUrl"; + public static final String SIGNUP_URL = "signupUrl"; public static final String DEFAULT_PRODUCT_LIST_URL = "/pompei/portal/products.psml"; @@ -41,7 +41,7 @@ public static final String DEFAULT_ORDER_URL = "/pompei/portal/order.psml"; - public static final String DEFAULT_REGISTER_URL = "/pompei/portal/register.psml"; + public static final String DEFAULT_SIGNUP_URL = "/pompei/portal/signup.psml"; public static final String INSERT_MODE = "insert"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java 2007-10-19 07:02:28 UTC (rev 640) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java 2007-10-19 07:03:11 UTC (rev 641) @@ -46,9 +46,9 @@ public static String createRegisterUrl() { String url = getPortletConfig().getInitParameter( - PompeiConstants.REGISTER_URL); + PompeiConstants.SIGNUP_URL); if (url == null) { - return PompeiConstants.DEFAULT_REGISTER_URL; + return PompeiConstants.DEFAULT_SIGNUP_URL; } return url; } From svnnotify @ sourceforge.jp Fri Oct 19 16:04:09 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 19 Oct 2007 16:04:09 +0900 Subject: [pal-cvs 2898] [642] workaround: dynamic property issue?? Message-ID: <1192777449.407675.21527.nullmailer@users.sourceforge.jp> Revision: 642 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=642 Author: shinsuke Date: 2007-10-19 16:04:09 +0900 (Fri, 19 Oct 2007) Log Message: ----------- workaround: dynamic property issue?? Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html -------------- next part -------------- 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-10-19 07:03:11 UTC (rev 641) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2007-10-19 07:04:09 UTC (rev 642) @@ -170,6 +170,11 @@ return UrlBuilderUtil.createRegisterUrl(); } + //TODO is it a bug? + public String getProductListLinkOnEmptyHref() { + return UrlBuilderUtil.createProductListUrl(); + } + /** * @return user */ 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-10-19 07:03:11 UTC (rev 641) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-19 07:04:09 UTC (rev 642) @@ -98,13 +98,13 @@ お買物を続ける
    -
    +

    From svnnotify @ sourceforge.jp Sat Oct 20 07:26:54 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 20 Oct 2007 07:26:54 +0900 Subject: [pal-cvs 2899] [643] check duplicated portal id. Message-ID: <1192832814.216434.21969.nullmailer@users.sourceforge.jp> Revision: 643 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=643 Author: shinsuke Date: 2007-10-20 07:26:53 +0900 (Sat, 20 Oct 2007) Log Message: ----------- check duplicated portal id. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java -------------- next part -------------- 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-10-19 07:04:09 UTC (rev 642) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2007-10-19 22:26:53 UTC (rev 643) @@ -98,8 +98,11 @@ CustomerCB cb = new CustomerCB(); // cb.setupSelect_CustomerInfoAsOne(); cb.query().setPortalId_Equal(portalId); - Customer customers = customerBhv.selectEntity(cb); - return customers; + List customers = customerBhv.selectList(cb); + if(customers.isEmpty()){ + return null; + } + return customers.get(0); } public void deleteCustomer(BigDecimal customerId) { @@ -172,6 +175,7 @@ } public void addCustomer(Customer customer, AddressBook addressBook) { + //TODO check portalid getCustomerBhv().insert(customer); addressBook.setCustomerId(customer.getCustomerId()); getAddressBookBhv().insert(addressBook); @@ -247,6 +251,11 @@ } String userName = userInfo.get(PompeiConstants.USER_NAME); + Customer c=getCustomerByPortalId(userName); + if(c!=null){ + deleteCustomer(c.getCustomerId()); + } + try { SystemUtil.getPortalAdministration().registerUser( userName, From svnnotify @ sourceforge.jp Sat Oct 20 07:27:52 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 20 Oct 2007 07:27:52 +0900 Subject: [pal-cvs 2900] [644] modified link name. Message-ID: <1192832872.737603.22145.nullmailer@users.sourceforge.jp> Revision: 644 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=644 Author: shinsuke Date: 2007-10-20 07:27:52 +0900 (Sat, 20 Oct 2007) Log Message: ----------- modified link name. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.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/webapp/view/user/cart/productList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java 2007-10-19 22:26:53 UTC (rev 643) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UrlBuilderUtil.java 2007-10-19 22:27:52 UTC (rev 644) @@ -44,7 +44,7 @@ return url; } - public static String createRegisterUrl() { + public static String createSignupUrl() { String url = getPortletConfig().getInitParameter( PompeiConstants.SIGNUP_URL); if (url == null) { 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-10-19 22:26:53 UTC (rev 643) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2007-10-19 22:27:52 UTC (rev 644) @@ -166,8 +166,8 @@ return UrlBuilderUtil.createOrderUrl(); } - public String getRegisterLinkHref() { - return UrlBuilderUtil.createRegisterUrl(); + public String getSignupLinkHref() { + return UrlBuilderUtil.createSignupUrl(); } //TODO is it a bug? 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-10-19 22:26:53 UTC (rev 643) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-19 22:27:52 UTC (rev 644) @@ -129,7 +129,7 @@

    - ユーザー登録へ進む + ユーザー登録へ進む
    From svnnotify @ sourceforge.jp Mon Oct 22 11:25:06 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 11:25:06 +0900 Subject: [pal-cvs 2901] [645] updated teeda version. Message-ID: <1193019906.018790.28900.nullmailer@users.sourceforge.jp> Revision: 645 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=645 Author: shinsuke Date: 2007-10-22 11:25:05 +0900 (Mon, 22 Oct 2007) Log Message: ----------- updated teeda version. Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2007-10-19 22:27:52 UTC (rev 644) +++ pal-admin/trunk/pom.xml 2007-10-22 02:25:05 UTC (rev 645) @@ -55,20 +55,6 @@ true - org.codehaus.mojo cobertura-maven-plugin @@ -96,23 +82,21 @@ - + + maven-javadoc-plugin + + + javadoc-jar + package + + jar + + + + + UTF-8 + + @@ -157,17 +141,17 @@ org.seasar.teeda teeda-core - 1.0.11-RC2 + 1.0.12-SNAPSHOT org.seasar.teeda teeda-extension - 1.0.11-RC2 + 1.0.12-SNAPSHOT org.seasar.teeda teeda-tiger - 1.0.11-RC2 + 1.0.11 org.apache.geronimo.specs From svnnotify @ sourceforge.jp Mon Oct 22 11:26:37 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 11:26:37 +0900 Subject: [pal-cvs 2902] [646] move delete button, and fixed wrong html. Message-ID: <1193019997.708578.30015.nullmailer@users.sourceforge.jp> Revision: 646 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=646 Author: shinsuke Date: 2007-10-22 11:26:37 +0900 (Mon, 22 Oct 2007) Log Message: ----------- move delete button, and fixed wrong html. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html pal-admin/trunk/src/main/webapp/view/user/userConfirm.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-10-22 02:26:37 UTC (rev 646) @@ -270,4 +270,7 @@ return getLabelHelper().getLabelValue("delete"); } + public String getOpenThisPageValue() { + return getLabelHelper().getLabelValue("jumpToThisPage"); + } } Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html 2007-10-22 02:26:37 UTC (rev 646) @@ -22,13 +22,13 @@
    -
    +
    -
    +
    -
    +
    @@ -40,20 +40,30 @@
    +
    + + + + +
    REPOSITORY
    +
    + +
    + + -
    -
    REPOSITORY
    PATH
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) @@ -90,8 +90,6 @@
    -
    -
    Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) @@ -90,8 +90,6 @@
    -
    -
    Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) @@ -96,9 +96,7 @@
    -
    Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) @@ -90,8 +90,6 @@
    -
    -
    Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 02:25:05 UTC (rev 645) +++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 02:26:37 UTC (rev 646) @@ -29,13 +29,23 @@ +
    + + + + +
    user
    +
    + +
    + + -
    @@ -51,8 +61,8 @@ -
    user
    TODOROLE
    +
    From svnnotify @ sourceforge.jp Mon Oct 22 16:53:15 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 16:53:15 +0900 Subject: [pal-cvs 2903] [647] added property editor for layout and portlet, and fixed message class name in html. Message-ID: <1193039595.798004.28117.nullmailer@users.sourceforge.jp> Revision: 647 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=647 Author: shinsuke Date: 2007-10-22 16:53:13 +0900 (Mon, 22 Oct 2007) Log Message: ----------- added property editor for layout and portlet, and fixed message class name in html. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html pal-admin/trunk/src/main/webapp/view/deployer/remotePortletDeployConfirm.html pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html pal-admin/trunk/src/main/webapp/view/group/groupEdit.html pal-admin/trunk/src/main/webapp/view/group/groupList.html pal-admin/trunk/src/main/webapp/view/portletmanager/portletActionConfirm.html pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html pal-admin/trunk/src/main/webapp/view/role/roleEdit.html pal-admin/trunk/src/main/webapp/view/role/roleList.html pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html pal-admin/trunk/src/main/webapp/view/user/userConfirm.html pal-admin/trunk/src/main/webapp/view/user/userCreate.html pal-admin/trunk/src/main/webapp/view/user/userEdit.html pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html pal-admin/trunk/src/main/webapp/view/user/userList.html pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-10-22 07:53:13 UTC (rev 647) @@ -709,6 +709,56 @@ return list; } + public List> createPropertyListForLayout(String path) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + List> list = new ArrayList>(); + if (page != null) { + String fid = getFragmentId(path); + Fragment fragment = page.getFragmentById(fid); + if (fragment != null && fragment.getProperties() != null) { + for (Iterator> itr = fragment + .getProperties().entrySet().iterator(); itr.hasNext();) { + Map.Entry entry = itr.next(); + Map map = new HashMap(); + map.put("propertyName", entry.getKey()); + map.put("propertyValue", entry.getValue()); + list.add(map); + } + } else { + //TODO throw exception + } + } + + return list; + } + + public List> createPropertyListForPortlet(String path) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + List> list = new ArrayList>(); + if (page != null) { + String fid = getFragmentId(path); + Fragment fragment = page.getFragmentById(fid); + if (fragment != null && fragment.getProperties() != null) { + for (Iterator> itr = fragment + .getProperties().entrySet().iterator(); itr.hasNext();) { + Map.Entry entry = itr.next(); + Map map = new HashMap(); + map.put("propertyName", entry.getKey()); + map.put("propertyValue", entry.getValue()); + list.add(map); + } + } else { + //TODO throw exception + } + } + + return list; + } + public List> createPermissionsList() throws CommonException { List> list = new ArrayList>(); @@ -2206,4 +2256,141 @@ // TODO layout or portlet return NodeInfo.LAYOUT; } + + public void addPropertyToLayout(String path, String name, String value) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.layout", + "Could not find a fragment: " + fid); + } + // fragment.getProperties() is not null. + fragment.getProperties().put(name, value); + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } + } + + public void deletePropertyFromLayout(String path, String name) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.layout", + "Could not find a fragment: " + fid); + } + // fragment.getProperties() is not null. + fragment.getProperties().remove(name); + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } + } + + public void addPropertyToPortlet(String path, String name, String value) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a fragment: " + fid); + } + // fragment.getProperties() is not null. + fragment.getProperties().put(name, value); + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } + } + + public void deletePropertyFromPortlet(String path, String name) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a fragment: " + fid); + } + // fragment.getProperties() is not null. + fragment.getProperties().remove(name); + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } + } + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-10-22 07:53:13 UTC (rev 647) @@ -19,10 +19,12 @@ import jp.sf.pal.admin.web.site.FolderSecurityEditorPage; import jp.sf.pal.admin.web.site.LayoutAddPortletEditorPage; import jp.sf.pal.admin.web.site.LayoutInfoEditorPage; +import jp.sf.pal.admin.web.site.LayoutPropertyEditorPage; import jp.sf.pal.admin.web.site.PageInfoEditorPage; import jp.sf.pal.admin.web.site.PageMetadataEditorPage; import jp.sf.pal.admin.web.site.PageSecurityEditorPage; import jp.sf.pal.admin.web.site.PortletInfoEditorPage; +import jp.sf.pal.admin.web.site.PortletPropertyEditorPage; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.LocaleUtil; @@ -226,6 +228,18 @@ } + public void loadPage(LayoutPropertyEditorPage page) throws CommonException { + if (!getSiteEditorLogic().checkFolderOrPageViewAccess(page.getPath())) { + throw new CommonException("could.not.access.path", + "Could not access a path: " + page.getPath()); + } + + loadTree(page); + + page.setPropertyItems(getSiteEditorLogic().createPropertyListForLayout( + page.getPath())); + } + public void loadPage(PortletInfoEditorPage page) throws CommonException { if (!getSiteEditorLogic().checkFolderOrPageViewAccess(page.getPath())) { throw new CommonException("could.not.access.path", @@ -244,6 +258,18 @@ getSiteEditorLogic().getPortletInfo(page.getPath()), page); } + public void loadPage(PortletPropertyEditorPage page) throws CommonException { + if (!getSiteEditorLogic().checkFolderOrPageViewAccess(page.getPath())) { + throw new CommonException("could.not.access.path", + "Could not access a path: " + page.getPath()); + } + + loadTree(page); + + page.setPropertyItems(getSiteEditorLogic() + .createPropertyListForPortlet(page.getPath())); + } + protected void loadTree(AbstractSiteEditorPage page) throws CommonException { String path = page.getPath(); if (path != null) { @@ -335,6 +361,30 @@ page.getMetadataName()); } + public void addProperty(LayoutPropertyEditorPage page) + throws CommonException { + getSiteEditorLogic().addPropertyToLayout(page.getPath(), + page.getNewPropertyName(), page.getNewPropertyValue()); + } + + public void deleteProperty(LayoutPropertyEditorPage page) + throws CommonException { + getSiteEditorLogic().deletePropertyFromLayout(page.getPath(), + page.getPropertyName()); + } + + public void addProperty(PortletPropertyEditorPage page) + throws CommonException { + getSiteEditorLogic().addPropertyToPortlet(page.getPath(), + page.getNewPropertyName(), page.getNewPropertyValue()); + } + + public void deleteProperty(PortletPropertyEditorPage page) + throws CommonException { + getSiteEditorLogic().deletePropertyFromPortlet(page.getPath(), + page.getPropertyName()); + } + public void deleteDocumentOrder(FolderOrderEditorPage page) throws CommonException { getSiteEditorLogic().deleteDocumentOrder(page.getPath(), @@ -581,7 +631,7 @@ public Boolean isEditable(String path) { try { - return new Boolean(getSiteEditorLogic() + return Boolean.valueOf(getSiteEditorLogic() .checkFolderOrPageEditAccess(path)); } catch (CommonException e) { return Boolean.FALSE; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2007-10-22 07:53:13 UTC (rev 647) @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; -import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.entity.NodeInfo; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2007-10-22 07:53:13 UTC (rev 647) @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; -import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.entity.NodeInfo; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-22 07:53:13 UTC (rev 647) @@ -5,3 +5,15 @@ EPA0005=Could not load a user info. EPA0006=Could not load a order. EPA0007=Could not change a order. + +EPA0008=Could not load a page. +EPA0009=Could not add a property. +EPA0010=Could not add a property. +EPA0011=Could not delete a property. +EPA0012=Could not delete a property. +EPA0013=Could not load a page. +EPA0014=Could not add a property. +EPA0015=Could not add a property. +EPA0016=Could not delete a property. +EPA0017=Could not delete a property. + Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-22 07:53:13 UTC (rev 647) @@ -196,4 +196,9 @@ could.not.remove.user=Could not remove a user. If you see this error message again, please contact a site administrator. invalid.password=Invalid password. +could.not.find.property=Could not find the property. If you see this error message again, please contact a site administrator. +added.property=Added the property +could.not.add.property=Could not add the property. If you see this error message again, please contact a site administrator. +deleted.property=Deleted the property. +could.not.delete.property=Could not delete the property. If you see this error message again, please contact a site administrator. Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-10-22 07:53:13 UTC (rev 647) @@ -3,6 +3,7 @@ metadataTab=Metadata addTab=Add orderTab=Order +propertyTab=Property path=Path: finish=Finish @@ -109,3 +110,19 @@ pageMetadataEditor.newMetadataValue=Value: pageMetadataEditor.add=Add +layoutPropertyEditor.name=Name +layoutPropertyEditor.value=Value +layoutPropertyEditor.action=Action +layoutPropertyEditor.delete=Delete +layoutPropertyEditor.newPropertyName=Name: +layoutPropertyEditor.newPropertyValue=Value: +layoutPropertyEditor.add=Add + +portletPropertyEditor.name=Name +portletPropertyEditor.value=Value +portletPropertyEditor.action=Action +portletPropertyEditor.delete=Delete +portletPropertyEditor.newPropertyName=Name: +portletPropertyEditor.newPropertyValue=Value: +portletPropertyEditor.add=Add + Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-10-22 07:53:13 UTC (rev 647) @@ -3,6 +3,7 @@ metadataTab=\u30e1\u30bf\u30c7\u30fc\u30bf addTab=\u8ffd\u52a0 orderTab=\u9806\u5e8f +propertyTab=\u30d7\u30ed\u30d1\u30c6\u30a3 path=\u30d1\u30b9: finish=\u5b8c\u4e86 @@ -111,3 +112,18 @@ pageMetadataEditor.newMetadataValue=\u5024: pageMetadataEditor.add=\u8ffd\u52a0 +layoutPropertyEditor.name=\u540d\u524d +layoutPropertyEditor.value=\u5024 +layoutPropertyEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 +layoutPropertyEditor.delete=\u524a\u9664 +layoutPropertyEditor.newPropertyName=\u540d\u524d: +layoutPropertyEditor.newPropertyValue=\u5024: +layoutPropertyEditor.add=\u8ffd\u52a0 + +portletPropertyEditor.name=\u540d\u524d +portletPropertyEditor.value=\u5024 +portletPropertyEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 +portletPropertyEditor.delete=\u524a\u9664 +portletPropertyEditor.newPropertyName=\u540d\u524d: +portletPropertyEditor.newPropertyValue=\u5024: +portletPropertyEditor.add=\u8ffd\u52a0 Modified: pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/deployer/remotePortletDeployConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remotePortletDeployConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/deployer/remotePortletDeployConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/group/groupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/group/groupList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/portletmanager/portletActionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/portletmanager/portletActionConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/portletmanager/portletActionConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -19,7 +19,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -17,7 +17,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    @@ -19,7 +19,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    * Modified: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    * Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    * Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    * Modified: pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/resetPassword.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    @@ -22,7 +22,7 @@ @@ -34,7 +34,7 @@ @@ -45,7 +45,7 @@ @@ -56,7 +56,7 @@ Modified: pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/role/roleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - +
    @@ -54,7 +54,7 @@
    - +
    @@ -102,7 +102,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - +
    @@ -54,7 +54,7 @@
    - +
    @@ -93,7 +93,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - +
    @@ -54,16 +54,16 @@
    - +
    - +
    - +
    - +
    - +
    - - + + - + @@ -100,7 +100,7 @@ - +
    Modified: pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -29,7 +29,7 @@ - +
    @@ -58,7 +58,7 @@
    - +
    @@ -87,7 +87,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - +
    @@ -54,7 +54,7 @@
    - +
    @@ -118,7 +118,7 @@ - +
    Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - +
    @@ -55,14 +55,12 @@ Information -
    - +
    @@ -86,7 +84,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - +
    @@ -55,14 +55,12 @@ Add -
    - +
    @@ -93,7 +91,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - +
    @@ -60,7 +60,7 @@
    - +
    @@ -100,7 +100,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - +
    @@ -60,16 +60,16 @@
    - +
    - - + + - + @@ -106,7 +106,7 @@ - +
    Modified: pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - +
    @@ -60,7 +60,7 @@
    - +
    @@ -124,7 +124,7 @@ - +
    Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - +
    @@ -52,17 +52,12 @@
    -
    - +
    @@ -93,7 +88,7 @@
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userCreate.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-10-22 07:53:13 UTC (rev 647) @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-22 07:53:13 UTC (rev 647) @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    Modified: pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html 2007-10-22 02:26:37 UTC (rev 646) +++ pal-admin/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html 2007-10-22 07:53:13 UTC (rev 647) @@ -8,7 +8,7 @@
    - +
    From svnnotify @ sourceforge.jp Mon Oct 22 16:54:12 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 16:54:12 +0900 Subject: [pal-cvs 2904] [648] added page class for property editor. Message-ID: <1193039652.441450.29134.nullmailer@users.sourceforge.jp> Revision: 648 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=648 Author: shinsuke Date: 2007-10-22 16:54:12 +0900 (Mon, 22 Oct 2007) Log Message: ----------- added page class for property editor. Added Paths: ----------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java -------------- next part -------------- Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2007-10-22 07:53:13 UTC (rev 647) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2007-10-22 07:54:12 UTC (rev 648) @@ -0,0 +1,237 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.site; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.entity.NodeInfo; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Required; + +public class LayoutPropertyEditorPage extends AbstractSiteEditorPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -7433703093804486330L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(LayoutPropertyEditorPage.class); + + private int propertyIndex; + + private List> propertyItems; + + private String propertyName; + + private String propertyValue; + + @Required + private String newPropertyName; + + private String newPropertyValue; + + private String action; + + public Class initialize() { + return null; + } + + public Class prerender() { + // parse request parameters + parseRequestParameters(); + + if (getPath() == null) { + setPath("/"); + } + + if (getReturnPath() == null) { + setReturnPath("/"); + } + + // check node + int type = getSiteEditorService().getNodeInfoType(getPath()); + if (type == NodeInfo.FOLDER) { + return FolderInfoEditorPage.class; + } else if (type == NodeInfo.PAGE) { + return PageInfoEditorPage.class; + } + + if ("delete".equals(getAction())) { + // delete + if (getPropertyName() != null) { + doDelete(); + } else { + FacesMessageUtil.addWarnMessage("could.not.find.property"); + } + + setPropertyName(null); + setPropertyValue(null); + } + + try { + getSiteEditorService().loadPage(this); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0008", new Object[] { this.toString() }, e); + } + + // render FacesMessages + FacesMessageUtil.renderMessages(); + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doAdd() { + try { + getSiteEditorService().addProperty(this); + FacesMessageUtil.addInfoMessage("added.property"); + return LayoutPropertyEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0009", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.add.property"); + logger.log("EPA0010", new Object[] { this.toString() }, e); + } + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doDelete() { + try { + getSiteEditorService().deleteProperty(this); + FacesMessageUtil.addInfoMessage("deleted.property"); + return LayoutPropertyEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0011", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.delete.property"); + logger.log("EPA0012", new Object[] { this.toString() }, e); + } + return null; + } + + /** + * @return the propertyIndex + */ + public int getPropertyIndex() { + return propertyIndex; + } + + /** + * @param propertyIndex the propertyIndex to set + */ + public void setPropertyIndex(int propertyIndex) { + this.propertyIndex = propertyIndex; + } + + /** + * @return the propertyItems + */ + public List> getPropertyItems() { + return propertyItems; + } + + /** + * @param propertyItems the propertyItems to set + */ + public void setPropertyItems(List> propertyItems) { + this.propertyItems = propertyItems; + } + + /** + * @return the propertyName + */ + public String getPropertyName() { + return propertyName; + } + + /** + * @param propertyName the propertyName to set + */ + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + + /** + * @return the propertyValue + */ + public String getPropertyValue() { + return propertyValue; + } + + /** + * @param propertyValue the propertyValue to set + */ + public void setPropertyValue(String propertyValue) { + this.propertyValue = propertyValue; + } + + /** + * @return the newPropertyName + */ + public String getNewPropertyName() { + return newPropertyName; + } + + /** + * @param newPropertyName the newPropertyName to set + */ + public void setNewPropertyName(String newPropertyName) { + this.newPropertyName = newPropertyName; + } + + /** + * @return the newPropertyValue + */ + public String getNewPropertyValue() { + return newPropertyValue; + } + + /** + * @param newPropertyValue the newPropertyValue to set + */ + public void setNewPropertyValue(String newPropertyValue) { + this.newPropertyValue = newPropertyValue; + } + + /** + * @return the action + */ + public String getAction() { + return action; + } + + /** + * @param action the action to set + */ + public void setAction(String action) { + this.action = action; + } +} \ No newline at end of file Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2007-10-22 07:53:13 UTC (rev 647) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2007-10-22 07:54:12 UTC (rev 648) @@ -0,0 +1,237 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.site; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.entity.NodeInfo; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Required; + +public class PortletPropertyEditorPage extends AbstractSiteEditorPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = 1628021934053317733L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortletPropertyEditorPage.class); + + private int propertyIndex; + + private List> propertyItems; + + private String propertyName; + + private String propertyValue; + + @Required + private String newPropertyName; + + private String newPropertyValue; + + private String action; + + public Class initialize() { + return null; + } + + public Class prerender() { + // parse request parameters + parseRequestParameters(); + + if (getPath() == null) { + setPath("/"); + } + + if (getReturnPath() == null) { + setReturnPath("/"); + } + + // check node + int type = getSiteEditorService().getNodeInfoType(getPath()); + if (type == NodeInfo.FOLDER) { + return FolderInfoEditorPage.class; + } else if (type == NodeInfo.PAGE) { + return PageInfoEditorPage.class; + } + + if ("delete".equals(getAction())) { + // delete + if (getPropertyName() != null) { + doDelete(); + } else { + FacesMessageUtil.addWarnMessage("could.not.find.property"); + } + + setPropertyName(null); + setPropertyValue(null); + } + + try { + getSiteEditorService().loadPage(this); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0013", new Object[] { this.toString() }, e); + } + + // render FacesMessages + FacesMessageUtil.renderMessages(); + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doAdd() { + try { + getSiteEditorService().addProperty(this); + FacesMessageUtil.addInfoMessage("added.property"); + return PortletPropertyEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0014", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.add.property"); + logger.log("EPA0015", new Object[] { this.toString() }, e); + } + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doDelete() { + try { + getSiteEditorService().deleteProperty(this); + FacesMessageUtil.addInfoMessage("deleted.property"); + return PortletPropertyEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0016", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.delete.property"); + logger.log("EPA0017", new Object[] { this.toString() }, e); + } + return null; + } + + /** + * @return the propertyIndex + */ + public int getPropertyIndex() { + return propertyIndex; + } + + /** + * @param propertyIndex the propertyIndex to set + */ + public void setPropertyIndex(int propertyIndex) { + this.propertyIndex = propertyIndex; + } + + /** + * @return the propertyItems + */ + public List> getPropertyItems() { + return propertyItems; + } + + /** + * @param propertyItems the propertyItems to set + */ + public void setPropertyItems(List> propertyItems) { + this.propertyItems = propertyItems; + } + + /** + * @return the propertyName + */ + public String getPropertyName() { + return propertyName; + } + + /** + * @param propertyName the propertyName to set + */ + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + + /** + * @return the propertyValue + */ + public String getPropertyValue() { + return propertyValue; + } + + /** + * @param propertyValue the propertyValue to set + */ + public void setPropertyValue(String propertyValue) { + this.propertyValue = propertyValue; + } + + /** + * @return the newPropertyName + */ + public String getNewPropertyName() { + return newPropertyName; + } + + /** + * @param newPropertyName the newPropertyName to set + */ + public void setNewPropertyName(String newPropertyName) { + this.newPropertyName = newPropertyName; + } + + /** + * @return the newPropertyValue + */ + public String getNewPropertyValue() { + return newPropertyValue; + } + + /** + * @param newPropertyValue the newPropertyValue to set + */ + public void setNewPropertyValue(String newPropertyValue) { + this.newPropertyValue = newPropertyValue; + } + + /** + * @return the action + */ + public String getAction() { + return action; + } + + /** + * @param action the action to set + */ + public void setAction(String action) { + this.action = action; + } +} \ No newline at end of file Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Mon Oct 22 18:20:08 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 18:20:08 +0900 Subject: [pal-cvs 2905] [649] added html files for property editor. Message-ID: <1193044808.585648.4938.nullmailer@users.sourceforge.jp> Revision: 649 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=649 Author: shinsuke Date: 2007-10-22 18:20:08 +0900 (Mon, 22 Oct 2007) Log Message: ----------- added html files for property editor. Added Paths: ----------- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html -------------- next part -------------- Added: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2007-10-22 07:54:12 UTC (rev 648) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2007-10-22 09:20:08 UTC (rev 649) @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + +
    +
    +
    + + /path/path +
    +
    + Finish +
    +
    + +
    + +
    +
    +
    + + + + + + + + + + + + + + +
    NV + +
    + +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + + + + Property changes on: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2007-10-22 07:54:12 UTC (rev 648) +++ pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2007-10-22 09:20:08 UTC (rev 649) @@ -0,0 +1,108 @@ + + + + + + + + +
    + + + + + + +
    +
    +
    + + /path/path +
    +
    + Finish +
    +
    + +
    + +
    +
    + + + + + + + + + + + + + + + +
    NV + +
    + +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Mon Oct 22 18:20:52 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 18:20:52 +0900 Subject: [pal-cvs 2906] [650] added preference editor for layout and portlet. Message-ID: <1193044852.679040.5135.nullmailer@users.sourceforge.jp> Revision: 650 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=650 Author: shinsuke Date: 2007-10-22 18:20:52 +0900 (Mon, 22 Oct 2007) Log Message: ----------- added preference editor for layout and portlet. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html Added Paths: ----------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-10-22 09:20:52 UTC (rev 650) @@ -31,6 +31,7 @@ import jp.sf.pal.admin.util.PortalComponentUtil; import jp.sf.pal.common.CommonException; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.jetspeed.JetspeedActions; import org.apache.jetspeed.PortalReservedParameters; import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent; @@ -56,6 +57,7 @@ import org.apache.jetspeed.om.page.Page; import org.apache.jetspeed.om.page.PageSecurity; import org.apache.jetspeed.om.page.SecurityConstraintsDef; +import org.apache.jetspeed.om.preference.FragmentPreference; import org.apache.jetspeed.page.FolderNotUpdatedException; import org.apache.jetspeed.page.PageManager; import org.apache.jetspeed.page.PageNotFoundException; @@ -759,6 +761,68 @@ return list; } + public List> createPreferenceListForLayout(String path) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + List> list = new ArrayList>(); + if (page != null) { + String fid = getFragmentId(path); + Fragment fragment = page.getFragmentById(fid); + if (fragment != null && fragment.getPreferences() != null) { + for (Iterator ite = fragment + .getPreferences().iterator(); ite.hasNext();) { + FragmentPreference fp = ite.next(); + Map map = new HashMap(); + map.put("preferenceName", fp.getName()); + //TODO handles multiple values + List valueList = fp.getValueList(); + if (valueList != null && !valueList.isEmpty()) { + map.put("preferenceValue", valueList.get(0)); + } else { + map.put("preferenceValue", ""); + } + list.add(map); + } + } else { + //TODO throw exception + } + } + + return list; + } + + public List> createPreferenceListForPortlet(String path) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + List> list = new ArrayList>(); + if (page != null) { + String fid = getFragmentId(path); + Fragment fragment = page.getFragmentById(fid); + if (fragment != null && fragment.getPreferences() != null) { + for (Iterator ite = fragment + .getPreferences().iterator(); ite.hasNext();) { + FragmentPreference fp = ite.next(); + Map map = new HashMap(); + map.put("preferenceName", fp.getName()); + //TODO handles multiple values + List valueList = fp.getValueList(); + if (valueList != null && !valueList.isEmpty()) { + map.put("preferenceValue", valueList.get(0)); + } else { + map.put("preferenceValue", ""); + } + list.add(map); + } + } else { + //TODO throw exception + } + } + + return list; + } + public List> createPermissionsList() throws CommonException { List> list = new ArrayList>(); @@ -2393,4 +2457,193 @@ } } + public void addPreferenceToLayout(String path, String name, String value) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.layout", + "Could not find a fragment: " + fid); + } + FragmentPreference fp = getFragmentPreferenceByName(fragment, name); + //TODO handles multiple values + if (fp == null) { + fp = pageManager.newFragmentPreference(); + fp.setName(name); + fp.setReadOnly(false); + List list = new ArrayList(); + list.add(StringEscapeUtils.escapeXml(value)); + fp.setValueList(list); + fragment.getPreferences().add(fp); + } else { + fp.getValueList().set(0, StringEscapeUtils.escapeXml(value)); + } + + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } + } + + public void deletePreferenceFromLayout(String path, String name) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.layout", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.layout", + "Could not find a fragment: " + fid); + } + FragmentPreference fp = getFragmentPreferenceByName(fragment, name); + //TODO handles multiple values + if (fp == null) { + throw new CommonException("could.not.find.preference", + "Could not find a preference: " + fid + ":" + name); + } else { + fragment.getPreferences().remove(fp); + } + + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.layout", + "Could not update a layout: " + path, e); + } + } + + public void addPreferenceToPortlet(String path, String name, String value) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a fragment: " + fid); + } + FragmentPreference fp = getFragmentPreferenceByName(fragment, name); + //TODO handles multiple values + if (fp == null) { + fp = pageManager.newFragmentPreference(); + fp.setName(name); + fp.setReadOnly(false); + List list = new ArrayList(); + list.add(StringEscapeUtils.escapeXml(value)); + fp.setValueList(list); + fragment.getPreferences().add(fp); + } else { + fp.getValueList().set(0, StringEscapeUtils.escapeXml(value)); + } + + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } + } + + public void deletePreferenceFromPortlet(String path, String name) + throws CommonException { + + Page page = getPage(getFolderOrPagePath(path)); + if (page == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + String fid = getFragmentId(path); + if (fid == null || fid.equals("")) { + throw new CommonException("could.not.find.portlet", + "Could not find a page: " + path); + } + + Fragment fragment = page.getFragmentById(fid); + if (fragment == null) { + throw new CommonException("could.not.find.portlet", + "Could not find a fragment: " + fid); + } + FragmentPreference fp = getFragmentPreferenceByName(fragment, name); + //TODO handles multiple values + if (fp == null) { + throw new CommonException("could.not.find.preference", + "Could not find a preference: " + fid + ":" + name); + } else { + fragment.getPreferences().remove(fp); + } + + try { + getPageManager().updatePage(page); + getPageManager().reset(); + } catch (PageNotUpdatedException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } catch (NodeException e) { + throw new CommonException("could.not.update.portlet", + "Could not update a portlet: " + path, e); + } + } + + private FragmentPreference getFragmentPreferenceByName(Fragment fragment, + String name) { + if (name == null) { + return null; + } + List preferences = fragment.getPreferences(); + for (Iterator ite = preferences.iterator(); ite.hasNext();) { + FragmentPreference fp = (FragmentPreference) ite.next(); + if (fp.getName() != null && fp.getName().equals(name)) { + return fp; + } + } + return null; + } + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-10-22 09:20:52 UTC (rev 650) @@ -19,11 +19,13 @@ import jp.sf.pal.admin.web.site.FolderSecurityEditorPage; import jp.sf.pal.admin.web.site.LayoutAddPortletEditorPage; import jp.sf.pal.admin.web.site.LayoutInfoEditorPage; +import jp.sf.pal.admin.web.site.LayoutPreferenceEditorPage; import jp.sf.pal.admin.web.site.LayoutPropertyEditorPage; import jp.sf.pal.admin.web.site.PageInfoEditorPage; import jp.sf.pal.admin.web.site.PageMetadataEditorPage; import jp.sf.pal.admin.web.site.PageSecurityEditorPage; import jp.sf.pal.admin.web.site.PortletInfoEditorPage; +import jp.sf.pal.admin.web.site.PortletPreferenceEditorPage; import jp.sf.pal.admin.web.site.PortletPropertyEditorPage; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.LocaleUtil; @@ -240,6 +242,19 @@ page.getPath())); } + public void loadPage(LayoutPreferenceEditorPage page) + throws CommonException { + if (!getSiteEditorLogic().checkFolderOrPageViewAccess(page.getPath())) { + throw new CommonException("could.not.access.path", + "Could not access a path: " + page.getPath()); + } + + loadTree(page); + + page.setPreferenceItems(getSiteEditorLogic() + .createPreferenceListForLayout(page.getPath())); + } + public void loadPage(PortletInfoEditorPage page) throws CommonException { if (!getSiteEditorLogic().checkFolderOrPageViewAccess(page.getPath())) { throw new CommonException("could.not.access.path", @@ -270,6 +285,19 @@ .createPropertyListForPortlet(page.getPath())); } + public void loadPage(PortletPreferenceEditorPage page) + throws CommonException { + if (!getSiteEditorLogic().checkFolderOrPageViewAccess(page.getPath())) { + throw new CommonException("could.not.access.path", + "Could not access a path: " + page.getPath()); + } + + loadTree(page); + + page.setPreferenceItems(getSiteEditorLogic() + .createPreferenceListForPortlet(page.getPath())); + } + protected void loadTree(AbstractSiteEditorPage page) throws CommonException { String path = page.getPath(); if (path != null) { @@ -385,6 +413,30 @@ page.getPropertyName()); } + public void addPreference(LayoutPreferenceEditorPage page) + throws CommonException { + getSiteEditorLogic().addPreferenceToLayout(page.getPath(), + page.getNewPreferenceName(), page.getNewPreferenceValue()); + } + + public void deletePreference(LayoutPreferenceEditorPage page) + throws CommonException { + getSiteEditorLogic().deletePreferenceFromLayout(page.getPath(), + page.getPreferenceName()); + } + + public void addPreference(PortletPreferenceEditorPage page) + throws CommonException { + getSiteEditorLogic().addPreferenceToPortlet(page.getPath(), + page.getNewPreferenceName(), page.getNewPreferenceValue()); + } + + public void deletePreference(PortletPreferenceEditorPage page) + throws CommonException { + getSiteEditorLogic().deletePreferenceFromPortlet(page.getPath(), + page.getPreferenceName()); + } + public void deleteDocumentOrder(FolderOrderEditorPage page) throws CommonException { getSiteEditorLogic().deleteDocumentOrder(page.getPath(), Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2007-10-22 09:20:52 UTC (rev 650) @@ -0,0 +1,237 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.site; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.entity.NodeInfo; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Required; + +public class LayoutPreferenceEditorPage extends AbstractSiteEditorPage + implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 8040353172823831504L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(LayoutPreferenceEditorPage.class); + + private int propertyIndex; + + private List> propertyItems; + + private String propertyName; + + private String propertyValue; + + @Required + private String newPreferenceName; + + private String newPreferenceValue; + + private String action; + + public Class initialize() { + return null; + } + + public Class prerender() { + // parse request parameters + parseRequestParameters(); + + if (getPath() == null) { + setPath("/"); + } + + if (getReturnPath() == null) { + setReturnPath("/"); + } + + // check node + int type = getSiteEditorService().getNodeInfoType(getPath()); + if (type == NodeInfo.FOLDER) { + return FolderInfoEditorPage.class; + } else if (type == NodeInfo.PAGE) { + return PageInfoEditorPage.class; + } + + if ("delete".equals(getAction())) { + // delete + if (getPreferenceName() != null) { + doDelete(); + } else { + FacesMessageUtil.addWarnMessage("could.not.find.property"); + } + + setPreferenceName(null); + setPreferenceValue(null); + } + + try { + getSiteEditorService().loadPage(this); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0018", new Object[] { this.toString() }, e); + } + + // render FacesMessages + FacesMessageUtil.renderMessages(); + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doAdd() { + try { + getSiteEditorService().addPreference(this); + FacesMessageUtil.addInfoMessage("added.property"); + return LayoutPreferenceEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0019", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.add.property"); + logger.log("EPA0020", new Object[] { this.toString() }, e); + } + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doDelete() { + try { + getSiteEditorService().deletePreference(this); + FacesMessageUtil.addInfoMessage("deleted.property"); + return LayoutPreferenceEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0021", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.delete.property"); + logger.log("EPA0022", new Object[] { this.toString() }, e); + } + return null; + } + + /** + * @return the propertyIndex + */ + public int getPreferenceIndex() { + return propertyIndex; + } + + /** + * @param propertyIndex the propertyIndex to set + */ + public void setPreferenceIndex(int propertyIndex) { + this.propertyIndex = propertyIndex; + } + + /** + * @return the propertyItems + */ + public List> getPreferenceItems() { + return propertyItems; + } + + /** + * @param propertyItems the propertyItems to set + */ + public void setPreferenceItems(List> propertyItems) { + this.propertyItems = propertyItems; + } + + /** + * @return the propertyName + */ + public String getPreferenceName() { + return propertyName; + } + + /** + * @param propertyName the propertyName to set + */ + public void setPreferenceName(String propertyName) { + this.propertyName = propertyName; + } + + /** + * @return the propertyValue + */ + public String getPreferenceValue() { + return propertyValue; + } + + /** + * @param propertyValue the propertyValue to set + */ + public void setPreferenceValue(String propertyValue) { + this.propertyValue = propertyValue; + } + + /** + * @return the newPreferenceName + */ + public String getNewPreferenceName() { + return newPreferenceName; + } + + /** + * @param newPreferenceName the newPreferenceName to set + */ + public void setNewPreferenceName(String newPreferenceName) { + this.newPreferenceName = newPreferenceName; + } + + /** + * @return the newPreferenceValue + */ + public String getNewPreferenceValue() { + return newPreferenceValue; + } + + /** + * @param newPreferenceValue the newPreferenceValue to set + */ + public void setNewPreferenceValue(String newPreferenceValue) { + this.newPreferenceValue = newPreferenceValue; + } + + /** + * @return the action + */ + public String getAction() { + return action; + } + + /** + * @param action the action to set + */ + public void setAction(String action) { + this.action = action; + } +} \ No newline at end of file Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2007-10-22 09:20:52 UTC (rev 650) @@ -0,0 +1,237 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.web.site; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.entity.NodeInfo; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Required; + +public class PortletPreferenceEditorPage extends AbstractSiteEditorPage + implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -3291082572720400440L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortletPreferenceEditorPage.class); + + private int propertyIndex; + + private List> propertyItems; + + private String propertyName; + + private String propertyValue; + + @Required + private String newPreferenceName; + + private String newPreferenceValue; + + private String action; + + public Class initialize() { + return null; + } + + public Class prerender() { + // parse request parameters + parseRequestParameters(); + + if (getPath() == null) { + setPath("/"); + } + + if (getReturnPath() == null) { + setReturnPath("/"); + } + + // check node + int type = getSiteEditorService().getNodeInfoType(getPath()); + if (type == NodeInfo.FOLDER) { + return FolderInfoEditorPage.class; + } else if (type == NodeInfo.PAGE) { + return PageInfoEditorPage.class; + } + + if ("delete".equals(getAction())) { + // delete + if (getPreferenceName() != null) { + doDelete(); + } else { + FacesMessageUtil.addWarnMessage("could.not.find.property"); + } + + setPreferenceName(null); + setPreferenceValue(null); + } + + try { + getSiteEditorService().loadPage(this); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0023", new Object[] { this.toString() }, e); + } + + // render FacesMessages + FacesMessageUtil.renderMessages(); + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doAdd() { + try { + getSiteEditorService().addPreference(this); + FacesMessageUtil.addInfoMessage("added.property"); + return PortletPreferenceEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0024", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.add.property"); + logger.log("EPA0025", new Object[] { this.toString() }, e); + } + return null; + } + + @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,path,returnPath") + public Class doDelete() { + try { + getSiteEditorService().deletePreference(this); + FacesMessageUtil.addInfoMessage("deleted.property"); + return PortletPreferenceEditorPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0026", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.delete.property"); + logger.log("EPA0027", new Object[] { this.toString() }, e); + } + return null; + } + + /** + * @return the propertyIndex + */ + public int getPreferenceIndex() { + return propertyIndex; + } + + /** + * @param propertyIndex the propertyIndex to set + */ + public void setPreferenceIndex(int propertyIndex) { + this.propertyIndex = propertyIndex; + } + + /** + * @return the propertyItems + */ + public List> getPreferenceItems() { + return propertyItems; + } + + /** + * @param propertyItems the propertyItems to set + */ + public void setPreferenceItems(List> propertyItems) { + this.propertyItems = propertyItems; + } + + /** + * @return the propertyName + */ + public String getPreferenceName() { + return propertyName; + } + + /** + * @param propertyName the propertyName to set + */ + public void setPreferenceName(String propertyName) { + this.propertyName = propertyName; + } + + /** + * @return the propertyValue + */ + public String getPreferenceValue() { + return propertyValue; + } + + /** + * @param propertyValue the propertyValue to set + */ + public void setPreferenceValue(String propertyValue) { + this.propertyValue = propertyValue; + } + + /** + * @return the newPreferenceName + */ + public String getNewPreferenceName() { + return newPreferenceName; + } + + /** + * @param newPreferenceName the newPreferenceName to set + */ + public void setNewPreferenceName(String newPreferenceName) { + this.newPreferenceName = newPreferenceName; + } + + /** + * @return the newPreferenceValue + */ + public String getNewPreferenceValue() { + return newPreferenceValue; + } + + /** + * @param newPreferenceValue the newPreferenceValue to set + */ + public void setNewPreferenceValue(String newPreferenceValue) { + this.newPreferenceValue = newPreferenceValue; + } + + /** + * @return the action + */ + public String getAction() { + return action; + } + + /** + * @param action the action to set + */ + public void setAction(String action) { + this.action = action; + } +} \ No newline at end of file Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-22 09:20:52 UTC (rev 650) @@ -16,4 +16,14 @@ EPA0015=Could not add a property. EPA0016=Could not delete a property. EPA0017=Could not delete a property. +EPA0018=Could not load a page. +EPA0019=Could not add a preference. +EPA0020=Could not add a preference. +EPA0021=Could not delete a preference. +EPA0022=Could not delete a preference. +EPA0023=Could not load a page. +EPA0024=Could not add a preference. +EPA0025=Could not add a preference. +EPA0026=Could not delete a preference. +EPA0027=Could not delete a preference. Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-22 09:20:52 UTC (rev 650) @@ -202,3 +202,8 @@ deleted.property=Deleted the property. could.not.delete.property=Could not delete the property. If you see this error message again, please contact a site administrator. +could.not.find.preference=Could not find the preference. If you see this error message again, please contact a site administrator. +added.preference=Added the preference +could.not.add.preference=Could not add the preference. If you see this error message again, please contact a site administrator. +deleted.preference=Deleted the preference. +could.not.delete.preference=Could not delete the preference. If you see this error message again, please contact a site administrator. Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-10-22 09:20:52 UTC (rev 650) @@ -4,6 +4,7 @@ addTab=Add orderTab=Order propertyTab=Property +preferenceTab=Preference path=Path: finish=Finish @@ -126,3 +127,19 @@ portletPropertyEditor.newPropertyValue=Value: portletPropertyEditor.add=Add +layoutPreferenceEditor.name=Name +layoutPreferenceEditor.value=Value +layoutPreferenceEditor.action=Action +layoutPreferenceEditor.delete=Delete +layoutPreferenceEditor.newPreferenceName=Name: +layoutPreferenceEditor.newPreferenceValue=Value: +layoutPreferenceEditor.add=Add + +portletPreferenceEditor.name=Name +portletPreferenceEditor.value=Value +portletPreferenceEditor.action=Action +portletPreferenceEditor.delete=Delete +portletPreferenceEditor.newPreferenceName=Name: +portletPreferenceEditor.newPreferenceValue=Value: +portletPreferenceEditor.add=Add + Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-10-22 09:20:52 UTC (rev 650) @@ -4,6 +4,7 @@ addTab=\u8ffd\u52a0 orderTab=\u9806\u5e8f propertyTab=\u30d7\u30ed\u30d1\u30c6\u30a3 +preferenceTab=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 path=\u30d1\u30b9: finish=\u5b8c\u4e86 @@ -127,3 +128,20 @@ portletPropertyEditor.newPropertyName=\u540d\u524d: portletPropertyEditor.newPropertyValue=\u5024: portletPropertyEditor.add=\u8ffd\u52a0 + +layoutPreferenceEditor.name=\u540d\u524d +layoutPreferenceEditor.value=\u5024 +layoutPreferenceEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 +layoutPreferenceEditor.delete=\u524a\u9664 +layoutPreferenceEditor.newPreferenceName=\u540d\u524d: +layoutPreferenceEditor.newPreferenceValue=\u5024: +layoutPreferenceEditor.add=\u8ffd\u52a0 + +portletPreferenceEditor.name=\u540d\u524d +portletPreferenceEditor.value=\u5024 +portletPreferenceEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 +portletPreferenceEditor.delete=\u524a\u9664 +portletPreferenceEditor.newPreferenceName=\u540d\u524d: +portletPreferenceEditor.newPreferenceValue=\u5024: +portletPreferenceEditor.add=\u8ffd\u52a0 + Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-10-22 09:20:52 UTC (rev 650) @@ -58,6 +58,9 @@ Property + + Preference +
    Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 09:20:52 UTC (rev 650) @@ -58,6 +58,9 @@ Property + + Preference +
    Added: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2007-10-22 09:20:52 UTC (rev 650) @@ -0,0 +1,111 @@ + + + + + + + + +
    + + + + + + +
    +
    +
    + + /path/path +
    +
    + Finish +
    +
    + +
    + +
    +
    + + + + + + + + + + + + + + + +
    NV + +
    + +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 09:20:52 UTC (rev 650) @@ -55,6 +55,9 @@ Property + + Preference +
    Added: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2007-10-22 09:20:08 UTC (rev 649) +++ pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2007-10-22 09:20:52 UTC (rev 650) @@ -0,0 +1,108 @@ + + + + + + + + +
    + + + + + + +
    +
    +
    + + /path/path +
    +
    + Finish +
    +
    + +
    + +
    +
    + + + + + + + + + + + + + + + +
    NV + +
    + +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Mon Oct 22 18:21:46 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 18:21:46 +0900 Subject: [pal-cvs 2907] [651] added commons lang and removed log4j. Message-ID: <1193044906.842222.5304.nullmailer@users.sourceforge.jp> Revision: 651 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=651 Author: shinsuke Date: 2007-10-22 18:21:46 +0900 (Mon, 22 Oct 2007) Log Message: ----------- added commons lang and removed log4j. Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2007-10-22 09:20:52 UTC (rev 650) +++ pal-admin/trunk/pom.xml 2007-10-22 09:21:46 UTC (rev 651) @@ -217,10 +217,17 @@ 1.1 + commons-lang + commons-lang + 2.3 + + xerces xercesImpl From svnnotify @ sourceforge.jp Mon Oct 22 18:22:18 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 22 Oct 2007 18:22:18 +0900 Subject: [pal-cvs 2908] [652] updated eclipse files. Message-ID: <1193044938.782330.6058.nullmailer@users.sourceforge.jp> Revision: 652 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=652 Author: shinsuke Date: 2007-10-22 18:22:18 +0900 (Mon, 22 Oct 2007) Log Message: ----------- updated eclipse files. Modified Paths: -------------- pal-admin/trunk/.classpath pal-admin/trunk/.project pal-admin/trunk/.settings/org.seasar.dolteng.eclipse.prefs -------------- next part -------------- Modified: pal-admin/trunk/.classpath =================================================================== --- pal-admin/trunk/.classpath 2007-10-22 09:21:46 UTC (rev 651) +++ pal-admin/trunk/.classpath 2007-10-22 09:22:18 UTC (rev 652) @@ -5,26 +5,29 @@ - - - + + + - + + + - - + + - + + @@ -34,5 +37,4 @@ - Modified: pal-admin/trunk/.project =================================================================== --- pal-admin/trunk/.project 2007-10-22 09:21:46 UTC (rev 651) +++ pal-admin/trunk/.project 2007-10-22 09:22:18 UTC (rev 652) @@ -10,9 +10,9 @@ org.eclipse.jdt.core.javanature - org.seasar.dolteng.eclipse.nature org.seasar.diigu.eclipse.diiguNature org.seasar.dblauncher.nature com.sysdeo.eclipse.tomcat.tomcatnature + org.seasar.dolteng.eclipse.nature \ No newline at end of file Modified: pal-admin/trunk/.settings/org.seasar.dolteng.eclipse.prefs =================================================================== --- pal-admin/trunk/.settings/org.seasar.dolteng.eclipse.prefs 2007-10-22 09:21:46 UTC (rev 651) +++ pal-admin/trunk/.settings/org.seasar.dolteng.eclipse.prefs 2007-10-22 09:22:18 UTC (rev 652) @@ -1,11 +1,12 @@ -#Fri Mar 30 11:20:11 JST 2007 +#Mon Oct 22 11:56:53 JST 2007 DaoType=S2Dao DefaultDaoPackage=jp.sf.pal.admin.dao DefaultDtoPackage=jp.sf.pal.admin.dto DefaultEntityPackage=jp.sf.pal.admin.entity DefaultResourcePath=/pal-admin/src/main/resources +DefaultRootPackage=jp.sf.pal.admin DefaultSrcPath=/pal-admin/src/main/java DefaultWebPackage=jp.sf.pal.admin.web -ServletPath=/cumatcher +ServletPath=/pal-admin WebContentsRoot=src/main/webapp/ eclipse.preferences.version=1 From svnnotify @ sourceforge.jp Tue Oct 23 13:37:38 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 23 Oct 2007 13:37:38 +0900 Subject: [pal-cvs 2909] [653] added password confirmation, added sub navigation menu, added columns to user list. Message-ID: <1193114258.432185.30432.nullmailer@users.sourceforge.jp> Revision: 653 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=653 Author: shinsuke Date: 2007-10-23 13:37:37 +0900 (Tue, 23 Oct 2007) Log Message: ----------- added password confirmation, added sub navigation menu, added columns to user list. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html pal-admin/trunk/src/main/webapp/view/group/groupEdit.html pal-admin/trunk/src/main/webapp/view/group/groupList.html pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html pal-admin/trunk/src/main/webapp/view/role/roleEdit.html pal-admin/trunk/src/main/webapp/view/role/roleList.html pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html pal-admin/trunk/src/main/webapp/view/user/userConfirm.html pal-admin/trunk/src/main/webapp/view/user/userCreate.html pal-admin/trunk/src/main/webapp/view/user/userEdit.html pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html pal-admin/trunk/src/main/webapp/view/user/userList.html pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-10-23 04:37:37 UTC (rev 653) @@ -306,7 +306,23 @@ for (int i = 0; i < size; i++) { User entity = new User(); entity.setName(principals.get(i).getName()); - // TODO Others + + PasswordCredential credential = getPasswordCredential(principals + .get(i).getName()); + if (credential != null) { + entity.setUpdateRequired(credential.isUpdateRequired()); + entity.setLastLogon(credential.getLastAuthenticationDate()); + entity.setUserEnabled(credential.isEnabled()); + entity.setExpirationDate(credential.getExpirationDate()); + if (credential.isExpired()) { + entity + .setExpires(PALAdminConstants.USER_CREDENTIAL_EXPIRED); + } else { + entity + .setExpires(PALAdminConstants.USER_CREDENTIAL_ACTIVE); + } + } + userList.add(entity); } } catch (SecurityException e) { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -21,11 +21,8 @@ import jp.sf.pal.admin.service.GroupManagementService; import jp.sf.pal.admin.web.AbstractPagerPage; -import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; -import org.seasar.teeda.extension.annotation.takeover.TakeOver; - public class GroupListPage extends AbstractPagerPage implements Serializable { /** @@ -92,9 +89,9 @@ return null; } - @TakeOver(properties = "crudType") - public Class doCreate() { - setCrudType(CrudType.CREATE); - return GroupEditPage.class; - } + // @TakeOver(properties = "crudType") + // public Class doCreate() { + // setCrudType(CrudType.CREATE); + // return GroupEditPage.class; + // } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -109,10 +109,10 @@ return null; } - @TakeOver(properties = "crudType") - public Class doCreate() { - setCrudType(CrudType.CREATE); - return RoleEditPage.class; - } + // @TakeOver(properties = "crudType") + // public Class doCreate() { + // setCrudType(CrudType.CREATE); + // return RoleEditPage.class; + // } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -39,11 +39,11 @@ private static final Logger logger = Logger .getLogger(UserAttributeConfirmPage.class); - public Class initialize() { + public Class initialize() { return null; } - public Class prerender() { + public Class prerender() { if (getCrudType() == CrudType.DELETE) { // update if (getKey() != null) { @@ -67,7 +67,7 @@ } @TakeOver(type = TakeOverType.INCLUDE, properties = "name") - public Class doUpdate() { + public Class doUpdate() { switch (getCrudType()) { case CrudType.CREATE: Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -37,11 +37,11 @@ private static final Logger logger = Logger .getLogger(UserAttributeEditPage.class); - public String initialize() { + public Class initialize() { return null; } - public String prerender() { + public Class prerender() { if (getCrudType() == CrudType.UPDATE) { // update if (getKey() != null) { @@ -63,7 +63,7 @@ return null; } - public Class doBack() { + public Class doBack() { setCrudType(CrudType.READ); return UserAttributeListPage.class; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -117,16 +117,16 @@ } @TakeOver(properties = "crudType,name") - public Class doCreate() { + public Class doCreate() { setCrudType(CrudType.CREATE); return UserAttributeEditPage.class; } - public String initialize() { + public Class initialize() { return null; } - public String prerender() { + public Class prerender() { try { getUserManagementService().loadPage(this); } catch (PALAdminException e) { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -38,18 +38,18 @@ private static final Logger logger = Logger .getLogger(UserConfirmPage.class); - public String initialize() { + public Class initialize() { return null; } - public String prerender() { + public Class prerender() { // render FacesMessages FacesMessageUtil.renderMessages(); return null; } @TakeOver(type = TakeOverType.NEVER) - public Class doFinish() { + public Class doFinish() { switch (getCrudType()) { case CrudType.CREATE: addUser(); @@ -92,7 +92,7 @@ } @TakeOver(properties = "name,updateRequired,roleName") - public Class doCreate() { + public Class doCreate() { PALAdminUtil.removePasswordFromSession(); return UserCreatePage.class; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -23,6 +23,7 @@ import jp.sf.pal.common.util.FacesMessageUtil; import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.validator.Equal; public class UserCreatePage extends AbstractUserPage implements Serializable { /** @@ -32,6 +33,9 @@ private List> roleNameItems; + @Equal(targetId = "password") + private String passwordConfirm; + /** * @return the roleItems */ @@ -46,11 +50,11 @@ this.roleNameItems = roleItems; } - public String initialize() { + public Class initialize() { return null; } - public String prerender() { + public Class prerender() { // set pull-down setRoleNameItems(getUserManagementService().getRoleNames()); @@ -62,9 +66,23 @@ } @TakeOver(properties = "name,password,updateRequired,roleName") - public Class doConfirm() { + public Class doConfirm() { PALAdminUtil.setPasswordToSession(getPassword()); setPassword("******"); return UserConfirmPage.class; } + + /** + * @return the passwordConfrim + */ + public String getPasswordConfirm() { + return passwordConfirm; + } + + /** + * @param passwordConfrim the passwordConfrim to set + */ + public void setPasswordConfirm(String passwordConfrim) { + this.passwordConfirm = passwordConfrim; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -25,6 +25,7 @@ import jp.sf.pal.common.util.FacesMessageUtil; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Equal; import org.seasar.teeda.extension.annotation.validator.Required; public class UserEditPage extends AbstractCrudPage implements Serializable { @@ -50,6 +51,9 @@ private String password; + @Equal(targetId = "password") + private String passwordConfirm; + private boolean updateRequired; private boolean userEnabled; @@ -165,11 +169,11 @@ this.expirationDate = expirationDate; } - public String initialize() { + public Class initialize() { return null; } - public Class prerender() { + public Class prerender() { // Check name if (!getUserManagementService().isUserExists(getName())) { FacesMessageUtil.addWarnMessage("could.not.find.user"); @@ -184,7 +188,7 @@ return null; } - public String doUpdate() { + public Class doUpdate() { try { getUserManagementService().update(this); FacesMessageUtil.addInfoMessage("updated.user.information", @@ -197,4 +201,18 @@ } return null; } + + /** + * @return the passwordConfrim + */ + public String getPasswordConfirm() { + return passwordConfirm; + } + + /** + * @param passwordConfrim the passwordConfrim to set + */ + public void setPasswordConfirm(String passwordConfrim) { + this.passwordConfirm = passwordConfrim; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -25,6 +25,7 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; public class UserGroupEditPage extends AbstractCrudPage implements Serializable { @@ -143,11 +144,11 @@ this.userManagementService = userManagementService; } - public String initialize() { + public Class initialize() { return null; } - public String prerender() { + public Class prerender() { // load page getUserManagementService().loadPage(this); @@ -156,7 +157,7 @@ return null; } - public String doAddGroup() { + public Class doAddGroup() { if (getName() == null || getNewGroup() == null) { FacesMessageUtil.addWarnMessage("invalid.group.or.user.name"); return null; @@ -186,7 +187,7 @@ return null; } - public String doRemoveGroup() { + public Class doRemoveGroup() { try { getUserManagementService().removeGroupsFromUser(this); FacesMessageUtil.addInfoMessage("removed.groups.from.user", @@ -200,7 +201,7 @@ "failed.to.remove.groups.from.user", new Object[] { getName(), getGroups() }); logger.error("Failed to remove groups from user. user=" + getName() - + ", groups=" + getGroups(), e); + + ", groups=" + StringUtils.join(getGroups()), e); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -16,17 +16,20 @@ package jp.sf.pal.admin.web.user; import java.io.Serializable; +import java.sql.Timestamp; +import java.util.Date; import java.util.List; import java.util.Map; +import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.UserManagementService; import jp.sf.pal.admin.web.AbstractPagerPage; -import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; import org.seasar.framework.log.Logger; -import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; +import org.seasar.teeda.extension.util.LabelHelper; public class UserListPage extends AbstractPagerPage implements Serializable { @@ -48,8 +51,22 @@ private List> userItems; + private String expires; + + @DateTimeConverter(pattern = "yyyy-MM-dd HH:mm:ss") + private Timestamp lastLogon; + + private boolean updateRequired; + + private boolean userEnabled; + + @DateTimeConverter(pattern = "yyyy-MM-dd HH:mm:ss") + private Date expirationDate; + private UserManagementService userManagementService; + private LabelHelper labelHelper; + public String getName() { return name; } @@ -120,20 +137,111 @@ return null; } - @TakeOver(properties = "crudType") - public Class doCreate() { - setCrudType(CrudType.CREATE); - return UserCreatePage.class; - } + // @TakeOver(properties = "crudType") + // public Class doCreate() { + // setCrudType(CrudType.CREATE); + // return UserCreatePage.class; + // } - public Class doSearch() { + public Class doSearch() { getUserManagementService().updateQuery(this); return null; } - public Class doResetSearch() { + public Class doResetSearch() { setFilter(""); getUserManagementService().updateQuery(this); return null; } + + /** + * @return the expires + */ + public String getExpires() { + if (expires == null) { + return ""; + } else if (PALAdminConstants.USER_CREDENTIAL_EXPIRED.equals(expires)) { + return getLabelHelper().getLabelValue("expired"); + } else if (PALAdminConstants.USER_CREDENTIAL_ACTIVE.equals(expires)) { + return getLabelHelper().getLabelValue("active"); + } + return ""; + } + + /** + * @param expires the expires to set + */ + public void setExpires(String expires) { + this.expires = expires; + } + + /** + * @return the lastLogon + */ + public Timestamp getLastLogon() { + return lastLogon; + } + + /** + * @param lastLogon the lastLogon to set + */ + public void setLastLogon(Timestamp lastLogon) { + this.lastLogon = lastLogon; + } + + /** + * @return the updateRequired + */ + public boolean isUpdateRequired() { + return updateRequired; + } + + /** + * @param updateRequired the updateRequired to set + */ + public void setUpdateRequired(boolean updateRequired) { + this.updateRequired = updateRequired; + } + + /** + * @return the userEnabled + */ + public boolean isUserEnabled() { + return userEnabled; + } + + /** + * @param userEnabled the userEnabled to set + */ + public void setUserEnabled(boolean userEnabled) { + this.userEnabled = userEnabled; + } + + /** + * @return the expirationDate + */ + public Date getExpirationDate() { + return expirationDate; + } + + /** + * @param expirationDate the expirationDate to set + */ + public void setExpirationDate(Date expirationDate) { + this.expirationDate = expirationDate; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -27,6 +27,7 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; public class UserProfilingRuleEditPage extends AbstractCrudPage implements @@ -245,7 +246,8 @@ PALAdminUtil .toStringFromArray(parsePrincipalRules(getPrincipalRules())) }); logger.error("Failed to remove principalRules from user. user=" - + getName() + ", principalRules=" + getPrincipalRules(), e); + + getName() + ", principalRules=" + + StringUtils.join(getPrincipalRules()), e); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2007-10-23 04:37:37 UTC (rev 653) @@ -25,6 +25,7 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; public class UserRoleEditPage extends AbstractCrudPage implements Serializable { @@ -191,7 +192,7 @@ "failed.to.remove.roles.from.user", new Object[] { getName(), getRoles() }); logger.error("Failed to remove roles from user. user=" + getName() - + ", roles=" + getRoles(), e); + + ", roles=" + StringUtils.join(getRoles()), e); } return null; } Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-10-23 04:37:37 UTC (rev 653) @@ -1,6 +1,7 @@ # Common userName=User Name password=Password +retypePassword=Re-type Password changePassword=Change Password on First Login defaultRole=Default Role profilingRule=Profiling Rule @@ -10,10 +11,20 @@ basicTab=Basic profilingRuleTab=Rule userAttributeTab=User Attribute +listTab=List +newTab=New +editTab=Edit # userList userList.delete=Delete userList.edit=Edit +userList.filter=Filter(Prefix Search): +userList.userEnabled=User Enabled +userList.lastLogon=Last Logon +userList.expires=Expires +userList.active=Active +userList.enabled=Enabled +userList.disabled=Disabled # userEdit userEdit.changePassword=Change Password on Next Login Modified: pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,18 @@
    +
    + List | + + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/group/groupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,18 @@
    +
    + List | + + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/group/groupList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,22 +19,23 @@
    +
    + | + New +
    +
    -
    +
    +
    - -
    -
    - -
    10 (3/5)
    @@ -77,6 +78,7 @@ Next>>
    +
    Modified: pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,18 @@
    +
    + List | + + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/role/roleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,18 @@
    +
    + List | + + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,22 +19,23 @@
    +
    + | + New +
    +
    -
    +
    +
    - -
    -
    - -
    10 (3/5)
    @@ -77,6 +78,7 @@ Next>>
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,18 @@
    +
    + List | + + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userCreate.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    @@ -41,6 +46,11 @@ + + + + + Modified: pal-admin/trunk/src/main/webapp/view/user/userEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    @@ -61,6 +66,11 @@ + + + + + April 7, 2007 6:44:43 AM JST Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,28 +19,30 @@
    +
    + | + New +
    +
    -
    +
    +
    -
    - -
    -
    - -
    +

    +
    10 (3/5) @@ -61,12 +63,18 @@ + + +
    user + + expires + lastLogon Edit Delete @@ -85,6 +93,7 @@ Next>>
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-22 09:22:18 UTC (rev 652) +++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-23 04:37:37 UTC (rev 653) @@ -19,12 +19,17 @@
    +
    + List | + +
    +
    -
    +
    From svnnotify @ sourceforge.jp Thu Oct 25 16:54:34 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 25 Oct 2007 16:54:34 +0900 Subject: [pal-cvs 2910] [654] code format. Message-ID: <1193298874.249970.18481.nullmailer@users.sourceforge.jp> Revision: 654 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=654 Author: shinsuke Date: 2007-10-25 16:54:33 +0900 (Thu, 25 Oct 2007) Log Message: ----------- code format. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java 2007-10-23 04:37:37 UTC (rev 653) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java 2007-10-25 07:54:33 UTC (rev 654) @@ -18,8 +18,7 @@ import jp.sf.pal.admin.entity.PortletApplication; -public class DeploymentStatus -{ +public class DeploymentStatus { public static final int DEPLOYED = 2; public static final int DEPLOYING = 1; @@ -32,8 +31,7 @@ public PortletApplication portletApplication; - public DeploymentStatus(PortletApplication portletApplication) - { + public DeploymentStatus(PortletApplication portletApplication) { startTime = 0; status = READY; this.portletApplication = portletApplication; @@ -42,48 +40,42 @@ /** * @return the status */ - public int getStatus() - { + public int getStatus() { return status; } /** * @param status the status to set */ - public void setStatus(int status) - { + public void setStatus(int status) { this.status = status; } /** * @return the portletApplication */ - public PortletApplication getPortletApplication() - { + public PortletApplication getPortletApplication() { return portletApplication; } /** * @param portletApplication the portletApplication to set */ - public void setPortletApplication(PortletApplication portletApplication) - { + public void setPortletApplication(PortletApplication portletApplication) { this.portletApplication = portletApplication; } /** * @return the startTime */ - public long getStartTime() - { + public long getStartTime() { return startTime; } /** * @param startTime the startTime to set */ - public void setStartTime(long startTime) - { + public void setStartTime(long startTime) { this.startTime = startTime; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java 2007-10-23 04:37:37 UTC (rev 653) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java 2007-10-25 07:54:33 UTC (rev 654) @@ -35,8 +35,7 @@ import org.apache.jetspeed.deployment.DeploymentException; import org.apache.jetspeed.deployment.DeploymentManager; -public class PortletDeployer extends Thread -{ +public class PortletDeployer extends Thread { public static final String FILEPATH_PROTOCOL_HTTPS = "https:"; public static final String PATH_PROTOCOL_HTTP = "http:"; @@ -57,8 +56,7 @@ private DeploymentStatus deploymentStatus; - public PortletDeployer(PortletApplication portletApplication) - { + public PortletDeployer(PortletApplication portletApplication) { this.portletApplication = portletApplication; deploymentStatus = new DeploymentStatus(portletApplication); } @@ -66,122 +64,82 @@ /* (non-Javadoc) * @see java.lang.Thread#run() */ - public void run() - { + public void run() { deploymentStatus.setStatus(DeploymentStatus.DEPLOYING); - try - { + try { deploymentStatus.setStartTime(Calendar.getInstance() .getTimeInMillis()); - if (getDeploymentManager() != null) - { + if (getDeploymentManager() != null) { String binaryUrl = portletApplication.getBinaryUrl(); - if (binaryUrl != null && !binaryUrl.equals("")) - { + if (binaryUrl != null && !binaryUrl.equals("")) { File targetFile = null; - try - { + try { File tempFile = null; - if (binaryUrl.startsWith(FILEPATH_PROTOCOL_TEMP)) - { - tempFile=new File(binaryUrl.substring(FILEPATH_PROTOCOL_TEMP.length())); - } - else - { + if (binaryUrl.startsWith(FILEPATH_PROTOCOL_TEMP)) { + tempFile = new File(binaryUrl + .substring(FILEPATH_PROTOCOL_TEMP.length())); + } else { tempFile = File.createTempFile("rpad_", "." + portletApplication.getPackaging()); FileOutputStream out = new FileOutputStream( tempFile); PALAdminUtil.drain(getInputStream(binaryUrl), out); } - try - { + try { targetFile = new File(tempFile.getParentFile(), portletApplication.getArtifactId() + "." + portletApplication.getPackaging()); tempFile.renameTo(targetFile); - } - catch (Exception e) - { + } catch (Exception e) { targetFile = tempFile; } if (getDeploymentManager().deploy(targetFile) - .getStatus() == org.apache.jetspeed.deployment.DeploymentStatus.STATUS_OKAY) - { + .getStatus() == org.apache.jetspeed.deployment.DeploymentStatus.STATUS_OKAY) { log.info(portletApplication.getName() + " was deployed."); - } - else - { + } else { log.error("Could not deploy " + portletApplication.getName()); } - } - catch (FileNotFoundException e) - { + } catch (FileNotFoundException e) { log.error(e); - } - catch (IOException e) - { + } catch (IOException e) { log.error(e); - } - catch (DeploymentException e) - { + } catch (DeploymentException e) { log.error(e); } - if (targetFile != null && targetFile.exists()) - { + if (targetFile != null && targetFile.exists()) { targetFile.delete(); } - } - else - { + } else { log.error("The target url is invalid. The path is " + binaryUrl); } - } - else - { + } else { log.error("Could not find the deployment manager."); } - } - catch (Exception e) - { + } catch (Exception e) { log.error("Unexpected exception.", e); - } - finally - { + } finally { deploymentStatus.setStatus(DeploymentStatus.DEPLOYED); } } - protected InputStream getInputStream(String path) - { + protected InputStream getInputStream(String path) { if (path.startsWith(PATH_PROTOCOL_HTTP) - || path.startsWith(FILEPATH_PROTOCOL_HTTPS)) - { - try - { + || path.startsWith(FILEPATH_PROTOCOL_HTTPS)) { + try { URL url = new URL(path); return url.openStream(); - } - catch (MalformedURLException e) - { + } catch (MalformedURLException e) { log.error("Wrong url: " + path, e); - } - catch (IOException e) - { + } catch (IOException e) { log.error("Could not load " + path, e); } - } - else if (path.startsWith(FILEPATH_PROTOCOL_FILE)) - { - try - { + } else if (path.startsWith(FILEPATH_PROTOCOL_FILE)) { + try { return new FileInputStream(new File(path.substring(5))); - } - catch (FileNotFoundException e) - { + } catch (FileNotFoundException e) { log.error("Could not load " + path, e); } } @@ -191,48 +149,42 @@ /** * @return the portletApplication */ - public PortletApplication getPortletApplication() - { + public PortletApplication getPortletApplication() { return portletApplication; } /** * @param portletApplication the portletApplication to set */ - public void setPortletApplication(PortletApplication portletApplication) - { + public void setPortletApplication(PortletApplication portletApplication) { this.portletApplication = portletApplication; } /** * @return the deploymentManager */ - public DeploymentManager getDeploymentManager() - { + public DeploymentManager getDeploymentManager() { return deploymentManager; } /** * @param deploymentManager the deploymentManager to set */ - public void setDeploymentManager(DeploymentManager deploymentManager) - { + public void setDeploymentManager(DeploymentManager deploymentManager) { this.deploymentManager = deploymentManager; } /** * @return the deploymentStatus */ - public DeploymentStatus getDeploymentStatus() - { + public DeploymentStatus getDeploymentStatus() { return deploymentStatus; } /** * @param deploymentStatus the deploymentStatus to set */ - public void setDeploymentStatus(DeploymentStatus deploymentStatus) - { + public void setDeploymentStatus(DeploymentStatus deploymentStatus) { this.deploymentStatus = deploymentStatus; } From svnnotify @ sourceforge.jp Thu Oct 25 16:54:56 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 25 Oct 2007 16:54:56 +0900 Subject: [pal-cvs 2911] [655] fixed messages Message-ID: <1193298896.019524.18578.nullmailer@users.sourceforge.jp> Revision: 655 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=655 Author: shinsuke Date: 2007-10-25 16:54:55 +0900 (Thu, 25 Oct 2007) Log Message: ----------- fixed messages Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/SiteEditorFilter.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/SiteEditorFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/SiteEditorFilter.java 2007-10-25 07:54:33 UTC (rev 654) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/SiteEditorFilter.java 2007-10-25 07:54:55 UTC (rev 655) @@ -85,7 +85,7 @@ .getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT); if (null == profiler) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the profiler on portlet initialization"); } // decorationFactory @@ -93,7 +93,7 @@ .getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY); if (null == decorationFactory) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the decorationFactory on portlet initialization"); } // portletRegistry @@ -101,7 +101,7 @@ .getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT); if (null == portletRegistry) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the portletRegistry on portlet initialization"); } // permissionManager @@ -109,7 +109,7 @@ .getAttribute(CommonPortletServices.CPS_PERMISSION_MANAGER); if (null == permissionManager) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the permissionManager on portlet initialization"); } // portletEntityAccessComponent @@ -117,7 +117,7 @@ .getAttribute(CommonPortletServices.CPS_ENTITY_ACCESS_COMPONENT); if (null == portletEntityAccessComponent) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the portletEntityAccessComponent on portlet initialization"); } // portletWindowAccessor @@ -125,7 +125,7 @@ .getAttribute(CommonPortletServices.CPS_WINDOW_ACCESS_COMPONENT); if (null == portletWindowAccessor) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the portletWindowAccessor on portlet initialization"); } // securityAccessController @@ -133,7 +133,7 @@ .getAttribute(CommonPortletServices.CPS_SECURITY_ACCESS_CONTROLLER); if (null == securityAccessController) { throw new PortletException( - "Failed to find the Profiler on portlet initialization"); + "Failed to find the securityAccessController on portlet initialization"); } } From svnnotify @ sourceforge.jp Thu Oct 25 16:56:14 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 25 Oct 2007 16:56:14 +0900 Subject: [pal-cvs 2912] [656] added permission editor, and ja properties files. Message-ID: <1193298974.157503.19695.nullmailer@users.sourceforge.jp> Revision: 656 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=656 Author: shinsuke Date: 2007-10-25 16:56:12 +0900 (Thu, 25 Oct 2007) Log Message: ----------- added permission editor, and ja properties files. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/appMessages_ja.properties pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Added Paths: ----------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PermissionEditorFilter.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/deployer/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties pal-admin/trunk/src/main/webapp/view/permission/ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html pal-admin/trunk/src/main/webapp/view/permission/folderPermissionEdit.html pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html pal-admin/trunk/src/main/webapp/view/permission/pagePermissionEdit.html pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html pal-admin/trunk/src/main/webapp/view/permission/portletPermissionEdit.html pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html -------------- next part -------------- Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.admin.dxo; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.entity.Permission; + +public interface PermissionDxo extends Serializable { + public void convert(List entities, + List> list); + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,81 @@ +package jp.sf.pal.admin.entity; + +import java.io.Serializable; + +public class Permission implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -8769219617696836249L; + + public static final int PORTLET = 1; + + public static final int FOLDER = 2; + + public static final int PAGE = 3; + + private int type; + + private String name; + + private String actions; + + private String roles; + + /** + * @return the type + */ + public int getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(int type) { + this.type = type; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the actions + */ + public String getActions() { + return actions; + } + + /** + * @param actions the actions to set + */ + public void setActions(String actions) { + this.actions = actions; + } + + /** + * @return the roles + */ + public String getRoles() { + return roles; + } + + /** + * @param roles the roles to set + */ + public void setRoles(String roles) { + this.roles = roles; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,47 @@ +package jp.sf.pal.admin.entity; + +public class RolePrincipal implements + org.apache.jetspeed.security.RolePrincipal { + /** + * + */ + private static final long serialVersionUID = 5389809674607909098L; + + private final String name; + + private final String fullPath; + + private boolean enabled = true; + + public RolePrincipal(String name) { + this(name, true); + } + + public RolePrincipal(String name, boolean hiearchicalNames) { + this.name = name; + if (null != name) { + this.fullPath = PREFS_ROLE_ROOT + + (hiearchicalNames ? name.replace('.', '/') : name); + } else { + this.fullPath = name; + } + + } + + public String getFullPath() { + return fullPath; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getName() { + return name; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PermissionEditorFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PermissionEditorFilter.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PermissionEditorFilter.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,91 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.filter; + +import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletConfig; +import javax.portlet.PortletContext; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import jp.sf.pal.admin.PALAdminConstants; + +import org.apache.jetspeed.CommonPortletServices; +import org.apache.jetspeed.security.PermissionManager; +import org.apache.jetspeed.security.RoleManager; +import org.apache.portals.bridges.portletfilter.PortletFilter; +import org.apache.portals.bridges.portletfilter.PortletFilterChain; +import org.apache.portals.bridges.portletfilter.PortletFilterConfig; + +public class PermissionEditorFilter implements PortletFilter { + private PermissionManager permissionManager; + + private RoleManager roleManager; + + public void destroy() { + permissionManager = null; + roleManager = null; + } + + public void init(PortletFilterConfig filterConfig) throws PortletException { + PortletConfig portletConfig = filterConfig.getPortletConfig(); + PortletContext portletContext = portletConfig.getPortletContext(); + + // permissionManager + permissionManager = (PermissionManager) portletContext + .getAttribute(CommonPortletServices.CPS_PERMISSION_MANAGER); + if (null == permissionManager) { + throw new PortletException( + "Failed to find the Profiler on portlet initialization"); + } + + // roleManager + roleManager = (RoleManager) portletContext + .getAttribute(CommonPortletServices.CPS_ROLE_MANAGER_COMPONENT); + if (null == roleManager) { + throw new PortletException( + "Failed to find the roleManager on portlet initialization"); + } + + } + + public void processActionFilter(ActionRequest request, + ActionResponse response, PortletFilterChain chain) + throws PortletException, IOException { + request.setAttribute(PALAdminConstants.PERMISSION_MANAGER_COMPONENT, + permissionManager); + request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT, + roleManager); + + chain.processActionFilter(request, response); + } + + public void renderFilter(RenderRequest request, RenderResponse response, + PortletFilterChain chain) throws PortletException, IOException { + request.setAttribute(PALAdminConstants.PERMISSION_MANAGER_COMPONENT, + permissionManager); + request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT, + roleManager); + + chain.renderFilter(request, response); + + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PermissionEditorFilter.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,434 @@ +package jp.sf.pal.admin.logic; + +import java.io.Serializable; +import java.lang.reflect.Constructor; +import java.security.Principal; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.entity.Permission; +import jp.sf.pal.admin.entity.RolePrincipal; +import jp.sf.pal.admin.pager.FolderPermissionPager; +import jp.sf.pal.admin.pager.PagePermissionPager; +import jp.sf.pal.admin.pager.PortletPermissionPager; +import jp.sf.pal.admin.util.PortalComponentUtil; + +import org.apache.jetspeed.security.PermissionManager; +import org.apache.jetspeed.security.Role; +import org.apache.jetspeed.security.RoleManager; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.om.InternalPermission; +import org.apache.jetspeed.security.om.InternalPrincipal; +import org.seasar.framework.log.Logger; + +public class PermissionManagementLogic implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 102231630594363688L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PermissionManagementLogic.class); + + private static final String FOLER_PERMISSION = "org.apache.jetspeed.security.FolderPermission"; + + private static final String PAGE_PERMISSION = "org.apache.jetspeed.security.PagePermission"; + + private static final String PORTLET_PERMISSION = "org.apache.jetspeed.security.PortletPermission"; + + private RoleManager roleManager; + + private PermissionManager permissionManager; + + public List getPortletPermissions(PortletPermissionPager pager) + throws PALAdminException { + + List permissionList = new ArrayList(); + List portletPermissionList = new ArrayList(); + Collection permissions = getPermissionManager() + .getPermissions(); + + for (InternalPermission permission : permissions) { + if (PORTLET_PERMISSION.equals(permission.getClassname())) { + portletPermissionList.add(permission); + } + } + + // set count + pager.setCount(portletPermissionList.size()); + + // create list + int offset = pager.getOffset(); + int limit = pager.getLimit(); + int size = portletPermissionList.size(); + if (logger.isDebugEnabled()) { + logger.debug("getPortletPermission(pager) - offset=" + offset + + ", limit=" + limit + ", size=" + size); + } + for (int i = offset; i < offset + limit && i < size; i++) { + InternalPermission inerInternalPermission = portletPermissionList + .get(i); + permissionList.add(createPermission(Permission.PORTLET, + inerInternalPermission)); + } + + return permissionList; + + } + + public List getFolderPermissions(FolderPermissionPager pager) + throws PALAdminException { + + List permissionList = new ArrayList(); + List folderPermissionList = new ArrayList(); + Collection permissions = getPermissionManager() + .getPermissions(); + + for (InternalPermission permission : permissions) { + if (FOLER_PERMISSION.equals(permission.getClassname())) { + folderPermissionList.add(permission); + } + } + + // set count + pager.setCount(folderPermissionList.size()); + + // create list + int offset = pager.getOffset(); + int limit = pager.getLimit(); + int size = folderPermissionList.size(); + if (logger.isDebugEnabled()) { + logger.debug("getFolderPermission(pager) - offset=" + offset + + ", limit=" + limit + ", size=" + size); + } + for (int i = offset; i < offset + limit && i < size; i++) { + InternalPermission inerInternalPermission = folderPermissionList + .get(i); + permissionList.add(createPermission(Permission.PORTLET, + inerInternalPermission)); + } + + return permissionList; + + } + + public List getPagePermissions(PagePermissionPager pager) + throws PALAdminException { + + List permissionList = new ArrayList(); + List pagePermissionList = new ArrayList(); + Collection permissions = getPermissionManager() + .getPermissions(); + + for (InternalPermission permission : permissions) { + if (PAGE_PERMISSION.equals(permission.getClassname())) { + pagePermissionList.add(permission); + } + } + + // set count + pager.setCount(pagePermissionList.size()); + + // create list + int offset = pager.getOffset(); + int limit = pager.getLimit(); + int size = pagePermissionList.size(); + if (logger.isDebugEnabled()) { + logger.debug("getPagePermission(pager) - offset=" + offset + + ", limit=" + limit + ", size=" + size); + } + for (int i = offset; i < offset + limit && i < size; i++) { + InternalPermission inerInternalPermission = pagePermissionList + .get(i); + permissionList.add(createPermission(Permission.PORTLET, + inerInternalPermission)); + } + + return permissionList; + + } + + public Permission getPortletPermission(String name, String actions) + throws PALAdminException { + return getPermission(PORTLET_PERMISSION, name, actions); + } + + public Permission getFolderPermission(String name, String actions) + throws PALAdminException { + return getPermission(FOLER_PERMISSION, name, actions); + } + + public Permission getPagePermission(String name, String actions) + throws PALAdminException { + return getPermission(PAGE_PERMISSION, name, actions); + } + + public Permission getPermission(String classname, String name, + String actions) throws PALAdminException { + if (classname == null || name == null || actions == null) { + return null; + } + + Collection permissions = getPermissionManager() + .getPermissions(); + + for (InternalPermission inerInternalPermission : permissions) { + if (classname.equals(inerInternalPermission.getClassname()) + && name.equals(inerInternalPermission.getName()) + && actions.equals(inerInternalPermission.getActions())) { + return createPermission(getPermissionType(classname), + inerInternalPermission); + } + } + return null; + } + + private int getPermissionType(String classname) { + if (PORTLET_PERMISSION.equals(classname)) { + return Permission.PORTLET; + } else if (FOLER_PERMISSION.equals(classname)) { + return Permission.FOLDER; + } else if (PAGE_PERMISSION.equals(classname)) { + return Permission.PAGE; + } + return 0; + } + + private Permission createPermission(int type, + InternalPermission inerInternalPermission) { + Permission permission = new Permission(); + permission.setType(Permission.PORTLET); + permission.setName(inerInternalPermission.getName()); + permission.setActions(inerInternalPermission.getActions()); + int c = inerInternalPermission.getPrincipals().size(); + if (c != 0) { + Iterator principals = inerInternalPermission + .getPrincipals().iterator(); + int count = 0; + StringBuilder result = new StringBuilder(); + while (principals.hasNext()) { + InternalPrincipal principal = principals.next(); + int last = principal.getFullPath().lastIndexOf("/") + 1; + result.append(principal.getFullPath().substring(last)); + count++; + if (count < c) { + result.append(","); + } + } + permission.setRoles(result.toString()); + } + return permission; + } + + public void addPortletPermission(String resource, String actions, + String roles) throws PALAdminException { + addPermission(PORTLET_PERMISSION, resource, actions, roles); + } + + public void addFolderPermission(String resource, String actions, + String roles) throws PALAdminException { + addPermission(FOLER_PERMISSION, resource, actions, roles); + } + + public void addPagePermission(String resource, String actions, String roles) + throws PALAdminException { + addPermission(PAGE_PERMISSION, resource, actions, roles); + } + + protected void addPermission(String classname, String resource, + String actions, String roles) throws PALAdminException { + //TODO check permissoin + java.security.Permission permission = createPermissionFromClass( + classname, resource, actions); + if (getPermissionManager().permissionExists(permission)) { + throw new PALAdminException("Permission " + resource + + " already exists"); + } + + try { + getPermissionManager().addPermission(permission); + updateRoles(permission, roles); + } catch (SecurityException e) { + if (permission != null) { + try { + getPermissionManager().removePermission(permission); + } catch (SecurityException e1) { + // nothing + } + } + throw new PALAdminException("Could not add a permission.", e); + } + } + + public void updatePortletPermission(String resource, String oldActions, + String actions, String roles) throws PALAdminException { + updatePermission(PORTLET_PERMISSION, resource, oldActions, actions, + roles); + } + + public void updateFolderPermission(String resource, String oldActions, + String actions, String roles) throws PALAdminException { + updatePermission(FOLER_PERMISSION, resource, oldActions, actions, roles); + } + + public void updatePagePermission(String resource, String oldActions, + String actions, String roles) throws PALAdminException { + updatePermission(PAGE_PERMISSION, resource, oldActions, actions, roles); + } + + protected void updatePermission(String classname, String resource, + String oldActions, String actions, String roles) + throws PALAdminException { + try { + java.security.Permission permission = createPermissionFromClass( + classname, resource, oldActions); + if (permission != null) { + getPermissionManager().removePermission(permission); + } + permission = createPermissionFromClass(classname, resource, actions); + getPermissionManager().addPermission(permission); + + updateRoles(permission, roles); + + } catch (SecurityException e) { + throw new PALAdminException(e.toString(), e); + } + } + + protected int updateRoles(java.security.Permission permission, + String roleNames) throws SecurityException { + List principals = new LinkedList(); + if (roleNames != null) { + StringTokenizer toke = new StringTokenizer(roleNames, ","); + while (toke.hasMoreTokens()) { + String roleName = toke.nextToken(); + Principal role = new RolePrincipal(roleName.trim()); + principals.add(role); + } + } + return getPermissionManager().updatePermission(permission, principals); + } + + public void deletePortletPermission(String resource, String actions) + throws PALAdminException { + deletePermission(PORTLET_PERMISSION, resource, actions); + } + + public void deleteFolderPermission(String resource, String actions) + throws PALAdminException { + deletePermission(FOLER_PERMISSION, resource, actions); + } + + public void deletePagePermission(String resource, String actions) + throws PALAdminException { + deletePermission(PAGE_PERMISSION, resource, actions); + } + + protected void deletePermission(String classname, String resource, + String actions) throws PALAdminException { + + try { + java.security.Permission permission = createPermissionFromClass( + classname, resource, actions); + if (getPermissionManager().permissionExists(permission)) { + getPermissionManager().removePermission(permission); + return; + } + } catch (SecurityException e) { + throw new PALAdminException(e.toString(), e); + } + } + + protected java.security.Permission createPermissionFromClass( + String classname, String resource, String actions) + throws PALAdminException { + try { + Class permissionClass = Class.forName(classname); + Class[] parameterTypes = { String.class, String.class }; + Constructor permissionConstructor = permissionClass + .getConstructor(parameterTypes); + Object[] initArgs = { resource, actions }; + return (java.security.Permission) permissionConstructor + .newInstance(initArgs); + } catch (Exception e) { + throw new PALAdminException(e.toString(), e); + } + } + + public List> createRoleList() throws PALAdminException { + List> list = new ArrayList>(); + try { + for (Iterator itr = getRoleManager().getRoles(""); itr + .hasNext();) { + Map map = new HashMap(); + Role role = itr.next(); + map.put("label", role.getPrincipal().getName()); + map.put("value", role.getPrincipal().getName()); + list.add(map); + } + } catch (SecurityException e) { + throw new PALAdminException("Could not get roles. ", e); + } + return list; + } + + public List> createActionList() { + //TODO move to config file + String[] permissions = new String[] { "view", "edit", "help" }; + + List> list = new ArrayList>(); + for (int i = 0; i < permissions.length; i++) { + Map map = new HashMap(); + String permission = permissions[i]; + map.put("label", permission); + map.put("value", permission); + list.add(map); + } + return list; + } + + /** + * @return the roleManager + */ + public RoleManager getRoleManager() { + if (roleManager == null) { + roleManager = PortalComponentUtil.getRoleManager(); + } + return roleManager; + } + + /** + * @param roleManager the roleManager to set + */ + public void setRoleManager(RoleManager roleManager) { + this.roleManager = roleManager; + } + + /** + * @return the permissionManager + */ + public PermissionManager getPermissionManager() { + if (permissionManager == null) { + permissionManager = PortalComponentUtil.getPermissionManager(); + } + return permissionManager; + } + + /** + * @param permissionManager the permissionManager to set + */ + public void setPermissionManager(PermissionManager permissionManager) { + this.permissionManager = permissionManager; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,12 @@ +package jp.sf.pal.admin.pager; + +import java.io.Serializable; + +public class FolderPermissionPager extends DefaultPager implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 5243875311780257309L; + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,12 @@ +package jp.sf.pal.admin.pager; + +import java.io.Serializable; + +public class PagePermissionPager extends DefaultPager implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 8078803807468194425L; + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,12 @@ +package jp.sf.pal.admin.pager; + +import java.io.Serializable; + +public class PortletPermissionPager extends DefaultPager implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -1482210099302003151L; + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,379 @@ +package jp.sf.pal.admin.service; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.dxo.PermissionDxo; +import jp.sf.pal.admin.entity.Permission; +import jp.sf.pal.admin.logic.PermissionManagementLogic; +import jp.sf.pal.admin.pager.FolderPermissionPager; +import jp.sf.pal.admin.pager.PagePermissionPager; +import jp.sf.pal.admin.pager.PortletPermissionPager; +import jp.sf.pal.admin.util.PagerUtil; +import jp.sf.pal.admin.web.permission.FolderPermissionConfirmPage; +import jp.sf.pal.admin.web.permission.FolderPermissionEditPage; +import jp.sf.pal.admin.web.permission.FolderPermissionListPage; +import jp.sf.pal.admin.web.permission.PagePermissionConfirmPage; +import jp.sf.pal.admin.web.permission.PagePermissionEditPage; +import jp.sf.pal.admin.web.permission.PagePermissionListPage; +import jp.sf.pal.admin.web.permission.PortletPermissionConfirmPage; +import jp.sf.pal.admin.web.permission.PortletPermissionEditPage; +import jp.sf.pal.admin.web.permission.PortletPermissionListPage; + +public class PermissionManagementService implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 5125836806619644922L; + + private PortletPermissionPager portletPermissionPager; + + private FolderPermissionPager folderPermissionPager; + + private PagePermissionPager pagePermissionPager; + + private PermissionManagementLogic permissionManagementLogic; + + private PermissionDxo permissionDxo; + + public void loadPage(PortletPermissionListPage page) + throws PALAdminException { + PortletPermissionPager pager = getPortletPermissionPager(); + + // check page action + PagerUtil.updatePageNumber(pager, + PALAdminConstants.PREVIOUS_PAGE_NUMBER, + PALAdminConstants.NEXT_PAGE_NUMBER); + + // set portlet permission list + List> list = new ArrayList>(); + getPermissionDxo().convert( + getPermissionManagementLogic().getPortletPermissions(pager), + list); + PagerUtil.updatePagerPage(page, pager); + page.setResourceItems(list); + + } + + public void loadPage(PortletPermissionEditPage page) + throws PALAdminException { + if (page.isUpdate()) { + Permission permission = getPermissionManagementLogic() + .getPortletPermission(page.getName(), page.getActions()); + page.setName(permission.getName()); + String actions = permission.getActions(); + if (actions != null) { + page.setActionArray(actions.split(", *")); + page.setActions(actions); + } + String roles = permission.getRoles(); + if (roles != null) { + page.setRoleArray(roles.split(", *")); + page.setRoles(roles); + } + } else { + page.setActionArray(null); + page.setActions(null); + page.setName(null); + page.setRoles(null); + page.setRoleArray(null); + } + + // list-box + page.setActionArrayItems(getPermissionManagementLogic() + .createActionList()); + page.setRoleArrayItems(getPermissionManagementLogic().createRoleList()); + + } + + public void loadPage(PortletPermissionConfirmPage page) + throws PALAdminException { + Permission permission = getPermissionManagementLogic() + .getPortletPermission(page.getName(), page.getActions()); + if (permission == null) { + throw new PALAdminException("Could not find a permission. "); + } + page.setName(permission.getName()); + String actions = permission.getActions(); + if (actions != null) { + page.setActionArray(actions.split(", *")); + page.setActions(actions); + } + String roles = permission.getRoles(); + if (roles != null) { + page.setRoleArray(roles.split(", *")); + page.setRoles(roles); + } + + } + + public void loadPage(FolderPermissionListPage page) + throws PALAdminException { + FolderPermissionPager pager = getFolderPermissionPager(); + + // check page action + PagerUtil.updatePageNumber(pager, + PALAdminConstants.PREVIOUS_PAGE_NUMBER, + PALAdminConstants.NEXT_PAGE_NUMBER); + + // set portlet permission list + List> list = new ArrayList>(); + getPermissionDxo().convert( + getPermissionManagementLogic().getFolderPermissions(pager), + list); + PagerUtil.updatePagerPage(page, pager); + page.setResourceItems(list); + + } + + public void loadPage(FolderPermissionEditPage page) + throws PALAdminException { + if (page.isUpdate()) { + Permission permission = getPermissionManagementLogic() + .getFolderPermission(page.getName(), page.getActions()); + page.setName(permission.getName()); + String actions = permission.getActions(); + if (actions != null) { + page.setActionArray(actions.split(", *")); + page.setActions(actions); + } + String roles = permission.getRoles(); + if (roles != null) { + page.setRoleArray(roles.split(", *")); + page.setRoles(roles); + } + } else { + page.setActionArray(null); + page.setActions(null); + page.setName(null); + page.setRoles(null); + page.setRoleArray(null); + } + + // list-box + page.setActionArrayItems(getPermissionManagementLogic() + .createActionList()); + page.setRoleArrayItems(getPermissionManagementLogic().createRoleList()); + + } + + public void loadPage(FolderPermissionConfirmPage page) + throws PALAdminException { + Permission permission = getPermissionManagementLogic() + .getFolderPermission(page.getName(), page.getActions()); + if (permission == null) { + throw new PALAdminException("Could not find a permission. "); + } + page.setName(permission.getName()); + String actions = permission.getActions(); + if (actions != null) { + page.setActionArray(actions.split(", *")); + page.setActions(actions); + } + String roles = permission.getRoles(); + if (roles != null) { + page.setRoleArray(roles.split(", *")); + page.setRoles(roles); + } + + } + + public void loadPage(PagePermissionListPage page) throws PALAdminException { + PagePermissionPager pager = getPagePermissionPager(); + + // check page action + PagerUtil.updatePageNumber(pager, + PALAdminConstants.PREVIOUS_PAGE_NUMBER, + PALAdminConstants.NEXT_PAGE_NUMBER); + + // set portlet permission list + List> list = new ArrayList>(); + getPermissionDxo().convert( + getPermissionManagementLogic().getPagePermissions(pager), list); + PagerUtil.updatePagerPage(page, pager); + page.setResourceItems(list); + + } + + public void loadPage(PagePermissionEditPage page) throws PALAdminException { + if (page.isUpdate()) { + Permission permission = getPermissionManagementLogic() + .getPagePermission(page.getName(), page.getActions()); + page.setName(permission.getName()); + String actions = permission.getActions(); + if (actions != null) { + page.setActionArray(actions.split(", *")); + page.setActions(actions); + } + String roles = permission.getRoles(); + if (roles != null) { + page.setRoleArray(roles.split(", *")); + page.setRoles(roles); + } + } else { + page.setActionArray(null); + page.setActions(null); + page.setName(null); + page.setRoles(null); + page.setRoleArray(null); + } + + // list-box + page.setActionArrayItems(getPermissionManagementLogic() + .createActionList()); + page.setRoleArrayItems(getPermissionManagementLogic().createRoleList()); + + } + + public void loadPage(PagePermissionConfirmPage page) + throws PALAdminException { + Permission permission = getPermissionManagementLogic() + .getPagePermission(page.getName(), page.getActions()); + if (permission == null) { + throw new PALAdminException("Could not find a permission. "); + } + page.setName(permission.getName()); + String actions = permission.getActions(); + if (actions != null) { + page.setActionArray(actions.split(", *")); + page.setActions(actions); + } + String roles = permission.getRoles(); + if (roles != null) { + page.setRoleArray(roles.split(", *")); + page.setRoles(roles); + } + + } + + public void addPortletPermission(PortletPermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().addPortletPermission(page.getName(), + page.getActions(), page.getRoles()); + } + + public void updatePortletPermission(PortletPermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().updatePortletPermission(page.getName(), + page.getOldActions(), page.getActions(), page.getRoles()); + } + + public void deletePortletPermission(PortletPermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().deletePortletPermission(page.getName(), + page.getActions()); + } + + public void addFolderPermission(FolderPermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().addFolderPermission(page.getName(), + page.getActions(), page.getRoles()); + } + + public void updateFolderPermission(FolderPermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().updateFolderPermission(page.getName(), + page.getOldActions(), page.getActions(), page.getRoles()); + } + + public void deleteFolderPermission(FolderPermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().deleteFolderPermission(page.getName(), + page.getActions()); + } + + public void addPagePermission(PagePermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().addPagePermission(page.getName(), + page.getActions(), page.getRoles()); + } + + public void updatePagePermission(PagePermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().updatePagePermission(page.getName(), + page.getOldActions(), page.getActions(), page.getRoles()); + } + + public void deletePagePermission(PagePermissionConfirmPage page) + throws PALAdminException { + getPermissionManagementLogic().deletePagePermission(page.getName(), + page.getActions()); + } + + /** + * @return the permissionPager + */ + public PortletPermissionPager getPortletPermissionPager() { + return portletPermissionPager; + } + + /** + * @param permissionPager the permissionPager to set + */ + public void setPortletPermissionPager(PortletPermissionPager permissionPager) { + this.portletPermissionPager = permissionPager; + } + + /** + * @return the permissionManagementLogic + */ + public PermissionManagementLogic getPermissionManagementLogic() { + return permissionManagementLogic; + } + + /** + * @param permissionManagementLogic the permissionManagementLogic to set + */ + public void setPermissionManagementLogic( + PermissionManagementLogic permissionManagementLogic) { + this.permissionManagementLogic = permissionManagementLogic; + } + + /** + * @return the permissionDxo + */ + public PermissionDxo getPermissionDxo() { + return permissionDxo; + } + + /** + * @param permissionDxo the permissionDxo to set + */ + public void setPermissionDxo(PermissionDxo permissionDxo) { + this.permissionDxo = permissionDxo; + } + + /** + * @return the folderPermissionPager + */ + public FolderPermissionPager getFolderPermissionPager() { + return folderPermissionPager; + } + + /** + * @param folderPermissionPager the folderPermissionPager to set + */ + public void setFolderPermissionPager( + FolderPermissionPager folderPermissionPager) { + this.folderPermissionPager = folderPermissionPager; + } + + /** + * @return the pagePermissionPager + */ + public PagePermissionPager getPagePermissionPager() { + return pagePermissionPager; + } + + /** + * @param pagePermissionPager the pagePermissionPager to set + */ + public void setPagePermissionPager(PagePermissionPager pagePermissionPager) { + this.pagePermissionPager = pagePermissionPager; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -102,4 +102,11 @@ this.previousPageNumber = previousPageNumber; } + public boolean isPreviousPage() { + return getPreviousPageNumber() != null; + } + + public boolean isNextPage() { + return getNextPageNumber() != null; + } } \ No newline at end of file Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,79 @@ +package jp.sf.pal.admin.web.permission; + +import jp.sf.pal.admin.web.AbstractCrudPage; + +public abstract class AbstractPermissionPage extends AbstractCrudPage { + private String name; + + private String actions; + + private String roles; + + private String[] actionArray; + + private String[] roleArray; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + /** + * @return the actions + */ + public String getActions() { + return actions; + } + + /** + * @param actions the actions to set + */ + public void setActions(String actions) { + this.actions = actions; + } + + /** + * @return the roles + */ + public String getRoles() { + return roles; + } + + /** + * @param roles the roles to set + */ + public void setRoles(String roles) { + this.roles = roles; + } + + /** + * @return the actionArray + */ + public String[] getActionArray() { + return actionArray; + } + + /** + * @param actionArray the actionArray to set + */ + public void setActionArray(String[] actionArray) { + this.actionArray = actionArray; + } + + /** + * @return the roleArray + */ + public String[] getRoleArray() { + return roleArray; + } + + /** + * @param roleArray the roleArray to set + */ + public void setRoleArray(String[] roleArray) { + this.roleArray = roleArray; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,129 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; + +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.log.Logger; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.admin.web.CrudType; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class FolderPermissionConfirmPage extends AbstractPermissionPage + implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 9023563142910966532L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(FolderPermissionConfirmPage.class); + + private String oldActions; + + private PermissionManagementService permissionManagementService; + + public Class initialize() { + return null; + } + + public Class prerender() { + if (isDelete()) { + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0036", e); + FacesMessageUtil + .addErrorMessage("could.not.find.folder.permission"); + } + } else { + if (isUpdate()) { + setOldActions(getActions()); + } + setActions(StringUtils.join(getActionArray(), ", ")); + setRoles(StringUtils.join(getRoleArray(), ", ")); + } + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + public Class doFinish() { + if (isCreate()) { + // create + try { + getPermissionManagementService().addFolderPermission(this); + FacesMessageUtil.addInfoMessage("added.folder.permission"); + return FolderPermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0037", e); + FacesMessageUtil + .addErrorMessage("could.not.add.folder.permission"); + } + } else if (isUpdate()) { + // update + try { + getPermissionManagementService().updateFolderPermission(this); + FacesMessageUtil.addInfoMessage("updated.folder.permission"); + return FolderPermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0038", e); + FacesMessageUtil + .addErrorMessage("could.not.update.folder.permission"); + } + } else if (isDelete()) { + // delete + try { + getPermissionManagementService().deleteFolderPermission(this); + FacesMessageUtil.addInfoMessage("deleted.folder.permission"); + return FolderPermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0039", e); + FacesMessageUtil + .addErrorMessage("could.not.delete.folder.permission"); + } + } else { + FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + } + return null; + } + + public Class doEdit() { + return FolderPermissionEditPage.class; + } + + public boolean isComeFromList() { + return getCrudType() == CrudType.READ + || getCrudType() == CrudType.DELETE; + + } + + public String getOldActions() { + return oldActions; + } + + public void setOldActions(String oldActions) { + this.oldActions = oldActions; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,86 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import org.seasar.framework.log.Logger; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class FolderPermissionEditPage extends AbstractPermissionPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -4575207464231801908L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(FolderPermissionEditPage.class); + + private List> actionArrayItems; + + private List> roleArrayItems; + + private PermissionManagementService permissionManagementService; + + public Class doConfirm() { + return FolderPermissionConfirmPage.class; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0035", e); + FacesMessageUtil + .addErrorMessage("could.not.find.folder.permission"); + } + + // render faces message + FacesMessageUtil.renderMessages(); + return null; + } + + public List> getActionArrayItems() { + return actionArrayItems; + } + + public void setActionArrayItems(List> actionsItems) { + this.actionArrayItems = actionsItems; + } + + public List> getRoleArrayItems() { + return roleArrayItems; + } + + public void setRoleArrayItems(List> rolesItems) { + this.roleArrayItems = rolesItems; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,114 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.admin.web.AbstractPagerPage; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class FolderPermissionListPage extends AbstractPagerPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = 2457037062742678960L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(FolderPermissionListPage.class); + + private String actions; + + private String name; + + private int resourceIndex; + + private List> resourceItems; + + private String roles; + + private PermissionManagementService permissionManagementService; + + public Class initialize() { + return null; + } + + public Class prerender() { + + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0034", e); + FacesMessageUtil + .addErrorMessage("could.not.find.folder.permissions"); + } + + // render faces message + FacesMessageUtil.renderMessages(); + return null; + } + + public String getActions() { + return actions; + } + + public void setActions(String actions) { + this.actions = actions; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getResourceIndex() { + return resourceIndex; + } + + public void setResourceIndex(int resourceIndex) { + this.resourceIndex = resourceIndex; + } + + public List> getResourceItems() { + return resourceItems; + } + + public void setResourceItems(List> resourceItems) { + this.resourceItems = resourceItems; + } + + public String getRoles() { + return roles; + } + + public void setRoles(String roles) { + this.roles = roles; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,129 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; + +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.log.Logger; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.admin.web.CrudType; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PagePermissionConfirmPage extends AbstractPermissionPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = 525599648048090961L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PagePermissionConfirmPage.class); + + private String oldActions; + + private PermissionManagementService permissionManagementService; + + public Class initialize() { + return null; + } + + public Class prerender() { + if (isDelete()) { + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0042", e); + FacesMessageUtil + .addErrorMessage("could.not.find.page.permission"); + } + } else { + if (isUpdate()) { + setOldActions(getActions()); + } + setActions(StringUtils.join(getActionArray(), ", ")); + setRoles(StringUtils.join(getRoleArray(), ", ")); + } + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + public Class doFinish() { + if (isCreate()) { + // create + try { + getPermissionManagementService().addPagePermission(this); + FacesMessageUtil.addInfoMessage("added.page.permission"); + return PagePermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0043", e); + FacesMessageUtil + .addErrorMessage("could.not.add.page.permission"); + } + } else if (isUpdate()) { + // update + try { + getPermissionManagementService().updatePagePermission(this); + FacesMessageUtil.addInfoMessage("updated.page.permission"); + return PagePermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0044", e); + FacesMessageUtil + .addErrorMessage("could.not.update.page.permission"); + } + } else if (isDelete()) { + // delete + try { + getPermissionManagementService().deletePagePermission(this); + FacesMessageUtil.addInfoMessage("deleted.page.permission"); + return PagePermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0045", e); + FacesMessageUtil + .addErrorMessage("could.not.delete.page.permission"); + } + } else { + FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + } + return null; + } + + public Class doEdit() { + return PagePermissionEditPage.class; + } + + public boolean isComeFromList() { + return getCrudType() == CrudType.READ + || getCrudType() == CrudType.DELETE; + + } + + public String getOldActions() { + return oldActions; + } + + public void setOldActions(String oldActions) { + this.oldActions = oldActions; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,85 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import org.seasar.framework.log.Logger; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PagePermissionEditPage extends AbstractPermissionPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -6276578931150134498L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PagePermissionEditPage.class); + + private List> actionArrayItems; + + private List> roleArrayItems; + + private PermissionManagementService permissionManagementService; + + public Class doConfirm() { + return PagePermissionConfirmPage.class; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0041", e); + FacesMessageUtil.addErrorMessage("could.not.find.page.permission"); + } + + // render faces message + FacesMessageUtil.renderMessages(); + return null; + } + + public List> getActionArrayItems() { + return actionArrayItems; + } + + public void setActionArrayItems(List> actionsItems) { + this.actionArrayItems = actionsItems; + } + + public List> getRoleArrayItems() { + return roleArrayItems; + } + + public void setRoleArrayItems(List> rolesItems) { + this.roleArrayItems = rolesItems; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,114 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.admin.web.AbstractPagerPage; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class PagePermissionListPage extends AbstractPagerPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -5318877226955302854L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PagePermissionListPage.class); + + private String actions; + + private String name; + + private int resourceIndex; + + private List> resourceItems; + + private String roles; + + private PermissionManagementService permissionManagementService; + + public Class initialize() { + return null; + } + + public Class prerender() { + + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0024", e); + FacesMessageUtil + .addErrorMessage("could.not.find.page.permissions"); + } + + // render faces message + FacesMessageUtil.renderMessages(); + return null; + } + + public String getActions() { + return actions; + } + + public void setActions(String actions) { + this.actions = actions; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getResourceIndex() { + return resourceIndex; + } + + public void setResourceIndex(int resourceIndex) { + this.resourceIndex = resourceIndex; + } + + public List> getResourceItems() { + return resourceItems; + } + + public void setResourceItems(List> resourceItems) { + this.resourceItems = resourceItems; + } + + public String getRoles() { + return roles; + } + + public void setRoles(String roles) { + this.roles = roles; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,129 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; + +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.log.Logger; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.admin.web.CrudType; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PortletPermissionConfirmPage extends AbstractPermissionPage + implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 7198440443223185603L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortletPermissionConfirmPage.class); + + private String oldActions; + + private PermissionManagementService permissionManagementService; + + public Class initialize() { + return null; + } + + public Class prerender() { + if (isDelete()) { + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0030", e); + FacesMessageUtil + .addErrorMessage("could.not.find.portlet.permission"); + } + } else { + if (isUpdate()) { + setOldActions(getActions()); + } + setActions(StringUtils.join(getActionArray(), ", ")); + setRoles(StringUtils.join(getRoleArray(), ", ")); + } + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + public Class doFinish() { + if (isCreate()) { + // create + try { + getPermissionManagementService().addPortletPermission(this); + FacesMessageUtil.addInfoMessage("added.portlet.permission"); + return PortletPermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0031", e); + FacesMessageUtil + .addErrorMessage("could.not.add.portlet.permission"); + } + } else if (isUpdate()) { + // update + try { + getPermissionManagementService().updatePortletPermission(this); + FacesMessageUtil.addInfoMessage("updated.portlet.permission"); + return PortletPermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0032", e); + FacesMessageUtil + .addErrorMessage("could.not.update.portlet.permission"); + } + } else if (isDelete()) { + // delete + try { + getPermissionManagementService().deletePortletPermission(this); + FacesMessageUtil.addInfoMessage("deleted.portlet.permission"); + return PortletPermissionListPage.class; + } catch (PALAdminException e) { + logger.error("EPA0033", e); + FacesMessageUtil + .addErrorMessage("could.not.delete.portlet.permission"); + } + } else { + FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + } + return null; + } + + public Class doEdit() { + return PortletPermissionEditPage.class; + } + + public boolean isComeFromList() { + return getCrudType() == CrudType.READ + || getCrudType() == CrudType.DELETE; + + } + + public String getOldActions() { + return oldActions; + } + + public void setOldActions(String oldActions) { + this.oldActions = oldActions; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,86 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import org.seasar.framework.log.Logger; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PortletPermissionEditPage extends AbstractPermissionPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = 2408447311367739937L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortletPermissionEditPage.class); + + private List> actionArrayItems; + + private List> roleArrayItems; + + private PermissionManagementService permissionManagementService; + + public Class doConfirm() { + return PortletPermissionConfirmPage.class; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0029", e); + FacesMessageUtil + .addErrorMessage("could.not.find.portlet.permission"); + } + + // render faces message + FacesMessageUtil.renderMessages(); + return null; + } + + public List> getActionArrayItems() { + return actionArrayItems; + } + + public void setActionArrayItems(List> actionsItems) { + this.actionArrayItems = actionsItems; + } + + public List> getRoleArrayItems() { + return roleArrayItems; + } + + public void setRoleArrayItems(List> rolesItems) { + this.roleArrayItems = rolesItems; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,114 @@ +package jp.sf.pal.admin.web.permission; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PermissionManagementService; +import jp.sf.pal.admin.web.AbstractPagerPage; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class PortletPermissionListPage extends AbstractPagerPage implements + Serializable { + + /** + * + */ + private static final long serialVersionUID = -3454682306082731012L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortletPermissionListPage.class); + + private String actions; + + private String name; + + private int resourceIndex; + + private List> resourceItems; + + private String roles; + + private PermissionManagementService permissionManagementService; + + public Class initialize() { + return null; + } + + public Class prerender() { + + try { + getPermissionManagementService().loadPage(this); + } catch (PALAdminException e) { + logger.error("EPA0028", e); + FacesMessageUtil + .addErrorMessage("could.not.find.portlet.permissions"); + } + + // render faces message + FacesMessageUtil.renderMessages(); + return null; + } + + public String getActions() { + return actions; + } + + public void setActions(String actions) { + this.actions = actions; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getResourceIndex() { + return resourceIndex; + } + + public void setResourceIndex(int resourceIndex) { + this.resourceIndex = resourceIndex; + } + + public List> getResourceItems() { + return resourceItems; + } + + public void setResourceItems(List> resourceItems) { + this.resourceItems = resourceItems; + } + + public String getRoles() { + return roles; + } + + public void setRoles(String roles) { + this.roles = roles; + } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -26,4 +26,21 @@ EPA0025=Could not add a preference. EPA0026=Could not delete a preference. EPA0027=Could not delete a preference. - +EPA0028=Could not find permissions for portlet. +EPA0029=Could not find a permission for portlet. +EPA0030=Could not find a permission for portlet. +EPA0031=Could not add a permission for portlet. +EPA0032=Could not update a permission for portlet. +EPA0033=Could not delete a permission for portlet. +EPA0034=Could not find permissions for folder. +EPA0035=Could not find a permission for folder. +EPA0036=Could not find a permission for folder. +EPA0037=Could not add a permission for folder. +EPA0038=Could not update a permission for folder. +EPA0039=Could not delete a permission for folder. +EPA0040=Could not find permissions for page. +EPA0041=Could not find a permission for page. +EPA0042=Could not find a permission for page. +EPA0043=Could not add a permission for page. +EPA0044=Could not update a permission for page. +EPA0045=Could not delete a permission for folder. Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -207,3 +207,32 @@ could.not.add.preference=Could not add the preference. If you see this error message again, please contact a site administrator. deleted.preference=Deleted the preference. could.not.delete.preference=Could not delete the preference. If you see this error message again, please contact a site administrator. + +could.not.find.target.action=Could not find the target action. If you see this error message again, please contact a site administrator. + +could.not.find.portlet.permissions=Could not find permissions for portlet. If you see this error message again, please contact a site administrator. +could.not.find.portlet.permission=Could not find a permission for portlet. If you see this error message again, please contact a site administrator. +could.not.add.portlet.permission=Could not add a portlet permission. If you see this error message again, please contact a site administrator. +could.not.update.portlet.permission=Could not update a portlet permission. If you see this error message again, please contact a site administrator. +could.not.delete.portlet.permission=Could not delete a portlet permission. If you see this error message again, please contact a site administrator. +added.portlet.permission=Added a portlet permission. +updated.portlet.permission=Updated the portlet permission. +deleted.portlet.permission=Removed the portlet permission. + +could.not.find.folder.permissions=Could not find permissions for folder. If you see this error message again, please contact a site administrator. +could.not.find.folder.permission=Could not find a permission for folder. If you see this error message again, please contact a site administrator. +could.not.add.folder.permission=Could not add a folder permission. If you see this error message again, please contact a site administrator. +could.not.update.folder.permission=Could not update a folder permission. If you see this error message again, please contact a site administrator. +could.not.delete.folder.permission=Could not delete a folder permission. If you see this error message again, please contact a site administrator. +added.folder.permission=Added a folder permission. +updated.folder.permission=Updated the folder permission. +deleted.folder.permission=Removed the folder permission. + +could.not.find.page.permissions=Could not find permissions for page. If you see this error message again, please contact a site administrator. +could.not.find.page.permission=Could not find a permission for page. If you see this error message again, please contact a site administrator. +could.not.add.page.permission=Could not add a page permission. If you see this error message again, please contact a site administrator. +could.not.update.page.permission=Could not update a page permission. If you see this error message again, please contact a site administrator. +could.not.delete.page.permission=Could not delete a page permission. If you see this error message again, please contact a site administrator. +added.page.permission=Added a page permission. +updated.page.permission=Updated the page permission. +deleted.page.permission=Removed the page permission. Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -1,33 +1,199 @@ # Validator -org.seasar.teeda.extension.validator.TRegularExpressionValidator.INVALID=\u30d0\u30ea\u30c7\u30fc\u30b7\u30e7\u30f3\u30a8\u30e9\u30fc -org.seasar.teeda.extension.validator.TRegularExpressionValidator.INVALID_detail=\u5165\u529b\u5024({1})\u3067\u5229\u7528\u3067\u304d\u306a\u3044\u6587\u5b57\u304c\u5165\u529b\u3055\u308c\u3066\u3044\u307e\u3059\u3002 +org.seasar.teeda.extension.validator.TRegularExpressionValidator.INVALID=Validation\u3000\u30a8\u30e9\u30fc +org.seasar.teeda.extension.validator.TRegularExpressionValidator.INVALID_detail=\u4f7f\u7528\u3057\u305f\u6587\u5b57\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 # Messages -error.lacking.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +added.new.user=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.new.user=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.user=\u30e6\u30fc\u30b6\u30fc({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.user=\u30e6\u30fc\u30b6\u30fc({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +added.new.role=\u65b0\u3057\u3044\u5f79\u5272({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.new.role=\u65b0\u3057\u3044\u5f79\u5272({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.role=\u5f79\u5272({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.role=\u5f79\u5272({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +added.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.group=\u30b0\u30eb\u30fc\u30d7{0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.group=\u30b0\u30eb\u30fc\u30d7{0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +added.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +could.not.find.user=\u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u30fc({0})\u3092\u898b\u3064\u3051\u308b\u4e8b\u304c\u51fa\u6765\u307e\u305b\u3093\u3002 +updated.user.information= \u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u30fc\u60c5\u5831({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +failed.to.update.user.information=\u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u30fc\u60c5\u5831({0})\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +added.group.to.user= \u30b0\u30eb\u30fc\u30d7({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.group.to.user=\u30b0\u30eb\u30fc\u30d7({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +removed.groups.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u30b0\u30eb\u30fc\u30d7({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.remove.groups.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u30b0\u30eb\u30fc\u30d7({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +invalid.group.or.user.name=\u7121\u52b9\u306a\u30b0\u30eb\u30fc\u30d7\u540d\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 +group.exists.in.user=\u30b0\u30eb\u30fc\u30d7({1})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 + +added.role.to.user= \u5f79\u5272({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002 +failed.to.add.role.to.user=\u5f79\u5272({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +removed.roles.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.remove.roles.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +invalid.role.or.user.name=\u7121\u52b9\u306a\u5f79\u5272\u540d\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 +role.exists.in.user=\u5f79\u5272({1})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 + +added.principalRule.to.user= \u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1}/{2})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.principalRule.to.user=\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1}/{2})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +removed.principalRules.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.remove.principalRules.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +principalRule.exists.in.user=\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1}/{2})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 +invalid.profilingRule.or.user.name=\u7121\u52b9\u306a\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 + +invalid.action.for.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u5bfe\u3057\u3066\u7121\u52b9\u306a\u30a2\u30af\u30b7\u30e7\u30f3\u3067\u3059\u3002 +started.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u8d77\u52d5\u3057\u307e\u3057\u305f\u3002 +failed.to.start.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +stopped.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u505c\u6b62\u3057\u307e\u3057\u305f\u3002 +failed.to.stop.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u505c\u6b62\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +undeployed.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u3092\u89e3\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.undeploy.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u89e3\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u5931\u6557\u306b\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +invalid.upload.file=\u7121\u52b9\u306a\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u30d5\u30a1\u30a4\u30eb\u3067\u3059\u3002 +started.portlet.application.deployment=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u3092\u958b\u59cb\u3057\u307e\u3057\u305f\u3002 +failed.to.start.portlet.application.deployment=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099\u958b\u59cb\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +invalid.portlet.parameter=\u7121\u52b9\u306a\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30d1\u30e9\u30e1\u30fc\u30bf\u3067\u3059\u3002 + +invalid.repository.parameters=\u7121\u52b9\u306a\u30ea\u30dd\u30b8\u30c8\u30ea\u30d1\u30e9\u30e1\u30fc\u30bf\u3067\u3059\u3002 + +added.new.repository=\u65b0\u898f\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.new.repository=\u65b0\u898f\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +updated.repository=\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +failed.to.update.repository=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.repository=\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.repository=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +failed.to.get.users=\u30e6\u30fc\u30b6\u30fc\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +failed.to.get.userattributes=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 + +error.lacking.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 error.userid_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fcID\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u30e6\u30fc\u30b6\u30fcID\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -error.email_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u65e2\u306b\u30b7\u30b9\u30c6\u30e0\u3067\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u65e2\u306b\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u6240\u6709\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u78ba\u8a8d\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -error.two_passwords_do_not_match=\uff12\u3064\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +error.email_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u65e2\u306b\u30b7\u30b9\u30c6\u30e0\u3067\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u65e2\u306b\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u6240\u6709\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u78ba\u8a8d\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002 error.failed_to_add=\u30e6\u30fc\u30b6\u30fc\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 success.login_above=\u30e6\u30fc\u30b6\u30fc\u767b\u9332\u30d7\u30ed\u30bb\u30b9\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002 success.check_your_email= \u30e6\u30fc\u30b6\u30fc\u767b\u9332\u30d7\u30ed\u30bb\u30b9\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u542b\u307e\u308c\u308b\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002 error.registration_completed_but_could_not_send=\u30e6\u30fc\u30b6\u30fc\u767b\u9332\u30d7\u30ed\u30bb\u30b9\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u767b\u9332\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -forgotten.email_address_not_found=\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u898b\u3064\u3051\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u5165\u529b\u3057\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u6b63\u3057\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -failed_to_send=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u554f\u984c\u304c\u8d77\u304d\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +forgotten.email_address_not_found=\u8a72\u5f53\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u6b63\u3057\u3044\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +failed_to_send=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 an_email_has_been_sent=\u30e1\u30fc\u30eb\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002\u518d\u767a\u884c\u3055\u308c\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u4f7f\u7528\u3057\u3066\u3001\u30ed\u30b0\u30a4\u30f3\u5f8c\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002 forgotten.successful_pw_update = \u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002\u305d\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u4f7f\u7528\u3057\u3066\u3001\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30ed\u30b0\u30a4\u30f3\u5f8c\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -forgotten.unable_to_update_pw=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u8d77\u304d\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +forgotten.unable_to_update_pw=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -could.not.read.term.of.service=\u5229\u7528\u898f\u7d04\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 +could.not.read.term.of.service=\u5229\u7528\u898f\u7d04\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002 incorrect.scret.answer=\u300c\u79d8\u5bc6\u306e\u7b54\u3048\u300d\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002 -could.not.find.your.credential=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002 -could.not.find.your.account=\u30a2\u30ab\u30a6\u30f3\u30c8\u60c5\u5831\u3092\u898b\u3064\u3051\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002 +could.not.find.your.credential=\u8a72\u5f53\u3059\u308b\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002 +could.not.find.your.account=\u8a72\u5f53\u3059\u308b\u30a2\u30ab\u30a6\u30f3\u30c8\u60c5\u5831\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u307f\u3066\u304f\u3060\u3055\u3044\u3002 could.not.match.passwords=\u78ba\u8a8d\u7528\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5165\u529b\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u5185\u5bb9\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -could.not.update.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u66f4\u65b0\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 updated.user.info=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +could.not.access.folder=\u6307\u5b9a\u3057\u305f\u30d5\u30a9\u30eb\u30c0\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.access.page=\u6307\u5b9a\u3057\u305f\u30da\u30fc\u30b8\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.page=\u6307\u5b9a\u3057\u305f\u30da\u30fc\u30b8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.page=\u6307\u5b9a\u3057\u305f\u30da\u30fc\u30b8\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +updated.page=\u6307\u5b9a\u3057\u305f\u30da\u30fc\u30b8\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 + +could.not.find.folder=\u6307\u5b9a\u3057\u305f\u30d5\u30a9\u30eb\u30c0\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.folder=\u6307\u5b9a\u3057\u305f\u30d5\u30a9\u30eb\u30c0\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002 \u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +updated.folder=\u6307\u5b9a\u3057\u305f\u30d5\u30a9\u30eb\u30c0\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 + +could.not.find.layout=\u6307\u5b9a\u3057\u305f\u30ec\u30a4\u30a2\u30a6\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.layout=\u6307\u5b9a\u3057\u305f\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +updated.layout=\u6307\u5b9a\u3057\u305f\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 + +could.not.find.portlet=\u6307\u5b9a\u3057\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.portlet=\u6307\u5b9a\u3057\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +updated.portlet=\u6307\u5b9a\u3057\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 + +need.to.specify.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +could.not.add.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002 \u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 + +need.to.specify.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +could.not.add.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 + +added.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.change.folder.order=\u30d5\u30a9\u30eb\u30c0\u306e\u9806\u756a\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.add.default.page=\u30c7\u30d5\u30a9\u30eb\u30c8\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.change.default.page.order=\u30c7\u30d5\u30a9\u30eb\u30c8\u30da\u30fc\u30b8\u306e\u9806\u756a\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +need.to.specify.folder.name=\u30d5\u30a9\u30eb\u30c0\u540d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +added.page=\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.page=\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.change.page.order=\u30da\u30fc\u30b8\u306e\u9806\u756a\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +need.to.specify.page.name=\u30da\u30fc\u30b8\u540d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 + +could.not.delete.root.folder=\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 +could.not.delete.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.delete.page=\u30da\u30fc\u30b8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.page=\u30da\u30fc\u30b8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.delete.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.root.layout=\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 + +could.not.delete.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.encode.secret.password=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +could.not.access.page.security=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +need.to.specify.users.roles.groups=\u30e6\u30fc\u30b6\u30fc\u306e\u5f79\u5272\u307e\u305f\u306f\u30b0\u30eb\u30fc\u30d7\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +need.to.specify.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +need.to.specify.security.constraint.ref=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u898f\u5b9a\u53c2\u7167\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 + +added.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.page.security=\u8a72\u5f53\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +removed.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +added.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.folder.security=\u8a72\u5f53\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +removed.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +invalid.path=\u7121\u52b9\u306a\u30d1\u30b9\u3067\u3059\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.access.path=\u30d1\u30b9\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002 + +updated.layout.but.could.not.update.cache=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u69cb\u6210\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +updated.portlet.but.could.not.update.cache=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u69cb\u6210\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +updated.document.order=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u9806\u756a\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +could.not.update.document.order=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u9806\u756a\u3092\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.document.order=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u9806\u756a\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.document.order=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u9806\u756a\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.document.order=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u9806\u756a\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.document.order=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u9806\u756a\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +document.already.exists=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002 +document.does.not.exist=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 + +could.not.find.metadata=\u8a72\u5f53\u306e\u30e1\u30bf\u30c7\u30fc\u30bf\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.metadata=\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.metadata=\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.metadata=\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.metadata=\u30e1\u30bf\u30c7\u30fc\u30bf\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.field=\u8a72\u5f53\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u30c7\u30fc\u30bf\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + login.first=\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -could.not.find.user=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -could.not.remove.user=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.remove.user=\u30e6\u30fc\u30b6\u30fc\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 invalid.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002 + + Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/deployer/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/deployer/label_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/deployer/label_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,34 @@ +localTab=\u30ed\u30fc\u30ab\u30eb +remoteTab=\u30ea\u30e2\u30fc\u30c8 + +deployPortlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u914d\u5099 +portletApplicationFile=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30d5\u30a1\u30a4\u30eb + +portletsInRepositories=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 + +repository=\u30ea\u30dd\u30b8\u30c8\u30ea: +groupId=\u30b0\u30eb\u30fc\u30d7ID +artifactId=\u30a2\u30fc\u30c6\u30a3\u30d5\u30a1\u30af\u30c8ID +name=\u540d\u524d +version=\u30d0\u30fc\u30b8\u30e7\u30f3 +type=\u30bf\u30a4\u30d7 +deployingOthers=\u305d\u306e\u4ed6\u306e\u914d\u5099 +deploy=\u914d\u5099 +publisherName=\u30d1\u30d6\u30ea\u30c3\u30b7\u30e3\u30fc + +create=\u4f5c\u6210 +edit=\u7de8\u96c6 +delete=\u524a\u9664 + +yes=\u306f\u3044 +no=\u3044\u3044\u3048 + +repositories=\u30ea\u30dd\u30b8\u30c8\u30ea +portlets=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +available=\u5229\u7528\u53ef\u80fd + +createRepository=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u6210 +editRepository=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u7de8\u96c6 +deleteRepository=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u524a\u9664 +repositoryName=\u30ea\u30dd\u30b8\u30c8\u30ea\u540d +configPath=\u69cb\u6210\u30d1\u30b9 \ No newline at end of file Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/deployer/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,7 @@ +# Common +groupName=\u30b0\u30eb\u30fc\u30d7\u540d +groupList=\u30b0\u30eb\u30fc\u30d7\u30ea\u30b9\u30c8 +groupInformation=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831 + +# groupList +groupList.delete=\u524a\u9664 Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,12 @@ +userTab=\u30e6\u30fc\u30b6 +roleTab=\u5f79\u5272 +groupTab=\u30b0\u30eb\u30fc\u30d7 + +portletsTab=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +deployerTab=\u30c7\u30d7\u30ed\u30a4\u30e4\u30fc + +previousPage=<<\u623b\u308b +found= \u4ef6\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002 +nextPage=\u6b21\u3078>> +action=\u30a2\u30af\u30b7\u30e7\u30f3: +filter=\u30d5\u30a3\u30eb\u30bf\u30fc: Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,18 @@ +# Common +portletTab=Portlets +folderTab=Folders +pageTab=Pages +listTab=List +newTab=New +editTab=Edit +deleteTab=Delete + +portletPermissionList=Portlet Permission List +resourceName=Resource Name +action=Actions +role=Roles + +permissionInformation=Permission Information + +delete=Delete +edit=Edit Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,20 @@ +deployedPortletsList=\u914d\u5099\u3055\u308c\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30ea\u30b9\u30c8 +portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u540d +version=\u30d0\u30fc\u30b8\u30e7\u30f3 +path=\u30d1\u30b9 +status=\u30b9\u30c6\u30fc\u30bf\u30b9 +delete=\u524a\u9664 +start=\u958b\u59cb +stop=\u505c\u6b62 +undeploy=\u914d\u5099\u89e3\u9664 + +startPortlet= \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u958b\u59cb +stopPortlet= \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u505c\u6b62 +undeployPortlet= \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u914d\u5099\u89e3\u9664 +deletePortlet= \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u524a\u9664 + +running=\u8d77\u52d5\u4e2d +stopped=\u505c\u6b62 +unknown=\u4e0d\u660e + +refreshTab=\u518d\u8aad\u8fbc \ No newline at end of file Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,7 @@ +# Common +roleName=\u5f79\u5272\u540d +roleList=\u5f79\u5272\u30ea\u30b9\u30c8 +roleInformation=\u5f79\u5272\u60c5\u5831 + +# roleList +roleList.delete=\u524a\u9664 Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,55 @@ +# Common +userName=\u30e6\u30fc\u30b6\u30fc\u540d +password=\u30d1\u30b9\u30ef\u30fc\u30c9 +changePassword=\u521d\u671f\u30ed\u30b0\u30a4\u30f3\u6642\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 +defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5f79\u5272 +profilingRule=\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +userList=\u30e6\u30fc\u30b6\u30fc\u30ea\u30b9\u30c8 +userInformation=\u30e6\u30fc\u30b6\u30fc\u306e\u60c5\u5831 +userAttributeList=\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u306e\u30ea\u30b9\u30c8 +basicTab=\u57fa\u672c\u30bf\u30d6 +profilingRuleTab=\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u30bf\u30d6 +userAttributeTab=\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u30bf\u30d6 + +# userList +userList.delete=\u524a\u9664 +userList.edit=\u7de8\u96c6 + +# userEdit +userEdit.changePassword=\u6b21\u56de\u30ed\u30b0\u30a4\u30f3\u6642\u304b\u3089\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 +userEdit.userEnabled=\u5229\u7528\u53ef\u80fd\u72b6\u614b +userEdit.lastLogon=\u6700\u7d42\u30ed\u30b0\u30aa\u30f3 +userEdit.expirationDate=\u6709\u52b9\u671f\u9650 +userEdit.expires=\u671f\u9650 +userEdit.Active=\u6709\u52b9 +userEdit.Expired=\u671f\u9650\u5207\u308c +userEdit.Extend=\u5ef6\u9577 +userEdit.ExtendUnlimited=\u7121\u5236\u9650\u306b\u5ef6\u9577 + +# userGroupEdit +userGroupEdit.newGroup=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7 +userGroupEdit.group=\u30b0\u30eb\u30fc\u30d7 +userGroupEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 + +# userRoleEdit +userRoleEdit.newRole=\u65b0\u3057\u3044\u5f79\u5272 +userRoleEdit.role=\u5f79\u5272 +userRoleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 + +# userProfilingRuleEdit +userProfilingRuleEdit.newProfilingRule=\u65b0\u3057\u3044\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +userProfilingRuleEdit.profilingrule=\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +userProfilingRuleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 + +# userAttributeList +userAttributeList.userAttributeKey=\u30ad\u30fc +userAttributeList.userAttributeValue=\u5024 + +# userAttributeEdit +userAttributeEdit.userAttributeKey=\u30ad\u30fc +userAttributeEdit.userAttributeValue=\u5024 + +# userAttributeConfirm +userAttributeConfirm.userAttributeKey=\u30ad\u30fc +userAttributeConfirm.userAttributeValue=\u5024 + Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-25 07:56:12 UTC (rev 656) @@ -542,4 +542,37 @@ Withdrawal + + Provides features for managing permissions. + パーミッションを管理する機能を提供します。 + PermissionEditor + PermissionEditor + パーミッションエディター + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.filter.PermissionEditorFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/permission/portletPermissionList.html + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.web.permission.PermissionEditor + + Permission Editor + Permission + Permission + + Added: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,85 @@ + + + + + + + + +
    + + + + +
    + List | + + + +
    +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + + NAME + + + +
    + + + + + NAME + + +
    + + + + NAME + + +
    +
    +
    + + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/folderPermissionEdit.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionEdit.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,92 @@ + + + + + + + + +
    + + + + +
    + List | + + +
    +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + +
    + +
    +
    + NAME + +
    +
    + +
    + + + + + + +
    + + + + + + +
    +
    + +
    + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionEdit.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,94 @@ + + + + + + + + +
    + + + +
    + | + New +
    +
    + +
    + +
    +
    + +
    +
    +
    + 10 + (3/5) +
    +
    + + <<Previous + + + Next>> + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + +
    +
    + user + + user + + roles + + Edit + Delete +
    +
    + + <<Previous + + + Next>> + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,85 @@ + + + + + + + + +
    + + + + +
    + List | + + + +
    +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + + NAME + + + +
    + + + + + NAME + + +
    + + + + NAME + + +
    +
    +
    + + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionEdit.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionEdit.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,92 @@ + + + + + + + + +
    + + + + +
    + List | + + +
    +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + +
    + +
    +
    + NAME + +
    +
    + +
    + + + + + + +
    + + + + + + +
    +
    + +
    + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionEdit.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,94 @@ + + + + + + + + +
    + + + +
    + | + New +
    +
    + +
    + +
    +
    + +
    +
    +
    + 10 + (3/5) +
    +
    + + <<Previous + + + Next>> + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + +
    +
    + user + + user + + roles + + Edit + Delete +
    +
    + + <<Previous + + + Next>> + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,85 @@ + + + + + + + + +
    + + +
    + + + Folder + + + Page + +
    + +
    + List | + + + +
    +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + + NAME + + + +
    + + + + + NAME + + +
    + + + + NAME + + +
    +
    +
    + + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionEdit.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionEdit.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,92 @@ + + + + + + + + +
    + + +
    + + + Folder + + + Page + +
    + +
    + List | + + +
    +
    + +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + +
    + + +
    + +
    +
    + NAME + +
    +
    + +
    + + + + + + +
    + + + + + + +
    +
    + +
    + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionEdit.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html 2007-10-25 07:54:55 UTC (rev 655) +++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html 2007-10-25 07:56:12 UTC (rev 656) @@ -0,0 +1,94 @@ + + + + + + + + +
    + +
    + + + Folder + + + Page + +
    + +
    + | + New +
    +
    + +
    + +
    +
    + +
    +
    +
    + 10 + (3/5) +
    +
    + + <<Previous + + + Next>> + +
    + + + + + + + + + + + + + + + + + +
    + + + + + + +
    +
    + user + + user + + roles + + Edit + Delete +
    +
    + + <<Previous + + + Next>> + +
    +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Fri Oct 26 06:42:05 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 06:42:05 +0900 Subject: [pal-cvs 2913] [657] changed background color. Message-ID: <1193348525.553655.19194.nullmailer@users.sourceforge.jp> Revision: 657 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=657 Author: shinsuke Date: 2007-10-26 06:42:05 +0900 (Fri, 26 Oct 2007) Log Message: ----------- changed background color. Modified Paths: -------------- pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css -------------- next part -------------- Modified: pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css =================================================================== --- pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css 2007-10-25 07:56:12 UTC (rev 656) +++ pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css 2007-10-25 21:42:05 UTC (rev 657) @@ -185,7 +185,7 @@ .nextgen .portlet-section-header { background-image:url(../images/header_background.gif); background-repeat: repeat-x; - background-color:#90d0ff; + background-color:#113377; color: #fff; padding: 5px; margin-right: 2px; @@ -225,7 +225,7 @@ .nextgen .portlet-section-subheader { background-image:url(../images/subheader_background.gif); background-repeat: repeat-x; - background-color:#c0e0f0; + background-color:#88aacc; color: #000099; padding: 5px; margin-right: 2px; @@ -533,7 +533,7 @@ .nextgen .portlet-table-header { background-image:url(../images/header_background.gif); background-repeat: repeat-x; - background-color:#90d0ff; + background-color:#113377; color: #fff; border: 0.75px solid #fff; From svnnotify @ sourceforge.jp Fri Oct 26 06:52:15 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 06:52:15 +0900 Subject: [pal-cvs 2914] [658] updated messages. Message-ID: <1193349135.372025.25530.nullmailer@users.sourceforge.jp> Revision: 658 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=658 Author: shinsuke Date: 2007-10-26 06:52:15 +0900 (Fri, 26 Oct 2007) Log Message: ----------- updated messages. Modified Paths: -------------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties Added Paths: ----------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties -------------- next part -------------- Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties =================================================================== Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties 2007-10-25 21:42:05 UTC (rev 657) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties 2007-10-25 21:52:15 UTC (rev 658) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u30a8\u30c7\u30a3\u30bf\u30fc +javax.portlet.short-title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 +javax.portlet.keywords=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 + Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties 2007-10-25 21:42:05 UTC (rev 657) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties 2007-10-25 21:52:15 UTC (rev 658) @@ -8,6 +8,8 @@ deleteTab=Delete portletPermissionList=Portlet Permission List +folderPermissionList=Folder Permission List +pagePermissionList=Page Permission List resourceName=Resource Name action=Actions role=Roles From svnnotify @ sourceforge.jp Fri Oct 26 06:52:50 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 06:52:50 +0900 Subject: [pal-cvs 2915] [659] added change password portlet. Message-ID: <1193349170.457427.25655.nullmailer@users.sourceforge.jp> Revision: 659 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=659 Author: shinsuke Date: 2007-10-26 06:52:50 +0900 (Fri, 26 Oct 2007) Log Message: ----------- added change password portlet. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Added Paths: ----------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PasswordManagementFilter.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label.properties pal-admin/trunk/src/main/webapp/view/password/ pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-10-25 21:52:50 UTC (rev 659) @@ -186,4 +186,6 @@ public static final String REMOVE_USER_FOLDER = PREFIX + "withdraw.RemoveUserFolder"; + public static final String USER_ADMINISTRATION = "PAL User Administration"; + } Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PasswordManagementFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PasswordManagementFilter.java 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PasswordManagementFilter.java 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,91 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.filter; + +import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletConfig; +import javax.portlet.PortletContext; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import jp.sf.pal.admin.PALAdminConstants; + +import org.apache.jetspeed.CommonPortletServices; +import org.apache.jetspeed.audit.AuditActivity; +import org.apache.jetspeed.security.UserManager; +import org.apache.portals.bridges.portletfilter.PortletFilter; +import org.apache.portals.bridges.portletfilter.PortletFilterChain; +import org.apache.portals.bridges.portletfilter.PortletFilterConfig; + +public class PasswordManagementFilter implements PortletFilter { + private UserManager userManager; + + private AuditActivity auditActivity; + + public void destroy() { + userManager = null; + auditActivity = null; + } + + public void init(PortletFilterConfig filterConfig) throws PortletException { + PortletConfig portletConfig = filterConfig.getPortletConfig(); + PortletContext portletContext = portletConfig.getPortletContext(); + + // userManager + userManager = (UserManager) portletContext + .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT); + if (null == userManager) { + throw new PortletException( + "Failed to find userManager on portlet initialization"); + } + + // auditActivity + auditActivity = (AuditActivity) portletContext + .getAttribute(CommonPortletServices.CPS_AUDIT_ACTIVITY); + if (null == auditActivity) { + throw new PortletException( + "Failed to find auditActivity on portlet initialization"); + } + + } + + public void processActionFilter(ActionRequest request, + ActionResponse response, PortletFilterChain chain) + throws PortletException, IOException { + request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PALAdminConstants.AUDIT_ACTIVITY_COMPONENT, + auditActivity); + + chain.processActionFilter(request, response); + } + + public void renderFilter(RenderRequest request, RenderResponse response, + PortletFilterChain chain) throws PortletException, IOException { + request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PALAdminConstants.AUDIT_ACTIVITY_COMPONENT, + auditActivity); + + chain.renderFilter(request, response); + + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PasswordManagementFilter.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,79 @@ +package jp.sf.pal.admin.service; + +import java.io.Serializable; +import java.security.Principal; + +import javax.faces.context.FacesContext; +import javax.security.auth.Subject; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.admin.util.PortalComponentUtil; +import jp.sf.pal.common.CommonException; + +import org.apache.jetspeed.PortalReservedParameters; +import org.apache.jetspeed.audit.AuditActivity; +import org.apache.jetspeed.request.RequestContext; +import org.apache.jetspeed.security.InvalidNewPasswordException; +import org.apache.jetspeed.security.InvalidPasswordException; +import org.apache.jetspeed.security.PasswordAlreadyUsedException; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.UserManager; + +public class PasswordManagementService implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 7648155261356882471L; + + public void updatePassword(String currentPassword, String newPassword) + throws CommonException { + Principal principal = FacesContext.getCurrentInstance() + .getExternalContext().getUserPrincipal(); + if (principal == null) { + throw new CommonException("could.not.change.password", + "User principal is null."); + } + + UserManager userManager = PortalComponentUtil.getUserManager(); + if (userManager == null) { + throw new CommonException("could.not.change.password", + "userManager is null."); + } + AuditActivity auditActivity = PortalComponentUtil.getAuditActivity(); + if (auditActivity == null) { + throw new CommonException("could.not.change.password", + "auditActivity is null."); + } + + try { + String username = principal.getName(); + RequestContext requestContext = (RequestContext) FacesContext + .getCurrentInstance().getExternalContext().getRequestMap() + .get(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); + + userManager.setPassword(username, currentPassword, newPassword); + auditActivity.logUserActivity(username, requestContext.getRequest() + .getRemoteAddr(), AuditActivity.PASSWORD_CHANGE_SUCCESS, + PALAdminConstants.USER_ADMINISTRATION); + + // refresh/update Subject in session to reflect the changed PasswordCredential + Subject subject = userManager.getUser(username).getSubject(); + + requestContext.setSessionAttribute( + PortalReservedParameters.SESSION_KEY_SUBJECT, subject); + } catch (InvalidPasswordException ipe) { + throw new CommonException("invalid.current.password", "Invalid password. "); + } catch (InvalidNewPasswordException inpe) { + throw new CommonException("invalid.new.password", + "Invalid new password. "); + } catch (PasswordAlreadyUsedException paue) { + throw new CommonException("password.already.used", + "The password already used. "); + } catch (SecurityException e) { + throw new CommonException("could.not.change.password", + "Security exception. "); + } + + } +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,121 @@ +package jp.sf.pal.admin.web.password; + +import java.io.Serializable; + +import jp.sf.pal.admin.PALAdminException; +import jp.sf.pal.admin.service.PasswordManagementService; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Equal; +import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; + +public class PasswordEditPage implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 8299805833656409820L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PasswordEditPage.class); + + @Required + private String currentPassword; + + @Required + private String newPassword; + + @Required + @Equal(targetId = "newPassword") + private String retypePassword; + + private PasswordManagementService passwordManagementService; + + private LabelHelper labelHelper; + + public Class initialize() { + return null; + } + + public Class prerender() { + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + public Class doFinish() { + try { + getPasswordManagementService().updatePassword(currentPassword, + newPassword); + FacesMessageUtil.addInfoMessage("changed.password"); + } catch (CommonException e) { + logger.error("EPA0046", e); + FacesMessageUtil.addErrorMessage(e.getMessageId()); + } + return null; + } + + public String getDoFinishValue() { + return getLabelHelper().getLabelValue("changePassword"); + } + + public String getCurrentPassword() { + return currentPassword; + } + + public void setCurrentPassword(String currentPassword) { + this.currentPassword = currentPassword; + } + + public String getNewPassword() { + return newPassword; + } + + public void setNewPassword(String newPassword) { + this.newPassword = newPassword; + } + + public String getRetypePassword() { + return retypePassword; + } + + public void setRetypePassword(String retypePassword) { + this.retypePassword = retypePassword; + } + + /** + * @return the passwordManagementService + */ + public PasswordManagementService getPasswordManagementService() { + return passwordManagementService; + } + + /** + * @param passwordManagementService the passwordManagementService to set + */ + public void setPasswordManagementService( + PasswordManagementService passwordManagementService) { + this.passwordManagementService = passwordManagementService; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-25 21:52:50 UTC (rev 659) @@ -44,3 +44,4 @@ EPA0043=Could not add a permission for page. EPA0044=Could not update a permission for page. EPA0045=Could not delete a permission for folder. +EPA0046=Could not change the password. Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-10-25 21:52:50 UTC (rev 659) @@ -236,3 +236,9 @@ added.page.permission=Added a page permission. updated.page.permission=Updated the page permission. deleted.page.permission=Removed the page permission. + +could.not.change.password=Could not change a password. If you see this error message again, please contact a site administrator. +changed.password=Changed password. +invalid.current.password=Invalid password. Please check a current password. +invalid.new.password=Invalid new password. Please check a new password. +password.already.used=The password is already used. Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 +javax.portlet.short-title=\u30d1\u30b9\u30ef\u30fc\u30c9 +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9 + Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 +javax.portlet.short-title=\u30d1\u30b9\u30ef\u30fc\u30c9 +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9 + Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label.properties 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label.properties 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,7 @@ +currentPasswordField=Current Password: +newPasswordField=New Password: +retypePasswordField=Re-type Password: +currentPassword=Current Password +newPassword=New Password +retypePassword=Re-type Password +changePassword=Change Password Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-25 21:52:50 UTC (rev 659) @@ -546,7 +546,7 @@ Provides features for managing permissions. パーミッションを管理する機能を提供します。 PermissionEditor - PermissionEditor + Permission Editor パーミッションエディター org.apache.portals.bridges.portletfilter.FilterPortlet @@ -575,4 +575,37 @@ Permission + + Provides features for changing user's password. + ユーザーパスワードを変更する機能を提供します。 + ChangePassword + Change Password + パスワード変更 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.filter.PasswordManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/password/passwordEdit.html + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.web.password.ChangePassword + + Change Password + Password + Password + + Added: pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html 2007-10-25 21:52:15 UTC (rev 658) +++ pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html 2007-10-25 21:52:50 UTC (rev 659) @@ -0,0 +1,50 @@ + + + + + + + + +
    +
    + +
    + +
    + + + + + + + + + + + + + + + + +
    + + + +
    + + + +
    + + + +
    + +
    +
    + +
    + + Property changes on: pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Fri Oct 26 06:55:39 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 06:55:39 +0900 Subject: [pal-cvs 2916] [660] modified a translation of role. Message-ID: <1193349339.878010.27030.nullmailer@users.sourceforge.jp> Revision: 660 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=660 Author: shinsuke Date: 2007-10-26 06:55:39 +0900 (Fri, 26 Oct 2007) Log Message: ----------- modified a translation of role. Modified Paths: -------------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-10-25 21:52:50 UTC (rev 659) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) @@ -1,7 +1,7 @@ # Common -roleName=\u5f79\u5272\u540d -roleList=\u5f79\u5272\u30ea\u30b9\u30c8 -roleInformation=\u5f79\u5272\u60c5\u5831 +roleName=\u30ed\u30fc\u30eb\u540d +roleList=\u30ed\u30fc\u30eb\u30ea\u30b9\u30c8 +roleInformation=\u30ed\u30fc\u30eb\u60c5\u5831 # roleList roleList.delete=\u524a\u9664 Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-10-25 21:52:50 UTC (rev 659) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) @@ -2,13 +2,13 @@ userName=\u30e6\u30fc\u30b6\u30fc\u540d password=\u30d1\u30b9\u30ef\u30fc\u30c9 changePassword=\u521d\u671f\u30ed\u30b0\u30a4\u30f3\u6642\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 -defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u5f79\u5272 -profilingRule=\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30ed\u30fc\u30eb +profilingRule=\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb userList=\u30e6\u30fc\u30b6\u30fc\u30ea\u30b9\u30c8 userInformation=\u30e6\u30fc\u30b6\u30fc\u306e\u60c5\u5831 userAttributeList=\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u306e\u30ea\u30b9\u30c8 basicTab=\u57fa\u672c\u30bf\u30d6 -profilingRuleTab=\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u30bf\u30d6 +profilingRuleTab=\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u30bf\u30d6 userAttributeTab=\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u30bf\u30d6 # userList @@ -32,13 +32,13 @@ userGroupEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 # userRoleEdit -userRoleEdit.newRole=\u65b0\u3057\u3044\u5f79\u5272 -userRoleEdit.role=\u5f79\u5272 +userRoleEdit.newRole=\u65b0\u3057\u3044\u30ed\u30fc\u30eb +userRoleEdit.role=\u30ed\u30fc\u30eb userRoleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 # userProfilingRuleEdit -userProfilingRuleEdit.newProfilingRule=\u65b0\u3057\u3044\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb -userProfilingRuleEdit.profilingrule=\u5f79\u5272\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +userProfilingRuleEdit.newProfilingRule=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +userProfilingRuleEdit.profilingrule=\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb userProfilingRuleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 # userAttributeList From svnnotify @ sourceforge.jp Fri Oct 26 07:23:01 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 07:23:01 +0900 Subject: [pal-cvs 2917] [661] updated translation. Message-ID: <1193350981.530195.10689.nullmailer@users.sourceforge.jp> Revision: 661 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=661 Author: shinsuke Date: 2007-10-26 07:23:01 +0900 (Fri, 26 Oct 2007) Log Message: ----------- updated translation. Modified Paths: -------------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties Added Paths: ----------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -1,6 +1,6 @@ # Common groupName=\u30b0\u30eb\u30fc\u30d7\u540d -groupList=\u30b0\u30eb\u30fc\u30d7\u30ea\u30b9\u30c8 +groupList=\u30b0\u30eb\u30fc\u30d7\u306e\u4e00\u89a7 groupInformation=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831 # groupList Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -1,5 +1,5 @@ userTab=\u30e6\u30fc\u30b6 -roleTab=\u5f79\u5272 +roleTab=\u30ed\u30fc\u30eb groupTab=\u30b0\u30eb\u30fc\u30d7 portletsTab=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -0,0 +1,7 @@ +currentPasswordField=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9: +newPasswordField=\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9: +retypePasswordField=\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d): +currentPassword=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9 +newPassword=\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9 +retypePassword=\u78ba\u8a8d\u7528\u306e\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9 +changePassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4 Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -0,0 +1,20 @@ +# Common +portletTab=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +folderTab=\u30d5\u30a9\u30eb\u30c0 +pageTab=\u30da\u30fc\u30b8 +listTab=\u4e00\u89a7 +newTab=\u65b0\u898f +editTab=\u7de8\u96c6 +deleteTab=\u524a\u9664 + +portletPermissionList=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7 +folderPermissionList=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7 +pagePermissionList=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7 +resourceName=\u30ea\u30bd\u30fc\u30b9\u540d +action=\u30a2\u30af\u30b7\u30e7\u30f3 +role=\u30ed\u30fc\u30eb + +permissionInformation=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u60c5\u5831 + +delete=\u524a\u9664 +edit=\u7de8\u96c6 Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -1,4 +1,4 @@ -deployedPortletsList=\u914d\u5099\u3055\u308c\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30ea\u30b9\u30c8 +deployedPortletsList=\u914d\u5099\u3055\u308c\u305f\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u4e00\u89a7 portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u540d version=\u30d0\u30fc\u30b8\u30e7\u30f3 path=\u30d1\u30b9 Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -1,6 +1,6 @@ # Common roleName=\u30ed\u30fc\u30eb\u540d -roleList=\u30ed\u30fc\u30eb\u30ea\u30b9\u30c8 +roleList=\u30ed\u30fc\u30eb\u306e\u4e00\u89a7 roleInformation=\u30ed\u30fc\u30eb\u60c5\u5831 # roleList Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-10-25 21:55:39 UTC (rev 660) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-10-25 22:23:01 UTC (rev 661) @@ -1,26 +1,37 @@ # Common userName=\u30e6\u30fc\u30b6\u30fc\u540d password=\u30d1\u30b9\u30ef\u30fc\u30c9 +retypePassword=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528) changePassword=\u521d\u671f\u30ed\u30b0\u30a4\u30f3\u6642\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 -defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30ed\u30fc\u30eb -profilingRule=\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb -userList=\u30e6\u30fc\u30b6\u30fc\u30ea\u30b9\u30c8 +defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u30ed\u30fc\u30eb +profilingRule=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb +userList=\u30e6\u30fc\u30b6\u30fc\u306e\u4e00\u89a7 userInformation=\u30e6\u30fc\u30b6\u30fc\u306e\u60c5\u5831 -userAttributeList=\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u306e\u30ea\u30b9\u30c8 -basicTab=\u57fa\u672c\u30bf\u30d6 -profilingRuleTab=\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u30bf\u30d6 -userAttributeTab=\u30e6\u30fc\u30b6\u30fc\u306e\u5c5e\u6027\u30bf\u30d6 +userAttributeList=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027\u306e\u4e00\u89a7 +basicTab=\u57fa\u672c\u60c5\u5831 +profilingRuleTab=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb +userAttributeTab=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027 +listTab=\u4e00\u89a7 +newTab=\u65b0\u898f +editTab=\u7de8\u96c6 # userList userList.delete=\u524a\u9664 userList.edit=\u7de8\u96c6 +userList.filter=\u30d5\u30a3\u30eb\u30bf(\u524d\u65b9\u4e00\u81f4): +userList.userEnabled=\u5229\u7528\u53ef\u80fd\u72b6\u614b +userList.lastLogon=\u6700\u7d42\u30ed\u30b0\u30aa\u30f3\u6642\u523b +userList.expires=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u72b6\u614b +userList.active=\u6709\u52b9 +userList.enabled=\u6709\u52b9 +userList.disabled=\u7121\u52b9 # userEdit -userEdit.changePassword=\u6b21\u56de\u30ed\u30b0\u30a4\u30f3\u6642\u304b\u3089\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 +userEdit.changePassword=\u6b21\u56de\u30ed\u30b0\u30a4\u30f3\u6642\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 userEdit.userEnabled=\u5229\u7528\u53ef\u80fd\u72b6\u614b -userEdit.lastLogon=\u6700\u7d42\u30ed\u30b0\u30aa\u30f3 +userEdit.lastLogon=\u6700\u7d42\u30ed\u30b0\u30aa\u30f3\u6642\u523b userEdit.expirationDate=\u6709\u52b9\u671f\u9650 -userEdit.expires=\u671f\u9650 +userEdit.expires=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u72b6\u614b userEdit.Active=\u6709\u52b9 userEdit.Expired=\u671f\u9650\u5207\u308c userEdit.Extend=\u5ef6\u9577 @@ -32,13 +43,13 @@ userGroupEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 # userRoleEdit -userRoleEdit.newRole=\u65b0\u3057\u3044\u30ed\u30fc\u30eb +userRoleEdit.newRole=\u65b0\u898f\u30ed\u30fc\u30eb userRoleEdit.role=\u30ed\u30fc\u30eb userRoleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 # userProfilingRuleEdit -userProfilingRuleEdit.newProfilingRule=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb -userProfilingRuleEdit.profilingrule=\u30ed\u30fc\u30eb\u306e\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb +userProfilingRuleEdit.newProfilingRule=\u65b0\u898f\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb +userProfilingRuleEdit.profilingrule=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb userProfilingRuleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 # userAttributeList From svnnotify @ sourceforge.jp Fri Oct 26 08:25:38 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 08:25:38 +0900 Subject: [pal-cvs 2918] [662] fixed page navigation. Message-ID: <1193354738.947084.16923.nullmailer@users.sourceforge.jp> Revision: 662 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=662 Author: shinsuke Date: 2007-10-26 08:25:38 +0900 (Fri, 26 Oct 2007) Log Message: ----------- fixed page navigation. Modified Paths: -------------- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html pal-admin/trunk/src/main/webapp/view/user/userEdit.html pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-10-25 23:25:38 UTC (rev 662) @@ -35,21 +35,21 @@
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-10-25 23:25:38 UTC (rev 662) @@ -35,21 +35,21 @@
    Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2007-10-25 23:25:38 UTC (rev 662) @@ -35,21 +35,21 @@
    Modified: pal-admin/trunk/src/main/webapp/view/user/userEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-10-25 23:25:38 UTC (rev 662) @@ -37,11 +37,11 @@
    | - + Role | - + Group | @@ -49,7 +49,7 @@ User Attribute | - + Profiling Rule
    Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-25 23:25:38 UTC (rev 662) @@ -35,21 +35,21 @@
    Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-25 23:25:38 UTC (rev 662) @@ -35,19 +35,19 @@
    - + Basic | - + Role | - + Group | - + User Attribute | Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-25 22:23:01 UTC (rev 661) +++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-25 23:25:38 UTC (rev 662) @@ -35,21 +35,21 @@
    From svnnotify @ sourceforge.jp Fri Oct 26 10:03:34 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 10:03:34 +0900 Subject: [pal-cvs 2919] [663] updated license and code format. Message-ID: <1193360614.558406.19140.nullmailer@users.sourceforge.jp> Revision: 663 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=663 Author: shinsuke Date: 2007-10-26 10:03:32 +0900 (Fri, 26 Oct 2007) Log Message: ----------- updated license and code format. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/creator/PagerCreator.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/GroupDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RepositoryDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RoleDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/SiteEditorDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/UserDxo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Group.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/NodeInfo.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PrincipalRule.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Role.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/RepositoryManagementLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/GroupPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RemotePortletApplicationPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RepositoryPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RolePager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserAttributePager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADConstants.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADException.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/Repository.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryConfigHandler.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryManager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleConfigHandler.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleRepository.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RepositoryManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/DeploymentUtil.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml pal-admin/trunk/src/main/webapp/WEB-INF/web.xml -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/creator/PagerCreator.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/creator/PagerCreator.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/creator/PagerCreator.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.creator; @@ -26,25 +25,21 @@ * @author shinsuke * */ -public class PagerCreator extends ComponentCreatorImpl -{ +public class PagerCreator extends ComponentCreatorImpl { public static final String SUFFIX = "Pager"; - public PagerCreator(NamingConvention namingConvention) - { + public PagerCreator(NamingConvention namingConvention) { super(namingConvention); setNameSuffix(SUFFIX); setInstanceDef(InstanceDefFactory.SESSION); setAutoBindingDef(AutoBindingDefFactory.NONE); } - public ComponentCustomizer getPagerCustomizer() - { + public ComponentCustomizer getPagerCustomizer() { return getCustomizer(); } - public void setPagerCustomizer(ComponentCustomizer customizer) - { + public void setPagerCustomizer(ComponentCustomizer customizer) { setCustomizer(customizer); } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/DeploymentStatus.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.deployer; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/deployer/PortletDeployer.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.deployer; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/GroupDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/GroupDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/GroupDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.dxo; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PermissionDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.dxo; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.dxo; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RepositoryDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RepositoryDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RepositoryDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.dxo; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RoleDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RoleDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/RoleDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.dxo; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/SiteEditorDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/SiteEditorDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/SiteEditorDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.dxo; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/UserDxo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/UserDxo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/UserDxo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.dxo; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Group.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Group.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Group.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.entity; import java.io.Serializable; -public class Group implements Serializable -{ +public class Group implements Serializable { /** * @@ -31,16 +29,14 @@ /** * @return the name */ - public String getName() - { + public String getName() { return name; } /** * @param name the name to set */ - public void setName(String name) - { + public void setName(String name) { this.name = name; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/NodeInfo.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/NodeInfo.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/NodeInfo.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.entity; import java.io.Serializable; @@ -2,4 +17,3 @@ -public class NodeInfo implements Serializable -{ +public class NodeInfo implements Serializable { /** @@ -31,8 +45,8 @@ private boolean selected; - public NodeInfo(int type, String name, String path, String returnPath, int depth, boolean expanded, boolean selected) - { + public NodeInfo(int type, String name, String path, String returnPath, + int depth, boolean expanded, boolean selected) { this.type = type; this.name = name; this.path = path; @@ -45,117 +59,102 @@ /** * @return the type */ - public int getType() - { + public int getType() { return type; } /** * @param type the type to set */ - public void setType(int type) - { + public void setType(int type) { this.type = type; } /** * @return the name */ - public String getName() - { + public String getName() { return name; } /** * @param name the name to set */ - public void setName(String name) - { + public void setName(String name) { this.name = name; } /** * @return the expanded */ - public boolean isExpanded() - { + public boolean isExpanded() { return expanded; } /** * @param expanded the expanded to set */ - public void setExpanded(boolean expanded) - { + public void setExpanded(boolean expanded) { this.expanded = expanded; } /** * @return the depth */ - public int getDepth() - { + public int getDepth() { return depth; } /** * @param depth the depth to set */ - public void setDepth(int depth) - { + public void setDepth(int depth) { this.depth = depth; } /** * @return the selected */ - public boolean isSelected() - { + public boolean isSelected() { return selected; } /** * @param selected the selected to set */ - public void setSelected(boolean selected) - { + public void setSelected(boolean selected) { this.selected = selected; } /** * @return the path */ - public String getPath() - { + public String getPath() { return path; } /** * @param path the path to set */ - public void setPath(String path) - { + public void setPath(String path) { this.path = path; } /** * @return the returnPath */ - public String getReturnPath() - { + public String getReturnPath() { return returnPath; } /** * @param returnPath the returnPath to set */ - public void setReturnPath(String returnPath) - { + public void setReturnPath(String returnPath) { this.returnPath = returnPath; } - public void incrementDepth() - { + public void incrementDepth() { depth++; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Permission.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.entity; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.entity; @@ -22,8 +21,7 @@ import java.util.List; import java.util.Locale; -public class PortletApplication implements Serializable -{ +public class PortletApplication implements Serializable { /** * @@ -81,365 +79,319 @@ private List supportedLocales = new ArrayList(); - public void addTag(String category) - { + public void addTag(String category) { tags.add(category); } - public void addSupportedLocale(Locale locale) - { + public void addSupportedLocale(Locale locale) { supportedLocales.add(locale); } /** * @return the name */ - public String getName() - { + public String getName() { return name; } /** * @param name the name to set */ - public void setName(String name) - { + public void setName(String name) { this.name = name; } /** * @return the path */ - public String getPath() - { + public String getPath() { return path; } /** * @param path the path to set */ - public void setPath(String path) - { + public void setPath(String path) { this.path = path; } /** * @return the status */ - public int getStatus() - { + public int getStatus() { return status; } /** * @param status the status to set */ - public void setStatus(int status) - { + public void setStatus(int status) { this.status = status; } /** * @return the version */ - public String getVersion() - { + public String getVersion() { return version; } /** * @param version the version to set */ - public void setVersion(String version) - { + public void setVersion(String version) { this.version = version; } /** * @return the applicationType */ - public int getApplicationType() - { + public int getApplicationType() { return applicationType; } /** * @param applicationType the applicationType to set */ - public void setApplicationType(int applicationType) - { + public void setApplicationType(int applicationType) { this.applicationType = applicationType; } /** * @return the artifactId */ - public String getArtifactId() - { + public String getArtifactId() { return artifactId; } /** * @param artifactId the artifactId to set */ - public void setArtifactId(String artifactId) - { + public void setArtifactId(String artifactId) { this.artifactId = artifactId; } /** * @return the binaryUrl */ - public String getBinaryUrl() - { + public String getBinaryUrl() { return binaryUrl; } /** * @param binaryUrl the binaryUrl to set */ - public void setBinaryUrl(String binaryUrl) - { + public void setBinaryUrl(String binaryUrl) { this.binaryUrl = binaryUrl; } /** * @return the compiledJDKVersion */ - public String getCompiledJDKVersion() - { + public String getCompiledJDKVersion() { return compiledJDKVersion; } /** * @param compiledJDKVersion the compiledJDKVersion to set */ - public void setCompiledJDKVersion(String compiledJDKVersion) - { + public void setCompiledJDKVersion(String compiledJDKVersion) { this.compiledJDKVersion = compiledJDKVersion; } /** * @return the created */ - public Date getCreated() - { + public Date getCreated() { return created; } /** * @param created the created to set */ - public void setCreated(Date created) - { + public void setCreated(Date created) { this.created = created; } /** * @return the description */ - public String getDescription() - { + public String getDescription() { return description; } /** * @param description the description to set */ - public void setDescription(String description) - { + public void setDescription(String description) { this.description = description; } /** * @return the groupId */ - public String getGroupId() - { + public String getGroupId() { return groupId; } /** * @param groupId the groupId to set */ - public void setGroupId(String groupId) - { + public void setGroupId(String groupId) { this.groupId = groupId; } /** * @return the imageUrl */ - public String getImageUrl() - { + public String getImageUrl() { return imageUrl; } /** * @param imageUrl the imageUrl to set */ - public void setImageUrl(String imageUrl) - { + public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } /** * @return the lastModified */ - public Date getLastModified() - { + public Date getLastModified() { return lastModified; } /** * @param lastModified the lastModified to set */ - public void setLastModified(Date lastModified) - { + public void setLastModified(Date lastModified) { this.lastModified = lastModified; } /** * @return the licenseName */ - public String getLicenseName() - { + public String getLicenseName() { return licenseName; } /** * @param licenseName the licenseName to set */ - public void setLicenseName(String licenseName) - { + public void setLicenseName(String licenseName) { this.licenseName = licenseName; } /** * @return the licenseUrl */ - public String getLicenseUrl() - { + public String getLicenseUrl() { return licenseUrl; } /** * @param licenseUrl the licenseUrl to set */ - public void setLicenseUrl(String licenseUrl) - { + public void setLicenseUrl(String licenseUrl) { this.licenseUrl = licenseUrl; } /** * @return the packaging */ - public String getPackaging() - { + public String getPackaging() { return packaging; } /** * @param packaging the packaging to set */ - public void setPackaging(String packaging) - { + public void setPackaging(String packaging) { this.packaging = packaging; } /** * @return the portletSpecVersion */ - public String getPortletSpecVersion() - { + public String getPortletSpecVersion() { return portletSpecVersion; } /** * @param portletSpecVersion the portletSpecVersion to set */ - public void setPortletSpecVersion(String portletSpecVersion) - { + public void setPortletSpecVersion(String portletSpecVersion) { this.portletSpecVersion = portletSpecVersion; } /** * @return the publisherName */ - public String getPublisherName() - { + public String getPublisherName() { return publisherName; } /** * @param publisherName the publisherName to set */ - public void setPublisherName(String publisherName) - { + public void setPublisherName(String publisherName) { this.publisherName = publisherName; } /** * @return the publisherUrl */ - public String getPublisherUrl() - { + public String getPublisherUrl() { return publisherUrl; } /** * @param publisherUrl the publisherUrl to set */ - public void setPublisherUrl(String publisherUrl) - { + public void setPublisherUrl(String publisherUrl) { this.publisherUrl = publisherUrl; } /** * @return the sourceUrl */ - public String getSourceUrl() - { + public String getSourceUrl() { return sourceUrl; } /** * @param sourceUrl the sourceUrl to set */ - public void setSourceUrl(String sourceUrl) - { + public void setSourceUrl(String sourceUrl) { this.sourceUrl = sourceUrl; } /** * @return the supportedLocales */ - public List getSupportedLocales() - { + public List getSupportedLocales() { return supportedLocales; } /** * @param supportedLocales the supportedLocales to set */ - public void setSupportedLocales(List supportedLocales) - { + public void setSupportedLocales(List supportedLocales) { this.supportedLocales = supportedLocales; } /** * @return the tags */ - public List getTags() - { + public List getTags() { return tags; } /** * @param tags the tags to set */ - public void setTags(List tags) - { + public void setTags(List tags) { this.tags = tags; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PrincipalRule.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PrincipalRule.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PrincipalRule.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.entity; @@ -20,8 +19,7 @@ import jp.sf.pal.admin.PALAdminConstants; -public class PrincipalRule implements Serializable -{ +public class PrincipalRule implements Serializable { /** * @@ -38,59 +36,49 @@ /** * @return the locatorName */ - public String getLocatorName() - { + public String getLocatorName() { return locatorName; } /** * @param locatorName the locatorName to set */ - public void setLocatorName(String locatorName) - { + public void setLocatorName(String locatorName) { this.locatorName = locatorName; } /** * @return the profilingRuleName */ - public String getProfilingRuleName() - { + public String getProfilingRuleName() { return profilingRuleName; } /** * @param profilingRuleName the profilingRuleName to set */ - public void setProfilingRuleName(String id) - { + public void setProfilingRuleName(String id) { this.profilingRuleName = id; } - public String getLabel() - { + public String getLabel() { return getLocatorName() + "/" + getProfilingRuleName(); } - public String getValue() - { + public String getValue() { return getLocatorName() + SEPARATOR + getProfilingRuleName(); } - public String toString() - { + public String toString() { return getLabel(); } - public static PrincipalRule getInstance(String value) - { - if (value == null) - { + public static PrincipalRule getInstance(String value) { + if (value == null) { return null; } int index = value.indexOf(SEPARATOR); - if (index < 0) - { + if (index < 0) { return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Role.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Role.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/Role.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.entity; import java.io.Serializable; -public class Role implements Serializable -{ +public class Role implements Serializable { /** * */ @@ -30,16 +28,14 @@ /** * @return the name */ - public String getName() - { + public String getName() { return name; } /** * @param name the name to set */ - public void setName(String name) - { + public void setName(String name) { this.name = name; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.entity; public class RolePrincipal implements Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.entity; @@ -24,8 +23,7 @@ import jp.sf.pal.admin.PALAdminConstants; -public class User implements Serializable -{ +public class User implements Serializable { /** * */ @@ -51,8 +49,7 @@ private Date expirationDate; - public User() - { + public User() { roles = new ArrayList(); groups = new ArrayList(); principalRules = new ArrayList(); @@ -61,145 +58,124 @@ /** * @return the name */ - public String getName() - { + public String getName() { return name; } /** * @param name the name to set */ - public void setName(String name) - { + public void setName(String name) { this.name = name; } /** * @return the password */ - public String getPassword() - { + public String getPassword() { return password; } /** * @param password the password to set */ - public void setPassword(String password) - { + public void setPassword(String password) { this.password = password; } /** * @return the profileRules */ - public List getPrincipalRules() - { + public List getPrincipalRules() { return principalRules; } /** * @param profileRules the profileRules to set */ - public void setPrincipalRules(List profileRules) - { + public void setPrincipalRules(List profileRules) { this.principalRules = profileRules; } /** * @return the roles */ - public List getRoles() - { + public List getRoles() { return roles; } /** * @param roles the roles to set */ - public void setRoles(List roles) - { + public void setRoles(List roles) { this.roles = roles; } /** * @return the groups */ - public List getGroups() - { + public List getGroups() { return groups; } /** * @param groups the groups to set */ - public void setGroups(List groups) - { + public void setGroups(List groups) { this.groups = groups; } /** * @return the updateRequired */ - public boolean isUpdateRequired() - { + public boolean isUpdateRequired() { return updateRequired; } /** * @param updateRequired the updateRequired to set */ - public void setUpdateRequired(boolean updateRequired) - { + public void setUpdateRequired(boolean updateRequired) { this.updateRequired = updateRequired; } // Aditional method - public void setRoleName(String rolename) - { + public void setRoleName(String rolename) { Role role = new Role(); role.setName(rolename); roles.add(role); } - public String getRoleName() - { - if (!roles.isEmpty()) - { + public String getRoleName() { + if (!roles.isEmpty()) { return roles.get(0).getName(); } return null; } - public void setGroupName(String groupname) - { + public void setGroupName(String groupname) { Group group = new Group(); group.setName(groupname); groups.add(group); } - public String getGroupName() - { - if (!groups.isEmpty()) - { + public String getGroupName() { + if (!groups.isEmpty()) { return groups.get(0).getName(); } return null; } - public void setPrincipalRuleName(String principalRulename) - { + public void setPrincipalRuleName(String principalRulename) { PrincipalRule principalRule = new PrincipalRule(); principalRule.setProfilingRuleName(principalRulename); principalRule.setLocatorName(PALAdminConstants.LOCATOR_PAGE); principalRules.add(principalRule); } - public String getPrincipalRuleName() - { - if (!principalRules.isEmpty()) - { + public String getPrincipalRuleName() { + if (!principalRules.isEmpty()) { return principalRules.get(0).getProfilingRuleName(); } return null; @@ -208,64 +184,56 @@ /** * @return the expires */ - public String getExpires() - { + public String getExpires() { return expires; } /** * @param expires the expires to set */ - public void setExpires(String expires) - { + public void setExpires(String expires) { this.expires = expires; } /** * @return the lastLogon */ - public Timestamp getLastLogon() - { + public Timestamp getLastLogon() { return lastLogon; } /** * @param lastLogon the lastLogon to set */ - public void setLastLogon(Timestamp lastLogon) - { + public void setLastLogon(Timestamp lastLogon) { this.lastLogon = lastLogon; } /** * @return the userEnabled */ - public boolean isUserEnabled() - { + public boolean isUserEnabled() { return userEnabled; } /** * @param userEnabled the userEnabled to set */ - public void setUserEnabled(boolean userEnabled) - { + public void setUserEnabled(boolean userEnabled) { this.userEnabled = userEnabled; } /** * @return the expirationDate */ - public Date getExpirationDate() - { + public Date getExpirationDate() { return expirationDate; } /** * @param expirationDate the expirationDate to set */ - public void setExpirationDate(Date expirationDate) - { + public void setExpirationDate(Date expirationDate) { this.expirationDate = expirationDate; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.filter; import javax.portlet.PortletConfig; @@ -7,15 +22,12 @@ import org.apache.portals.bridges.portletfilter.PortletFilterConfig; -public class ForgottenPasswordFilter extends DefaultUserRegistrationFilter -{ - public ForgottenPasswordFilter() - { +public class ForgottenPasswordFilter extends DefaultUserRegistrationFilter { + public ForgottenPasswordFilter() { super(); } - public void init(PortletFilterConfig filterConfig) throws PortletException - { + public void init(PortletFilterConfig filterConfig) throws PortletException { super.init(filterConfig); PortletConfig portletConfig = filterConfig.getPortletConfig(); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.filter; @@ -41,8 +40,7 @@ import org.apache.portals.bridges.portletfilter.PortletFilterChain; import org.apache.portals.bridges.portletfilter.PortletFilterConfig; -public class PortletManagementFilter implements PortletFilter -{ +public class PortletManagementFilter implements PortletFilter { /** * Logger for this class */ @@ -63,23 +61,18 @@ private DeploymentManager deploymentManager; - public void destroy() - { + public void destroy() { applicationServerManager = null; portletFactory = null; portletRegistry = null; - try - { + try { RepositoryManager.getInstance().store(); - } - catch (RPADException e) - { + } catch (RPADException e) { log.error("Could not store the configuration.", e); } } - public void init(PortletFilterConfig filterConfig) throws PortletException - { + public void init(PortletFilterConfig filterConfig) throws PortletException { PortletConfig portletConfig = filterConfig.getPortletConfig(); PortletContext portletContext = portletConfig.getPortletContext(); @@ -97,35 +90,27 @@ } protected void initRRPAD(PortletConfig portletConfig) - throws PortletException - { + throws PortletException { PortletContext portletContext = portletConfig.getPortletContext(); String rpadConfigFile = portletConfig .getInitParameter(RPAD_CONFIG_FILE); - if (rpadConfigFile == null) - { + if (rpadConfigFile == null) { rpadConfigFile = portletContext .getRealPath(DEFAULT_RPAD_CONFIG_FILE); - } - else if (rpadConfigFile.startsWith(WEBAPP_ROOT_PREFIX)) - { + } else if (rpadConfigFile.startsWith(WEBAPP_ROOT_PREFIX)) { rpadConfigFile = portletContext.getRealPath(rpadConfigFile .substring(WEBAPP_ROOT_PREFIX.length())); } - if (log.isDebugEnabled()) - { + if (log.isDebugEnabled()) { log.debug("init(PortletConfig) - configFile=" + rpadConfigFile); } // Create RepositoryManager - try - { + try { RepositoryManager.init(rpadConfigFile); - } - catch (Exception e) - { + } catch (Exception e) { throw new PortletException( "Could not create RepositoryManager. The config file is " + rpadConfigFile, e); @@ -134,8 +119,7 @@ public void processActionFilter(ActionRequest request, ActionResponse response, PortletFilterChain chain) - throws PortletException, IOException - { + throws PortletException, IOException { request.setAttribute( PALAdminConstants.APPLICATION_SERVER_MANAGER_COMPONENT, applicationServerManager); @@ -150,8 +134,7 @@ } public void renderFilter(RenderRequest request, RenderResponse response, - PortletFilterChain chain) throws PortletException, IOException - { + PortletFilterChain chain) throws PortletException, IOException { request.setAttribute( PALAdminConstants.APPLICATION_SERVER_MANAGER_COMPONENT, applicationServerManager); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.filter; @@ -39,8 +38,7 @@ import org.apache.portals.bridges.portletfilter.PortletFilterChain; import org.apache.portals.bridges.portletfilter.PortletFilterConfig; -public class UserManagementFilter implements PortletFilter -{ +public class UserManagementFilter implements PortletFilter { private SecurityProvider securityProvider; private UserManager userManager; @@ -58,8 +56,7 @@ * * @see org.apache.portals.bridges.portletfilter.PortletFilter#destroy() */ - public void destroy() - { + public void destroy() { securityProvider = null; userManager = null; groupManager = null; @@ -73,52 +70,56 @@ * * @see org.apache.portals.bridges.portletfilter.PortletFilter#init(org.apache.portals.bridges.portletfilter.PortletFilterConfig) */ - public void init(PortletFilterConfig filterConfig) throws PortletException - { + public void init(PortletFilterConfig filterConfig) throws PortletException { PortletConfig portletConfig = filterConfig.getPortletConfig(); PortletContext portletContext = portletConfig.getPortletContext(); - if (!PALAdminConstants.DEBUG) - { + if (!PALAdminConstants.DEBUG) { // securityProvider - securityProvider = (SecurityProvider) portletContext.getAttribute(PALAdminConstants.CPS_SECURITY_PROVIDER_COMPONENT); - if (securityProvider == null) - { - throw new PortletException("Failed to find the Security Provider on portlet initialization"); + securityProvider = (SecurityProvider) portletContext + .getAttribute(PALAdminConstants.CPS_SECURITY_PROVIDER_COMPONENT); + if (securityProvider == null) { + throw new PortletException( + "Failed to find the Security Provider on portlet initialization"); } // userManager - userManager = (UserManager) portletContext.getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT); - if (userManager == null) - { - throw new PortletException("Failed to find the User Manager on portlet initialization"); + userManager = (UserManager) portletContext + .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT); + if (userManager == null) { + throw new PortletException( + "Failed to find the User Manager on portlet initialization"); } // groupManager - groupManager = (GroupManager) portletContext.getAttribute(CommonPortletServices.CPS_GROUP_MANAGER_COMPONENT); - if (groupManager == null) - { - throw new PortletException("Failed to find the Group Manager on portlet initialization"); + groupManager = (GroupManager) portletContext + .getAttribute(CommonPortletServices.CPS_GROUP_MANAGER_COMPONENT); + if (groupManager == null) { + throw new PortletException( + "Failed to find the Group Manager on portlet initialization"); } // roleManager - roleManager = (RoleManager) portletContext.getAttribute(CommonPortletServices.CPS_ROLE_MANAGER_COMPONENT); - if (roleManager == null) - { - throw new PortletException("Failed to find the Role Manager on portlet initialization"); + roleManager = (RoleManager) portletContext + .getAttribute(CommonPortletServices.CPS_ROLE_MANAGER_COMPONENT); + if (roleManager == null) { + throw new PortletException( + "Failed to find the Role Manager on portlet initialization"); } // profiler - profiler = (Profiler) portletContext.getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT); - if (null == profiler) - { - throw new PortletException("Failed to find the Profiler on portlet initialization"); + profiler = (Profiler) portletContext + .getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT); + if (null == profiler) { + throw new PortletException( + "Failed to find the Profiler on portlet initialization"); } // pageManager - pageManager = (PageManager) portletContext.getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT); - if (null == pageManager) - { - throw new PortletException("Failed to find the Page Manager on portlet initialization"); + pageManager = (PageManager) portletContext + .getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT); + if (null == pageManager) { + throw new PortletException( + "Failed to find the Page Manager on portlet initialization"); } } @@ -131,15 +132,20 @@ * javax.portlet.ActionResponse, * org.apache.portals.bridges.portletfilter.PortletFilterChain) */ - public void processActionFilter(ActionRequest request, ActionResponse response, PortletFilterChain chain) - throws PortletException, IOException - { - request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT, securityProvider); - request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, userManager); - request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT, groupManager); - request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT, roleManager); + public void processActionFilter(ActionRequest request, + ActionResponse response, PortletFilterChain chain) + throws PortletException, IOException { + request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT, + securityProvider); + request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT, + groupManager); + request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT, + roleManager); request.setAttribute(PALAdminConstants.PROFILER_COMPONENT, profiler); - request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT, pageManager); + request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT, + pageManager); chain.processActionFilter(request, response); } @@ -151,15 +157,19 @@ * javax.portlet.RenderResponse, * org.apache.portals.bridges.portletfilter.PortletFilterChain) */ - public void renderFilter(RenderRequest request, RenderResponse response, PortletFilterChain chain) throws PortletException, - IOException - { - request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT, securityProvider); - request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, userManager); - request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT, groupManager); - request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT, roleManager); + public void renderFilter(RenderRequest request, RenderResponse response, + PortletFilterChain chain) throws PortletException, IOException { + request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT, + securityProvider); + request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT, + groupManager); + request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT, + roleManager); request.setAttribute(PALAdminConstants.PROFILER_COMPONENT, profiler); - request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT, pageManager); + request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT, + pageManager); chain.renderFilter(request, response); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java 2007-10-26 01:03:32 UTC (rev 663) @@ -28,15 +28,12 @@ import org.apache.portals.bridges.portletfilter.PortletFilterConfig; public class UserRegistrationFilter extends DefaultUserRegistrationFilter - implements PortletFilter -{ - public UserRegistrationFilter() - { + implements PortletFilter { + public UserRegistrationFilter() { super(); } - public void init(PortletFilterConfig filterConfig) throws PortletException - { + public void init(PortletFilterConfig filterConfig) throws PortletException { super.init(filterConfig); PortletConfig portletConfig = filterConfig.getPortletConfig(); @@ -58,8 +55,7 @@ PALAdminConstants.RULE_VALUES); Map rules = new HashMap(); for (int ix = 0; ix < ((names.size() < values.size()) ? names.size() - : values.size()); ix++) - { + : values.size()); ix++) { rules.put(names.get(ix), values.get(ix)); } getUserRegistrationParams().put(PALAdminConstants.RULES, rules); @@ -89,8 +85,7 @@ portletConfig .getInitParameter(PALAdminConstants.FORCE_UNIQUE_EMAIL)) .booleanValue(); - if (forceEmailAsUsername) - { + if (forceEmailAsUsername) { // just to be sure forceEmailsToBeSystemUnique = Boolean.TRUE; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.logic; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.logic; @@ -39,8 +38,7 @@ import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManagerResult; import org.seasar.framework.log.Logger; -public class PortletDeploymentLogic implements Serializable -{ +public class PortletDeploymentLogic implements Serializable { /** * */ @@ -59,10 +57,8 @@ /** * @return the applicationServerManager */ - public ApplicationServerManager getApplicationServerManager() - { - if (applicationServerManager == null) - { + public ApplicationServerManager getApplicationServerManager() { + if (applicationServerManager == null) { applicationServerManager = PortalComponentUtil .getApplicationServerManager(); } @@ -73,18 +69,15 @@ * @param applicationServerManager the applicationServerManager to set */ public void setApplicationServerManager( - ApplicationServerManager applicationServerManager) - { + ApplicationServerManager applicationServerManager) { this.applicationServerManager = applicationServerManager; } /** * @return the portletRegistry */ - public PortletRegistry getPortletRegistry() - { - if (portletRegistry == null) - { + public PortletRegistry getPortletRegistry() { + if (portletRegistry == null) { portletRegistry = PortalComponentUtil.getPortletRegistry(); } return portletRegistry; @@ -93,17 +86,14 @@ /** * @param portletRegistry the portletRegistry to set */ - public void setPortletRegistry(PortletRegistry portletRegistry) - { + public void setPortletRegistry(PortletRegistry portletRegistry) { this.portletRegistry = portletRegistry; } synchronized public void deploy(PortletApplication portlet) - throws PALAdminException - { + throws PALAdminException { - if (DeploymentUtil.isDeploying()) - { + if (DeploymentUtil.isDeploying()) { //TODO check timeout throw new PALAdminException("Other deployment process is running."); @@ -117,13 +107,10 @@ // set deployment status to application context DeploymentUtil.setDeploymentStatus(deployer.getDeploymentStatus()); - try - { + try { // start deployer deployer.start(); - } - catch (Exception e) - { + } catch (Exception e) { logger.error("Could not start deployment process.", e); throw new PALAdminException("Could not start deployment process.", e); @@ -131,21 +118,17 @@ } public File storeLocalFile(InputStream inputStream) - throws PALAdminException - { + throws PALAdminException { File localTempFile = null; OutputStream outputStream = null; - try - { + try { localTempFile = File.createTempFile( PALAdminConstants.LOCAL_TEMP_FILENAME_PREFIX, PALAdminConstants.LOCAL_TEMP_FILENAME_SUFFIX); outputStream = new FileOutputStream(localTempFile); PALAdminUtil.drain(inputStream, outputStream); outputStream.flush(); - } - catch (FileNotFoundException e) - { + } catch (FileNotFoundException e) { logger .error( "Could not store the uploaded file. Could not find a local temp file.", @@ -153,35 +136,23 @@ throw new PALAdminException( "Could not store the uploaded file. Could not find a local temp file.", e); - } - catch (IOException e) - { + } catch (IOException e) { logger.error("Could not store the uploaded file.", e); throw new PALAdminException("Could not store the uploaded file.", e); - } - finally - { - if (inputStream != null) - { - try - { + } finally { + if (inputStream != null) { + try { inputStream.close(); - } - catch (IOException e) - { + } catch (IOException e) { logger.error("Could not close the input stream.", e); throw new PALAdminException( "Could not close the input stream.", e); } } - if (outputStream != null) - { - try - { + if (outputStream != null) { + try { outputStream.close(); - } - catch (IOException e) - { + } catch (IOException e) { logger.error("Could not close the output stream.", e); throw new PALAdminException( "Could not close the output stream.", e); @@ -194,21 +165,16 @@ } public void startPortletApplication(String portletName) - throws PALAdminException - { + throws PALAdminException { MutablePortletApplication pa = getPortletRegistry() .getPortletApplication(portletName); - try - { + try { ApplicationServerManagerResult result = getApplicationServerManager() .start(pa.getWebApplicationDefinition().getContextRoot()); - if (!result.isOk()) - { + if (!result.isOk()) { throw new PALAdminException(result.getMessage()); } - } - catch (IOException e) - { + } catch (IOException e) { logger.error("Could not start the portlet: " + portletName, e); throw new PALAdminException("Could not start the portlet: " + portletName, e); @@ -216,21 +182,16 @@ } public void stopPortletApplication(String portletName) - throws PALAdminException - { + throws PALAdminException { MutablePortletApplication pa = getPortletRegistry() .getPortletApplication(portletName); - try - { + try { ApplicationServerManagerResult result = getApplicationServerManager() .stop(pa.getWebApplicationDefinition().getContextRoot()); - if (!result.isOk()) - { + if (!result.isOk()) { throw new PALAdminException(result.getMessage()); } - } - catch (IOException e) - { + } catch (IOException e) { logger.error("Could not stop the portlet: " + portletName, e); throw new PALAdminException("Could not stop the portlet: " + portletName, e); @@ -238,21 +199,16 @@ } public void undeployPortletApplication(String portletName) - throws PALAdminException - { + throws PALAdminException { MutablePortletApplication pa = getPortletRegistry() .getPortletApplication(portletName); - try - { + try { ApplicationServerManagerResult result = getApplicationServerManager() .undeploy(pa.getWebApplicationDefinition().getContextRoot()); - if (!result.isOk()) - { + if (!result.isOk()) { throw new PALAdminException(result.getMessage()); } - } - catch (IOException e) - { + } catch (IOException e) { logger.error("Could not undeploy the portlet: " + portletName, e); throw new PALAdminException("Could not undeploy the portlet: " + portletName, e); @@ -260,16 +216,12 @@ } public void deletePortletApplication(String portletName) - throws PALAdminException - { + throws PALAdminException { MutablePortletApplication pa = getPortletRegistry() .getPortletApplication(portletName); - try - { + try { getPortletRegistry().removeApplication(pa); - } - catch (RegistryException e) - { + } catch (RegistryException e) { logger.error("Could not delete the portlet: " + portletName, e); throw new PALAdminException("Could not delete the portlet: " + portletName, e); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.logic; @@ -33,8 +32,7 @@ import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager; import org.seasar.framework.log.Logger; -public class PortletManagementLogic implements Serializable -{ +public class PortletManagementLogic implements Serializable { /** * */ @@ -55,10 +53,8 @@ /** * @return the applicationServerManager */ - public ApplicationServerManager getApplicationServerManager() - { - if (applicationServerManager == null) - { + public ApplicationServerManager getApplicationServerManager() { + if (applicationServerManager == null) { applicationServerManager = PortalComponentUtil .getApplicationServerManager(); } @@ -69,18 +65,15 @@ * @param applicationServerManager the applicationServerManager to set */ public void setApplicationServerManager( - ApplicationServerManager applicationServerManager) - { + ApplicationServerManager applicationServerManager) { this.applicationServerManager = applicationServerManager; } /** * @return the portletFactory */ - public PortletFactory getPortletFactory() - { - if (portletFactory == null) - { + public PortletFactory getPortletFactory() { + if (portletFactory == null) { portletFactory = PortalComponentUtil.getPortletFactory(); } return portletFactory; @@ -89,18 +82,15 @@ /** * @param portletFactory the portletFactory to set */ - public void setPortletFactory(PortletFactory portletFactory) - { + public void setPortletFactory(PortletFactory portletFactory) { this.portletFactory = portletFactory; } /** * @return the portletRegistry */ - public PortletRegistry getPortletRegistry() - { - if (portletRegistry == null) - { + public PortletRegistry getPortletRegistry() { + if (portletRegistry == null) { portletRegistry = PortalComponentUtil.getPortletRegistry(); } return portletRegistry; @@ -109,14 +99,12 @@ /** * @param portletRegistry the portletRegistry to set */ - public void setPortletRegistry(PortletRegistry portletRegistry) - { + public void setPortletRegistry(PortletRegistry portletRegistry) { this.portletRegistry = portletRegistry; } public List getPortletApplications( - PortletApplicationPager pager) - { + PortletApplicationPager pager) { List portletApplicationList = new ArrayList(); List portlets = new ArrayList( getPortletRegistry().getPortletApplications()); @@ -128,39 +116,31 @@ int offset = pager.getOffset(); int limit = pager.getLimit(); int size = portlets.size(); - if (logger.isDebugEnabled()) - { + if (logger.isDebugEnabled()) { logger .debug("getPortletApplications(PortletApplicationPager) - offset=" + offset + ", limit=" + limit + ", size=" + size); } - for (int i = offset; i < offset + limit && i < size; i++) - { + for (int i = offset; i < offset + limit && i < size; i++) { MutablePortletApplication pa = portlets.get(i); PortletApplication portlet = new PortletApplication(); portlet.setName(pa.getName()); portlet.setVersion(pa.getVersion()); - if (pa.getApplicationType() == MutablePortletApplication.LOCAL) - { + if (pa.getApplicationType() == MutablePortletApplication.LOCAL) { portlet.setPath(""); portlet .setApplicationType(PALAdminConstants.PORTLET_APPLICATION_TYPE_LOCAL); - } - else - { + } else { portlet.setPath(pa.getWebApplicationDefinition() .getContextRoot()); portlet .setApplicationType(PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP); } - if (getPortletFactory().isPortletApplicationRegistered(pa)) - { + if (getPortletFactory().isPortletApplicationRegistered(pa)) { portlet .setStatus(PALAdminConstants.PORTLET_APPLICATION_STATUS_RUNNING); - } - else - { + } else { portlet .setStatus(PALAdminConstants.PORTLET_APPLICATION_STATUS_STOPPED); } @@ -171,25 +151,20 @@ return portletApplicationList; } - public boolean isServerManagerAvailable() - { + public boolean isServerManagerAvailable() { return getApplicationServerManager() != null && getApplicationServerManager().isConnected(); } public List getPortletApplications( - RemotePortletApplicationPager pager) - { + RemotePortletApplicationPager pager) { RepositoryManager repositoryManager = RepositoryManager.getInstance(); List portletApplicationList = new ArrayList(); List portlets = null; - if (pager.getRepositoryName() == null) - { + if (pager.getRepositoryName() == null) { portlets = repositoryManager.getPortletApplications(); - } - else - { + } else { portlets = repositoryManager.getPortletApplications(pager .getRepositoryName()); } @@ -201,14 +176,12 @@ int offset = pager.getOffset(); int limit = pager.getLimit(); int size = portlets.size(); - if (logger.isDebugEnabled()) - { + if (logger.isDebugEnabled()) { logger .debug("getPortletApplications(PortletApplicationPager) - offset=" + offset + ", limit=" + limit + ", size=" + size); } - for (int i = offset; i < offset + limit && i < size; i++) - { + for (int i = offset; i < offset + limit && i < size; i++) { portletApplicationList.add(portlets.get(i)); } @@ -216,8 +189,7 @@ } public PortletApplication getPortletApplication(String groupId, - String artifactId, String version, String packaging) - { + String artifactId, String version, String packaging) { RepositoryManager repositoryManager = RepositoryManager.getInstance(); return repositoryManager.getPortletApplication(groupId, artifactId, version, packaging); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/RepositoryManagementLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/RepositoryManagementLogic.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/RepositoryManagementLogic.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.logic; @@ -29,8 +28,7 @@ import org.seasar.framework.log.Logger; -public class RepositoryManagementLogic implements Serializable -{ +public class RepositoryManagementLogic implements Serializable { /** * @@ -43,13 +41,11 @@ private static final Logger logger = Logger .getLogger(RepositoryManagementLogic.class); - protected RepositoryManager getRepositoryManager() - { + protected RepositoryManager getRepositoryManager() { return RepositoryManager.getInstance(); } - public List getRepositories(RepositoryPager pager) - { + public List getRepositories(RepositoryPager pager) { List repositoryList = new ArrayList(); List repositories = getRepositoryManager() .getRepositories(); @@ -61,32 +57,27 @@ int offset = pager.getOffset(); int limit = pager.getLimit(); int size = repositories.size(); - if (logger.isDebugEnabled()) - { + if (logger.isDebugEnabled()) { logger .debug("getPortletApplications(PortletApplicationPager) - offset=" + offset + ", limit=" + limit + ", size=" + size); } - for (int i = offset; i < offset + limit && i < size; i++) - { + for (int i = offset; i < offset + limit && i < size; i++) { repositoryList.add(repositories.get(i)); } return repositoryList; } - public List getRepositories() - { + public List getRepositories() { RepositoryManager repositoryManager = RepositoryManager.getInstance(); return repositoryManager.getRepositories(); } // For Simple Repository - public void create(String name, String configPath) throws PALAdminException - { + public void create(String name, String configPath) throws PALAdminException { Repository r = getRepositoryManager().getRepository(name); - if (r != null) - { + if (r != null) { throw new PALAdminException("The repository already exists. name=" + name); } @@ -94,12 +85,9 @@ SimpleRepository repository = new SimpleRepository(); repository.setName(name); repository.setConfigPath(configPath); - try - { + try { getRepositoryManager().addRepository(name, repository); - } - catch (RPADException e) - { + } catch (RPADException e) { logger.error("Could not add the repository. repository=" + repository, e); throw new PALAdminException( @@ -108,55 +96,42 @@ } // For Simple Repository - public void update(String name, String configPath) throws PALAdminException - { + public void update(String name, String configPath) throws PALAdminException { Repository repository = getRepositoryManager().getRepository(name); - if (repository == null) - { + if (repository == null) { throw new PALAdminException("Could not find the repository. name=" + name); } - if (repository instanceof SimpleRepository) - { + if (repository instanceof SimpleRepository) { SimpleRepository sr = (SimpleRepository) repository; sr.setName(name); sr.setConfigPath(configPath); - try - { + try { getRepositoryManager().store(); - } - catch (RPADException e) - { + } catch (RPADException e) { logger.error("Could not update the repository. repository=" + repository, e); throw new PALAdminException( "Could not update the repository. repository=" + repository, e); } - } - else - { + } else { throw new PALAdminException("The repository is not supported."); } } // For Simple Repository - public void delete(String name) throws PALAdminException - { + public void delete(String name) throws PALAdminException { Repository repository = getRepositoryManager().getRepository(name); - if (repository == null) - { + if (repository == null) { throw new PALAdminException("Could not find the repository. name=" + name); } - try - { + try { getRepositoryManager().removeRepository(repository.getName()); - } - catch (RPADException e) - { + } catch (RPADException e) { logger.error("Could not delete the repository. repository=" + repository, e); throw new PALAdminException( @@ -166,21 +141,16 @@ } - public void reload() throws PALAdminException - { - try - { + public void reload() throws PALAdminException { + try { getRepositoryManager().reload(); - } - catch (RPADException e) - { + } catch (RPADException e) { logger.error("Could not reload repositories.", e); throw new PALAdminException("Could not reload repositories.", e); } } - public Repository getRepository(String name) - { + public Repository getRepository(String name) { return getRepositoryManager().getRepository(name); } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.logic; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import jp.sf.pal.admin.PALAdminConstants; -public class DefaultPager implements Pager -{ +public class DefaultPager implements Pager { private int offset; @@ -27,8 +25,7 @@ private int limit; - public DefaultPager() - { + public DefaultPager() { super(); setOffset(0); setCount(0); @@ -38,48 +35,42 @@ /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#getLimit() */ - public int getLimit() - { + public int getLimit() { return limit; } /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#setLimit(int) */ - public void setLimit(int limit) - { + public void setLimit(int limit) { this.limit = limit; } /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#getCount() */ - public int getCount() - { + public int getCount() { return count; } /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#setCount(int) */ - public void setCount(int count) - { + public void setCount(int count) { this.count = count; } /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#getOffset() */ - public int getOffset() - { + public int getOffset() { return offset; } /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#setOffset(int) */ - public void setOffset(int offset) - { + public void setOffset(int offset) { this.offset = offset; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/FolderPermissionPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.pager; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/GroupPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/GroupPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/GroupPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import java.io.Serializable; -public class GroupPager extends DefaultPager implements Serializable -{ +public class GroupPager extends DefaultPager implements Serializable { /** * */ @@ -27,8 +25,7 @@ private String filter; - public GroupPager() - { + public GroupPager() { super(); filter = ""; } @@ -36,16 +33,14 @@ /** * @return the filter */ - public String getFilter() - { + public String getFilter() { return filter; } /** * @param filter the filter to set */ - public void setFilter(String filter) - { + public void setFilter(String filter) { this.filter = filter; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PagePermissionPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.pager; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,23 +1,21 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; -public interface Pager -{ +public interface Pager { /** * @return the limit Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,26 +1,24 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import java.io.Serializable; public class PortletApplicationPager extends DefaultPager implements - Serializable -{ + Serializable { /** * Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletPermissionPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.pager; import java.io.Serializable; @@ -2,3 +17,4 @@ -public class PortletPermissionPager extends DefaultPager implements Serializable { +public class PortletPermissionPager extends DefaultPager implements + Serializable { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RemotePortletApplicationPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RemotePortletApplicationPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RemotePortletApplicationPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,26 +1,24 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import java.io.Serializable; public class RemotePortletApplicationPager extends DefaultPager implements - Serializable -{ + Serializable { /** * */ @@ -31,16 +29,14 @@ /** * @return the repositoryName */ - public String getRepositoryName() - { + public String getRepositoryName() { return repositoryName; } /** * @param repositoryName the repositoryName to set */ - public void setRepositoryName(String repositoryName) - { + public void setRepositoryName(String repositoryName) { this.repositoryName = repositoryName; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RepositoryPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RepositoryPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RepositoryPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import java.io.Serializable; -public class RepositoryPager extends DefaultPager implements Serializable -{ +public class RepositoryPager extends DefaultPager implements Serializable { /** * Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RolePager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RolePager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/RolePager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import java.io.Serializable; -public class RolePager extends DefaultPager implements Serializable -{ +public class RolePager extends DefaultPager implements Serializable { /** * */ @@ -27,8 +25,7 @@ private String filter; - public RolePager() - { + public RolePager() { super(); filter = ""; } @@ -36,16 +33,14 @@ /** * @return the filter */ - public String getFilter() - { + public String getFilter() { return filter; } /** * @param filter the filter to set */ - public void setFilter(String filter) - { + public void setFilter(String filter) { this.filter = filter; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserAttributePager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserAttributePager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserAttributePager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.pager; import java.io.Serializable; @@ -4,8 +19,7 @@ import jp.sf.pal.admin.entity.User; -public class UserAttributePager extends DefaultPager implements Serializable -{ +public class UserAttributePager extends DefaultPager implements Serializable { /** * @@ -17,16 +31,14 @@ /** * @return the user */ - public User getUser() - { + public User getUser() { return user; } /** * @param user the user to set */ - public void setUser(User user) - { + public void setUser(User user) { this.user = user; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,25 +1,23 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.pager; import java.io.Serializable; -public class UserPager extends DefaultPager implements Serializable -{ +public class UserPager extends DefaultPager implements Serializable { /** * */ @@ -29,8 +27,7 @@ private String authenticationProviderName; - public UserPager() - { + public UserPager() { super(); filter = ""; authenticationProviderName = null; @@ -39,32 +36,28 @@ /** * @return the filter */ - public String getFilter() - { + public String getFilter() { return filter; } /** * @param filter the filter to set */ - public void setFilter(String filter) - { + public void setFilter(String filter) { this.filter = filter; } /** * @return the authenticationProviderName */ - public String getAuthenticationProviderName() - { + public String getAuthenticationProviderName() { return authenticationProviderName; } /** * @param authenticationProviderName the authenticationProviderName to set */ - public void setAuthenticationProviderName(String authenticationProviderName) - { + public void setAuthenticationProviderName(String authenticationProviderName) { this.authenticationProviderName = authenticationProviderName; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADConstants.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADConstants.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADConstants.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,23 +1,21 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ -package jp.sf.pal.admin.rpad; +package jp.sf.pal.admin.rpad; -public class RPADConstants -{ +public class RPADConstants { public final static String REPOSITORY_MANAGER = "jp.sf.pal.admin.rpad.repository.RepositoryManager"; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADException.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADException.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/RPADException.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,46 +1,40 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.rpad; -public class RPADException extends Exception -{ +public class RPADException extends Exception { /** * */ private static final long serialVersionUID = 113514206487940891L; - public RPADException() - { + public RPADException() { super(); } - public RPADException(String message) - { + public RPADException(String message) { super(message); } - public RPADException(String message, Throwable cause) - { + public RPADException(String message, Throwable cause) { super(message, cause); } - public RPADException(Throwable cause) - { + public RPADException(Throwable cause) { super(cause); } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/Repository.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/Repository.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/Repository.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.rpad.repository; @@ -20,8 +19,7 @@ import jp.sf.pal.admin.entity.PortletApplication; -public interface Repository -{ +public interface Repository { public void init(); public String getName(); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryConfigHandler.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryConfigHandler.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryConfigHandler.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.rpad.repository; @@ -28,8 +27,7 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -public class RepositoryConfigHandler extends DefaultHandler -{ +public class RepositoryConfigHandler extends DefaultHandler { /** * Logger for this class */ @@ -52,8 +50,7 @@ private Map repositories; - public RepositoryConfigHandler() - { + public RepositoryConfigHandler() { className = null; propertyName = null; properties = new HashMap(); @@ -61,19 +58,14 @@ repositories = new HashMap(); } - protected Repository loadRepository(String className, Map properties) - { - try - { + protected Repository loadRepository(String className, Map properties) { + try { Class cls = Class.forName(className); Object obj = cls.newInstance(); - if (obj instanceof Repository) - { + if (obj instanceof Repository) { Repository repo = (Repository) obj; - for (Iterator i = properties.entrySet().iterator(); i.hasNext();) - { - try - { + for (Iterator i = properties.entrySet().iterator(); i.hasNext();) { + try { Map.Entry entry = (Map.Entry) i.next(); String propertyName = (String) entry.getKey(); Class[] clsArgs = new Class[1]; @@ -86,22 +78,17 @@ Object[] args = new Object[1]; args[0] = entry.getValue(); method.invoke(repo, args); - } - catch (Exception e) - { + } catch (Exception e) { log.error("Could invoke a method for property: " + propertyName, e); } } - try - { + try { // call init() Method initMethod = cls.getMethod("init", null); initMethod.invoke(repo, null); - } - catch (Exception e) - { + } catch (Exception e) { log.error("Could not initialize an instance: " + className, e); repo.setAvailable(false); @@ -109,9 +96,7 @@ return repo; } - } - catch (Exception e) - { + } catch (Exception e) { log.error("Could not create an instance: " + className, e); } return null; @@ -121,31 +106,22 @@ * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String) */ public void endElement(String uri, String localName, String qName) - throws SAXException - { - if ("repository".equals(qName)) - { + throws SAXException { + if ("repository".equals(qName)) { if (className != null && repositoryName != null - && !repositories.equals("")) - { + && !repositories.equals("")) { Repository repo = loadRepository(className, properties); - if (repo != null) - { + if (repo != null) { repositories.put(repositoryName, repo); - } - else - { + } else { log.warn("Could not load " + className); } - } - else - { + } else { log.warn("The class name or repository name are null."); } } - if (currentQName != null && currentQName.equals(qName)) - { + if (currentQName != null && currentQName.equals(qName)) { currentQName = null; } } @@ -154,22 +130,16 @@ * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) */ public void startElement(String uri, String localName, String qName, - Attributes attributes) throws SAXException - { + Attributes attributes) throws SAXException { currentQName = qName; - if ("repository".equals(qName)) - { + if ("repository".equals(qName)) { className = null; propertyName = null; properties = new HashMap(); - } - else if ("class".equals(qName)) - { + } else if ("class".equals(qName)) { className = attributes.getValue("name"); - } - else if ("property".equals(qName)) - { + } else if ("property".equals(qName)) { propertyName = attributes.getValue("name"); } } @@ -178,19 +148,14 @@ * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int) */ public void characters(char[] ch, int start, int length) - throws SAXException - { + throws SAXException { - if ("property".equals(currentQName)) - { - if (propertyName != null) - { + if ("property".equals(currentQName)) { + if (propertyName != null) { properties.put(propertyName, new String(ch, start, length)); } propertyName = null; - } - else if ("name".equals(currentQName)) - { + } else if ("name".equals(currentQName)) { repositoryName = new String(ch, start, length); properties.put("name", repositoryName); } @@ -199,8 +164,7 @@ /** * @return the repositories */ - public Map getRepositories() - { + public Map getRepositories() { return repositories; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryManager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryManager.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/RepositoryManager.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.rpad.repository; @@ -39,8 +38,7 @@ import org.apache.commons.logging.LogFactory; import org.xml.sax.SAXException; -public class RepositoryManager -{ +public class RepositoryManager { /** * Logger for this class */ @@ -52,68 +50,51 @@ private static RepositoryManager repositoryManager; - public static void init(String configFileName) throws RPADException - { + public static void init(String configFileName) throws RPADException { repositoryManager = new RepositoryManager(configFileName); } - public static RepositoryManager getInstance() - { - if (repositoryManager == null) - { + public static RepositoryManager getInstance() { + if (repositoryManager == null) { throw new IllegalStateException( "init() needs to be called before getInstance()."); } return repositoryManager; } - public RepositoryManager(String configFileName) throws RPADException - { + public RepositoryManager(String configFileName) throws RPADException { this.configFileName = configFileName; load(); } - protected void load() throws RPADException - { - try - { + protected void load() throws RPADException { + try { SAXParserFactory spfactory = SAXParserFactory.newInstance(); SAXParser parser = spfactory.newSAXParser(); RepositoryConfigHandler repoConfigHandler = new RepositoryConfigHandler(); parser.parse(new File(configFileName), repoConfigHandler); repositories = repoConfigHandler.getRepositories(); - } - catch (ParserConfigurationException e) - { + } catch (ParserConfigurationException e) { throw new RPADException("Could not configure a parser.", e); - } - catch (SAXException e) - { + } catch (SAXException e) { throw new RPADException("An exception occurrs on SAX parser.", e); - } - catch (IOException e) - { + } catch (IOException e) { throw new RPADException( "An exception occurrs when accessing a configuration file: " + configFileName, e); } } - public void reload() throws RPADException - { - synchronized (repositories) - { + public void reload() throws RPADException { + synchronized (repositories) { load(); } } public void addRepository(String name, Repository repository) - throws RPADException - { - synchronized (repositories) - { - if (repositories.containsKey(name)) - { + throws RPADException { + synchronized (repositories) { + if (repositories.containsKey(name)) { throw new RPADException(name + "exists."); } repositories.put(name, repository); @@ -121,17 +102,13 @@ } } - public Repository getRepository(String name) - { + public Repository getRepository(String name) { return (Repository) repositories.get(name); } - public void removeRepository(String name) throws RPADException - { - synchronized (repositories) - { - if (!repositories.containsKey(name)) - { + public void removeRepository(String name) throws RPADException { + synchronized (repositories) { + if (!repositories.containsKey(name)) { throw new RPADException(name + "does not exist."); } repositories.remove(name); @@ -139,36 +116,27 @@ } } - public List getRepositories() - { + public List getRepositories() { return new ArrayList(repositories.values()); } - public void store() throws RPADException - { - synchronized (repositories) - { + public void store() throws RPADException { + synchronized (repositories) { BufferedWriter writer = null; - try - { - try - { + try { + try { writer = new BufferedWriter(new OutputStreamWriter( new FileOutputStream(configFileName), "UTF-8")); - } - catch (UnsupportedEncodingException e) - { + } catch (UnsupportedEncodingException e) { writer = new BufferedWriter(new OutputStreamWriter( new FileOutputStream(configFileName))); } writer.write("\n"); writer.write("\n"); for (Iterator i = repositories.entrySet().iterator(); i - .hasNext();) - { + .hasNext();) { Map.Entry entry = (Map.Entry) i.next(); - if (log.isDebugEnabled()) - { + if (log.isDebugEnabled()) { log.debug("Storing a repository: " + entry.getKey()); } @@ -177,44 +145,30 @@ } writer.write("\n"); writer.flush(); - } - catch (FileNotFoundException e) - { + } catch (FileNotFoundException e) { throw new RPADException("Could not find " + configFileName, e); - } - catch (IOException e) - { + } catch (IOException e) { throw new RPADException("Could not write " + configFileName, e); - } - finally - { - if (writer != null) - { - try - { + } finally { + if (writer != null) { + try { writer.close(); + } catch (IOException e) { } - catch (IOException e) - { - } } } } } - public List getPortletApplications() - { + public List getPortletApplications() { ArrayList list = new ArrayList(); - for (Iterator i = repositories.entrySet().iterator(); i.hasNext();) - { + for (Iterator i = repositories.entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry) i.next(); Repository repo = (Repository) entry.getValue(); - if (repo.isAvailable()) - { + if (repo.isAvailable()) { List portlets = repo .getPortletApplications(); - if (portlets != null) - { + if (portlets != null) { list.addAll(portlets); } } @@ -222,16 +176,13 @@ return list; } - public List getPortletApplications(String name) - { + public List getPortletApplications(String name) { ArrayList list = new ArrayList(); Repository repo = getRepository(name); - if (repo != null && repo.isAvailable()) - { + if (repo != null && repo.isAvailable()) { List portlets = repo.getPortletApplications(); - if (portlets != null) - { + if (portlets != null) { list.addAll(portlets); } } @@ -239,20 +190,17 @@ } public PortletApplication getPortletApplication(String groupId, - String artifactId, String version, String packaging) - { + String artifactId, String version, String packaging) { Iterator repositories = getRepositories().iterator(); - while (repositories.hasNext()) - { + while (repositories.hasNext()) { PortletApplication pa = repositories.next().getPortletApplication( groupId, artifactId, version, packaging); - if (pa != null) - { + if (pa != null) { return pa; } } return null; } - + //TODO search } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleConfigHandler.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleConfigHandler.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleConfigHandler.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.rpad.repository.impl; @@ -26,8 +25,7 @@ import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; -public class SimpleConfigHandler extends DefaultHandler -{ +public class SimpleConfigHandler extends DefaultHandler { private List portletApplications; @@ -35,180 +33,125 @@ private List qNameList; - public SimpleConfigHandler() - { + public SimpleConfigHandler() { portletApplications = new ArrayList(); qNameList = new ArrayList(); } public void startElement(String uri, String localName, String qName, - Attributes attributes) - { - if ("repository".equals(qName)) - { + Attributes attributes) { + if ("repository".equals(qName)) { //TODO version //TODO id - } - else if ("portlet".equals(qName)) - { + } else if ("portlet".equals(qName)) { portletApplication = new PortletApplication(); String artifactId = attributes.getValue("id"); - if (artifactId != null) - { + if (artifactId != null) { portletApplication.setArtifactId(artifactId); } String groupId = attributes.getValue("group"); - if (groupId != null) - { + if (groupId != null) { portletApplication.setGroupId(groupId); } String version = attributes.getValue("version"); - if (version != null) - { + if (version != null) { portletApplication.setVersion(version); } } - synchronized (qNameList) - { + synchronized (qNameList) { qNameList.add(qName); } } - public void characters(char[] ch, int start, int length) - { - if (qNameList.size() < 1) - { + public void characters(char[] ch, int start, int length) { + if (qNameList.size() < 1) { return; } String value = new String(ch, start, length); String qName = (String) qNameList.get(qNameList.size() - 1); String parentQName; - if (qNameList.size() - 2 >= 0) - { + if (qNameList.size() - 2 >= 0) { parentQName = (String) qNameList.get(qNameList.size() - 2); - } - else - { + } else { parentQName = ""; } - if ("portletSpecVersion".equals(qName)) - { + if ("portletSpecVersion".equals(qName)) { portletApplication.setPortletSpecVersion(value); - } - else if ("packaging".equals(qName)) - { + } else if ("packaging".equals(qName)) { portletApplication.setPackaging(value); - } - else if ("name".equals(qName)) - { - if ("publisher".equals(parentQName)) - { + } else if ("name".equals(qName)) { + if ("publisher".equals(parentQName)) { portletApplication.setPublisherName(value); - } - else if ("license".equals(parentQName)) - { + } else if ("license".equals(parentQName)) { portletApplication.setLicenseName(value); - } - else - { + } else { portletApplication.setName(value); } - } - else if ("description".equals(qName)) - { + } else if ("description".equals(qName)) { portletApplication.setDescription(value); - } - else if ("tag".equals(qName)) - { + } else if ("tag".equals(qName)) { portletApplication.addTag(value); - } - else if ("url".equals(qName)) - { - if ("publisher".equals(parentQName)) - { + } else if ("url".equals(qName)) { + if ("publisher".equals(parentQName)) { portletApplication.setPublisherUrl(value); - } - else if ("license".equals(parentQName)) - { + } else if ("license".equals(parentQName)) { portletApplication.setLicenseUrl(value); } - } - else if ("binaryURL".equals(qName)) - { + } else if ("binaryURL".equals(qName)) { portletApplication.setBinaryUrl(value); - } - else if ("sourceURL".equals(qName)) - { + } else if ("sourceURL".equals(qName)) { portletApplication.setSourceUrl(value); - } - else if ("imageURL".equals(qName)) - { + } else if ("imageURL".equals(qName)) { portletApplication.setImageUrl(value); } //TODO dependencies //TODO license - else if ("compiledJDKVersion".equals(qName)) - { + else if ("compiledJDKVersion".equals(qName)) { portletApplication.setCompiledJDKVersion(value); - } - else if ("locale".equals(qName)) - { + } else if ("locale".equals(qName)) { Locale l = getLocaleFromString(value); - if (l != null) - { + if (l != null) { portletApplication.addSupportedLocale(l); } } } - private Locale getLocaleFromString(String localeString) - { + private Locale getLocaleFromString(String localeString) { StringTokenizer st = new StringTokenizer(localeString, "_-"); String[] buf = new String[3]; int count = 0; - while (st.hasMoreTokens()) - { + while (st.hasMoreTokens()) { buf[count] = st.nextToken(); count++; } - if (count > 2) - { + if (count > 2) { return new Locale(buf[0], buf[1], buf[2]); - } - else if (count > 1) - { + } else if (count > 1) { return new Locale(buf[0], buf[1]); - } - else if (count > 0) - { + } else if (count > 0) { return new Locale(buf[0]); } return null; } - public void endElement(String uri, String localName, String qName) - { - if ("portlet".equals(qName)) - { + public void endElement(String uri, String localName, String qName) { + if ("portlet".equals(qName)) { portletApplications.add(portletApplication); portletApplication = null; } - synchronized (qNameList) - { - if (qNameList.size() < 1) - { + synchronized (qNameList) { + if (qNameList.size() < 1) { throw new IllegalStateException("The stacked QName is 0."); } String stackedQName = (String) qNameList .remove(qNameList.size() - 1); - if (!qName.equals(stackedQName)) - { + if (!qName.equals(stackedQName)) { throw new IllegalStateException("The expected QName is " + stackedQName + ". But the current value is " + qName); } @@ -218,16 +161,15 @@ /** * @return the portletApplications */ - public List getPortletApplications() - { + public List getPortletApplications() { return portletApplications; } /** * @param portletApplications the portletApplications to set */ - public void setPortletApplications(List portletApplications) - { + public void setPortletApplications( + List portletApplications) { this.portletApplications = portletApplications; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleRepository.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleRepository.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/rpad/repository/impl/SimpleRepository.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,20 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ -package jp.sf.pal.admin.rpad.repository.impl; +package jp.sf.pal.admin.rpad.repository.impl; import java.io.File; import java.io.FileInputStream; @@ -36,8 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.xml.sax.InputSource; -public class SimpleRepository implements Repository -{ +public class SimpleRepository implements Repository { /** * Logger for this class */ @@ -51,28 +49,22 @@ private boolean available; - public SimpleRepository() - { + public SimpleRepository() { available = false; } - public void init() - { - if (log.isDebugEnabled()) - { + public void init() { + if (log.isDebugEnabled()) { log.debug("Loading a repository: " + configPath); } - if (configPath == null) - { + if (configPath == null) { throw new IllegalStateException("The configuration path is null."); } //load config - try - { + try { InputSource inputSource = getInputSource(configPath); - if (inputSource == null) - { + if (inputSource == null) { log.error("Failed to load: " + configPath); return; } @@ -81,51 +73,35 @@ SimpleConfigHandler repoConfigHandler = new SimpleConfigHandler(); parser.parse(inputSource, repoConfigHandler); portletApplications = repoConfigHandler.getPortletApplications(); - if (portletApplications == null) - { - if (log.isDebugEnabled()) - { + if (portletApplications == null) { + if (log.isDebugEnabled()) { log.debug("No portlet application."); } portletApplications = new ArrayList(); } available = true; - } - catch (Exception e) - { + } catch (Exception e) { log.error("Could not load a repository.", e); portletApplications = new ArrayList(); available = false; } } - protected InputSource getInputSource(String path) - { - if (path.startsWith("http:") || path.startsWith("https:")) - { - try - { + protected InputSource getInputSource(String path) { + if (path.startsWith("http:") || path.startsWith("https:")) { + try { URL url = new URL(path); return new InputSource(url.openStream()); - } - catch (MalformedURLException e) - { + } catch (MalformedURLException e) { log.error("Wrong url: " + path, e); - } - catch (IOException e) - { + } catch (IOException e) { log.error("Could not load " + path, e); } - } - else if (path.startsWith("file:")) - { - try - { + } else if (path.startsWith("file:")) { + try { return new InputSource(new FileInputStream(new File(path .substring(5)))); - } - catch (FileNotFoundException e) - { + } catch (FileNotFoundException e) { log.error("Could not load " + path, e); } } @@ -133,20 +109,16 @@ } public PortletApplication getPortletApplication(String groupId, - String artifactId, String version, String packaging) - { + String artifactId, String version, String packaging) { if (groupId != null && artifactId != null && version != null - && packaging != null) - { + && packaging != null) { Iterator ite = portletApplications.iterator(); - while (ite.hasNext()) - { + while (ite.hasNext()) { PortletApplication portletApp = (PortletApplication) ite.next(); if (groupId.equals(portletApp.getGroupId()) && artifactId.equals(portletApp.getArtifactId()) && version.equals(portletApp.getVersion()) - && packaging.equals(portletApp.getPackaging())) - { + && packaging.equals(portletApp.getPackaging())) { return portletApp; } } @@ -157,45 +129,39 @@ /** * @return the configPath */ - public String getConfigPath() - { + public String getConfigPath() { return configPath; } /** * @param configPath the configPath to set */ - public void setConfigPath(String configPath) - { + public void setConfigPath(String configPath) { this.configPath = configPath; } /** * @return the portletApplications */ - public List getPortletApplications() - { + public List getPortletApplications() { return portletApplications; } /** * @return the name */ - public String getName() - { + public String getName() { return name; } /** * @param name the name to set */ - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String toXMLString() - { + public String toXMLString() { return " \n" // + " " + getName() @@ -212,16 +178,14 @@ /** * @return the available */ - public boolean isAvailable() - { + public boolean isAvailable() { return available; } /** * @param available the available to set */ - public void setAvailable(boolean available) - { + public void setAvailable(boolean available) { this.available = available; } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.service; @@ -31,8 +30,7 @@ import jp.sf.pal.admin.web.group.AbstractGroupPage; import jp.sf.pal.admin.web.group.GroupListPage; -public class GroupManagementService implements Serializable -{ +public class GroupManagementService implements Serializable { /** * */ @@ -47,40 +45,35 @@ /** * @return the groupDxo */ - public GroupDxo getGroupDxo() - { + public GroupDxo getGroupDxo() { return groupDxo; } /** * @param groupDxo the groupDxo to set */ - public void setGroupDxo(GroupDxo groupDxo) - { + public void setGroupDxo(GroupDxo groupDxo) { this.groupDxo = groupDxo; } /** * @return the groupPager */ - public GroupPager getGroupPager() - { + public GroupPager getGroupPager() { return groupPager; } /** * @param groupPager the groupPager to set */ - public void setGroupPager(GroupPager groupPager) - { + public void setGroupPager(GroupPager groupPager) { this.groupPager = groupPager; } /** * @return the securityProviderLogic */ - public SecurityProviderLogic getSecurityProviderLogic() - { + public SecurityProviderLogic getSecurityProviderLogic() { return securityProviderLogic; } @@ -88,27 +81,23 @@ * @param securityProviderLogic the securityProviderLogic to set */ public void setSecurityProviderLogic( - SecurityProviderLogic securityProviderLogic) - { + SecurityProviderLogic securityProviderLogic) { this.securityProviderLogic = securityProviderLogic; } - public void insert(AbstractGroupPage page) throws PALAdminException - { + public void insert(AbstractGroupPage page) throws PALAdminException { Group entity = new Group(); groupDxo.convert(page, entity); securityProviderLogic.insertGroup(entity); } - public void delete(AbstractGroupPage page) throws PALAdminException - { + public void delete(AbstractGroupPage page) throws PALAdminException { Group entity = new Group(); groupDxo.convert(page, entity); securityProviderLogic.deleteGroup(entity); } - public void loadPage(GroupListPage page) - { + public void loadPage(GroupListPage page) { GroupPager pager = getGroupPager(); // check page action Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.service; import java.io.Serializable; @@ -63,7 +78,8 @@ requestContext.setSessionAttribute( PortalReservedParameters.SESSION_KEY_SUBJECT, subject); } catch (InvalidPasswordException ipe) { - throw new CommonException("invalid.current.password", "Invalid password. "); + throw new CommonException("invalid.current.password", + "Invalid password. "); } catch (InvalidNewPasswordException inpe) { throw new CommonException("invalid.new.password", "Invalid new password. "); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PermissionManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.service; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.service; @@ -42,8 +41,7 @@ import jp.sf.pal.jsf.custom.fileupload.UploadedFile; -public class PortletDeploymentService implements Serializable -{ +public class PortletDeploymentService implements Serializable { /** * */ @@ -52,7 +50,9 @@ private PortletDeploymentLogic portletDeploymentLogic; private PortletManagementLogic portletManagementLogic; -private RepositoryManagementLogic repositoryManagementLogic; + + private RepositoryManagementLogic repositoryManagementLogic; + private RemotePortletApplicationPager remotePortletApplicationPager; private PortletApplicationDxo portletApplicationDxo; @@ -60,8 +60,7 @@ /** * @return the portletDeploymentLogic */ - public PortletDeploymentLogic getPortletDeploymentLogic() - { + public PortletDeploymentLogic getPortletDeploymentLogic() { return portletDeploymentLogic; } @@ -69,16 +68,14 @@ * @param portletDeploymentLogic the portletDeploymentLogic to set */ public void setPortletDeploymentLogic( - PortletDeploymentLogic portletDeploymentLogic) - { + PortletDeploymentLogic portletDeploymentLogic) { this.portletDeploymentLogic = portletDeploymentLogic; } /** * @return the portletManagementLogic */ - public PortletManagementLogic getPortletManagementLogic() - { + public PortletManagementLogic getPortletManagementLogic() { return portletManagementLogic; } @@ -86,16 +83,14 @@ * @param portletManagementLogic the portletManagementLogic to set */ public void setPortletManagementLogic( - PortletManagementLogic portletManagementLogic) - { + PortletManagementLogic portletManagementLogic) { this.portletManagementLogic = portletManagementLogic; } /** * @return the repositoryManagementLogic */ - public RepositoryManagementLogic getRepositoryManagementLogic() - { + public RepositoryManagementLogic getRepositoryManagementLogic() { return repositoryManagementLogic; } @@ -103,16 +98,14 @@ * @param repositoryManagementLogic the repositoryManagementLogic to set */ public void setRepositoryManagementLogic( - RepositoryManagementLogic repositoryManagementLogic) - { + RepositoryManagementLogic repositoryManagementLogic) { this.repositoryManagementLogic = repositoryManagementLogic; } /** * @return the remotePortletApplicationPager */ - public RemotePortletApplicationPager getRemotePortletApplicationPager() - { + public RemotePortletApplicationPager getRemotePortletApplicationPager() { return remotePortletApplicationPager; } @@ -120,16 +113,14 @@ * @param remotePortletApplicationPager the remotePortletApplicationPager to set */ public void setRemotePortletApplicationPager( - RemotePortletApplicationPager remotePortletApplicationPager) - { + RemotePortletApplicationPager remotePortletApplicationPager) { this.remotePortletApplicationPager = remotePortletApplicationPager; } /** * @return the portletApplicationDxo */ - public PortletApplicationDxo getPortletApplicationDxo() - { + public PortletApplicationDxo getPortletApplicationDxo() { return portletApplicationDxo; } @@ -137,23 +128,18 @@ * @param portletApplicationDxo the portletApplicationDxo to set */ public void setPortletApplicationDxo( - PortletApplicationDxo portletApplicationDxo) - { + PortletApplicationDxo portletApplicationDxo) { this.portletApplicationDxo = portletApplicationDxo; } - public void deploy(DeployerEditPage page) throws PALAdminException - { + public void deploy(DeployerEditPage page) throws PALAdminException { // store uploaded file File localFile = null; UploadedFile uploadedFile = page.getPortletApplicationFile(); - try - { + try { localFile = portletDeploymentLogic.storeLocalFile(uploadedFile .getInputStream()); - } - catch (IOException e) - { + } catch (IOException e) { throw new PALAdminException( "Could not get the input stream for the uploaded file.", e); } @@ -170,28 +156,23 @@ } - private String removeExtension(String name) - { + private String removeExtension(String name) { int pos = name.lastIndexOf("."); - if (pos != -1) - { + if (pos != -1) { return name.substring(0, pos); } return name; } - private String getExtension(String name) - { + private String getExtension(String name) { int pos = name.lastIndexOf("."); - if (pos != -1 && pos <= name.length()) - { + if (pos != -1 && pos <= name.length()) { return name.substring(pos + 1); } return ""; } - public void loadPage(RemotePortletListPage page) - { + public void loadPage(RemotePortletListPage page) { RemotePortletApplicationPager pager = getRemotePortletApplicationPager(); // check page action @@ -208,10 +189,9 @@ //set repository names ArrayList> repositoryItems = new ArrayList>(); - Iterator items = repositoryManagementLogic.getRepositories() - .iterator(); - while (items.hasNext()) - { + Iterator items = repositoryManagementLogic + .getRepositories().iterator(); + while (items.hasNext()) { String value = items.next().getName(); repositoryItems.add(PALAdminUtil.createItem(value, value)); } @@ -219,20 +199,17 @@ } - public void updatePager(RemotePortletListPage page) - { + public void updatePager(RemotePortletListPage page) { getRemotePortletApplicationPager().setRepositoryName( page.getRepositoryName()); } public void deploy(RemotePortletDeployConfirmPage page) - throws PALAdminException - { + throws PALAdminException { PortletApplication pa = getPortletManagementLogic() .getPortletApplication(page.getGroupId(), page.getArtifactId(), page.getVersion(), page.getPackaging()); - if (pa == null) - { + if (pa == null) { throw new PALAdminException("Could not find the portlet. page=" + page); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.service; @@ -31,8 +30,7 @@ import jp.sf.pal.admin.web.portletmanager.PortletActionConfirmPage; import jp.sf.pal.admin.web.portletmanager.PortletListPage; -public class PortletManagementService implements Serializable -{ +public class PortletManagementService implements Serializable { /** * */ @@ -49,8 +47,7 @@ /** * @return the portletManagementLogic */ - public PortletManagementLogic getPortletManagementLogic() - { + public PortletManagementLogic getPortletManagementLogic() { return portletManagementLogic; } @@ -58,16 +55,14 @@ * @param portletManagementLogic the portletManagementLogic to set */ public void setPortletManagementLogic( - PortletManagementLogic portletManagementLogic) - { + PortletManagementLogic portletManagementLogic) { this.portletManagementLogic = portletManagementLogic; } /** * @return the portletDeploymentLogic */ - public PortletDeploymentLogic getPortletDeploymentLogic() - { + public PortletDeploymentLogic getPortletDeploymentLogic() { return portletDeploymentLogic; } @@ -75,16 +70,14 @@ * @param portletDeploymentLogic the portletDeploymentLogic to set */ public void setPortletDeploymentLogic( - PortletDeploymentLogic portletDeploymentLogic) - { + PortletDeploymentLogic portletDeploymentLogic) { this.portletDeploymentLogic = portletDeploymentLogic; } /** * @return the portletApplicationPager */ - public PortletApplicationPager getPortletApplicationPager() - { + public PortletApplicationPager getPortletApplicationPager() { return portletApplicationPager; } @@ -92,16 +85,14 @@ * @param portletApplicationPager the portletApplicationPager to set */ public void setPortletApplicationPager( - PortletApplicationPager portletApplicationPager) - { + PortletApplicationPager portletApplicationPager) { this.portletApplicationPager = portletApplicationPager; } /** * @return the portletApplicationDxo */ - public PortletApplicationDxo getPortletApplicationDxo() - { + public PortletApplicationDxo getPortletApplicationDxo() { return portletApplicationDxo; } @@ -109,13 +100,11 @@ * @param portletApplicationDxo the portletApplicationDxo to set */ public void setPortletApplicationDxo( - PortletApplicationDxo portletApplicationDxo) - { + PortletApplicationDxo portletApplicationDxo) { this.portletApplicationDxo = portletApplicationDxo; } - public void loadPage(PortletListPage page) - { + public void loadPage(PortletListPage page) { PortletApplicationPager pager = getPortletApplicationPager(); // check page action @@ -136,29 +125,25 @@ } public void startPortletApplication(PortletActionConfirmPage page) - throws PALAdminException - { + throws PALAdminException { String portletName = page.getName(); getPortletDeploymentLogic().startPortletApplication(portletName); } public void stopPortletApplication(PortletActionConfirmPage page) - throws PALAdminException - { + throws PALAdminException { String portletName = page.getName(); getPortletDeploymentLogic().stopPortletApplication(portletName); } public void undeployPortletApplication(PortletActionConfirmPage page) - throws PALAdminException - { + throws PALAdminException { String portletName = page.getName(); getPortletDeploymentLogic().undeployPortletApplication(portletName); } public void deletePortletApplication(PortletActionConfirmPage page) - throws PALAdminException - { + throws PALAdminException { String portletName = page.getName(); getPortletDeploymentLogic().deletePortletApplication(portletName); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RepositoryManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RepositoryManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RepositoryManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.service; @@ -33,8 +32,7 @@ import jp.sf.pal.admin.web.deployer.RemoteRepositoryEditPage; import jp.sf.pal.admin.web.deployer.RemoteRepositoryListPage; -public class RepositoryManagementService implements Serializable -{ +public class RepositoryManagementService implements Serializable { /** * */ @@ -49,24 +47,21 @@ /** * @return the repositoryDxo */ - public RepositoryDxo getRepositoryDxo() - { + public RepositoryDxo getRepositoryDxo() { return repositoryDxo; } /** * @param repositoryDxo the repositoryDxo to set */ - public void setRepositoryDxo(RepositoryDxo repositoryDxo) - { + public void setRepositoryDxo(RepositoryDxo repositoryDxo) { this.repositoryDxo = repositoryDxo; } /** * @return the repositoryManagementLogic */ - public RepositoryManagementLogic getRepositoryManagementLogic() - { + public RepositoryManagementLogic getRepositoryManagementLogic() { return repositoryManagementLogic; } @@ -74,29 +69,25 @@ * @param repositoryManagementLogic the repositoryManagementLogic to set */ public void setRepositoryManagementLogic( - RepositoryManagementLogic repositoryManagementLogic) - { + RepositoryManagementLogic repositoryManagementLogic) { this.repositoryManagementLogic = repositoryManagementLogic; } /** * @return the repositoryPager */ - public RepositoryPager getRepositoryPager() - { + public RepositoryPager getRepositoryPager() { return repositoryPager; } /** * @param repositoryPager the repositoryPager to set */ - public void setRepositoryPager(RepositoryPager repositoryPager) - { + public void setRepositoryPager(RepositoryPager repositoryPager) { this.repositoryPager = repositoryPager; } - public void loadPage(RemoteRepositoryListPage page) - { + public void loadPage(RemoteRepositoryListPage page) { RepositoryPager pager = getRepositoryPager(); // check page action @@ -114,10 +105,8 @@ } public void create(RemoteRepositoryConfirmPage page) - throws PALAdminException - { - if (page.getName() == null) - { + throws PALAdminException { + if (page.getName() == null) { throw new PALAdminException("The repository name is null."); } @@ -127,10 +116,8 @@ } public void update(RemoteRepositoryConfirmPage page) - throws PALAdminException - { - if (page.getName() == null) - { + throws PALAdminException { + if (page.getName() == null) { throw new PALAdminException("The repository name is null."); } @@ -140,10 +127,8 @@ } public void delete(RemoteRepositoryConfirmPage page) - throws PALAdminException - { - if (page.getName() == null) - { + throws PALAdminException { + if (page.getName() == null) { throw new PALAdminException("The repository name is null."); } @@ -152,14 +137,11 @@ } - public void loadPage(RemoteRepositoryEditPage page) - { + public void loadPage(RemoteRepositoryEditPage page) { Repository repository = getRepositoryManagementLogic().getRepository( page.getName()); - if (repository != null) - { - if (repository instanceof SimpleRepository) - { + if (repository != null) { + if (repository instanceof SimpleRepository) { SimpleRepository sr = (SimpleRepository) repository; page.setConfigPath(sr.getConfigPath()); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.service; @@ -31,8 +30,7 @@ import jp.sf.pal.admin.web.role.AbstractRolePage; import jp.sf.pal.admin.web.role.RoleListPage; -public class RoleManagementService implements Serializable -{ +public class RoleManagementService implements Serializable { /** * */ @@ -47,8 +45,7 @@ /** * @return the securityProviderLogic */ - public SecurityProviderLogic getSecurityProviderLogic() - { + public SecurityProviderLogic getSecurityProviderLogic() { return securityProviderLogic; } @@ -56,59 +53,51 @@ * @param securityProviderLogic the securityProviderLogic to set */ public void setSecurityProviderLogic( - SecurityProviderLogic securityProviderLogic) - { + SecurityProviderLogic securityProviderLogic) { this.securityProviderLogic = securityProviderLogic; } /** * @return the roleDxo */ - public RoleDxo getRoleDxo() - { + public RoleDxo getRoleDxo() { return roleDxo; } /** * @param roleDxo the roleDxo to set */ - public void setRoleDxo(RoleDxo roleDxo) - { + public void setRoleDxo(RoleDxo roleDxo) { this.roleDxo = roleDxo; } /** * @return the roleListPager */ - public RolePager getRolePager() - { + public RolePager getRolePager() { return rolePager; } /** * @param roleListPager the roleListPager to set */ - public void setRolePager(RolePager roleListPager) - { + public void setRolePager(RolePager roleListPager) { this.rolePager = roleListPager; } - public void insert(AbstractRolePage page) throws PALAdminException - { + public void insert(AbstractRolePage page) throws PALAdminException { Role entity = new Role(); roleDxo.convert(page, entity); securityProviderLogic.insertRole(entity); } - public void delete(AbstractRolePage page) throws PALAdminException - { + public void delete(AbstractRolePage page) throws PALAdminException { Role entity = new Role(); roleDxo.convert(page, entity); securityProviderLogic.deleteRole(entity); } - public void loadPage(RoleListPage page) - { + public void loadPage(RoleListPage page) { RolePager pager = getRolePager(); // check page action Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.service; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.service; @@ -48,8 +47,7 @@ import org.seasar.teeda.extension.util.LabelHelper; -public class UserManagementService implements Serializable -{ +public class UserManagementService implements Serializable { /** * */ @@ -68,89 +66,81 @@ /** * @return the securityProviderLogic */ - public SecurityProviderLogic getSecurityProviderLogic() - { + public SecurityProviderLogic getSecurityProviderLogic() { return securityProviderLogic; } /** * @param securityProviderLogic the securityProviderLogic to set */ - public void setSecurityProviderLogic(SecurityProviderLogic securityProviderLogic) - { + public void setSecurityProviderLogic( + SecurityProviderLogic securityProviderLogic) { this.securityProviderLogic = securityProviderLogic; } /** * @return the userDxo */ - public UserDxo getUserDxo() - { + public UserDxo getUserDxo() { return userDxo; } /** * @param userDxo the userDxo to set */ - public void setUserDxo(UserDxo userDxo) - { + public void setUserDxo(UserDxo userDxo) { this.userDxo = userDxo; } /** * @return the userListPager */ - public UserPager getUserPager() - { + public UserPager getUserPager() { return userPager; } /** * @param userListPager the userListPager to set */ - public void setUserPager(UserPager userListPager) - { + public void setUserPager(UserPager userListPager) { this.userPager = userListPager; } /** * @return the userAttributePager */ - public UserAttributePager getUserAttributePager() - { + public UserAttributePager getUserAttributePager() { return userAttributePager; } /** * @param userAttributePager the userAttributePager to set */ - public void setUserAttributePager(UserAttributePager userAttributePager) - { + public void setUserAttributePager(UserAttributePager userAttributePager) { this.userAttributePager = userAttributePager; } /** * @return the labelHelper */ - public LabelHelper getLabelHelper() - { + public LabelHelper getLabelHelper() { return labelHelper; } /** * @param labelHelper the labelHelper to set */ - public void setLabelHelper(LabelHelper labelHelper) - { + public void setLabelHelper(LabelHelper labelHelper) { this.labelHelper = labelHelper; } - public void loadPage(UserListPage page) throws PALAdminException - { + public void loadPage(UserListPage page) throws PALAdminException { UserPager pager = getUserPager(); // check page action - PagerUtil.updatePageNumber(pager, PALAdminConstants.PREVIOUS_PAGE_NUMBER, PALAdminConstants.NEXT_PAGE_NUMBER); + PagerUtil.updatePageNumber(pager, + PALAdminConstants.PREVIOUS_PAGE_NUMBER, + PALAdminConstants.NEXT_PAGE_NUMBER); // set user list List> list = new ArrayList>(); @@ -160,80 +150,75 @@ } - public void insert(AbstractUserPage page) throws PALAdminException - { + public void insert(AbstractUserPage page) throws PALAdminException { User entity = new User(); userDxo.convert(page, entity); securityProviderLogic.insertUser(entity); } - public void delete(AbstractUserPage page) throws PALAdminException - { + public void delete(AbstractUserPage page) throws PALAdminException { User entity = new User(); userDxo.convert(page, entity); securityProviderLogic.deleteUser(entity); } - public List> getProfilingRuleNames() - { - return PALAdminUtil.createItems(securityProviderLogic.getProfilingRuleNames().iterator()); + public List> getProfilingRuleNames() { + return PALAdminUtil.createItems(securityProviderLogic + .getProfilingRuleNames().iterator()); } - public boolean isUserExists(String username) - { - if (username == null || username.equals("")) - { + public boolean isUserExists(String username) { + if (username == null || username.equals("")) { return false; } User user = getSecurityProviderLogic().getUser(username); - if (user != null) - { + if (user != null) { return true; } return false; } - public void loadPage(UserEditPage page) - { + public void loadPage(UserEditPage page) { User user = getSecurityProviderLogic().getUser(page.getName()); getUserDxo().convert(user, page); // set pull-down LabelHelper labelHelper = getLabelHelper(); List> list = new ArrayList>(); - list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Active"), PALAdminConstants.USER_CREDENTIAL_ACTIVE)); - list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Expired"), PALAdminConstants.USER_CREDENTIAL_EXPIRED)); - list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Extend"), PALAdminConstants.USER_CREDENTIAL_EXTEND)); - list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("ExtendUnlimited"), + list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Active"), + PALAdminConstants.USER_CREDENTIAL_ACTIVE)); + list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Expired"), + PALAdminConstants.USER_CREDENTIAL_EXPIRED)); + list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Extend"), + PALAdminConstants.USER_CREDENTIAL_EXTEND)); + list.add(PALAdminUtil.createItem(labelHelper + .getLabelValue("ExtendUnlimited"), PALAdminConstants.USER_CREDENTIAL_EXTEND_UNLIMITED)); page.setExpiresItems(list); } - public void update(UserEditPage page) throws PALAdminException - { + public void update(UserEditPage page) throws PALAdminException { User entity = new User(); getUserDxo().convert(page, entity); getSecurityProviderLogic().updateUser(entity); } - public void loadPage(UserGroupEditPage page) - { + public void loadPage(UserGroupEditPage page) { page.setNewGroupItems(getGroupNames()); page.setGroupsItems(getGroupNamesForUsername(page.getName())); } - public List> getGroupNames() - { - return PALAdminUtil.createItems(securityProviderLogic.getGroupNames().iterator()); + public List> getGroupNames() { + return PALAdminUtil.createItems(securityProviderLogic.getGroupNames() + .iterator()); } - public List> getGroupNamesForUsername(String username) - { - return PALAdminUtil.createItems(securityProviderLogic.getGroupNamesForUsername(username).iterator()); + public List> getGroupNamesForUsername(String username) { + return PALAdminUtil.createItems(securityProviderLogic + .getGroupNamesForUsername(username).iterator()); } - public void addGroupToUser(UserGroupEditPage page) throws PALAdminException - { + public void addGroupToUser(UserGroupEditPage page) throws PALAdminException { User user = new User(); user.setName(page.getName()); Group group = new Group(); @@ -241,49 +226,41 @@ getSecurityProviderLogic().addUserToGroup(user, group); } - public void removeGroupsFromUser(UserGroupEditPage page) throws PALAdminException - { + public void removeGroupsFromUser(UserGroupEditPage page) + throws PALAdminException { List failedGroups = new ArrayList(); User user = new User(); user.setName(page.getName()); String[] groupnames = page.getGroups(); - for (int i = 0; i < groupnames.length; i++) - { + for (int i = 0; i < groupnames.length; i++) { Group group = new Group(); group.setName(groupnames[i]); - try - { + try { getSecurityProviderLogic().removeGroupFromUser(user, group); - } - catch (PALAdminException e) - { + } catch (PALAdminException e) { failedGroups.add(groupnames[i]); } } - if (failedGroups.size() > 0) - { - throw new PALAdminException("Could not remove groups: " + failedGroups); + if (failedGroups.size() > 0) { + throw new PALAdminException("Could not remove groups: " + + failedGroups); } } - public boolean isGroupExists(String groupname) - { + public boolean isGroupExists(String groupname) { Group group = new Group(); group.setName(groupname); return getSecurityProviderLogic().exists(group); } - public boolean isGroupExistsInUser(String username, String groupname) - { - if (username == null || groupname == null) - { + public boolean isGroupExistsInUser(String username, String groupname) { + if (username == null || groupname == null) { return false; } - Iterator ite = getSecurityProviderLogic().getGroupNamesForUsername(username).iterator(); - while (ite.hasNext()) - { - if (groupname.equals(ite.next())) - { + Iterator ite = getSecurityProviderLogic() + .getGroupNamesForUsername(username).iterator(); + while (ite.hasNext()) { + if (groupname.equals(ite.next())) { return true; } } @@ -291,36 +268,30 @@ return false; } - public void loadPage(UserRoleEditPage page) - { + public void loadPage(UserRoleEditPage page) { page.setNewRoleItems(getRoleNames()); page.setRolesItems(getRoleNamesForUsername(page.getName())); } - public void updateQuery(UserListPage page) - { - if (page.getFilter() != null && !page.getFilter().equals("")) - { + public void updateQuery(UserListPage page) { + if (page.getFilter() != null && !page.getFilter().equals("")) { getUserPager().setFilter(page.getFilter()); - } - else - { + } else { getUserPager().setFilter(""); } } - public List> getRoleNames() - { - return PALAdminUtil.createItems(securityProviderLogic.getRoleNames().iterator()); + public List> getRoleNames() { + return PALAdminUtil.createItems(securityProviderLogic.getRoleNames() + .iterator()); } - public List> getRoleNamesForUsername(String username) - { - return PALAdminUtil.createItems(securityProviderLogic.getRoleNamesForUsername(username).iterator()); + public List> getRoleNamesForUsername(String username) { + return PALAdminUtil.createItems(securityProviderLogic + .getRoleNamesForUsername(username).iterator()); } - public void addRoleToUser(UserRoleEditPage page) throws PALAdminException - { + public void addRoleToUser(UserRoleEditPage page) throws PALAdminException { User user = new User(); user.setName(page.getName()); Role role = new Role(); @@ -328,49 +299,41 @@ getSecurityProviderLogic().addUserToRole(user, role); } - public void removeRolesFromUser(UserRoleEditPage page) throws PALAdminException - { + public void removeRolesFromUser(UserRoleEditPage page) + throws PALAdminException { List failedRoles = new ArrayList(); User user = new User(); user.setName(page.getName()); String[] rolenames = page.getRoles(); - for (int i = 0; i < rolenames.length; i++) - { + for (int i = 0; i < rolenames.length; i++) { Role role = new Role(); role.setName(rolenames[i]); - try - { + try { getSecurityProviderLogic().removeRoleFromUser(user, role); - } - catch (PALAdminException e) - { + } catch (PALAdminException e) { failedRoles.add(rolenames[i]); } } - if (failedRoles.size() > 0) - { - throw new PALAdminException("Could not remove roles: " + failedRoles); + if (failedRoles.size() > 0) { + throw new PALAdminException("Could not remove roles: " + + failedRoles); } } - public boolean isRoleExists(String rolename) - { + public boolean isRoleExists(String rolename) { Role role = new Role(); role.setName(rolename); return getSecurityProviderLogic().exists(role); } - public boolean isRoleExistsInUser(String username, String rolename) - { - if (username == null || rolename == null) - { + public boolean isRoleExistsInUser(String username, String rolename) { + if (username == null || rolename == null) { return false; } - Iterator ite = getSecurityProviderLogic().getRoleNamesForUsername(username).iterator(); - while (ite.hasNext()) - { - if (rolename.equals(ite.next())) - { + Iterator ite = getSecurityProviderLogic() + .getRoleNamesForUsername(username).iterator(); + while (ite.hasNext()) { + if (rolename.equals(ite.next())) { return true; } } @@ -378,8 +341,7 @@ return false; } - public void loadPage(UserAttributeListPage page) throws PALAdminException - { + public void loadPage(UserAttributeListPage page) throws PALAdminException { UserAttributePager pager = getUserAttributePager(); User user = new User(); @@ -387,13 +349,14 @@ pager.setUser(user); // check page action - PagerUtil.updatePageNumber(pager, PALAdminConstants.PREVIOUS_PAGE_NUMBER, PALAdminConstants.NEXT_PAGE_NUMBER); + PagerUtil.updatePageNumber(pager, + PALAdminConstants.PREVIOUS_PAGE_NUMBER, + PALAdminConstants.NEXT_PAGE_NUMBER); // set user list List> list = new ArrayList>(); - for (Iterator> ite = getSecurityProviderLogic().getUserAttributes(pager).entrySet().iterator(); ite - .hasNext();) - { + for (Iterator> ite = getSecurityProviderLogic() + .getUserAttributes(pager).entrySet().iterator(); ite.hasNext();) { Entry entry = ite.next(); Map map = new HashMap(); map.put("key", entry.getKey()); @@ -404,55 +367,56 @@ page.setUserAttributeItems(list); } - public void loadPage(UserAttributeEditPage page) throws PALAdminException - { - page.setValue(getSecurityProviderLogic().getUserAttributeValue(page.getName(), page.getKey())); + public void loadPage(UserAttributeEditPage page) throws PALAdminException { + page.setValue(getSecurityProviderLogic().getUserAttributeValue( + page.getName(), page.getKey())); } - public void loadPage(UserAttributeConfirmPage page) throws PALAdminException - { - page.setValue(getSecurityProviderLogic().getUserAttributeValue(page.getName(), page.getKey())); + public void loadPage(UserAttributeConfirmPage page) + throws PALAdminException { + page.setValue(getSecurityProviderLogic().getUserAttributeValue( + page.getName(), page.getKey())); } - public void insert(UserAttributeConfirmPage page) throws PALAdminException - { - if (page.getValue() == null) - { + public void insert(UserAttributeConfirmPage page) throws PALAdminException { + if (page.getValue() == null) { page.setValue(""); } - getSecurityProviderLogic().insertUserAttribute(page.getName(), page.getKey(), page.getValue()); + getSecurityProviderLogic().insertUserAttribute(page.getName(), + page.getKey(), page.getValue()); } - public void update(UserAttributeConfirmPage page) throws PALAdminException - { - if (page.getValue() == null) - { + public void update(UserAttributeConfirmPage page) throws PALAdminException { + if (page.getValue() == null) { page.setValue(""); } - getSecurityProviderLogic().insertUserAttribute(page.getName(), page.getKey(), page.getValue()); + getSecurityProviderLogic().insertUserAttribute(page.getName(), + page.getKey(), page.getValue()); } - public void delete(UserAttributeConfirmPage page) throws PALAdminException - { - getSecurityProviderLogic().deleteUserAttribute(page.getName(), page.getKey()); + public void delete(UserAttributeConfirmPage page) throws PALAdminException { + getSecurityProviderLogic().deleteUserAttribute(page.getName(), + page.getKey()); } - public void loadPage(UserProfilingRuleEditPage page) - { + public void loadPage(UserProfilingRuleEditPage page) { List> locatorList = new ArrayList>(); - locatorList.add(PALAdminUtil.createItem(PALAdminConstants.LOCATOR_PAGE, PALAdminConstants.LOCATOR_PAGE)); - locatorList.add(PALAdminUtil.createItem(PALAdminConstants.LOCATOR_MENU, PALAdminConstants.LOCATOR_MENU)); + locatorList.add(PALAdminUtil.createItem(PALAdminConstants.LOCATOR_PAGE, + PALAdminConstants.LOCATOR_PAGE)); + locatorList.add(PALAdminUtil.createItem(PALAdminConstants.LOCATOR_MENU, + PALAdminConstants.LOCATOR_MENU)); page.setNewLocatorNameItems(locatorList); page.setNewProfilingRuleNameItems(getProfilingRuleNames()); User user = new User(); user.setName(page.getName()); - page.setPrincipalRulesItems(getSecurityProviderLogic().getPrincipalRuleForUser(user)); + page.setPrincipalRulesItems(getSecurityProviderLogic() + .getPrincipalRuleForUser(user)); } - public void addPrincipalRuleToUser(UserProfilingRuleEditPage page) throws PALAdminException - { + public void addPrincipalRuleToUser(UserProfilingRuleEditPage page) + throws PALAdminException { User user = new User(); user.setName(page.getName()); PrincipalRule principalRule = new PrincipalRule(); @@ -461,27 +425,25 @@ getSecurityProviderLogic().addPrincipalRuleToUser(user, principalRule); } - public void removePrincipalRulesFromUser(UserProfilingRuleEditPage page) throws PALAdminException - { + public void removePrincipalRulesFromUser(UserProfilingRuleEditPage page) + throws PALAdminException { List failedPrincipalRules = new ArrayList(); User user = new User(); user.setName(page.getName()); String[] principalRules = page.getPrincipalRules(); - for (int i = 0; i < principalRules.length; i++) - { - try - { - PrincipalRule principalRule = PrincipalRule.getInstance(principalRules[i]); - getSecurityProviderLogic().removePrincipalRuleFromUser(user, principalRule); - } - catch (PALAdminException e) - { + for (int i = 0; i < principalRules.length; i++) { + try { + PrincipalRule principalRule = PrincipalRule + .getInstance(principalRules[i]); + getSecurityProviderLogic().removePrincipalRuleFromUser(user, + principalRule); + } catch (PALAdminException e) { failedPrincipalRules.add(principalRules[i]); } } - if (failedPrincipalRules.size() > 0) - { - throw new PALAdminException("Could not remove principalRules: " + failedPrincipalRules); + if (failedPrincipalRules.size() > 0) { + throw new PALAdminException("Could not remove principalRules: " + + failedPrincipalRules); } } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.service; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/DeploymentUtil.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/DeploymentUtil.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/DeploymentUtil.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.util; @@ -21,51 +20,41 @@ import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.deployer.DeploymentStatus; -public class DeploymentUtil -{ +public class DeploymentUtil { /** * @return the facesContext */ - private static FacesContext getFacesContext() - { + private static FacesContext getFacesContext() { return FacesContext.getCurrentInstance(); } - public static DeploymentStatus getDeploymentStatus() - { + public static DeploymentStatus getDeploymentStatus() { return (DeploymentStatus) getFacesContext().getExternalContext() .getApplicationMap().get(PALAdminConstants.DEPLOYMENT_STATUS); } - public static void setDeploymentStatus(DeploymentStatus deploymentStatus) - { + public static void setDeploymentStatus(DeploymentStatus deploymentStatus) { getFacesContext().getExternalContext().getApplicationMap().put( PALAdminConstants.DEPLOYMENT_STATUS, deploymentStatus); } - public static boolean isDeploying() - { + public static boolean isDeploying() { DeploymentStatus deploymentStatus = getDeploymentStatus(); - if (deploymentStatus == null) - { + if (deploymentStatus == null) { return false; } - if (deploymentStatus.getStatus() == DeploymentStatus.DEPLOYING) - { + if (deploymentStatus.getStatus() == DeploymentStatus.DEPLOYING) { return true; } return false; } - public static boolean isReady() - { + public static boolean isReady() { DeploymentStatus deploymentStatus = getDeploymentStatus(); - if (deploymentStatus == null) - { + if (deploymentStatus == null) { return true; } - if (deploymentStatus.getStatus() != DeploymentStatus.DEPLOYING) - { + if (deploymentStatus.getStatus() != DeploymentStatus.DEPLOYING) { return true; } return false; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,94 +1,79 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ -package jp.sf.pal.admin.util; +package jp.sf.pal.admin.util; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -public class FacesMessageUtil -{ +public class FacesMessageUtil { public static void addMessage(FacesMessage.Severity severity, - java.lang.String summary, java.lang.String detail) - { + java.lang.String summary, java.lang.String detail) { FacesMessage facesMessage = new FacesMessage(severity, summary, detail); FacesContext.getCurrentInstance().addMessage(null, facesMessage); } - public static void addErrorMessage(java.lang.String summary, Throwable t) - { + public static void addErrorMessage(java.lang.String summary, Throwable t) { addMessage(FacesMessage.SEVERITY_ERROR, summary, t.getMessage()); } public static void addErrorMessage(java.lang.String summary, - java.lang.String detail) - { + java.lang.String detail) { addMessage(FacesMessage.SEVERITY_ERROR, summary, detail); } - public static void addErrorMessage(java.lang.String summary) - { + public static void addErrorMessage(java.lang.String summary) { addMessage(FacesMessage.SEVERITY_ERROR, summary, null); } - public static void addFatalMessage(java.lang.String summary, Throwable t) - { + public static void addFatalMessage(java.lang.String summary, Throwable t) { addMessage(FacesMessage.SEVERITY_FATAL, summary, t.getMessage()); } public static void addFatalMessage(java.lang.String summary, - java.lang.String detail) - { + java.lang.String detail) { addMessage(FacesMessage.SEVERITY_FATAL, summary, detail); } - public static void addFatalMessage(java.lang.String summary) - { + public static void addFatalMessage(java.lang.String summary) { addMessage(FacesMessage.SEVERITY_FATAL, summary, null); } - public static void addInfoMessage(java.lang.String summary, Throwable t) - { + public static void addInfoMessage(java.lang.String summary, Throwable t) { addMessage(FacesMessage.SEVERITY_INFO, summary, t.getMessage()); } public static void addInfoMessage(java.lang.String summary, - java.lang.String detail) - { + java.lang.String detail) { addMessage(FacesMessage.SEVERITY_INFO, summary, detail); } - public static void addInfoMessage(java.lang.String summary) - { + public static void addInfoMessage(java.lang.String summary) { addMessage(FacesMessage.SEVERITY_INFO, summary, null); } - public static void addWarnMessage(java.lang.String summary, Throwable t) - { + public static void addWarnMessage(java.lang.String summary, Throwable t) { addMessage(FacesMessage.SEVERITY_WARN, summary, t.getMessage()); } public static void addWarnMessage(java.lang.String summary, - java.lang.String detail) - { + java.lang.String detail) { addMessage(FacesMessage.SEVERITY_WARN, summary, detail); } - public static void addWarnMessage(java.lang.String summary) - { + public static void addWarnMessage(java.lang.String summary) { addMessage(FacesMessage.SEVERITY_WARN, summary, null); } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,17 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. */ package jp.sf.pal.admin.util; @@ -23,59 +22,47 @@ import jp.sf.pal.admin.pager.Pager; import jp.sf.pal.admin.web.PagerPage; -public class PagerUtil -{ +public class PagerUtil { /** * @return the facesContext */ - private static FacesContext getFacesContext() - { + private static FacesContext getFacesContext() { return FacesContext.getCurrentInstance(); } public static void updatePageNumber(Pager pager, String prevKey, - String nextKey) - { + String nextKey) { Map requestMap = getFacesContext().getExternalContext() .getRequestParameterMap(); String prev = (String) requestMap.get(prevKey); - if (prev != null) - { + if (prev != null) { int pageNum = Integer.parseInt(prev); pager.setOffset((pageNum - 1) * pager.getLimit()); return; } String next = (String) requestMap.get(nextKey); - if (next != null) - { + if (next != null) { int pageNum = Integer.parseInt(next); pager.setOffset((pageNum - 1) * pager.getLimit()); return; } } - public static void updatePagerPage(PagerPage page, Pager pager) - { + public static void updatePagerPage(PagerPage page, Pager pager) { // update page page.setCount(pager.getCount()); page.setMaxPageNumber((pager.getCount() - 1) / pager.getLimit() + 1); page.setCurrentPageNumber(pager.getOffset() / pager.getLimit() + 1); - if (page.getMaxPageNumber() > page.getCurrentPageNumber()) - { + if (page.getMaxPageNumber() > page.getCurrentPageNumber()) { page.setNextPageNumber(page.getCurrentPageNumber() + 1); - } - else - { + } else { page.setNextPageNumber(null); } - if (page.getCurrentPageNumber() > 1) - { + if (page.getCurrentPageNumber() > 1) { page.setPreviousPageNumber(page.getCurrentPageNumber() - 1); - } - else - { + } else { page.setPreviousPageNumber(null); } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.util; import java.util.ArrayList; @@ -12,71 +27,58 @@ import jp.sf.pal.admin.PALAdminConstants; -public class UserRegistrationUtil -{ - private static FacesContext getFacesContext() - { +public class UserRegistrationUtil { + private static FacesContext getFacesContext() { return FacesContext.getCurrentInstance(); } - public static Map getUserRegistrationParams() - { + public static Map getUserRegistrationParams() { Map params = (Map) getFacesContext() .getExternalContext().getRequestMap().get( PALAdminConstants.USER_REGISTRATION_PARAMS); - if (params == null) - { + if (params == null) { throw new IllegalStateException( "The user registration params is null. "); } return params; } - public static boolean getBoolean(String key) - { + public static boolean getBoolean(String key) { Object value = getUserRegistrationParams().get(key); - if (value == null) - { + if (value == null) { return false; } return ((Boolean) value).booleanValue(); } - public static String getString(String key) - { + public static String getString(String key) { return (String) getUserRegistrationParams().get(key); } - public static List getStringList(String key) - { + public static List getStringList(String key) { Object value = getUserRegistrationParams().get(key); - if (value == null) - { + if (value == null) { return new ArrayList(); } return (List) value; } - public static Map getStringMap(String key) - { + public static Map getStringMap(String key) { Object value = getUserRegistrationParams().get(key); - if (value == null) - { + if (value == null) { return new HashMap(); } return (Map) value; } - public static JetspeedTemplateLocator getTemplateLocator() - { + public static JetspeedTemplateLocator getTemplateLocator() { return (JetspeedTemplateLocator) getUserRegistrationParams().get( PALAdminConstants.TEMPLATE_LOCATOR); } - public static String makeGUID(String user, String newpw) - { + public static String makeGUID(String user, String newpw) { // This is a quicky version long num = (long) user.hashCode() + (long) newpw.hashCode(); // Possible collisions here... long d = new Date().getTime(); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -97,7 +97,7 @@ return null; } - public Class doFinish() { + public Class doFinish() { if (getGroupId() == null || getArtifactId() == null || getVersion() == null || getPackaging() == null) { FacesMessageUtil.addWarnMessage("invalid.portlet.parameter"); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -74,12 +74,13 @@ return null; } - public Class prerender() { + public Class prerender() { +//TODO faces message return null; } @TakeOver(type = TakeOverType.NEVER) - public Class doFinish() { + public Class doFinish() { if (getName() == null) { FacesMessageUtil.addWarnMessage("invalid.repository.parameters"); return RemoteRepositoryListPage.class; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -77,7 +77,7 @@ return null; } - public Class prerender() { + public Class prerender() { if (isUpdate()) { if (getName() == null) { FacesMessageUtil Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -46,7 +46,7 @@ return null; } - public Class doFinish() { + public Class doFinish() { switch (getCrudType()) { case CrudType.CREATE: try { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.password; import java.io.Serializable; @@ -2,3 +17,2 @@ -import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PasswordManagementService; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import jp.sf.pal.admin.web.AbstractCrudPage; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; @@ -47,8 +62,7 @@ getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { logger.error("EPA0024", e); - FacesMessageUtil - .addErrorMessage("could.not.find.page.permissions"); + FacesMessageUtil.addErrorMessage("could.not.find.page.permissions"); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.permission; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -83,7 +83,7 @@ return null; } - public Class doFinish() { + public Class doFinish() { if (isStartAction()) { try { portletManagementService.startPortletApplication(this); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -45,7 +45,7 @@ return null; } - public Class doFinish() { + public Class doFinish() { switch (getCrudType()) { case CrudType.CREATE: try { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -21,11 +21,8 @@ import jp.sf.pal.admin.service.RoleManagementService; import jp.sf.pal.admin.web.AbstractPagerPage; -import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; -import org.seasar.teeda.extension.annotation.takeover.TakeOver; - public class RoleListPage extends AbstractPagerPage implements Serializable { /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.withdraw; import java.io.Serializable; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java 2007-10-26 01:03:32 UTC (rev 663) @@ -1,3 +1,18 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package jp.sf.pal.admin.web.withdraw; import java.io.Serializable; Modified: pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-10-26 01:03:32 UTC (rev 663) @@ -1,19 +1,18 @@ admin Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,18 @@ Modified: pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml 2007-10-26 01:03:32 UTC (rev 663) @@ -1,20 +1,18 @@ Modified: pal-admin/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-25 23:25:38 UTC (rev 662) +++ pal-admin/trunk/src/main/webapp/WEB-INF/web.xml 2007-10-26 01:03:32 UTC (rev 663) @@ -1,18 +1,18 @@ From svnnotify @ sourceforge.jp Fri Oct 26 13:23:18 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 13:23:18 +0900 Subject: [pal-cvs 2920] [664] added password validators. Message-ID: <1193372598.766024.13088.nullmailer@users.sourceforge.jp> Revision: 664 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=664 Author: shinsuke Date: 2007-10-26 13:23:18 +0900 (Fri, 26 Oct 2007) Log Message: ----------- added password validators. Added Paths: ----------- pal-portal/trunk/portal/files/components/security/ pal-portal/trunk/portal/files/components/security/src/ pal-portal/trunk/portal/files/components/security/src/java/ pal-portal/trunk/portal/files/components/security/src/java/org/ pal-portal/trunk/portal/files/components/security/src/java/org/apache/ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/CredentialPasswordValidatorsProxy.java pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/LengthCredentialPasswordValidator.java pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/RegexCredentialPasswordValidator.java pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/ReservedWordsCredentialPasswordValidator.java -------------- next part -------------- Added: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/CredentialPasswordValidatorsProxy.java =================================================================== --- pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/CredentialPasswordValidatorsProxy.java 2007-10-26 01:03:32 UTC (rev 663) +++ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/CredentialPasswordValidatorsProxy.java 2007-10-26 04:23:18 UTC (rev 664) @@ -0,0 +1,26 @@ +package org.apache.jetspeed.security.spi.impl; + +import java.util.List; + +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.spi.CredentialPasswordValidator; + +public class CredentialPasswordValidatorsProxy implements CredentialPasswordValidator +{ + private CredentialPasswordValidator[] credentialPasswordValidators; + + public CredentialPasswordValidatorsProxy(List validators) + { + this.credentialPasswordValidators = (CredentialPasswordValidator[]) validators + .toArray(new CredentialPasswordValidator[validators.size()]); + } + + public void validate(String clearTextPassword) throws SecurityException + { + for (int i = 0; i < credentialPasswordValidators.length; i++) + { + credentialPasswordValidators[i].validate(clearTextPassword); + } + } + +} Property changes on: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/CredentialPasswordValidatorsProxy.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/LengthCredentialPasswordValidator.java =================================================================== --- pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/LengthCredentialPasswordValidator.java 2007-10-26 01:03:32 UTC (rev 663) +++ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/LengthCredentialPasswordValidator.java 2007-10-26 04:23:18 UTC (rev 664) @@ -0,0 +1,82 @@ +package org.apache.jetspeed.security.spi.impl; + +import org.apache.jetspeed.security.InvalidPasswordException; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.spi.CredentialPasswordValidator; + +public class LengthCredentialPasswordValidator implements CredentialPasswordValidator +{ + private int minPasswordLength; + + private int maxPasswordLength; + + private int minLetterLength; + + private int minDigitLength; + + public LengthCredentialPasswordValidator(int minPasswordLength, int maxPasswordLength) + { + this(minPasswordLength, maxPasswordLength, 0, 0); + } + + public LengthCredentialPasswordValidator(int minPasswordLength, int maxPasswordLength, int minLetterLength, int minDigitLength) + { + this.minPasswordLength = minPasswordLength; + this.maxPasswordLength = maxPasswordLength; + this.minLetterLength = minLetterLength; + this.minDigitLength = minDigitLength; + } + + public void validate(String clearTextPassword) throws SecurityException + { + if (clearTextPassword == null) + { + clearTextPassword = ""; + } + + char[] pwd = clearTextPassword.toCharArray(); + + if (minPasswordLength > 0 && pwd.length < minPasswordLength) + { + throw new InvalidPasswordException(); + } + + if (maxPasswordLength > 0 && maxPasswordLength < pwd.length) + { + throw new InvalidPasswordException(); + } + + if (minLetterLength > 0) + { + int count = 0; + for (int i = 0; i < pwd.length; i++) + { + if (Character.isLetter(pwd[i])) + { + count++; + } + } + if (count < minLetterLength) + { + throw new InvalidPasswordException(); + } + } + + if (minDigitLength > 0) + { + int count = 0; + for (int i = 0; i < pwd.length; i++) + { + if (Character.isDigit(pwd[i])) + { + count++; + } + } + if (count < minDigitLength) + { + throw new InvalidPasswordException(); + } + } + } + +} Property changes on: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/LengthCredentialPasswordValidator.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/RegexCredentialPasswordValidator.java =================================================================== --- pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/RegexCredentialPasswordValidator.java 2007-10-26 01:03:32 UTC (rev 663) +++ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/RegexCredentialPasswordValidator.java 2007-10-26 04:23:18 UTC (rev 664) @@ -0,0 +1,29 @@ +package org.apache.jetspeed.security.spi.impl; + +import org.apache.jetspeed.security.InvalidPasswordException; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.spi.CredentialPasswordValidator; + +public class RegexCredentialPasswordValidator implements CredentialPasswordValidator +{ + private String regex; + + public RegexCredentialPasswordValidator(String regex) + { + this.regex = regex; + } + + public void validate(String clearTextPassword) throws SecurityException + { + if (clearTextPassword == null) + { + clearTextPassword = ""; + } + + if (!clearTextPassword.matches(regex)) + { + throw new InvalidPasswordException(); + } + } + +} Property changes on: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/RegexCredentialPasswordValidator.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/ReservedWordsCredentialPasswordValidator.java =================================================================== --- pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/ReservedWordsCredentialPasswordValidator.java 2007-10-26 01:03:32 UTC (rev 663) +++ pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/ReservedWordsCredentialPasswordValidator.java 2007-10-26 04:23:18 UTC (rev 664) @@ -0,0 +1,55 @@ +package org.apache.jetspeed.security.spi.impl; + +import java.util.List; + +import org.apache.jetspeed.security.InvalidPasswordException; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.spi.CredentialPasswordValidator; + +public class ReservedWordsCredentialPasswordValidator implements CredentialPasswordValidator +{ + private String[] reservedWords; + + private boolean ignoreCase; + + public ReservedWordsCredentialPasswordValidator(List words) + { + this(words, false); + } + + public ReservedWordsCredentialPasswordValidator(List words, boolean ignoreCase) + { + this.reservedWords = (String[]) words.toArray(new String[words.size()]); + this.ignoreCase = ignoreCase; + } + + public void validate(String clearTextPassword) throws SecurityException + { + if (clearTextPassword == null) + { + clearTextPassword = ""; + } + + if (ignoreCase) + { + for (int i = 0; i < reservedWords.length; i++) + { + if (clearTextPassword.equalsIgnoreCase(reservedWords[i])) + { + throw new InvalidPasswordException(); + } + } + } + else + { + for (int i = 0; i < reservedWords.length; i++) + { + if (clearTextPassword.equals(reservedWords[i])) + { + throw new InvalidPasswordException(); + } + } + } + } + +} Property changes on: pal-portal/trunk/portal/files/components/security/src/java/org/apache/jetspeed/security/spi/impl/ReservedWordsCredentialPasswordValidator.java ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Fri Oct 26 14:30:43 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 26 Oct 2007 14:30:43 +0900 Subject: [pal-cvs 2921] [665] added password validator. Message-ID: <1193376643.392890.23924.nullmailer@users.sourceforge.jp> Revision: 665 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=665 Author: shinsuke Date: 2007-10-26 14:30:42 +0900 (Fri, 26 Oct 2007) Log Message: ----------- added password validator. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/app.dicon Added Paths: ----------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/PasswordValidator.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/DifferencePasswordValidator.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/PasswordValidatorsProxy.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/UsernamePasswordValidator.java pal-admin/trunk/src/main/resources/passwordValidator.dicon -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-10-26 05:30:42 UTC (rev 665) @@ -188,4 +188,6 @@ public static final String USER_ADMINISTRATION = "PAL User Administration"; + public static final String PASSWORD_VALIDATOR = "passwordValidator"; + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PasswordManagementService.java 2007-10-26 05:30:42 UTC (rev 665) @@ -23,6 +23,7 @@ import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.util.PortalComponentUtil; +import jp.sf.pal.admin.validator.password.PasswordValidator; import jp.sf.pal.common.CommonException; import org.apache.jetspeed.PortalReservedParameters; @@ -33,6 +34,10 @@ import org.apache.jetspeed.security.PasswordAlreadyUsedException; import org.apache.jetspeed.security.SecurityException; import org.apache.jetspeed.security.UserManager; +import org.seasar.framework.container.ComponentNotFoundRuntimeException; +import org.seasar.framework.container.CyclicReferenceRuntimeException; +import org.seasar.framework.container.S2Container; +import org.seasar.framework.container.TooManyRegistrationRuntimeException; public class PasswordManagementService implements Serializable { @@ -41,15 +46,39 @@ */ private static final long serialVersionUID = 7648155261356882471L; - public void updatePassword(String currentPassword, String newPassword) - throws CommonException { + private S2Container container; + + public String getUsername() throws CommonException { Principal principal = FacesContext.getCurrentInstance() .getExternalContext().getUserPrincipal(); if (principal == null) { throw new CommonException("could.not.change.password", "User principal is null."); } + return principal.getName(); + } + public boolean validate(String username, String currentPassword, + String newPassword) { + if (getContainer() != null) { + try { + PasswordValidator passwordValidator = (PasswordValidator) getContainer() + .getComponent(PALAdminConstants.PASSWORD_VALIDATOR); + if (passwordValidator != null) { + return passwordValidator.validate(username, + currentPassword, newPassword); + } + } catch (ComponentNotFoundRuntimeException e) { + } catch (TooManyRegistrationRuntimeException e) { + } catch (CyclicReferenceRuntimeException e) { + } + } + return true; + } + + public void updatePassword(String username, String currentPassword, + String newPassword) throws CommonException { + UserManager userManager = PortalComponentUtil.getUserManager(); if (userManager == null) { throw new CommonException("could.not.change.password", @@ -62,7 +91,6 @@ } try { - String username = principal.getName(); RequestContext requestContext = (RequestContext) FacesContext .getCurrentInstance().getExternalContext().getRequestMap() .get(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); @@ -92,4 +120,18 @@ } } + + /** + * @return the container + */ + public S2Container getContainer() { + return container; + } + + /** + * @param container the container to set + */ + public void setContainer(S2Container container) { + this.container = container; + } } Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/PasswordValidator.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/PasswordValidator.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/PasswordValidator.java 2007-10-26 05:30:42 UTC (rev 665) @@ -0,0 +1,23 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.validator.password; + +import java.io.Serializable; + +public interface PasswordValidator extends Serializable { + public abstract boolean validate(String username, String oldpassword, + String newpassword); +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/PasswordValidator.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/DifferencePasswordValidator.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/DifferencePasswordValidator.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/DifferencePasswordValidator.java 2007-10-26 05:30:42 UTC (rev 665) @@ -0,0 +1,59 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.validator.password.impl; + +import jp.sf.pal.admin.validator.password.PasswordValidator; + +public class DifferencePasswordValidator implements PasswordValidator { + + /** + * + */ + private static final long serialVersionUID = -2933074231760851557L; + + private int differenceLength; + + public boolean validate(String username, String oldpassword, + String newpassword) { + if (oldpassword == null || newpassword == null) { + return false; + } + + for (int i = 0; i < oldpassword.length() - differenceLength + 1; i++) { + String partOfPassword = oldpassword.substring(i, i + + differenceLength); + if (newpassword.indexOf(partOfPassword) >= 0) { + return false; + } + } + return true; + } + + /** + * @return the differenceLength + */ + public int getDifferenceLength() { + return differenceLength; + } + + /** + * @param differenceLength the differenceLength to set + */ + public void setDifferenceLength(int differenceLength) { + this.differenceLength = differenceLength; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/DifferencePasswordValidator.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/PasswordValidatorsProxy.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/PasswordValidatorsProxy.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/PasswordValidatorsProxy.java 2007-10-26 05:30:42 UTC (rev 665) @@ -0,0 +1,56 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.validator.password.impl; + +import java.util.List; + +import jp.sf.pal.admin.validator.password.PasswordValidator; + +public class PasswordValidatorsProxy implements PasswordValidator { + + /** + * + */ + private static final long serialVersionUID = 8229215641608254153L; + + private List passwordValidatorList; + + public boolean validate(String username, String oldpassword, + String newpassword) { + for (PasswordValidator passwordValidator : passwordValidatorList) { + if (!passwordValidator.validate(username, oldpassword, newpassword)) { + return false; + } + } + return true; + } + + /** + * @return the passwordValidatorList + */ + public List getPasswordValidatorList() { + return passwordValidatorList; + } + + /** + * @param passwordValidatorList the passwordValidatorList to set + */ + public void setPasswordValidatorList( + List passwordValidatorList) { + this.passwordValidatorList = passwordValidatorList; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/PasswordValidatorsProxy.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/UsernamePasswordValidator.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/UsernamePasswordValidator.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/UsernamePasswordValidator.java 2007-10-26 05:30:42 UTC (rev 665) @@ -0,0 +1,39 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package jp.sf.pal.admin.validator.password.impl; + +import jp.sf.pal.admin.validator.password.PasswordValidator; + +public class UsernamePasswordValidator implements PasswordValidator { + + /** + * + */ + private static final long serialVersionUID = 2022271617054629377L; + + public boolean validate(String username, String oldpassword, + String newpassword) { + if (username == null || newpassword == null) { + return false; + } + + if (newpassword.indexOf(username) < 0) { + return true; + } + return false; + } + +} Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/validator/password/impl/UsernamePasswordValidator.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-10-26 05:30:42 UTC (rev 665) @@ -64,9 +64,27 @@ } public Class doFinish() { + String username = null; try { - getPasswordManagementService().updatePassword(currentPassword, - newPassword); + username = getPasswordManagementService().getUsername(); + } catch (CommonException e) { + logger.error("EPA0047", e); + FacesMessageUtil.addErrorMessage(e.getMessageId()); + } + + if (username == null) { + return null; + } + + if (!getPasswordManagementService().validate(username, currentPassword, + newPassword)) { + FacesMessageUtil.addErrorMessage("invalid.new.password"); + return null; + } + + try { + getPasswordManagementService().updatePassword(username, + currentPassword, newPassword); FacesMessageUtil.addInfoMessage("changed.password"); } catch (CommonException e) { logger.error("EPA0046", e); Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2007-10-26 05:30:42 UTC (rev 665) @@ -45,3 +45,4 @@ EPA0044=Could not update a permission for page. EPA0045=Could not delete a permission for folder. EPA0046=Could not change the password. +EPA0047=Could not get a username. Modified: pal-admin/trunk/src/main/resources/app.dicon =================================================================== --- pal-admin/trunk/src/main/resources/app.dicon 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/resources/app.dicon 2007-10-26 05:30:42 UTC (rev 665) @@ -7,4 +7,5 @@ + Added: pal-admin/trunk/src/main/resources/passwordValidator.dicon =================================================================== --- pal-admin/trunk/src/main/resources/passwordValidator.dicon 2007-10-26 04:23:18 UTC (rev 664) +++ pal-admin/trunk/src/main/resources/passwordValidator.dicon 2007-10-26 05:30:42 UTC (rev 665) @@ -0,0 +1,12 @@ + + + + + {usernamePasswordValidator, differencePasswordValidator} + + + + + 2 + + From svnnotify @ sourceforge.jp Mon Oct 29 22:31:08 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 29 Oct 2007 22:31:08 +0900 Subject: [pal-cvs 2922] [666] added name-hidden. Message-ID: <1193664668.952316.3701.nullmailer@users.sourceforge.jp> Revision: 666 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=666 Author: shinsuke Date: 2007-10-29 22:31:08 +0900 (Mon, 29 Oct 2007) Log Message: ----------- added name-hidden. Modified Paths: -------------- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-26 05:30:42 UTC (rev 665) +++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-10-29 13:31:08 UTC (rev 666) @@ -86,9 +86,7 @@
    -
    - -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-26 05:30:42 UTC (rev 665) +++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-10-29 13:31:08 UTC (rev 666) @@ -89,9 +89,7 @@
    -
    - -
    +
    Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-26 05:30:42 UTC (rev 665) +++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-10-29 13:31:08 UTC (rev 666) @@ -86,9 +86,7 @@
    -
    - -
    +
    From svnnotify @ sourceforge.jp Mon Oct 29 22:41:23 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 29 Oct 2007 22:41:23 +0900 Subject: [pal-cvs 2923] [667] updated translation. Message-ID: <1193665283.381980.10369.nullmailer@users.sourceforge.jp> Revision: 667 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=667 Author: shinsuke Date: 2007-10-29 22:41:23 +0900 (Mon, 29 Oct 2007) Log Message: ----------- updated translation. Modified Paths: -------------- pal-admin/trunk/src/main/resources/appMessages_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-10-29 13:31:08 UTC (rev 666) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-10-29 13:41:23 UTC (rev 667) @@ -8,10 +8,10 @@ deleted.user=\u30e6\u30fc\u30b6\u30fc({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 failed.to.delete.user=\u30e6\u30fc\u30b6\u30fc({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -added.new.role=\u65b0\u3057\u3044\u5f79\u5272({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 -failed.to.add.new.role=\u65b0\u3057\u3044\u5f79\u5272({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -deleted.role=\u5f79\u5272({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 -failed.to.delete.role=\u5f79\u5272({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +added.new.role=\u65b0\u3057\u3044\u30ed\u30fc\u30eb({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.new.role=\u65b0\u3057\u3044\u30ed\u30fc\u30eb({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +deleted.role=\u30ed\u30fc\u30eb({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.role=\u30ed\u30fc\u30eb({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 added.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 failed.to.add.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 @@ -34,19 +34,19 @@ invalid.group.or.user.name=\u7121\u52b9\u306a\u30b0\u30eb\u30fc\u30d7\u540d\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 group.exists.in.user=\u30b0\u30eb\u30fc\u30d7({1})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 -added.role.to.user= \u5f79\u5272({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3059\u3002 -failed.to.add.role.to.user=\u5f79\u5272({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -removed.roles.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 -failed.to.remove.roles.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -invalid.role.or.user.name=\u7121\u52b9\u306a\u5f79\u5272\u540d\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 -role.exists.in.user=\u5f79\u5272({1})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 +added.role.to.user= \u30ed\u30fc\u30eb({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.role.to.user=\u30ed\u30fc\u30eb({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +removed.roles.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u30ed\u30fc\u30eb({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.remove.roles.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u30ed\u30fc\u30eb({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +invalid.role.or.user.name=\u7121\u52b9\u306a\u30ed\u30fc\u30eb\u540d\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 +role.exists.in.user=\u30ed\u30fc\u30eb({1})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 -added.principalRule.to.user= \u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1}/{2})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 -failed.to.add.principalRule.to.user=\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1}/{2})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -removed.principalRules.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 -failed.to.remove.principalRules.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -principalRule.exists.in.user=\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb({1}/{2})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 -invalid.profilingRule.or.user.name=\u7121\u52b9\u306a\u5f79\u5272\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 +added.principalRule.to.user= \u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb({1}/{2})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +failed.to.add.principalRule.to.user=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb({1}/{2})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +removed.principalRules.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb({1})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.remove.principalRules.from.user=\u30e6\u30fc\u30b6\u30fc({0})\u304b\u3089\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb({1})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +principalRule.exists.in.user=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb({1}/{2})\u306f\u30e6\u30fc\u30b6\u30fc({0})\u306b\u5b58\u5728\u3057\u307e\u3059\u3002 +invalid.profilingRule.or.user.name=\u7121\u52b9\u306a\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u540d\u3067\u3059\u3002 invalid.action.for.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u5bfe\u3057\u3066\u7121\u52b9\u306a\u30a2\u30af\u30b7\u30e7\u30f3\u3067\u3059\u3002 started.portlet.application=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u8d77\u52d5\u3057\u307e\u3057\u305f\u3002 @@ -154,7 +154,7 @@ could.not.access.page.security=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -need.to.specify.users.roles.groups=\u30e6\u30fc\u30b6\u30fc\u306e\u5f79\u5272\u307e\u305f\u306f\u30b0\u30eb\u30fc\u30d7\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +need.to.specify.users.roles.groups=\u30e6\u30fc\u30b6\u30fc\u306e\u30ed\u30fc\u30eb\u307e\u305f\u306f\u30b0\u30eb\u30fc\u30d7\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 need.to.specify.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 need.to.specify.security.constraint.ref=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u898f\u5b9a\u53c2\u7167\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-10-29 13:31:08 UTC (rev 666) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-10-29 13:41:23 UTC (rev 667) @@ -1,4 +1,4 @@ -userTab=\u30e6\u30fc\u30b6 +userTab=\u30e6\u30fc\u30b6\u30fc roleTab=\u30ed\u30fc\u30eb groupTab=\u30b0\u30eb\u30fc\u30d7 From svnnotify @ sourceforge.jp Tue Oct 30 09:36:49 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 09:36:49 +0900 Subject: [pal-cvs 2924] [668] updated repo info. Message-ID: <1193704609.834648.32467.nullmailer@users.sourceforge.jp> Revision: 668 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=668 Author: shinsuke Date: 2007-10-30 09:36:49 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated repo info. Modified Paths: -------------- vfs-portlets/trunk/pom.xml -------------- next part -------------- Modified: vfs-portlets/trunk/pom.xml =================================================================== --- vfs-portlets/trunk/pom.xml 2007-10-29 13:41:23 UTC (rev 667) +++ vfs-portlets/trunk/pom.xml 2007-10-30 00:36:49 UTC (rev 668) @@ -117,11 +117,17 @@ - maven.marevol.com + maven2.marevol.com Maven2 Repository on marevol.com - http://www.marevol.com/maven2 + http://maven2.marevol.com/ + maven.marevol.com + Maven1 Repository on marevol.com + http://maven.marevol.com/ + legacy + + maven.seasar.org The Seasar Foundation Maven2 Repository http://maven.seasar.org/maven2 @@ -267,7 +273,7 @@ org.seasar.teeda teeda-core - 1.0.7-SNAPSHOT + 1.0.12-SNAPSHOT rhino @@ -278,7 +284,7 @@ org.seasar.portlet s2-portlet - 1.0.6 + 1.0.7 From svnnotify @ sourceforge.jp Tue Oct 30 09:37:48 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 09:37:48 +0900 Subject: [pal-cvs 2925] [669] updated repo info. Message-ID: <1193704668.802657.32732.nullmailer@users.sourceforge.jp> Revision: 669 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=669 Author: shinsuke Date: 2007-10-30 09:37:48 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated repo info. Modified Paths: -------------- webproxy/trunk/pom.xml -------------- next part -------------- Modified: webproxy/trunk/pom.xml =================================================================== --- webproxy/trunk/pom.xml 2007-10-30 00:36:49 UTC (rev 668) +++ webproxy/trunk/pom.xml 2007-10-30 00:37:48 UTC (rev 669) @@ -60,7 +60,7 @@ maven.marevol.com Maven2 Repository on marevol.com - http://www.marevol.com/maven2 + http://maven2.marevol.com/ maven.seasar.org @@ -119,12 +119,12 @@ org.seasar.teeda teeda-extension - 1.0.10-SNAPSHOT + 1.0.12-SNAPSHOT org.seasar.teeda teeda-tiger - 1.0.9 + 1.0.11 org.seasar.portlet From svnnotify @ sourceforge.jp Tue Oct 30 09:39:06 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 09:39:06 +0900 Subject: [pal-cvs 2926] [670] updated dependencies and repo info. Message-ID: <1193704746.035650.2912.nullmailer@users.sourceforge.jp> Revision: 670 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=670 Author: shinsuke Date: 2007-10-30 09:39:05 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated dependencies and repo info. Modified Paths: -------------- wiki/trunk/pom.xml -------------- next part -------------- Modified: wiki/trunk/pom.xml =================================================================== --- wiki/trunk/pom.xml 2007-10-30 00:37:48 UTC (rev 669) +++ wiki/trunk/pom.xml 2007-10-30 00:39:05 UTC (rev 670) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal wiki - 0.2 + 0.3-SNAPSHOT war Wiki Portlet Using Teeda @@ -119,7 +119,7 @@ maven.marevol.com Maven2 Repository on marevol.com - http://www.marevol.com/maven2 + http://maven2.marevol.com/ maven.seasar.org @@ -177,14 +177,12 @@ org.seasar.teeda teeda-core - 1.0.7-20070510 - jar + 1.0.8 org.seasar.teeda teeda-extension - 1.0.7-20070510 - jar + 1.0.8 org.seasar.portlet @@ -194,7 +192,25 @@ org.apache.portals.bridges portals-bridges-portletfilter - 1.0.2-dev + 1.0.3 + + + logkit + logkit + + + avalon-framework + avalon-framework + + + javax.servlet + servlet-api + + + log4j + log4j + + jp.sf.pal @@ -205,13 +221,11 @@ jp.sf.pal portlet-output-optimizer 0.2 - jar log4j log4j - 1.2.13 - jar + 1.2.9 From svnnotify @ sourceforge.jp Tue Oct 30 09:45:52 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 09:45:52 +0900 Subject: [pal-cvs 2927] [671] updated file path. Message-ID: <1193705152.001291.8592.nullmailer@users.sourceforge.jp> Revision: 671 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=671 Author: shinsuke Date: 2007-10-30 09:45:51 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated file path. Modified Paths: -------------- pal-portal/trunk/override.properties.sample -------------- next part -------------- Modified: pal-portal/trunk/override.properties.sample =================================================================== --- pal-portal/trunk/override.properties.sample 2007-10-30 00:39:05 UTC (rev 670) +++ pal-portal/trunk/override.properties.sample 2007-10-30 00:45:51 UTC (rev 671) @@ -6,14 +6,14 @@ # Jetspeed2 # org.apache.jetspeed.catalina.version.major=5.5 -org.apache.jetspeed.server.home = /home/testuser/apache-tomcat-5.5.17 +org.apache.jetspeed.server.home = /tmp/sample/apache-tomcat-5.5.25 org.apache.jetspeed.server.shared = ${org.apache.jetspeed.server.home}/shared/lib org.apache.jetspeed.deploy.war.dir = ${org.apache.jetspeed.server.home}/webapps/ org.apache.jetspeed.services.autodeployment.user=j2deployer org.apache.jetspeed.services.autodeployment.password=qwerasdf # Default production server settings. -org.apache.jetspeed.derbydatabase.path = /tmp +org.apache.jetspeed.derbydatabase.path = /tmp/sample org.apache.jetspeed.production.database.url = jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true org.apache.jetspeed.production.database.driver = org.apache.derby.jdbc.EmbeddedDriver org.apache.jetspeed.production.database.user = From svnnotify @ sourceforge.jp Tue Oct 30 10:23:12 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 10:23:12 +0900 Subject: [pal-cvs 2928] [672] updated file path. Message-ID: <1193707392.164666.6415.nullmailer@users.sourceforge.jp> Revision: 672 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=672 Author: shinsuke Date: 2007-10-30 10:23:11 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated file path. Modified Paths: -------------- pompei/portal/trunk/override.properties.sample -------------- next part -------------- Modified: pompei/portal/trunk/override.properties.sample =================================================================== --- pompei/portal/trunk/override.properties.sample 2007-10-30 00:45:51 UTC (rev 671) +++ pompei/portal/trunk/override.properties.sample 2007-10-30 01:23:11 UTC (rev 672) @@ -14,7 +14,7 @@ org.apache.jetspeed.services.autodeployment.password=j2deployer # Default production server settings. -org.apache.jetspeed.derbydatabase.path = /tmp +org.apache.jetspeed.derbydatabase.path = /tmp/pompei org.apache.jetspeed.production.database.url = jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true org.apache.jetspeed.production.database.driver = org.apache.derby.jdbc.EmbeddedDriver org.apache.jetspeed.production.database.user = From svnnotify @ sourceforge.jp Tue Oct 30 12:00:39 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 12:00:39 +0900 Subject: [pal-cvs 2929] [673] added pompei portlet decorator. Message-ID: <1193713239.376601.28358.nullmailer@users.sourceforge.jp> Revision: 673 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=673 Author: shinsuke Date: 2007-10-30 12:00:38 +0900 (Tue, 30 Oct 2007) Log Message: ----------- added pompei portlet decorator. Added Paths: ----------- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/css/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/css/styles.css pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/decorator.properties pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/button_background.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/button_background.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/close.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/customize.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/edit.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/footer_background.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/footer_background.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/header_background.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/header_background.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/help.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowdoc_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowfolderclosed1_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowfolderopen2_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_error_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_info_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_success_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_warning_sml.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/info.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/info1.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/leftnavbg.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/maximized.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/minimized.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/print.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/restore.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/subheader_background.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/subheader_background.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/title_background.gif pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/title_background.xcf pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/view.gif -------------- next part -------------- Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/css/styles.css =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/css/styles.css 2007-10-30 01:23:11 UTC (rev 672) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/css/styles.css 2007-10-30 03:00:38 UTC (rev 673) @@ -0,0 +1,620 @@ +/* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + + + +.pompei .PTitle +{ + background-image:url(../images/title_background.gif); + color:#0080b0; + + margin:0px; + padding:2px 4px; + height:20px; + border: 1px solid #ccbb88; + background-color: #fff1a1; +} + +.pompei .PTitleContent +{ + font-weight:bold; + display: inline; + float: left; + white-space: normal; + color:#444444; +} + +.pompei .PActionBar +{ + float: right; + display: inline; +} + +.pompei .PContentBorder +{ + margin:0px; + padding:10px 5px; + border-left: 1px solid #ccbb88; + border-right: 1px solid #ccbb88; + border-bottom: 1px solid #ccbb88; +} + +.pompei .PContent +{ + clear:both; + margin:0px; + padding:0px; + white-space: normal; + background-color: #ffffff; + position:static; + overflow:auto; +} + +.pompei .PContent form { + margin:0px; + padding:0px; +} + +/* font */ +.pompei .PTitleLeft, +.pompei .PTitle, +.pompei .PTitleContent, +.pompei .PTitleRight +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: inherit; + font-size: 10pt; +} + +.pompei .PContentLeft, +.pompei .PContent, +.pompei .PContentRight, +.pompei .PBottomLeft, +.pompei .PBottom, +.pompei .PBottomRight +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: inherit; + font-size: 9pt; +} + + + +/* --------------------------------- */ +/* PLT.C.1 Links (Anchor) */ +/* --------------------------------- */ + +.pompei A:link, +.pompei A:visited { + text-decoration: underline; +} + +.pompei A:hover, +.pompei A:active { + text-decoration: underline; +} + +/* font */ +.pompei A:link, +.pompei A:visited, +.pompei A:hover, +.pompei A:active +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + + +/* --------------------------------- */ +/* PLT.C.2 Fonts */ +/* --------------------------------- */ + +.pompei .portlet-font { + color: black; +} +.pompei .portlet-font-dim { + color: gray; +} + +/* font */ +.pompei .portlet-font, +.pompei .portlet-font-dim +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + + + +/* --------------------------------- */ +/* PLT.C.3 Messages */ +/* --------------------------------- */ +.pompei .portlet-msg-status, +.pompei .portlet-msg-info { + background: url(../images/icon_info_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.pompei .portlet-msg-error { + background: url(../images/icon_error_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.pompei .portlet-msg-alert { + background: url(../images/icon_warning_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.pompei .portlet-msg-success { + background: url(../images/icon_success_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +/* font */ +.pompei .portlet-msg-status, +.pompei .portlet-msg-info, +.pompei .portlet-msg-error, +.pompei .portlet-msg-alert, +.pompei .portlet-msg-success +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + + +/* --------------------------------- */ +/* PLT.C.4 Sections */ +/* --------------------------------- */ +.pompei .portlet-section-header { + font-weight:bold; + background-image:url(../images/header_background.gif); + background-repeat: repeat-x; + color: #333; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.pompei .portlet-section-body { + background: #ffffee; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; +} + +.pompei .portlet-section-alternate { + background: #ffffdd; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; +} + +.pompei .portlet-section-selected { + /* TODO : ex. change color */ + background: #ffffcc; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; + font-weight:bold; +} + +.pompei .portlet-section-subheader { + background-image:url(../images/subheader_background.gif); + background-repeat: repeat-x; + background-color:#fff8e2; + color: #665511; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.pompei .portlet-section-footer { + background-image:url(../images/footer_background.gif); + background-repeat: repeat-x; + background-position: top left; + color: #665511; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.pompei .portlet-section-text { + padding: 1em; + padding-bottom: .3em; + padding-left: 1em; +} + +/* font */ +.pompei .portlet-section-header, +.pompei .portlet-section-body, +.pompei .portlet-section-alternate, +.pompei .portlet-section-selected, +.pompei .portlet-section-subheader, +.pompei .portlet-section-footer, +.pompei .portlet-section-text +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + + +/* --------------------------------- */ +/* PLT.C.5 Forms */ +/* --------------------------------- */ +.pompei .portlet-form-label { +} + +.pompei .portlet-form-input-field { +} + +.pompei .portlet-form-button { +} + +.pompei .portlet-icon-label { +} + +.pompei .portlet-dlg-icon-label { +} + +.pompei .portlet-form-field-label { +} + +.pompei .portlet-form-field { +} + +/* font */ +.pompei .portlet-form-label, +.pompei .portlet-form-input-field, +.pompei .portlet-form-button, +.pompei .portlet-icon-label, +.pompei .portlet-dlg-icon-label, +.pompei .portlet-form-field-label, +.pompei .portlet-form-field +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + + +/* --------------------------------- */ +/* PLT.C.6 Menus */ +/* --------------------------------- */ +.pompei .portlet-menu { + background: #efefef; + margin-bottom: 6px; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 4px 4px 4px 0; + padding-bottom: .3em; + padding-left: 1em; +} + +.pompei .portlet-menu-item { + text-decoration: none; + color: blue; +} + +.pompei .portlet-menu-item-selected { + text-decoration: none; + color: #555 !important; +} + +.pompei .portlet-menu-item-hover { + text-decoration: none; + color: #f30 !important; +} + +.pompei .portlet-menu-item-hover-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; +} + +.pompei .portlet-menu-cascade-item { + text-decoration: none; + margin-top: .3em; + padding-bottom: 0; + color: blue; +} + +.pompei .portlet-menu-cascade-item-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; +} + +.pompei .portlet-menu-description { +} + +.pompei .portlet-menu-caption { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; + padding: 4px; +} + +/* font */ +.pompei .portlet-menu, +.pompei .portlet-menu-item, +.pompei .portlet-menu-item-selected, +.pompei .portlet-menu-item-hover, +.pompei .portlet-menu-item-hover-selected, +.pompei .portlet-menu-cascade-item, +.pompei .portlet-menu-cascade-item-selected, +.pompei .portlet-menu-description, +.pompei .portlet-menu-caption +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + + +/* --------------------------------- */ +/* PLT.C.6 Menus (arrowfolder style) */ +/* --------------------------------- */ +.pompei .arrowfolder .portlet-menu { + background: #efefef; + margin-bottom: 6px; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 4px 4px 4px 0; + padding-bottom: .3em; + padding-left: 1em; +} + +.pompei .arrowfolder .portlet-menu-item { + text-decoration: none; + color: blue; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; + +} + +.pompei .arrowfolder .portlet-menu-item-selected { + text-decoration: none; + color: #555 !important; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.pompei .arrowfolder .portlet-menu-item-hover { + text-decoration: none; + color: #f30 !important; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.pompei .arrowfolder .portlet-menu-item-hover-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.pompei .arrowfolder .portlet-menu-cascade-item { + text-decoration: none; + margin-top: .3em; + padding-bottom: 0; + color: blue; + padding-left: 34px; + background-image: url(../images/icon_arrowfolderclosed1_sml.gif); + background-repeat: no-repeat; +} + +.pompei .arrowfolder .portlet-menu-cascade-item-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; + padding-left: 34px; + background-image: url(../images/icon_arrowfolderopen2_sml.gif); + background-repeat: no-repeat; +} + +.pompei .arrowfolder .portlet-menu-description { +} + +.pompei .arrowfolder .portlet-menu-caption { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; + padding: 4px; +} + +/* font */ +.pompei .arrowfolder .portlet-menu, +.pompei .arrowfolder .portlet-menu-item, +.pompei .arrowfolder .portlet-menu-item-selected, +.pompei .arrowfolder .portlet-menu-item-hover, +.pompei .arrowfolder .portlet-menu-item-hover-selected, +.pompei .arrowfolder .portlet-menu-cascade-item, +.pompei .arrowfolder .portlet-menu-cascade-item-selected, +.pompei .arrowfolder .portlet-menu-description, +.pompei .arrowfolder .portlet-menu-caption +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 9pt; +} + +/* --------------------------------- */ +/* Tree component */ +/* --------------------------------- */ + +.pompei .tree { + lineheight: 18px; + font-family: arial, sans-serif; +} + +.pompei .tree-node { + padding: 2px 15px 2px 5px; +} + +.pompei .tree-node a { + text-decoration: none; +} + +.pompei .tree-node-selected { + padding: 2px 15px 2px 5px; +} + +.pompei .tree-node-selected a { + text-decoration: none; + font-weight: bold; +} + +/* --------------------------------- */ +/* Portlet Table */ +/* --------------------------------- */ +.pompei th, td, input { + font-family: Verdana, Helvetica, Arial, sans-serif; +} + +.pompei table, +.pompei th, +.pompei td { + vertical-align: top; + font-size: 9pt; + white-space: normal; + /* action buttons shifts right a few millimeters by the following */ +} + +.pompei th +{ + font-size: 9pt; +} + +.pompei .portlet-table-header { + font-weight:bold; + background-image:url(../images/header_background.gif); + background-repeat: repeat-x; + color: #333; + + border: 0.75px solid #fff; + padding: 2px 3px; + text-align: left; +} + +.pompei .portlet-table-footer { + background-image:url(../images/footer_background.gif); + background-repeat: repeat-x; + color: #665511; + + font-size: 9pt; + padding: 5px; + margin: .67em 2px; + margin-top: 0; +} + + +.pompei .portlet-table-row1 td { + font-size: 9pt; + background: #ddd; + border-bottom: 1px solid #fff; +} + +.pompei .portlet-table-row2 td { + font-size: 9pt; + background: #efefef; + border-bottom: 1px solid #fff; +} + +.pompei .portlet-table-col1 { + border-right: 1px solid #fff; + padding: 2px 15px 2px 5px; +} + +.pompei .portlet-table-col2 { + border-left: 1px solid #fff; + padding: 2px 15px 2px 5px; +} + +/* --------------------------------- */ +/* Portlet Data Scroller Table */ +/* --------------------------------- */ + +.pompei .portlet-scroller-grid td { + horizontal-align: center; +} + +.pompei .portlet-scroller { + horizontal-align: center; +} + +.pompei .portlet-paginator { + horizontal-align: center; +} + +.pompei .order-step-unselected { + text-align: center; + border: 1px solid #ffd155; + background-color: #fff4d4; +} +.pompei .order-step-current { + text-align: center; + border: 1px solid #ffd155; + background-color: #ffd153; +} +.pompei .order-step-selected { + text-align: center; + border: 1px solid #ffd155; + background-color: #dddddd; +} + +.pompei .portlet-msg ul li { + list-style-type: none; +} + +.pompei .onTeedaError { + background-color:#ffdddd; +} + Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/css/styles.css ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/decorator.properties =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/decorator.properties 2007-10-30 01:23:11 UTC (rev 672) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/decorator.properties 2007-10-30 03:00:38 UTC (rev 673) @@ -0,0 +1,19 @@ +# Copyright 2004 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +id=pompei +name=pompei +template.type=velocity +template.extension=.vm +decorates=portlet Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/decorator.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/button_background.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/button_background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/button_background.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/button_background.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/close.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/close.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/customize.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/customize.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/edit.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/edit.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/footer_background.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/footer_background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/footer_background.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/footer_background.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/header_background.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/header_background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/header_background.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/header_background.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/help.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/help.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowdoc_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowdoc_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowfolderclosed1_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowfolderclosed1_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowfolderopen2_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_arrowfolderopen2_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_error_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_error_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_info_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_info_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_success_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_success_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_warning_sml.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/icon_warning_sml.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/info.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/info.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/info1.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/info1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/leftnavbg.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/leftnavbg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/maximized.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/maximized.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/minimized.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/minimized.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/print.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/print.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/restore.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/restore.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/subheader_background.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/subheader_background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/subheader_background.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/subheader_background.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/title_background.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/title_background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/title_background.xcf =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/title_background.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/view.gif =================================================================== (Binary files differ) Property changes on: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/portlet/pompei/images/view.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From svnnotify @ sourceforge.jp Tue Oct 30 12:01:40 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 12:01:40 +0900 Subject: [pal-cvs 2930] [674] updated pompei layout decorator. Message-ID: <1193713300.841314.28680.nullmailer@users.sourceforge.jp> Revision: 674 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=674 Author: shinsuke Date: 2007-10-30 12:01:40 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated pompei layout decorator. Modified Paths: -------------- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm -------------- next part -------------- Modified: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css 2007-10-30 03:00:38 UTC (rev 673) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/css/styles.css 2007-10-30 03:01:40 UTC (rev 674) @@ -21,7 +21,7 @@ background: #FFF; color: #000000; font-family: Arial, Helvetica, sans-serif; - font-size: 10px; + font-size: 9pt; } /** @@ -31,7 +31,6 @@ a:link, a:visited { color: #335599; - text-decoration: underline; } a:hover { @@ -45,21 +44,28 @@ } -#portal-page-actions A img +#portal-page-actions a img { + vertical-align: middle; display: inline; } #portal-page-actions { text-align:right; + text-decoration: none; } +#portal-page-actions a +{ + text-decoration: none; +} + .layout-pompei .layout-edit-bar { width: 100%; padding-top: 5px; - font-size: 8pt; + font-size: 9pt; color: blue; overflow:hidden; clip:auto; @@ -69,13 +75,13 @@ .layout-pompei .layout-edit-bar input, .layout-pompei .layout-edit-bar select { - font-size: 8pt; + font-size: 9pt; color: blue; } .layout-pompei .layout-edit-bar input { - font-size: 8pt; + font-size: 9pt; } .layout-pompei .layout-edit-bar-left @@ -93,7 +99,7 @@ .layout-pompei .portlet-edit-bar select { - font-size: 8pt; + font-size: 9pt; color: blue; } @@ -144,7 +150,7 @@ .layout-pompei #navbar { margin:0px; padding:0px; - height:25px; + height:30px; background-image: url(../images/tab_bg.gif); } @@ -167,13 +173,12 @@ margin:0px; padding: 8px 5px; font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight: bold; - color: #ffffff; + font-size: 11pt; + color: #333333; } .layout-pompei #navbar a:hover { - background: #71758a; - color: #ffffff; + background: #ffff00; + color: #333333; } .layout-pompei #navbar span { float: left; @@ -181,9 +186,8 @@ margin:0px; padding: 8px 5px; font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight: bold; - color: #ffffff; + font-size: 11pt; + color: #999999; } .layout-pompei #navbar img { @@ -207,7 +211,7 @@ border-bottom: 1px dotted #666; voice-family: "\"}\""; voice-family: inherit; - font-size: x-small; + font-size: 9pt; padding: 3px 8px; margin: 3px; } @@ -215,7 +219,7 @@ .layout-pompei #breadcrumbs a { text-decoration: none; font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; + font-size: 9pt; color:#12248d; } @@ -245,7 +249,7 @@ margin:0px; padding: 5px 2px; font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; + font-size: 9pt; font-weight: bold; color: #666666; } @@ -273,7 +277,7 @@ vertical-align: middle; text-align: center; font-family: Arial Black, Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; + font-size: 9pt; margin-bottom:10px; margin-top:10px; /*position:relative;*/ Modified: pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm =================================================================== --- pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm 2007-10-30 03:00:38 UTC (rev 673) +++ pompei/portal/trunk/src/custom/portal/files/src/webapp/decorations/layout/pompei/header.vm 2007-10-30 03:01:40 UTC (rev 674) @@ -76,7 +76,7 @@ #else #end From svnnotify @ sourceforge.jp Tue Oct 30 12:04:26 2007 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 30 Oct 2007 12:04:26 +0900 Subject: [pal-cvs 2931] [675] updated psml files. Message-ID: <1193713466.100391.31085.nullmailer@users.sourceforge.jp> Revision: 675 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=675 Author: shinsuke Date: 2007-10-30 12:04:13 +0900 (Tue, 30 Oct 2007) Log Message: ----------- updated psml files. Modified Paths: -------------- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-wap2/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/cart.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/html/order.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-hdml/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-hdml/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-wap2/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-html/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-html/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-wap2/forgot.psml pompei/portal/trunk/src/psml/default/_role/site/default-page.psml pompei/portal/trunk/src/psml/default/_role/site/forgot.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/docomo-html/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/docomo-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/cart.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/html/order.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/kddi-hdml/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/kddi-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/softbank-html/default-page.psml pompei/portal/trunk/src/psml/default/_user/_template/_mediatype/softbank-wap2/default-page.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/customer/default-page.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/customer/folder.metadata pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/default-page.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/folder.metadata pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/order/default-page.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/order/folder.metadata pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/product/category.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/product/default-page.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/product/folder.metadata pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/product/manufacturer.psml pompei/portal/trunk/src/psml/default/default-page.psml pompei/portal/trunk/src/psml/default/my-account.psml pompei/portal/trunk/src/psml/default/system/customizer/portlet-selector.psml pompei/portal/trunk/src/psml/default/system/customizer/selector.psml pompei/portal/trunk/src/psml/default/system/customizer/site-editor.psml Added Paths: ----------- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/signup.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-wap2/signup.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-hdml/signup.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-wap2/signup.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-html/signup.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-wap2/signup.psml pompei/portal/trunk/src/psml/default/_role/site/signup.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/customer/ pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/portal/ pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/portal/default-page.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/portal/folder.metadata pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/portal/portlet-manager.psml Removed Paths: ------------- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/register.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-wap2/register.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-hdml/register.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/kddi-wap2/register.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-html/register.psml pompei/portal/trunk/src/psml/default/_role/site/_mediatype/softbank-wap2/register.psml pompei/portal/trunk/src/psml/default/_role/site/register.psml pompei/portal/trunk/src/psml/default/_user/admin/_mediatype/html/member/ -------------- next part -------------- Modified: pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/default-page.psml =================================================================== --- pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/default-page.psml 2007-10-30 03:01:40 UTC (rev 674) +++ pompei/portal/trunk/src/psml/default/_role/site/_mediatype/docomo-html/default-page.psml 2007-10-30 03:04:13 UTC (rev 675) @@ -2,7 +2,7 @@