From svnnotify @ sourceforge.jp Fri Apr 4 12:45:52 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 04 Apr 2008 12:45:52 +0900 Subject: [pal-cvs 3135] [871] disabled a name editing. Message-ID: <1207280752.222968.7208.nullmailer@users.sourceforge.jp> Revision: 871 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=871 Author: shinsuke Date: 2008-04-04 12:45:51 +0900 (Fri, 04 Apr 2008) Log Message: ----------- disabled a name editing. Modified Paths: -------------- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html 2008-03-29 22:18:32 UTC (rev 870) +++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryEdit.html 2008-04-04 03:45:51 UTC (rev 871) @@ -40,7 +40,10 @@ - + From svnnotify @ sourceforge.jp Fri Apr 4 12:46:07 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 04 Apr 2008 12:46:07 +0900 Subject: [pal-cvs 3136] [872] version 0.7 Message-ID: <1207280767.801752.8186.nullmailer@users.sourceforge.jp> Revision: 872 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=872 Author: shinsuke Date: 2008-04-04 12:46:07 +0900 (Fri, 04 Apr 2008) Log Message: ----------- version 0.7 Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2008-04-04 03:45:51 UTC (rev 871) +++ pal-admin/trunk/pom.xml 2008-04-04 03:46:07 UTC (rev 872) @@ -3,7 +3,7 @@ 4.0.0jp.sf.palpal-admin - 0.7-SNAPSHOT + 0.7warAdministration tools for PAL Portal From svnnotify @ sourceforge.jp Fri Apr 4 15:53:31 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 04 Apr 2008 15:53:31 +0900 Subject: [pal-cvs 3137] [873] version 0.7 Message-ID: <1207292011.605385.13444.nullmailer@users.sourceforge.jp> Revision: 873 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=873 Author: shinsuke Date: 2008-04-04 15:53:31 +0900 (Fri, 04 Apr 2008) Log Message: ----------- version 0.7 Added Paths: ----------- pal-admin/tags/pal-admin-0.7/ -------------- next part -------------- Copied: pal-admin/tags/pal-admin-0.7 (from rev 872, pal-admin/trunk) From svnnotify @ sourceforge.jp Fri Apr 4 15:56:04 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 04 Apr 2008 15:56:04 +0900 Subject: [pal-cvs 3138] [874] version 1.0.4 Message-ID: <1207292164.524540.16307.nullmailer@users.sourceforge.jp> Revision: 874 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=874 Author: shinsuke Date: 2008-04-04 15:56:04 +0900 (Fri, 04 Apr 2008) Log Message: ----------- version 1.0.4 Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-04-04 06:53:31 UTC (rev 873) +++ pal-portal/trunk/build.properties 2008-04-04 06:56:04 UTC (rev 874) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=0.4-dev +container.version.minor=0.4 container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build Modified: pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties =================================================================== --- pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties 2008-04-04 06:53:31 UTC (rev 873) +++ pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties 2008-04-04 06:56:04 UTC (rev 874) @@ -11,7 +11,7 @@ # SVN #svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-admin/trunk/ -svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-admin/tags/pal-admin-0.6 +svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-admin/tags/pal-admin-0.7 svn.revision=HEAD svn.module.name=pal-admin From svnnotify @ sourceforge.jp Mon Apr 7 10:40:12 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 07 Apr 2008 10:40:12 +0900 Subject: [pal-cvs 3139] [875] created tags. Message-ID: <1207532412.254553.13749.nullmailer@users.sourceforge.jp> Revision: 875 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=875 Author: shinsuke Date: 2008-04-07 10:40:12 +0900 (Mon, 07 Apr 2008) Log Message: ----------- created tags. Added Paths: ----------- pal-portal/tags/ -------------- next part -------------- From svnnotify @ sourceforge.jp Mon Apr 7 10:40:58 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 07 Apr 2008 10:40:58 +0900 Subject: [pal-cvs 3140] [876] version 1.0.4 Message-ID: <1207532458.070585.13956.nullmailer@users.sourceforge.jp> Revision: 876 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=876 Author: shinsuke Date: 2008-04-07 10:40:57 +0900 (Mon, 07 Apr 2008) Log Message: ----------- version 1.0.4 Added Paths: ----------- pal-portal/tags/pal-portal-1.0.4/ -------------- next part -------------- Copied: pal-portal/tags/pal-portal-1.0.4 (from rev 875, pal-portal/trunk) From svnnotify @ sourceforge.jp Mon Apr 7 10:45:35 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 07 Apr 2008 10:45:35 +0900 Subject: [pal-cvs 3141] [877] started 1.0.5 development. Message-ID: <1207532735.024419.16958.nullmailer@users.sourceforge.jp> Revision: 877 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=877 Author: shinsuke Date: 2008-04-07 10:45:34 +0900 (Mon, 07 Apr 2008) Log Message: ----------- started 1.0.5 development. Modified Paths: -------------- pal-portal/trunk/build.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-04-07 01:40:57 UTC (rev 876) +++ pal-portal/trunk/build.properties 2008-04-07 01:45:34 UTC (rev 877) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=0.4 +container.version.minor=0.5-dev container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build From svnnotify @ sourceforge.jp Tue Apr 8 13:39:31 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 08 Apr 2008 13:39:31 +0900 Subject: [pal-cvs 3142] [878] updated db schema and implemented entities. Message-ID: <1207629571.082876.4798.nullmailer@users.sourceforge.jp> Revision: 878 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=878 Author: shinsuke Date: 2008-04-08 13:39:30 +0900 (Tue, 08 Apr 2008) Log Message: ----------- updated db schema and implemented entities. Modified Paths: -------------- pompei/libraries/pompei-db-h2/trunk/.classpath pompei/libraries/pompei-db-h2/trunk/dbflute/build-pompei.properties pompei/libraries/pompei-db-h2/trunk/pom.xml pompei/libraries/pompei-db-h2/trunk/src/main/config/sql/create_table.sql pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCategoryBhv.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsFileDataBhv.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsManufacturerDescriptionBhv.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderPaymentBhv.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCategoryDao.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsFileDataDao.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsManufacturerDescriptionDao.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderPaymentDao.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBargain.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasket.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasketProductOption.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategory.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryContent.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryInfo.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountry.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountryDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethod.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethodDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatus.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatusDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryType.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryTypeDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZone.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZoneDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileData.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileTag.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsImageData.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturer.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerInfo.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderPayment.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProductOption.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethodDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatus.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatusDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductAttribute.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductContent.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductInfo.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOption.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValue.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValueDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReview.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxType.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxTypeDescription.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BargainDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketProductOptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryContentDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryInfoDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileDataDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileTagDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ImageDataDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerInfoDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderPaymentDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductOptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductAttributeDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductContentDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductInfoDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDescriptionDbm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCategoryCB.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsFileDataCB.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCategoryCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsFileDataCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsManufacturerDescriptionCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderPaymentCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCategoryCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsFileDataCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsManufacturerDescriptionCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderPaymentCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CategoryCIQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/FileDataCIQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ManufacturerDescriptionCIQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderPaymentCIQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNss.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNsst.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/FileDataNsst.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/CardType.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Category.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Country.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Customer.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryMethod.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryStatus.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryType.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryZone.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Manufacturer.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderForm.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderStatus.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethod.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentStatus.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Product.java pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/TaxType.java -------------- next part -------------- Modified: pompei/libraries/pompei-db-h2/trunk/.classpath =================================================================== --- pompei/libraries/pompei-db-h2/trunk/.classpath 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/.classpath 2008-04-08 04:39:30 UTC (rev 878) @@ -9,22 +9,23 @@ + + - + - + - \ No newline at end of file Modified: pompei/libraries/pompei-db-h2/trunk/dbflute/build-pompei.properties =================================================================== --- pompei/libraries/pompei-db-h2/trunk/dbflute/build-pompei.properties 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/dbflute/build-pompei.properties 2008-04-08 04:39:30 UTC (rev 878) @@ -156,13 +156,14 @@ # [Additional ForeignKey] torque.additionalForeignKeyMap = map:{ \ FK_FROM_CATEGORY_TO_CATEGORY = map:{ localTableName = CATEGORY; localColumnName = PARENT_CATEGORY_ID; foreignTableName = CATEGORY; foreignColumnName = CATEGORY_ID } \ + ;FK_FROM_CATEGORY_TO_FILE_DATA = map:{ localTableName = CATEGORY; localColumnName = FILE_DATA_ID; foreignTableName = FILE_DATA; foreignColumnName = FILE_DATA_ID } \ ;FK_FROM_MANUFACTURER_TO_FILE_DATA = map:{ localTableName = MANUFACTURER; localColumnName = FILE_DATA_ID; foreignTableName = FILE_DATA; foreignColumnName = FILE_DATA_ID } \ ;FK_FROM_CUSTOMER_TO_ORDER_FORM = map:{ localTableName = ORDER_FORM; localColumnName = CUSTOMER_ID; foreignTableName = CUSTOMER; foreignColumnName = CUSTOMER_ID } \ ;FK_FROM_ORDER_FORM_TO_ORDER_STATUS = map:{ localTableName = ORDER_FORM; localColumnName = ORDER_STATUS_ID; foreignTableName = ORDER_STATUS; foreignColumnName = ORDER_STATUS_ID } \ ;FK_FROM_PRODUCT_TO_MANUFACTURER = map:{ localTableName = PRODUCT; localColumnName = MANUFACTURER_ID; foreignTableName = MANUFACTURER; foreignColumnName = MANUFACTURER_ID } \ - ;FK_FROM_PRODUCT_TO_FILE_DATA = map:{ localTableName = PRODUCT; localColumnName = FILE_DATA_ID; foreignTableName = FILE_DATA; foreignColumnName = FILE_DATA_ID } \ ;FK_FROM_PRODUCT_TO_TAX_TYPE = map:{ localTableName = PRODUCT; localColumnName = TAX_TYPE_ID; foreignTableName = TAX_TYPE; foreignColumnName = TAX_TYPE_ID } \ ;FK_FROM_PRODUCT_TO_DELIVERY_TYPE = map:{ localTableName = PRODUCT; localColumnName = DELIVERY_TYPE_ID; foreignTableName = DELIVERY_TYPE; foreignColumnName = DELIVERY_TYPE_ID } \ + ;FK_FROM_PRODUCT_TO_FILE_DATA = map:{ localTableName = PRODUCT; localColumnName = FILE_DATA_ID; foreignTableName = FILE_DATA; foreignColumnName = FILE_DATA_ID } \ ;FK_FROM_BASKET_TO_PRODUCT = map:{ localTableName = BASKET; localColumnName = PRODUCT_ID; foreignTableName = PRODUCT; foreignColumnName = PRODUCT_ID } \ ;FK_FROM_BASKET_TO_CUSTOMER = map:{ localTableName = BASKET; localColumnName = CUSTOMER_ID; foreignTableName = CUSTOMER; foreignColumnName = CUSTOMER_ID } \ ;FK_FROM_REVIEW_TO_PRODUCT = map:{ localTableName = REVIEW; localColumnName = PRODUCT_ID; foreignTableName = PRODUCT; foreignColumnName = PRODUCT_ID } \ Modified: pompei/libraries/pompei-db-h2/trunk/pom.xml =================================================================== --- pompei/libraries/pompei-db-h2/trunk/pom.xml 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/pom.xml 2008-04-08 04:39:30 UTC (rev 878) @@ -185,5 +185,11 @@ 1.0.65 provided + + jp.sf.pal + pompei-db + 0.1.0-SNAPSHOT + provided + Modified: pompei/libraries/pompei-db-h2/trunk/src/main/config/sql/create_table.sql =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/config/sql/create_table.sql 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/config/sql/create_table.sql 2008-04-08 04:39:30 UTC (rev 878) @@ -179,6 +179,7 @@ CREATE TABLE CATEGORY ( CATEGORY_ID INTEGER NOT NULL AUTO_INCREMENT , PARENT_CATEGORY_ID INTEGER NOT NULL DEFAULT 0 + , FILE_DATA_ID BIGINT , NUM_OF_PRODUCT INTEGER , STATUS INTEGER NOT NULL , SORT_ORDER INTEGER NOT NULL @@ -228,7 +229,7 @@ , BILLING_POSTCODE VARCHAR(10) NOT NULL , BILLING_TELEPHONE VARCHAR(40) , BILLING_COUNTRY_CODE VARCHAR(40) NOT NULL - , BILLING_LOCALE_NAME VARCHAR(20) NOT NULL + , BILLING_LANGUAGE VARCHAR(20) NOT NULL , ORDER_STATUS_ID INTEGER NOT NULL , UPDATED_DATE TIMESTAMP NOT NULL , PURCHASED_DATE TIMESTAMP NOT NULL @@ -238,9 +239,11 @@ CREATE TABLE PRODUCT ( PRODUCT_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_MODE INTEGER NOT NULL + , CODE VARCHAR(40) NOT NULL , MODEL VARCHAR(80) - , CODE VARCHAR(40) NOT NULL , STOCK INTEGER + , CATALOG_PRICE DECIMAL(15, 4) , PRICE DECIMAL(15, 4) NOT NULL , WEIGHT DECIMAL(5, 2) , SIZE VARCHAR(40) @@ -427,7 +430,7 @@ CREATE TABLE MANUFACTURER_DESCRIPTION ( MANUFACTURER_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT , MANUFACTURER_ID INTEGER NOT NULL - , CONTENT TEXT + , DESCRIPTION TEXT , LANGUAGE VARCHAR(20) NOT NULL , PRIMARY KEY (MANUFACTURER_DESCRIPTION_ID) ); @@ -505,7 +508,6 @@ , PAYMENT_METHOD_CODE VARCHAR(40) NOT NULL , ORDER_CARD_INFO_ID BIGINT , PAYMENT_STATUS_ID INTEGER - , UPDATED_DATE TIMESTAMP , SUB_TOTAL_PRICE DECIMAL(14, 6) , TAX DECIMAL(14, 6) , DELIVERY_PRICE DECIMAL(14, 6) @@ -694,11 +696,17 @@ REFERENCES CATEGORY (CATEGORY_ID) ON DELETE SET DEFAULT; +ALTER TABLE CATEGORY + ADD CONSTRAINT FK_FROM_CATEGORY_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + ALTER TABLE MANUFACTURER ADD CONSTRAINT FK_FROM_MANUFACTURER_TO_FILE_DATA FOREIGN KEY (FILE_DATA_ID) REFERENCES FILE_DATA (FILE_DATA_ID) - ON DELETE CASCADE; + ON DELETE SET NULL; ALTER TABLE ORDER_FORM ADD CONSTRAINT FK_FROM_CUSTOMER_TO_ORDER_FORM @@ -719,12 +727,6 @@ ON DELETE SET NULL; ALTER TABLE PRODUCT - ADD CONSTRAINT FK_FROM_PRODUCT_TO_FILE_DATA - FOREIGN KEY (FILE_DATA_ID) - REFERENCES FILE_DATA (FILE_DATA_ID) - ON DELETE CASCADE; - -ALTER TABLE PRODUCT ADD CONSTRAINT FK_FROM_PRODUCT_TO_TAX_TYPE FOREIGN KEY (TAX_TYPE_ID) REFERENCES TAX_TYPE (TAX_TYPE_ID) @@ -736,6 +738,12 @@ REFERENCES DELIVERY_TYPE (DELIVERY_TYPE_ID) ON DELETE SET NULL; +ALTER TABLE PRODUCT + ADD CONSTRAINT FK_FROM_PRODUCT_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + ALTER TABLE BASKET ADD CONSTRAINT FK_FROM_BASKET_TO_PRODUCT FOREIGN KEY (PRODUCT_ID) Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCategoryBhv.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCategoryBhv.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCategoryBhv.java 2008-04-08 04:39:30 UTC (rev 878) @@ -34,10 +34,10 @@ * CATEGORY_ID * * [column-property] - * CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE + * CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE * * [foreign-property] - * categorySelf + * categorySelf, fileData * * [referrer-property] * categorySelfList, categoryContentList, categoryInfoList, categoryPageInfoList, productToCategoryList @@ -883,6 +883,17 @@ return helpPulloutInternally(categoryList, new InternalPulloutCallback() { public Category callbackGetForeignEntity(Category entity) { return entity.getCategorySelf(); } }); } + + /** + * Pull out the list of foreign table 'FileData'. + * + * @param categoryList The list of category. (NotNull) + * @return The list of foreign table. (NotNull) + */ + public List pulloutFileData(List categoryList) { + return helpPulloutInternally(categoryList, new InternalPulloutCallback() { + public FileData callbackGetForeignEntity(Category entity) { return entity.getFileData(); } }); + } /** * Pull out the list of referrer-as-one table 'CategoryPageInfo'. Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsFileDataBhv.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsFileDataBhv.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsFileDataBhv.java 2008-04-08 04:39:30 UTC (rev 878) @@ -40,7 +40,7 @@ * * * [referrer-property] - * fileTagToFileDataList, imageDataList, manufacturerList, productList + * categoryList, fileTagToFileDataList, imageDataList, manufacturerList, productList * * [sequence] * @@ -300,6 +300,120 @@ // ============= // /* * * * * * * * * * * * * * * * * * * * * * * + // ReferrerTable = [CATEGORY] + // ReferrerProperty = [categoryList] + // * * * * * * * * */ + + /** + * Load referrer of categoryList. + *
+     *   You can load referrer.
+     * 
+     *   ex) {Client Example}
+     *     final FileDataCB cb = new FileDataCB();
+     *     cb.query().setXxx_Equal("xxx");
+     *     final List<FileData> fileDataList = fileDataBhv.selectList(cb);
+     *     fileDataBhv.loadCategoryList(fileDataList);
+     * 
+     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
+     * 
+ * + * @param fileDataList Entity list of fileData. (NotNull) + */ + public void loadCategoryList(List fileDataList) { + final ConditionBeanSetupper conditionBeanSetupper = new ConditionBeanSetupper() { + public void setup(CategoryCB cb) {} + }; + loadCategoryList(fileDataList, conditionBeanSetupper); + } + + /** + * Load referrer of categoryList. + *
+     *   You can load referrer with your original condition.
+     * 
+     *   ex) {Client Example}: Referrer conditions are 'Xxx' is not null and order-by 'Yyy' desc
+     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+     *     final FileDataCB cb = new FileDataCB();
+     *     cb.query().setXxx_Equal("xxx");
+     *     final List<FileData> fileDataList = fileDataBhv.selectList(cb);
+     *     final ConditionBeanSetupper<CategoryCB> conditionBeanSetupper = new ConditionBeanSetupper<CategoryCB>() {
+     *         public void setup(CategoryCB cb) {
+     *             cb.query().setXxx_IsNotNull();
+     *             cb.query().addOrderBy_Yyy_Desc();
+     *         }
+     *     };
+     *     fileDataBhv.loadCategoryList(fileDataList, conditionBeanSetupper);
+     *     - - - - - - - - - -/
+     * 
+     *   The conditionBean that the setupper provides have settings before you touch it. It is as follows:
+     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+     *     cb.query().setFileDataId_InScope(pkList);
+     *     cb.query().addOrderBy_FileDataId_Asc();
+     *     - - - - - - - - - -/
+     * 
+     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
+     * 
+ * + * @param fileDataList Entity list of fileData. (NotNull) + * @param conditionBeanSetupper Referrer condition setupper instance for registering referrer condition. (NotNull) + */ + public void loadCategoryList(List fileDataList, ConditionBeanSetupper conditionBeanSetupper) { + assertObjectNotNull("fileDataList", fileDataList); + assertObjectNotNull("conditionBeanSetupper", conditionBeanSetupper); + if (fileDataList.isEmpty()) { return; } + loadCategoryList(fileDataList, new jp.sf.pal.pompei.allcommon.bhv.load.LoadReferrerOption(conditionBeanSetupper)); + } + + /** + * Load referrer of categoryList. + *
+     *   You can load referrer with your original condition.
+     * 
+     *   ex) {Client Example}: Referrer conditions are 'Xxx' is not null and order-by 'Yyy' desc
+     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+     *     final FileDataCB cb = new FileDataCB();
+     *     cb.query().setXxx_Equal("xxx");
+     *     final List<FileData> fileDataList = fileDataBhv.selectList(cb);
+     *     final ConditionBeanSetupper<CategoryCB> cbSetupper = new ConditionBeanSetupper<CategoryCB>() {
+     *         public void setup(CategoryCB cb) {
+     *             cb.query().setXxx_IsNotNull();
+     *             cb.query().addOrderBy_Yyy_Desc();
+     *         }
+     *     };
+     *     fileDataBhv.loadCategoryList(fileDataList, new LoadReferrerOption(cbSetupper));
+     *     - - - - - - - - - -/
+     * 
+     *   The conditionBean that the setupper provides have settings before you touch it. It is as follows:
+     *     /- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+     *     cb.query().setFileDataId_InScope(pkList);
+     *     cb.query().addOrderBy_FileDataId_Asc();
+     *     - - - - - - - - - -/
+     * 
+     *   *About internal policy, the value of primary key(and others too) is treated as CaseInsensitive.
+     * 
+ * + * @param fileDataList Entity list of fileData. (NotNull) + * @param loadReferrerOption Load-referrer option. (NotNull) + */ + public void loadCategoryList(List fileDataList, jp.sf.pal.pompei.allcommon.bhv.load.LoadReferrerOption loadReferrerOption) { + assertObjectNotNull("fileDataList", fileDataList); + assertObjectNotNull("loadReferrerOption", loadReferrerOption); + if (fileDataList.isEmpty()) { return; } + final CategoryBhv referrerBhv = getBehaviorSelector().select(CategoryBhv.class); + helpLoadReferrerInternally(fileDataList, loadReferrerOption, new InternalLoadReferrerCallback() { + public java.math.BigDecimal callbackBase_getPrimaryKeyValue(FileData entity) { return entity.getFileDataId(); } + public void callbackBase_setReferrerList(FileData entity, List referrerList) { entity.setCategoryList(referrerList); } + public CategoryCB callbackReferrer_newMyConditionBean() { return referrerBhv.newMyConditionBean(); } + public void callbackReferrer_queryForeignKeyInScope(CategoryCB cb, List pkList) { cb.query().setFileDataId_InScope(pkList); } + public void callbackReferrer_queryAddOrderByForeignKeyAsc(CategoryCB cb) { cb.query().addOrderBy_FileDataId_Asc(); } + public List callbackReferrer_selectList(CategoryCB cb) { return referrerBhv.selectList(cb); } + public java.math.BigDecimal callbackReferrer_getForeignKeyValue(Category entity) { return entity.getFileDataId(); } + public void callbackReferrer_setForeignEntity(Category referrerEntity, FileData baseEntity) { referrerEntity.setFileData(baseEntity); } + } ); + } + + // /* * * * * * * * * * * * * * * * * * * * * * * // ReferrerTable = [FILE_TAG_TO_FILE_DATA] // ReferrerProperty = [fileTagToFileDataList] // * * * * * * * * */ @@ -758,7 +872,7 @@ // =================================================================================== // Pull Out Foreign // ================ - + /** * Pull out the list of referrer-as-one table 'ImageData'. * Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsManufacturerDescriptionBhv.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsManufacturerDescriptionBhv.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsManufacturerDescriptionBhv.java 2008-04-08 04:39:30 UTC (rev 878) @@ -32,7 +32,7 @@ * MANUFACTURER_DESCRIPTION_ID * * [column-property] - * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE + * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE * * [foreign-property] * manufacturer Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2008-04-08 04:39:30 UTC (rev 878) @@ -34,7 +34,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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE + * 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE * * [foreign-property] * customer, orderStatus Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderPaymentBhv.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderPaymentBhv.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderPaymentBhv.java 2008-04-08 04:39:30 UTC (rev 878) @@ -32,7 +32,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE + * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * orderForm, paymentMethod, paymentStatus Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java 2008-04-08 04:39:30 UTC (rev 878) @@ -34,7 +34,7 @@ * PRODUCT_ID * * [column-property] - * PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE + * PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE * * [foreign-property] * deliveryType, fileData, manufacturer, taxType Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCategoryDao.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCategoryDao.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCategoryDao.java 2008-04-08 04:39:30 UTC (rev 878) @@ -13,10 +13,10 @@ * CATEGORY_ID * * [column-property] - * CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE + * CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE * * [foreign-property] - * categorySelf + * categorySelf, fileData * * [referrer-property] * categorySelfList, categoryContentList, categoryInfoList, categoryPageInfoList, productToCategoryList @@ -54,7 +54,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE from CATEGORY"; + public static final String getListAll_SQL = "select CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE from CATEGORY"; /** * Get the list as all. @@ -64,7 +64,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE from CATEGORY where CATEGORY.CATEGORY_ID = /*categoryId*/null"; + public static final String getEntity_SQL = "select CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE from CATEGORY where CATEGORY.CATEGORY_ID = /*categoryId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "categoryId"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsFileDataDao.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsFileDataDao.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsFileDataDao.java 2008-04-08 04:39:30 UTC (rev 878) @@ -19,7 +19,7 @@ * * * [referrer-property] - * fileTagToFileDataList, imageDataList, manufacturerList, productList + * categoryList, fileTagToFileDataList, imageDataList, manufacturerList, productList * * [sequence] * Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsManufacturerDescriptionDao.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsManufacturerDescriptionDao.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsManufacturerDescriptionDao.java 2008-04-08 04:39:30 UTC (rev 878) @@ -13,7 +13,7 @@ * MANUFACTURER_DESCRIPTION_ID * * [column-property] - * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE + * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE * * [foreign-property] * manufacturer @@ -54,7 +54,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE from MANUFACTURER_DESCRIPTION"; + public static final String getListAll_SQL = "select MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE from MANUFACTURER_DESCRIPTION"; /** * Get the list as all. @@ -64,7 +64,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE from MANUFACTURER_DESCRIPTION where MANUFACTURER_DESCRIPTION.MANUFACTURER_DESCRIPTION_ID = /*manufacturerDescriptionId*/null"; + public static final String getEntity_SQL = "select MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE from MANUFACTURER_DESCRIPTION where MANUFACTURER_DESCRIPTION.MANUFACTURER_DESCRIPTION_ID = /*manufacturerDescriptionId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "manufacturerDescriptionId"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2008-04-08 04:39:30 UTC (rev 878) @@ -13,7 +13,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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE + * 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE * * [foreign-property] * customer, orderStatus @@ -54,7 +54,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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE from ORDER_FORM"; /** * Get the list as all. @@ -64,7 +64,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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderFormId"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderPaymentDao.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderPaymentDao.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderPaymentDao.java 2008-04-08 04:39:30 UTC (rev 878) @@ -13,7 +13,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE + * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * orderForm, paymentMethod, paymentStatus @@ -54,7 +54,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_PAYMENT"; + public static final String getListAll_SQL = "select ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_PAYMENT"; /** * Get the list as all. @@ -64,7 +64,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_PAYMENT where ORDER_PAYMENT.ORDER_FORM_ID = /*orderFormId*/null"; + public static final String getEntity_SQL = "select ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_PAYMENT where ORDER_PAYMENT.ORDER_FORM_ID = /*orderFormId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "orderFormId"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java 2008-04-08 04:39:30 UTC (rev 878) @@ -13,7 +13,7 @@ * PRODUCT_ID * * [column-property] - * PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE + * PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE * * [foreign-property] * deliveryType, fileData, manufacturer, taxType @@ -54,7 +54,7 @@ public int getCountAll(); /** SQL-Annotation for getListAll(). */ - public static final String getListAll_SQL = "select PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE from PRODUCT"; + public static final String getListAll_SQL = "select PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE from PRODUCT"; /** * Get the list as all. @@ -64,7 +64,7 @@ public java.util.List getListAll(); /** SQL-Annotation for getEntity(). */ - public static final String getEntity_SQL = "select PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE from PRODUCT where PRODUCT.PRODUCT_ID = /*productId*/null"; + public static final String getEntity_SQL = "select PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE from PRODUCT where PRODUCT.PRODUCT_ID = /*productId*/null"; /** Args-Annotation for getEntity(). */ public static final String getEntity_ARGS = "productId"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of addressBookId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B2AB219C_D4F1_452C_B099_AD486A390F59]} */ + /** The value of addressBookId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_808D4A71_93E0_4FA1_A942_87936FD75DF1]} */ protected java.math.BigDecimal _addressBookId; /** The value of customerId. {BIGINT : NotNull : Default=[] : FK to CUSTOMER} */ @@ -501,12 +501,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B2AB219C_D4F1_452C_B099_AD486A390F59]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_808D4A71_93E0_4FA1_A942_87936FD75DF1]} */ public static final String addressBookId_COLUMN = "ADDRESS_BOOK_ID"; /** * Get the value of addressBookId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B2AB219C_D4F1_452C_B099_AD486A390F59]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_808D4A71_93E0_4FA1_A942_87936FD75DF1]} * * @return The value of addressBookId. (Nullable) */ @@ -516,7 +516,7 @@ /** * Set the value of addressBookId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B2AB219C_D4F1_452C_B099_AD486A390F59]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_808D4A71_93E0_4FA1_A942_87936FD75DF1]} * * @param addressBookId The value of addressBookId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBargain.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBargain.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBargain.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of bargainId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_41EE8F2A_146E_43EA_AEA0_14E70D67CD8F]} */ + /** The value of bargainId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA035F66_12AF_4013_8E9B_1D071C2AF23D]} */ protected java.math.BigDecimal _bargainId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -337,12 +337,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_41EE8F2A_146E_43EA_AEA0_14E70D67CD8F]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA035F66_12AF_4013_8E9B_1D071C2AF23D]} */ public static final String bargainId_COLUMN = "BARGAIN_ID"; /** * Get the value of bargainId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_41EE8F2A_146E_43EA_AEA0_14E70D67CD8F]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA035F66_12AF_4013_8E9B_1D071C2AF23D]} * * @return The value of bargainId. (Nullable) */ @@ -352,7 +352,7 @@ /** * Set the value of bargainId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_41EE8F2A_146E_43EA_AEA0_14E70D67CD8F]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA035F66_12AF_4013_8E9B_1D071C2AF23D]} * * @param bargainId The value of bargainId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasket.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasket.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasket.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of basketId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BD92529C_24B2_40C3_A935_007DDC28CCAC]} */ + /** The value of basketId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C81A57D4_EF48_44BD_82F6_EA8B07B4C91D]} */ protected java.math.BigDecimal _basketId; /** The value of customerId. {BIGINT : NotNull : Default=[] : FK to CUSTOMER} */ @@ -428,12 +428,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BD92529C_24B2_40C3_A935_007DDC28CCAC]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C81A57D4_EF48_44BD_82F6_EA8B07B4C91D]} */ public static final String basketId_COLUMN = "BASKET_ID"; /** * Get the value of basketId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BD92529C_24B2_40C3_A935_007DDC28CCAC]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C81A57D4_EF48_44BD_82F6_EA8B07B4C91D]} * * @return The value of basketId. (Nullable) */ @@ -443,7 +443,7 @@ /** * Set the value of basketId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BD92529C_24B2_40C3_A935_007DDC28CCAC]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C81A57D4_EF48_44BD_82F6_EA8B07B4C91D]} * * @param basketId The value of basketId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasketProductOption.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasketProductOption.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsBasketProductOption.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of basketProductOptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_312062F6_5D59_4533_B414_06ECBBBD36D5]} */ + /** The value of basketProductOptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9CC3076A_1B2D_4E23_ADAB_AF5045FCCBB9]} */ protected java.math.BigDecimal _basketProductOptionId; /** The value of basketId. {BIGINT : NotNull : Default=[] : FK to BASKET} */ @@ -377,12 +377,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_312062F6_5D59_4533_B414_06ECBBBD36D5]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9CC3076A_1B2D_4E23_ADAB_AF5045FCCBB9]} */ public static final String basketProductOptionId_COLUMN = "BASKET_PRODUCT_OPTION_ID"; /** * Get the value of basketProductOptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_312062F6_5D59_4533_B414_06ECBBBD36D5]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9CC3076A_1B2D_4E23_ADAB_AF5045FCCBB9]} * * @return The value of basketProductOptionId. (Nullable) */ @@ -392,7 +392,7 @@ /** * Set the value of basketProductOptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_312062F6_5D59_4533_B414_06ECBBBD36D5]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9CC3076A_1B2D_4E23_ADAB_AF5045FCCBB9]} * * @param basketProductOptionId The value of basketProductOptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCardType.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of cardTypeId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3B3C8382_1ECF_4D16_971A_A76CB729A43C]} */ + /** The value of cardTypeId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_74FC7C9E_0ED7_46ED_AB5A_96F2637F9F62]} */ protected java.math.BigDecimal _cardTypeId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -339,12 +339,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3B3C8382_1ECF_4D16_971A_A76CB729A43C]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_74FC7C9E_0ED7_46ED_AB5A_96F2637F9F62]} */ public static final String cardTypeId_COLUMN = "CARD_TYPE_ID"; /** * Get the value of cardTypeId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3B3C8382_1ECF_4D16_971A_A76CB729A43C]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_74FC7C9E_0ED7_46ED_AB5A_96F2637F9F62]} * * @return The value of cardTypeId. (Nullable) */ @@ -354,7 +354,7 @@ /** * Set the value of cardTypeId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3B3C8382_1ECF_4D16_971A_A76CB729A43C]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_74FC7C9E_0ED7_46ED_AB5A_96F2637F9F62]} * * @param cardTypeId The value of cardTypeId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategory.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategory.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategory.java 2008-04-08 04:39:30 UTC (rev 878) @@ -14,10 +14,10 @@ * CATEGORY_ID * * [column-property] - * CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE + * CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE * * [foreign-property] - * categorySelf + * categorySelf, fileData * * [referrer-property] * categorySelfList, categoryContentList, categoryInfoList, categoryPageInfoList, productToCategoryList @@ -58,12 +58,15 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of categoryId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2776E811_0F4F_4C4B_9D91_EACBF999E2AE]} */ + /** The value of categoryId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EFD2FD88_D7B6_478E_8C53_D744202F6C4E]} */ protected java.math.BigDecimal _categoryId; /** The value of parentCategoryId. {INTEGER : NotNull : Default=[0] : FK to CATEGORY} */ protected java.math.BigDecimal _parentCategoryId; + /** The value of fileDataId. {BIGINT : Default=[] : FK to FILE_DATA} */ + protected java.math.BigDecimal _fileDataId; + /** The value of numOfProduct. {INTEGER : Default=[]} */ protected java.math.BigDecimal _numOfProduct; @@ -122,16 +125,16 @@ // =================================================================================== // Classification Classifying // ========================== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Name/Alias // ========================= - + // =================================================================================== // Foreign Table @@ -197,6 +200,66 @@ return _parentCategorySelf != null ? _parentCategorySelf : new jp.sf.pal.pompei.exentity.Category(); } + // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + // ForeignTable = [FILE_DATA(TABLE)] + // ForeignProperty = [fileData] + // * * * * * * * * */ + + /** RELNO of foreign table for s2dao. */ + public static final int fileData_RELNO = 1; + + /** RELKEYS of foreign table for s2dao. */ + public static final String fileData_RELKEYS = "FILE_DATA_ID:FILE_DATA_ID"; + + /** The entity of foreign table. */ + protected jp.sf.pal.pompei.exentity.FileData _parentFileData; + + /** + * Get the entity of foreign table of fileData. {without lazyload} + * + * @return The entity of foreign table. (Nullable: If the foreign key does not have NotNull-constraint, please check null.) + */ + public jp.sf.pal.pompei.exentity.FileData getFileData() { + return _parentFileData; + } + + /** + * Set the entity of foreign table of fileData. + * + * @param fileData The entity of foreign table. (Nullable) + */ + public void setFileData(jp.sf.pal.pompei.exentity.FileData fileData) { + this._parentFileData = fileData; + } + + /** + * Has foreign instance of fileData. + * + * @return Determination. + */ + public boolean hasForeignInstanceFileData() { + return _parentFileData != null; + } + + + /** + * Same as lookFileData(). This method will be deprecated at the future. + * + * @return The entity of foreign table. (NotNull: If the object is null, it returns new empty entity as read-only.) + */ + public jp.sf.pal.pompei.exentity.FileData traceFileData() { + return lookFileData(); + } + + /** + * Look the foreign entity (for read) of fileData. + * + * @return The entity of foreign table. (NotNull: If the object is null, it returns new empty entity as read-only.) + */ + public jp.sf.pal.pompei.exentity.FileData lookFileData() { + return _parentFileData != null ? _parentFileData : new jp.sf.pal.pompei.exentity.FileData(); + } + // =================================================================================== // Referrer Table // ============== @@ -325,7 +388,7 @@ // * * * * * * * * */ /** RELNO of foreign table for s2dao. */ - public static final int categoryPageInfoAsOne_RELNO = 1; + public static final int categoryPageInfoAsOne_RELNO = 2; /** RELKEYS of foreign table for s2dao. */ public static final String categoryPageInfoAsOne_RELKEYS = "CATEGORY_ID:CATEGORY_ID"; @@ -571,6 +634,7 @@ sb.append(delimiter).append(getCategoryId()); sb.append(delimiter).append(getParentCategoryId()); + sb.append(delimiter).append(getFileDataId()); sb.append(delimiter).append(getNumOfProduct()); sb.append(delimiter).append(getStatus()); sb.append(delimiter).append(getSortOrder()); @@ -585,12 +649,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2776E811_0F4F_4C4B_9D91_EACBF999E2AE]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EFD2FD88_D7B6_478E_8C53_D744202F6C4E]} */ public static final String categoryId_COLUMN = "CATEGORY_ID"; /** * Get the value of categoryId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2776E811_0F4F_4C4B_9D91_EACBF999E2AE]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EFD2FD88_D7B6_478E_8C53_D744202F6C4E]} * * @return The value of categoryId. (Nullable) */ @@ -600,7 +664,7 @@ /** * Set the value of categoryId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2776E811_0F4F_4C4B_9D91_EACBF999E2AE]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EFD2FD88_D7B6_478E_8C53_D744202F6C4E]} * * @param categoryId The value of categoryId. (Nullable) */ @@ -633,6 +697,30 @@ this._parentCategoryId = parentCategoryId; } + /** Column Annotation for S2Dao. {BIGINT : Default=[] : FK to FILE_DATA} */ + public static final String fileDataId_COLUMN = "FILE_DATA_ID"; + + /** + * Get the value of fileDataId.
+ * {BIGINT : Default=[] : FK to FILE_DATA} + * + * @return The value of fileDataId. (Nullable) + */ + public java.math.BigDecimal getFileDataId() { + return _fileDataId; + } + + /** + * Set the value of fileDataId.
+ * {BIGINT : Default=[] : FK to FILE_DATA} + * + * @param fileDataId The value of fileDataId. (Nullable) + */ + public void setFileDataId(java.math.BigDecimal fileDataId) { + _modifiedProperties.addPropertyName("fileDataId"); + this._fileDataId = fileDataId; + } + /** Column Annotation for S2Dao. {INTEGER : Default=[]} */ public static final String numOfProduct_COLUMN = "NUM_OF_PRODUCT"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryContent.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryContent.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryContent.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of categoryContentId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A3BB881_B47B_401B_9EA5_7FEDC1329AE3]} */ + /** The value of categoryContentId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4C98039A_6237_4531_A90F_C0A50380C310]} */ protected java.math.BigDecimal _categoryContentId; /** The value of categoryId. {INTEGER : NotNull : Default=[] : FK to CATEGORY} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A3BB881_B47B_401B_9EA5_7FEDC1329AE3]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4C98039A_6237_4531_A90F_C0A50380C310]} */ public static final String categoryContentId_COLUMN = "CATEGORY_CONTENT_ID"; /** * Get the value of categoryContentId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A3BB881_B47B_401B_9EA5_7FEDC1329AE3]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4C98039A_6237_4531_A90F_C0A50380C310]} * * @return The value of categoryContentId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of categoryContentId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A3BB881_B47B_401B_9EA5_7FEDC1329AE3]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4C98039A_6237_4531_A90F_C0A50380C310]} * * @param categoryContentId The value of categoryContentId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryInfo.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryInfo.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCategoryInfo.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of categoryInfoId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C3387DA9_485D_4755_A8BB_8B5A1E89734B]} */ + /** The value of categoryInfoId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4D31DB8A_4A1B_4D8D_88D5_6A20F62BE48F]} */ protected java.math.BigDecimal _categoryInfoId; /** The value of categoryId. {INTEGER : NotNull : Default=[] : FK to CATEGORY} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C3387DA9_485D_4755_A8BB_8B5A1E89734B]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4D31DB8A_4A1B_4D8D_88D5_6A20F62BE48F]} */ public static final String categoryInfoId_COLUMN = "CATEGORY_INFO_ID"; /** * Get the value of categoryInfoId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C3387DA9_485D_4755_A8BB_8B5A1E89734B]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4D31DB8A_4A1B_4D8D_88D5_6A20F62BE48F]} * * @return The value of categoryInfoId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of categoryInfoId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C3387DA9_485D_4755_A8BB_8B5A1E89734B]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4D31DB8A_4A1B_4D8D_88D5_6A20F62BE48F]} * * @param categoryInfoId The value of categoryInfoId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountry.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountry.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountry.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of countryId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6AB0C81F_09E2_4F79_9D1F_F46C8C2CFD55]} */ + /** The value of countryId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3347384_761A_465D_A9E5_0D1BF6B4BC31]} */ protected java.math.BigDecimal _countryId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -378,12 +378,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6AB0C81F_09E2_4F79_9D1F_F46C8C2CFD55]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3347384_761A_465D_A9E5_0D1BF6B4BC31]} */ public static final String countryId_COLUMN = "COUNTRY_ID"; /** * Get the value of countryId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6AB0C81F_09E2_4F79_9D1F_F46C8C2CFD55]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3347384_761A_465D_A9E5_0D1BF6B4BC31]} * * @return The value of countryId. (Nullable) */ @@ -393,7 +393,7 @@ /** * Set the value of countryId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6AB0C81F_09E2_4F79_9D1F_F46C8C2CFD55]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3347384_761A_465D_A9E5_0D1BF6B4BC31]} * * @param countryId The value of countryId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountryDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountryDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCountryDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of countryDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B411FF2_6103_4E79_87B6_7903709FA783]} */ + /** The value of countryDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5DDEE634_838F_4FB5_B473_D62BB86B5C7E]} */ protected java.math.BigDecimal _countryDescriptionId; /** The value of countryId. {INTEGER : NotNull : Default=[] : FK to COUNTRY} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B411FF2_6103_4E79_87B6_7903709FA783]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5DDEE634_838F_4FB5_B473_D62BB86B5C7E]} */ public static final String countryDescriptionId_COLUMN = "COUNTRY_DESCRIPTION_ID"; /** * Get the value of countryDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B411FF2_6103_4E79_87B6_7903709FA783]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5DDEE634_838F_4FB5_B473_D62BB86B5C7E]} * * @return The value of countryDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of countryDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B411FF2_6103_4E79_87B6_7903709FA783]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5DDEE634_838F_4FB5_B473_D62BB86B5C7E]} * * @param countryDescriptionId The value of countryDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of customerId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_29635FE2_B951_464C_BC9A_3B9C0D5C4538]} */ + /** The value of customerId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65D35573_EB70_445A_AFF1_2FC92C088EA9]} */ protected java.math.BigDecimal _customerId; /** The value of portalId. {VARCHAR(255) : NotNull : Default=[]} */ @@ -527,12 +527,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_29635FE2_B951_464C_BC9A_3B9C0D5C4538]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65D35573_EB70_445A_AFF1_2FC92C088EA9]} */ public static final String customerId_COLUMN = "CUSTOMER_ID"; /** * Get the value of customerId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_29635FE2_B951_464C_BC9A_3B9C0D5C4538]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65D35573_EB70_445A_AFF1_2FC92C088EA9]} * * @return The value of customerId. (Nullable) */ @@ -542,7 +542,7 @@ /** * Set the value of customerId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_29635FE2_B951_464C_BC9A_3B9C0D5C4538]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65D35573_EB70_445A_AFF1_2FC92C088EA9]} * * @param customerId The value of customerId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethod.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethod.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethod.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryMethodId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BBB18455_B665_4B52_9728_9AFC3FF3BDFD]} */ + /** The value of deliveryMethodId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CF59FC79_99DD_4F91_BA52_20E25D3FE7DC]} */ protected java.math.BigDecimal _deliveryMethodId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -347,12 +347,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BBB18455_B665_4B52_9728_9AFC3FF3BDFD]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CF59FC79_99DD_4F91_BA52_20E25D3FE7DC]} */ public static final String deliveryMethodId_COLUMN = "DELIVERY_METHOD_ID"; /** * Get the value of deliveryMethodId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BBB18455_B665_4B52_9728_9AFC3FF3BDFD]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CF59FC79_99DD_4F91_BA52_20E25D3FE7DC]} * * @return The value of deliveryMethodId. (Nullable) */ @@ -362,7 +362,7 @@ /** * Set the value of deliveryMethodId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BBB18455_B665_4B52_9728_9AFC3FF3BDFD]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CF59FC79_99DD_4F91_BA52_20E25D3FE7DC]} * * @param deliveryMethodId The value of deliveryMethodId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethodDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethodDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryMethodDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryMethodDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6688B9F_0B09_4F21_ABFF_9C0952F602B7]} */ + /** The value of deliveryMethodDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1F2A2DC2_C76B_43E3_A1FD_A245D6595158]} */ protected java.math.BigDecimal _deliveryMethodDescriptionId; /** The value of deliveryMethodId. {INTEGER : NotNull : Default=[0] : FK to DELIVERY_METHOD} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6688B9F_0B09_4F21_ABFF_9C0952F602B7]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1F2A2DC2_C76B_43E3_A1FD_A245D6595158]} */ public static final String deliveryMethodDescriptionId_COLUMN = "DELIVERY_METHOD_DESCRIPTION_ID"; /** * Get the value of deliveryMethodDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6688B9F_0B09_4F21_ABFF_9C0952F602B7]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1F2A2DC2_C76B_43E3_A1FD_A245D6595158]} * * @return The value of deliveryMethodDescriptionId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of deliveryMethodDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6688B9F_0B09_4F21_ABFF_9C0952F602B7]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1F2A2DC2_C76B_43E3_A1FD_A245D6595158]} * * @param deliveryMethodDescriptionId The value of deliveryMethodDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatus.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatus.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatus.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryStatusId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA851A25_775C_4EFF_ABB2_49C6C4B07449]} */ + /** The value of deliveryStatusId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FEEA775_C06C_4886_8D86_550DB02172BE]} */ protected java.math.BigDecimal _deliveryStatusId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -339,12 +339,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA851A25_775C_4EFF_ABB2_49C6C4B07449]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FEEA775_C06C_4886_8D86_550DB02172BE]} */ public static final String deliveryStatusId_COLUMN = "DELIVERY_STATUS_ID"; /** * Get the value of deliveryStatusId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA851A25_775C_4EFF_ABB2_49C6C4B07449]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FEEA775_C06C_4886_8D86_550DB02172BE]} * * @return The value of deliveryStatusId. (Nullable) */ @@ -354,7 +354,7 @@ /** * Set the value of deliveryStatusId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA851A25_775C_4EFF_ABB2_49C6C4B07449]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FEEA775_C06C_4886_8D86_550DB02172BE]} * * @param deliveryStatusId The value of deliveryStatusId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatusDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatusDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryStatusDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryStatusDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E7F2D0F7_94F6_43BA_8F1C_74434F89ACF4]} */ + /** The value of deliveryStatusDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6ED016D_35D5_4EF2_864A_6ABD19BE70A6]} */ protected java.math.BigDecimal _deliveryStatusDescriptionId; /** The value of deliveryStatusId. {INTEGER : NotNull : Default=[] : FK to DELIVERY_STATUS} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E7F2D0F7_94F6_43BA_8F1C_74434F89ACF4]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6ED016D_35D5_4EF2_864A_6ABD19BE70A6]} */ public static final String deliveryStatusDescriptionId_COLUMN = "DELIVERY_STATUS_DESCRIPTION_ID"; /** * Get the value of deliveryStatusDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E7F2D0F7_94F6_43BA_8F1C_74434F89ACF4]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6ED016D_35D5_4EF2_864A_6ABD19BE70A6]} * * @return The value of deliveryStatusDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of deliveryStatusDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E7F2D0F7_94F6_43BA_8F1C_74434F89ACF4]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6ED016D_35D5_4EF2_864A_6ABD19BE70A6]} * * @param deliveryStatusDescriptionId The value of deliveryStatusDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryType.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryType.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryType.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryTypeId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE3303C_DD6F_4FEB_8AEA_697E4BCAE7DA]} */ + /** The value of deliveryTypeId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE9392C_413F_4D00_BEB3_90F49FB5A8A2]} */ protected java.math.BigDecimal _deliveryTypeId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -339,12 +339,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE3303C_DD6F_4FEB_8AEA_697E4BCAE7DA]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE9392C_413F_4D00_BEB3_90F49FB5A8A2]} */ public static final String deliveryTypeId_COLUMN = "DELIVERY_TYPE_ID"; /** * Get the value of deliveryTypeId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE3303C_DD6F_4FEB_8AEA_697E4BCAE7DA]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE9392C_413F_4D00_BEB3_90F49FB5A8A2]} * * @return The value of deliveryTypeId. (Nullable) */ @@ -354,7 +354,7 @@ /** * Set the value of deliveryTypeId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE3303C_DD6F_4FEB_8AEA_697E4BCAE7DA]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE9392C_413F_4D00_BEB3_90F49FB5A8A2]} * * @param deliveryTypeId The value of deliveryTypeId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryTypeDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryTypeDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryTypeDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryTypeDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_513D9D3C_8F0C_4367_B3DA_2863C987246D]} */ + /** The value of deliveryTypeDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38F192ED_EDB3_4717_BFFC_B2E1BDF57C25]} */ protected java.math.BigDecimal _deliveryTypeDescriptionId; /** The value of deliveryTypeId. {INTEGER : NotNull : Default=[] : FK to DELIVERY_TYPE} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_513D9D3C_8F0C_4367_B3DA_2863C987246D]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38F192ED_EDB3_4717_BFFC_B2E1BDF57C25]} */ public static final String deliveryTypeDescriptionId_COLUMN = "DELIVERY_TYPE_DESCRIPTION_ID"; /** * Get the value of deliveryTypeDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_513D9D3C_8F0C_4367_B3DA_2863C987246D]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38F192ED_EDB3_4717_BFFC_B2E1BDF57C25]} * * @return The value of deliveryTypeDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of deliveryTypeDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_513D9D3C_8F0C_4367_B3DA_2863C987246D]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38F192ED_EDB3_4717_BFFC_B2E1BDF57C25]} * * @param deliveryTypeDescriptionId The value of deliveryTypeDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZone.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZone.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZone.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryZoneId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B7E56541_CE09_4B7E_A125_001EA5B198D1]} */ + /** The value of deliveryZoneId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA74016E_FAE7_439E_B12B_58A30A49B460]} */ protected java.math.BigDecimal _deliveryZoneId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -378,12 +378,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B7E56541_CE09_4B7E_A125_001EA5B198D1]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA74016E_FAE7_439E_B12B_58A30A49B460]} */ public static final String deliveryZoneId_COLUMN = "DELIVERY_ZONE_ID"; /** * Get the value of deliveryZoneId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B7E56541_CE09_4B7E_A125_001EA5B198D1]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA74016E_FAE7_439E_B12B_58A30A49B460]} * * @return The value of deliveryZoneId. (Nullable) */ @@ -393,7 +393,7 @@ /** * Set the value of deliveryZoneId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B7E56541_CE09_4B7E_A125_001EA5B198D1]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA74016E_FAE7_439E_B12B_58A30A49B460]} * * @param deliveryZoneId The value of deliveryZoneId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZoneDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZoneDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsDeliveryZoneDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of deliveryZoneDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AF2C82E5_D881_4C61_B096_8667C945FD08]} */ + /** The value of deliveryZoneDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BB2396D3_E0E1_4B99_B786_0F09CE6BB3EF]} */ protected java.math.BigDecimal _deliveryZoneDescriptionId; /** The value of deliveryZoneId. {INTEGER : NotNull : Default=[] : FK to DELIVERY_ZONE} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AF2C82E5_D881_4C61_B096_8667C945FD08]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BB2396D3_E0E1_4B99_B786_0F09CE6BB3EF]} */ public static final String deliveryZoneDescriptionId_COLUMN = "DELIVERY_ZONE_DESCRIPTION_ID"; /** * Get the value of deliveryZoneDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AF2C82E5_D881_4C61_B096_8667C945FD08]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BB2396D3_E0E1_4B99_B786_0F09CE6BB3EF]} * * @return The value of deliveryZoneDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of deliveryZoneDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AF2C82E5_D881_4C61_B096_8667C945FD08]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BB2396D3_E0E1_4B99_B786_0F09CE6BB3EF]} * * @param deliveryZoneDescriptionId The value of deliveryZoneDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileData.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileData.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileData.java 2008-04-08 04:39:30 UTC (rev 878) @@ -20,7 +20,7 @@ * * * [referrer-property] - * fileTagToFileDataList, imageDataList, manufacturerList, productList + * categoryList, fileTagToFileDataList, imageDataList, manufacturerList, productList * * [sequence] * @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of fileDataId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2A0E9AB9_771C_44B3_910E_4B8C8345E7B2]} */ + /** The value of fileDataId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38D221B4_8B92_4D84_8BB0_5F0F5C0EAD26]} */ protected java.math.BigDecimal _fileDataId; /** The value of name. {VARCHAR(100) : NotNull : Default=[]} */ @@ -140,6 +140,45 @@ // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + // ReferrerTable = [CATEGORY(TABLE)] + // ReferrerProperty = [categoryList] + // * * * * * * * * */ + + + /** The list of referrer table. */ + protected java.util.List _childrenCategoryList; + + /** + * Get the list of referrer table. {without lazyload}
+ * + * @return The list of referrer table. (NotNull: If it's not loaded yet, initializes the list instance of referrer as empty and returns it.) + */ + public java.util.List getCategoryList() { + if (_childrenCategoryList == null) { _childrenCategoryList = new java.util.ArrayList(); } + return _childrenCategoryList; + } + + /** + * Set the list of referrer table. + * + * @param categoryList The list of referrer table. (Nullable) + */ + public void setCategoryList(java.util.List categoryList) { + this._childrenCategoryList = categoryList; + } + + /** + * Has referrer elements of CategoryList. + * + * @return Determination. + */ + public boolean hasRefererElementsCategoryList() { + return _childrenCategoryList != null && !_childrenCategoryList.isEmpty(); + } + + + + // /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ReferrerTable = [FILE_TAG_TO_FILE_DATA(TABLE)] // ReferrerProperty = [fileTagToFileDataList] // * * * * * * * * */ @@ -482,12 +521,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2A0E9AB9_771C_44B3_910E_4B8C8345E7B2]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38D221B4_8B92_4D84_8BB0_5F0F5C0EAD26]} */ public static final String fileDataId_COLUMN = "FILE_DATA_ID"; /** * Get the value of fileDataId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2A0E9AB9_771C_44B3_910E_4B8C8345E7B2]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38D221B4_8B92_4D84_8BB0_5F0F5C0EAD26]} * * @return The value of fileDataId. (Nullable) */ @@ -497,7 +536,7 @@ /** * Set the value of fileDataId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2A0E9AB9_771C_44B3_910E_4B8C8345E7B2]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38D221B4_8B92_4D84_8BB0_5F0F5C0EAD26]} * * @param fileDataId The value of fileDataId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileTag.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileTag.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsFileTag.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of fileTagId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1D4C5B93_A4EF_4BD8_82A8_96C55C046F98]} */ + /** The value of fileTagId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3829C625_F661_4D38_B5B5_67D2347121EB]} */ protected java.math.BigDecimal _fileTagId; /** The value of name. {VARCHAR(100) : NotNull : Default=[]} */ @@ -292,12 +292,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1D4C5B93_A4EF_4BD8_82A8_96C55C046F98]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3829C625_F661_4D38_B5B5_67D2347121EB]} */ public static final String fileTagId_COLUMN = "FILE_TAG_ID"; /** * Get the value of fileTagId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1D4C5B93_A4EF_4BD8_82A8_96C55C046F98]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3829C625_F661_4D38_B5B5_67D2347121EB]} * * @return The value of fileTagId. (Nullable) */ @@ -307,7 +307,7 @@ /** * Set the value of fileTagId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1D4C5B93_A4EF_4BD8_82A8_96C55C046F98]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3829C625_F661_4D38_B5B5_67D2347121EB]} * * @param fileTagId The value of fileTagId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsImageData.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsImageData.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsImageData.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of fileDataId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B575C1_8C44_4C92_B3A9_FD08C9ED1C56] : FK to FILE_DATA} */ + /** The value of fileDataId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_66963A12_0B02_4F1B_887F_6330FE2597CA] : FK to FILE_DATA} */ protected java.math.BigDecimal _fileDataId; /** The value of size. {INTEGER : Default=[]} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B575C1_8C44_4C92_B3A9_FD08C9ED1C56] : FK to FILE_DATA} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_66963A12_0B02_4F1B_887F_6330FE2597CA] : FK to FILE_DATA} */ public static final String fileDataId_COLUMN = "FILE_DATA_ID"; /** * Get the value of fileDataId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B575C1_8C44_4C92_B3A9_FD08C9ED1C56] : FK to FILE_DATA} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_66963A12_0B02_4F1B_887F_6330FE2597CA] : FK to FILE_DATA} * * @return The value of fileDataId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of fileDataId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B575C1_8C44_4C92_B3A9_FD08C9ED1C56] : FK to FILE_DATA} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_66963A12_0B02_4F1B_887F_6330FE2597CA] : FK to FILE_DATA} * * @param fileDataId The value of fileDataId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturer.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturer.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturer.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of manufacturerId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C12F970E_8F1F_444E_81FE_5119267871E5]} */ + /** The value of manufacturerId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6AE78A2_ED57_48EB_B856_54EDE7606F3F]} */ protected java.math.BigDecimal _manufacturerId; /** The value of fileDataId. {BIGINT : Default=[] : FK to FILE_DATA} */ @@ -438,12 +438,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C12F970E_8F1F_444E_81FE_5119267871E5]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6AE78A2_ED57_48EB_B856_54EDE7606F3F]} */ public static final String manufacturerId_COLUMN = "MANUFACTURER_ID"; /** * Get the value of manufacturerId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C12F970E_8F1F_444E_81FE_5119267871E5]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6AE78A2_ED57_48EB_B856_54EDE7606F3F]} * * @return The value of manufacturerId. (Nullable) */ @@ -453,7 +453,7 @@ /** * Set the value of manufacturerId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C12F970E_8F1F_444E_81FE_5119267871E5]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6AE78A2_ED57_48EB_B856_54EDE7606F3F]} * * @param manufacturerId The value of manufacturerId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -14,7 +14,7 @@ * MANUFACTURER_DESCRIPTION_ID * * [column-property] - * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE + * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE * * [foreign-property] * manufacturer @@ -58,14 +58,14 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of manufacturerDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FB14852_D548_492E_A546_D94CFE117480]} */ + /** The value of manufacturerDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B00AC5CA_F645_4F81_AA2D_C6372A3892D8]} */ protected java.math.BigDecimal _manufacturerDescriptionId; /** The value of manufacturerId. {INTEGER : NotNull : Default=[] : FK to MANUFACTURER} */ protected java.math.BigDecimal _manufacturerId; - /** The value of content. {CLOB : Default=[]} */ - protected String _content; + /** The value of description. {CLOB : Default=[]} */ + protected String _description; /** The value of language. {VARCHAR(20) : NotNull : Default=[]} */ protected String _language; @@ -309,7 +309,7 @@ sb.append(delimiter).append(getManufacturerDescriptionId()); sb.append(delimiter).append(getManufacturerId()); - sb.append(delimiter).append(getContent()); + sb.append(delimiter).append(getDescription()); sb.append(delimiter).append(getLanguage()); sb.delete(0, delimiter.length()); @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FB14852_D548_492E_A546_D94CFE117480]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B00AC5CA_F645_4F81_AA2D_C6372A3892D8]} */ public static final String manufacturerDescriptionId_COLUMN = "MANUFACTURER_DESCRIPTION_ID"; /** * Get the value of manufacturerDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FB14852_D548_492E_A546_D94CFE117480]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B00AC5CA_F645_4F81_AA2D_C6372A3892D8]} * * @return The value of manufacturerDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of manufacturerDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FB14852_D548_492E_A546_D94CFE117480]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B00AC5CA_F645_4F81_AA2D_C6372A3892D8]} * * @param manufacturerDescriptionId The value of manufacturerDescriptionId. (Nullable) */ @@ -370,27 +370,27 @@ } /** Column Annotation for S2Dao. {CLOB : Default=[]} */ - public static final String content_COLUMN = "CONTENT"; + public static final String description_COLUMN = "DESCRIPTION"; /** - * Get the value of content.
+ * Get the value of description.
* {CLOB : Default=[]} * - * @return The value of content. (Nullable) + * @return The value of description. (Nullable) */ - public String getContent() { - return _content; + public String getDescription() { + return _description; } /** - * Set the value of content.
+ * Set the value of description.
* {CLOB : Default=[]} * - * @param content The value of content. (Nullable) + * @param description The value of description. (Nullable) */ - public void setContent(String content) { - _modifiedProperties.addPropertyName("content"); - this._content = content; + public void setDescription(String description) { + _modifiedProperties.addPropertyName("description"); + this._description = description; } /** Column Annotation for S2Dao. {VARCHAR(20) : NotNull : Default=[]} */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerInfo.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerInfo.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsManufacturerInfo.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of manufacturerInfoId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F63EF95_2A3B_4D50_A9E6_CBD0A2F58A9D]} */ + /** The value of manufacturerInfoId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D899A060_636B_445D_87E6_0F22ED18FACD]} */ protected java.math.BigDecimal _manufacturerInfoId; /** The value of manufacturerId. {INTEGER : NotNull : Default=[] : FK to MANUFACTURER} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F63EF95_2A3B_4D50_A9E6_CBD0A2F58A9D]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D899A060_636B_445D_87E6_0F22ED18FACD]} */ public static final String manufacturerInfoId_COLUMN = "MANUFACTURER_INFO_ID"; /** * Get the value of manufacturerInfoId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F63EF95_2A3B_4D50_A9E6_CBD0A2F58A9D]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D899A060_636B_445D_87E6_0F22ED18FACD]} * * @return The value of manufacturerInfoId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of manufacturerInfoId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F63EF95_2A3B_4D50_A9E6_CBD0A2F58A9D]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D899A060_636B_445D_87E6_0F22ED18FACD]} * * @param manufacturerInfoId The value of manufacturerInfoId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderCardInfo.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderFormId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CA7695D_D15F_4F2B_9051_506B115F603E]} */ + /** The value of orderFormId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8025507D_BC2F_4AC6_A3E4_87F4CAC6CD3B]} */ protected java.math.BigDecimal _orderFormId; /** The value of cardTypeId. {INTEGER : Default=[] : FK to CARD_TYPE} */ @@ -333,12 +333,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CA7695D_D15F_4F2B_9051_506B115F603E]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8025507D_BC2F_4AC6_A3E4_87F4CAC6CD3B]} */ public static final String orderFormId_COLUMN = "ORDER_FORM_ID"; /** * Get the value of orderFormId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CA7695D_D15F_4F2B_9051_506B115F603E]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8025507D_BC2F_4AC6_A3E4_87F4CAC6CD3B]} * * @return The value of orderFormId. (Nullable) */ @@ -348,7 +348,7 @@ /** * Set the value of orderFormId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CA7695D_D15F_4F2B_9051_506B115F603E]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8025507D_BC2F_4AC6_A3E4_87F4CAC6CD3B]} * * @param orderFormId The value of orderFormId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderComment.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderCommentId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53709283_8417_4D26_9790_CEE2549C20F0]} */ + /** The value of orderCommentId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_509E62A5_5887_4863_B360_A4AC2C632E4F]} */ protected java.math.BigDecimal _orderCommentId; /** The value of orderFormId. {BIGINT : NotNull : Default=[] : FK to ORDER_FORM} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53709283_8417_4D26_9790_CEE2549C20F0]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_509E62A5_5887_4863_B360_A4AC2C632E4F]} */ public static final String orderCommentId_COLUMN = "ORDER_COMMENT_ID"; /** * Get the value of orderCommentId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53709283_8417_4D26_9790_CEE2549C20F0]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_509E62A5_5887_4863_B360_A4AC2C632E4F]} * * @return The value of orderCommentId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of orderCommentId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53709283_8417_4D26_9790_CEE2549C20F0]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_509E62A5_5887_4863_B360_A4AC2C632E4F]} * * @param orderCommentId The value of orderCommentId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE + * 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE * * [foreign-property] * customer, orderStatus @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderFormId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E1DFBFB_6E87_4AFF_B190_B7582A1DAF58]} */ + /** The value of orderFormId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D028B5F8_30A1_4068_B44A_15B15660D6A7]} */ protected java.math.BigDecimal _orderFormId; /** The value of orderFormNumber. {VARCHAR(40) : NotNull : Default=[]} */ @@ -157,8 +157,8 @@ /** The value of billingCountryCode. {VARCHAR(40) : NotNull : Default=[]} */ protected String _billingCountryCode; - /** The value of billingLocaleName. {VARCHAR(20) : NotNull : Default=[]} */ - protected String _billingLocaleName; + /** The value of billingLanguage. {VARCHAR(20) : NotNull : Default=[]} */ + protected String _billingLanguage; /** The value of orderStatusId. {INTEGER : NotNull : Default=[] : FK to ORDER_STATUS} */ protected java.math.BigDecimal _orderStatusId; @@ -819,7 +819,7 @@ sb.append(delimiter).append(getBillingPostcode()); sb.append(delimiter).append(getBillingTelephone()); sb.append(delimiter).append(getBillingCountryCode()); - sb.append(delimiter).append(getBillingLocaleName()); + sb.append(delimiter).append(getBillingLanguage()); sb.append(delimiter).append(getOrderStatusId()); sb.append(delimiter).append(getUpdatedDate()); sb.append(delimiter).append(getPurchasedDate()); @@ -834,12 +834,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E1DFBFB_6E87_4AFF_B190_B7582A1DAF58]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D028B5F8_30A1_4068_B44A_15B15660D6A7]} */ public static final String orderFormId_COLUMN = "ORDER_FORM_ID"; /** * Get the value of orderFormId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E1DFBFB_6E87_4AFF_B190_B7582A1DAF58]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D028B5F8_30A1_4068_B44A_15B15660D6A7]} * * @return The value of orderFormId. (Nullable) */ @@ -849,7 +849,7 @@ /** * Set the value of orderFormId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E1DFBFB_6E87_4AFF_B190_B7582A1DAF58]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D028B5F8_30A1_4068_B44A_15B15660D6A7]} * * @param orderFormId The value of orderFormId. (Nullable) */ @@ -1627,27 +1627,27 @@ } /** Column Annotation for S2Dao. {VARCHAR(20) : NotNull : Default=[]} */ - public static final String billingLocaleName_COLUMN = "BILLING_LOCALE_NAME"; + public static final String billingLanguage_COLUMN = "BILLING_LANGUAGE"; /** - * Get the value of billingLocaleName.
+ * Get the value of billingLanguage.
* {VARCHAR(20) : NotNull : Default=[]} * - * @return The value of billingLocaleName. (Nullable) + * @return The value of billingLanguage. (Nullable) */ - public String getBillingLocaleName() { - return _billingLocaleName; + public String getBillingLanguage() { + return _billingLanguage; } /** - * Set the value of billingLocaleName.
+ * Set the value of billingLanguage.
* {VARCHAR(20) : NotNull : Default=[]} * - * @param billingLocaleName The value of billingLocaleName. (Nullable) + * @param billingLanguage The value of billingLanguage. (Nullable) */ - public void setBillingLocaleName(String billingLocaleName) { - _modifiedProperties.addPropertyName("billingLocaleName"); - this._billingLocaleName = billingLocaleName; + public void setBillingLanguage(String billingLanguage) { + _modifiedProperties.addPropertyName("billingLanguage"); + this._billingLanguage = billingLanguage; } /** Column Annotation for S2Dao. {INTEGER : NotNull : Default=[] : FK to ORDER_STATUS} */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderNotification.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderNotificationId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5EC32B11_0D84_4CE1_A08D_11E0C96B55D6]} */ + /** The value of orderNotificationId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E10C6D3C_63F1_4367_966E_F57D333ABD11]} */ protected java.math.BigDecimal _orderNotificationId; /** The value of orderStatusId. {INTEGER : NotNull : Default=[] : FK to ORDER_STATUS} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5EC32B11_0D84_4CE1_A08D_11E0C96B55D6]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E10C6D3C_63F1_4367_966E_F57D333ABD11]} */ public static final String orderNotificationId_COLUMN = "ORDER_NOTIFICATION_ID"; /** * Get the value of orderNotificationId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5EC32B11_0D84_4CE1_A08D_11E0C96B55D6]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E10C6D3C_63F1_4367_966E_F57D333ABD11]} * * @return The value of orderNotificationId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of orderNotificationId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5EC32B11_0D84_4CE1_A08D_11E0C96B55D6]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E10C6D3C_63F1_4367_966E_F57D333ABD11]} * * @param orderNotificationId The value of orderNotificationId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderPayment.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderPayment.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderPayment.java 2008-04-08 04:39:30 UTC (rev 878) @@ -14,7 +14,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE + * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * orderForm, paymentMethod, paymentStatus @@ -70,9 +70,6 @@ /** The value of paymentStatusId. {INTEGER : Default=[] : FK to PAYMENT_STATUS} */ protected java.math.BigDecimal _paymentStatusId; - /** The value of updatedDate. {TIMESTAMP : Default=[]} */ - protected java.sql.Timestamp _updatedDate; - /** The value of subTotalPrice. {DECIMAL(14, 6) : Default=[]} */ protected java.math.BigDecimal _subTotalPrice; @@ -134,16 +131,16 @@ // =================================================================================== // Classification Classifying // ========================== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Name/Alias // ========================= - + // =================================================================================== // Foreign Table @@ -450,7 +447,6 @@ sb.append(delimiter).append(getPaymentMethodCode()); sb.append(delimiter).append(getOrderCardInfoId()); sb.append(delimiter).append(getPaymentStatusId()); - sb.append(delimiter).append(getUpdatedDate()); sb.append(delimiter).append(getSubTotalPrice()); sb.append(delimiter).append(getTax()); sb.append(delimiter).append(getDeliveryPrice()); @@ -586,30 +582,6 @@ this._paymentStatusId = paymentStatusId; } - /** Column Annotation for S2Dao. {TIMESTAMP : Default=[]} */ - public static final String updatedDate_COLUMN = "UPDATED_DATE"; - - /** - * Get the value of updatedDate.
- * {TIMESTAMP : Default=[]} - * - * @return The value of updatedDate. (Nullable) - */ - public java.sql.Timestamp getUpdatedDate() { - return _updatedDate; - } - - /** - * Set the value of updatedDate.
- * {TIMESTAMP : Default=[]} - * - * @param updatedDate The value of updatedDate. (Nullable) - */ - public void setUpdatedDate(java.sql.Timestamp updatedDate) { - _modifiedProperties.addPropertyName("updatedDate"); - this._updatedDate = updatedDate; - } - /** Column Annotation for S2Dao. {DECIMAL(14, 6) : Default=[]} */ public static final String subTotalPrice_COLUMN = "SUB_TOTAL_PRICE"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderProductId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6A0998C7_E994_4EAD_82DA_CD13DD6F3FDB]} */ + /** The value of orderProductId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E7663C8_2AA3_4A71_BA3C_9FB60F8CD5F4]} */ protected java.math.BigDecimal _orderProductId; /** The value of orderFormId. {BIGINT : NotNull : Default=[] : FK to ORDER_FORM} */ @@ -456,12 +456,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6A0998C7_E994_4EAD_82DA_CD13DD6F3FDB]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E7663C8_2AA3_4A71_BA3C_9FB60F8CD5F4]} */ public static final String orderProductId_COLUMN = "ORDER_PRODUCT_ID"; /** * Get the value of orderProductId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6A0998C7_E994_4EAD_82DA_CD13DD6F3FDB]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E7663C8_2AA3_4A71_BA3C_9FB60F8CD5F4]} * * @return The value of orderProductId. (Nullable) */ @@ -471,7 +471,7 @@ /** * Set the value of orderProductId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6A0998C7_E994_4EAD_82DA_CD13DD6F3FDB]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E7663C8_2AA3_4A71_BA3C_9FB60F8CD5F4]} * * @param orderProductId The value of orderProductId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProductOption.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProductOption.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProductOption.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderProductOptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FE7F2B02_B5E2_4245_A033_EBF6D16F6F7A]} */ + /** The value of orderProductOptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_34BAF4A8_D116_4023_BC0A_AEA573B5280F]} */ protected java.math.BigDecimal _orderProductOptionId; /** The value of orderProductId. {BIGINT : NotNull : Default=[] : FK to ORDER_PRODUCT} */ @@ -401,12 +401,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FE7F2B02_B5E2_4245_A033_EBF6D16F6F7A]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_34BAF4A8_D116_4023_BC0A_AEA573B5280F]} */ public static final String orderProductOptionId_COLUMN = "ORDER_PRODUCT_OPTION_ID"; /** * Get the value of orderProductOptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FE7F2B02_B5E2_4245_A033_EBF6D16F6F7A]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_34BAF4A8_D116_4023_BC0A_AEA573B5280F]} * * @return The value of orderProductOptionId. (Nullable) */ @@ -416,7 +416,7 @@ /** * Set the value of orderProductOptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FE7F2B02_B5E2_4245_A033_EBF6D16F6F7A]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_34BAF4A8_D116_4023_BC0A_AEA573B5280F]} * * @param orderProductOptionId The value of orderProductOptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatus.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderStatusId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_50CD49BE_2DFF_4EBC_B0A3_352D3224CD8E]} */ + /** The value of orderStatusId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E39CF5F_3F03_4CD2_93AF_D5271B7A9CD4]} */ protected java.math.BigDecimal _orderStatusId; /** The value of type. {INTEGER : NotNull : Default=[]} */ @@ -417,12 +417,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_50CD49BE_2DFF_4EBC_B0A3_352D3224CD8E]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E39CF5F_3F03_4CD2_93AF_D5271B7A9CD4]} */ public static final String orderStatusId_COLUMN = "ORDER_STATUS_ID"; /** * Get the value of orderStatusId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_50CD49BE_2DFF_4EBC_B0A3_352D3224CD8E]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E39CF5F_3F03_4CD2_93AF_D5271B7A9CD4]} * * @return The value of orderStatusId. (Nullable) */ @@ -432,7 +432,7 @@ /** * Set the value of orderStatusId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_50CD49BE_2DFF_4EBC_B0A3_352D3224CD8E]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E39CF5F_3F03_4CD2_93AF_D5271B7A9CD4]} * * @param orderStatusId The value of orderStatusId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderStatusDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57005BDB_8F67_48C9_8FA8_A5873EE74109]} */ + /** The value of orderStatusDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CFF5800_E0F8_4DFD_B8E7_DD338204FCF2]} */ protected java.math.BigDecimal _orderStatusDescriptionId; /** The value of orderStatusId. {INTEGER : NotNull : Default=[] : FK to ORDER_STATUS} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57005BDB_8F67_48C9_8FA8_A5873EE74109]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CFF5800_E0F8_4DFD_B8E7_DD338204FCF2]} */ public static final String orderStatusDescriptionId_COLUMN = "ORDER_STATUS_DESCRIPTION_ID"; /** * Get the value of orderStatusDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57005BDB_8F67_48C9_8FA8_A5873EE74109]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CFF5800_E0F8_4DFD_B8E7_DD338204FCF2]} * * @return The value of orderStatusDescriptionId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of orderStatusDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57005BDB_8F67_48C9_8FA8_A5873EE74109]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CFF5800_E0F8_4DFD_B8E7_DD338204FCF2]} * * @param orderStatusDescriptionId The value of orderStatusDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderStatusHistory.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of orderStatusHistoryId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A1233B6_C86A_4560_9F95_D174C0F8AECD]} */ + /** The value of orderStatusHistoryId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EAC40217_D574_4478_888A_8632E9DF0DDC]} */ protected java.math.BigDecimal _orderStatusHistoryId; /** The value of orderFormId. {BIGINT : NotNull : Default=[] : FK to ORDER_FORM} */ @@ -389,12 +389,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A1233B6_C86A_4560_9F95_D174C0F8AECD]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EAC40217_D574_4478_888A_8632E9DF0DDC]} */ public static final String orderStatusHistoryId_COLUMN = "ORDER_STATUS_HISTORY_ID"; /** * Get the value of orderStatusHistoryId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A1233B6_C86A_4560_9F95_D174C0F8AECD]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EAC40217_D574_4478_888A_8632E9DF0DDC]} * * @return The value of orderStatusHistoryId. (Nullable) */ @@ -404,7 +404,7 @@ /** * Set the value of orderStatusHistoryId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A1233B6_C86A_4560_9F95_D174C0F8AECD]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EAC40217_D574_4478_888A_8632E9DF0DDC]} * * @param orderStatusHistoryId The value of orderStatusHistoryId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of paymentMethodId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A860291A_CEB7_4C33_B2C5_E17DDFF29780]} */ + /** The value of paymentMethodId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1ACB50B5_1334_4789_83C3_F4D2B67AE926]} */ protected java.math.BigDecimal _paymentMethodId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -347,12 +347,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A860291A_CEB7_4C33_B2C5_E17DDFF29780]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1ACB50B5_1334_4789_83C3_F4D2B67AE926]} */ public static final String paymentMethodId_COLUMN = "PAYMENT_METHOD_ID"; /** * Get the value of paymentMethodId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A860291A_CEB7_4C33_B2C5_E17DDFF29780]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1ACB50B5_1334_4789_83C3_F4D2B67AE926]} * * @return The value of paymentMethodId. (Nullable) */ @@ -362,7 +362,7 @@ /** * Set the value of paymentMethodId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A860291A_CEB7_4C33_B2C5_E17DDFF29780]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1ACB50B5_1334_4789_83C3_F4D2B67AE926]} * * @param paymentMethodId The value of paymentMethodId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethodDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethodDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethodDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of paymentMethodDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FCCE10D1_1C23_4261_8F63_ACC2E84661E5]} */ + /** The value of paymentMethodDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4F0976EF_3F52_43FD_A80E_0BE4F5CB6B09]} */ protected java.math.BigDecimal _paymentMethodDescriptionId; /** The value of paymentMethodId. {INTEGER : NotNull : Default=[] : FK to PAYMENT_METHOD} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FCCE10D1_1C23_4261_8F63_ACC2E84661E5]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4F0976EF_3F52_43FD_A80E_0BE4F5CB6B09]} */ public static final String paymentMethodDescriptionId_COLUMN = "PAYMENT_METHOD_DESCRIPTION_ID"; /** * Get the value of paymentMethodDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FCCE10D1_1C23_4261_8F63_ACC2E84661E5]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4F0976EF_3F52_43FD_A80E_0BE4F5CB6B09]} * * @return The value of paymentMethodDescriptionId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of paymentMethodDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FCCE10D1_1C23_4261_8F63_ACC2E84661E5]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4F0976EF_3F52_43FD_A80E_0BE4F5CB6B09]} * * @param paymentMethodDescriptionId The value of paymentMethodDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatus.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatus.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatus.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of paymentStatusId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_07F04D5F_8DEB_4F29_802E_787FF0C257F7]} */ + /** The value of paymentStatusId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A2F7FC55_6332_417D_8BF0_AA4E09968224]} */ protected java.math.BigDecimal _paymentStatusId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -339,12 +339,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_07F04D5F_8DEB_4F29_802E_787FF0C257F7]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A2F7FC55_6332_417D_8BF0_AA4E09968224]} */ public static final String paymentStatusId_COLUMN = "PAYMENT_STATUS_ID"; /** * Get the value of paymentStatusId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_07F04D5F_8DEB_4F29_802E_787FF0C257F7]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A2F7FC55_6332_417D_8BF0_AA4E09968224]} * * @return The value of paymentStatusId. (Nullable) */ @@ -354,7 +354,7 @@ /** * Set the value of paymentStatusId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_07F04D5F_8DEB_4F29_802E_787FF0C257F7]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A2F7FC55_6332_417D_8BF0_AA4E09968224]} * * @param paymentStatusId The value of paymentStatusId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatusDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatusDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentStatusDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of paymentStatusDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0FA0CE4E_1A66_4141_BB8C_DEF9F3002150]} */ + /** The value of paymentStatusDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD3A4F90_5DB1_4753_8E86_CEFC8E032F6E]} */ protected java.math.BigDecimal _paymentStatusDescriptionId; /** The value of paymentStatusId. {INTEGER : NotNull : Default=[] : FK to PAYMENT_STATUS} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0FA0CE4E_1A66_4141_BB8C_DEF9F3002150]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD3A4F90_5DB1_4753_8E86_CEFC8E032F6E]} */ public static final String paymentStatusDescriptionId_COLUMN = "PAYMENT_STATUS_DESCRIPTION_ID"; /** * Get the value of paymentStatusDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0FA0CE4E_1A66_4141_BB8C_DEF9F3002150]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD3A4F90_5DB1_4753_8E86_CEFC8E032F6E]} * * @return The value of paymentStatusDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of paymentStatusDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0FA0CE4E_1A66_4141_BB8C_DEF9F3002150]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD3A4F90_5DB1_4753_8E86_CEFC8E032F6E]} * * @param paymentStatusDescriptionId The value of paymentStatusDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java 2008-04-08 04:39:30 UTC (rev 878) @@ -14,7 +14,7 @@ * PRODUCT_ID * * [column-property] - * PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE + * PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE * * [foreign-property] * deliveryType, fileData, manufacturer, taxType @@ -58,18 +58,24 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53F43142_633D_4D33_B998_7660EB2AAA6E]} */ + /** The value of productId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_401D882C_D7F7_4467_952C_FF7279D1F245]} */ protected java.math.BigDecimal _productId; - /** The value of model. {VARCHAR(80) : Default=[]} */ - protected String _model; + /** The value of productMode. {INTEGER : NotNull : Default=[]} */ + protected java.math.BigDecimal _productMode; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ protected String _code; + /** The value of model. {VARCHAR(80) : Default=[]} */ + protected String _model; + /** The value of stock. {INTEGER : Default=[]} */ protected java.math.BigDecimal _stock; + /** The value of catalogPrice. {DECIMAL(15, 4) : Default=[]} */ + protected java.math.BigDecimal _catalogPrice; + /** The value of price. {DECIMAL(15, 4) : NotNull : Default=[]} */ protected java.math.BigDecimal _price; @@ -158,16 +164,16 @@ // =================================================================================== // Classification Classifying // ========================== - + // =================================================================================== // Classification Determination // ============================ - + // =================================================================================== // Classification Name/Alias // ========================= - + // =================================================================================== // Foreign Table @@ -1198,9 +1204,11 @@ final StringBuffer sb = new StringBuffer(); sb.append(delimiter).append(getProductId()); + sb.append(delimiter).append(getProductMode()); + sb.append(delimiter).append(getCode()); sb.append(delimiter).append(getModel()); - sb.append(delimiter).append(getCode()); sb.append(delimiter).append(getStock()); + sb.append(delimiter).append(getCatalogPrice()); sb.append(delimiter).append(getPrice()); sb.append(delimiter).append(getWeight()); sb.append(delimiter).append(getSize()); @@ -1225,12 +1233,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53F43142_633D_4D33_B998_7660EB2AAA6E]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_401D882C_D7F7_4467_952C_FF7279D1F245]} */ public static final String productId_COLUMN = "PRODUCT_ID"; /** * Get the value of productId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53F43142_633D_4D33_B998_7660EB2AAA6E]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_401D882C_D7F7_4467_952C_FF7279D1F245]} * * @return The value of productId. (Nullable) */ @@ -1240,7 +1248,7 @@ /** * Set the value of productId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53F43142_633D_4D33_B998_7660EB2AAA6E]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_401D882C_D7F7_4467_952C_FF7279D1F245]} * * @param productId The value of productId. (Nullable) */ @@ -1249,28 +1257,28 @@ this._productId = productId; } - /** Column Annotation for S2Dao. {VARCHAR(80) : Default=[]} */ - public static final String model_COLUMN = "MODEL"; + /** Column Annotation for S2Dao. {INTEGER : NotNull : Default=[]} */ + public static final String productMode_COLUMN = "PRODUCT_MODE"; /** - * Get the value of model.
- * {VARCHAR(80) : Default=[]} + * Get the value of productMode.
+ * {INTEGER : NotNull : Default=[]} * - * @return The value of model. (Nullable) + * @return The value of productMode. (Nullable) */ - public String getModel() { - return _model; + public java.math.BigDecimal getProductMode() { + return _productMode; } /** - * Set the value of model.
- * {VARCHAR(80) : Default=[]} + * Set the value of productMode.
+ * {INTEGER : NotNull : Default=[]} * - * @param model The value of model. (Nullable) + * @param productMode The value of productMode. (Nullable) */ - public void setModel(String model) { - _modifiedProperties.addPropertyName("model"); - this._model = model; + public void setProductMode(java.math.BigDecimal productMode) { + _modifiedProperties.addPropertyName("productMode"); + this._productMode = productMode; } /** Column Annotation for S2Dao. {VARCHAR(40) : NotNull : Default=[]} */ @@ -1297,6 +1305,30 @@ this._code = code; } + /** Column Annotation for S2Dao. {VARCHAR(80) : Default=[]} */ + public static final String model_COLUMN = "MODEL"; + + /** + * Get the value of model.
+ * {VARCHAR(80) : Default=[]} + * + * @return The value of model. (Nullable) + */ + public String getModel() { + return _model; + } + + /** + * Set the value of model.
+ * {VARCHAR(80) : Default=[]} + * + * @param model The value of model. (Nullable) + */ + public void setModel(String model) { + _modifiedProperties.addPropertyName("model"); + this._model = model; + } + /** Column Annotation for S2Dao. {INTEGER : Default=[]} */ public static final String stock_COLUMN = "STOCK"; @@ -1321,6 +1353,30 @@ this._stock = stock; } + /** Column Annotation for S2Dao. {DECIMAL(15, 4) : Default=[]} */ + public static final String catalogPrice_COLUMN = "CATALOG_PRICE"; + + /** + * Get the value of catalogPrice.
+ * {DECIMAL(15, 4) : Default=[]} + * + * @return The value of catalogPrice. (Nullable) + */ + public java.math.BigDecimal getCatalogPrice() { + return _catalogPrice; + } + + /** + * Set the value of catalogPrice.
+ * {DECIMAL(15, 4) : Default=[]} + * + * @param catalogPrice The value of catalogPrice. (Nullable) + */ + public void setCatalogPrice(java.math.BigDecimal catalogPrice) { + _modifiedProperties.addPropertyName("catalogPrice"); + this._catalogPrice = catalogPrice; + } + /** Column Annotation for S2Dao. {DECIMAL(15, 4) : NotNull : Default=[]} */ public static final String price_COLUMN = "PRICE"; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductAttribute.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductAttribute.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductAttribute.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productAttributeId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2610CCC8_5F78_4EB1_9A12_0AC2591CAA82]} */ + /** The value of productAttributeId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_68ADF6E2_A268_4D8C_8EAB_FCFA9F4C21E5]} */ protected java.math.BigDecimal _productAttributeId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2610CCC8_5F78_4EB1_9A12_0AC2591CAA82]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_68ADF6E2_A268_4D8C_8EAB_FCFA9F4C21E5]} */ public static final String productAttributeId_COLUMN = "PRODUCT_ATTRIBUTE_ID"; /** * Get the value of productAttributeId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2610CCC8_5F78_4EB1_9A12_0AC2591CAA82]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_68ADF6E2_A268_4D8C_8EAB_FCFA9F4C21E5]} * * @return The value of productAttributeId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of productAttributeId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2610CCC8_5F78_4EB1_9A12_0AC2591CAA82]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_68ADF6E2_A268_4D8C_8EAB_FCFA9F4C21E5]} * * @param productAttributeId The value of productAttributeId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductContent.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductContent.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductContent.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productContentId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B293D68B_28E4_4793_9AF6_F0349ECD15DD]} */ + /** The value of productContentId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CCD79C7E_3A54_4424_B91D_A9E7FBDBFF59]} */ protected java.math.BigDecimal _productContentId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B293D68B_28E4_4793_9AF6_F0349ECD15DD]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CCD79C7E_3A54_4424_B91D_A9E7FBDBFF59]} */ public static final String productContentId_COLUMN = "PRODUCT_CONTENT_ID"; /** * Get the value of productContentId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B293D68B_28E4_4793_9AF6_F0349ECD15DD]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CCD79C7E_3A54_4424_B91D_A9E7FBDBFF59]} * * @return The value of productContentId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of productContentId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B293D68B_28E4_4793_9AF6_F0349ECD15DD]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CCD79C7E_3A54_4424_B91D_A9E7FBDBFF59]} * * @param productContentId The value of productContentId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productDescriptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FB791960_CC5F_45D5_B37F_B6D75E155C0C]} */ + /** The value of productDescriptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4DA6852D_7749_4178_928F_F2004FABABCE]} */ protected java.math.BigDecimal _productDescriptionId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FB791960_CC5F_45D5_B37F_B6D75E155C0C]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4DA6852D_7749_4178_928F_F2004FABABCE]} */ public static final String productDescriptionId_COLUMN = "PRODUCT_DESCRIPTION_ID"; /** * Get the value of productDescriptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FB791960_CC5F_45D5_B37F_B6D75E155C0C]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4DA6852D_7749_4178_928F_F2004FABABCE]} * * @return The value of productDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of productDescriptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FB791960_CC5F_45D5_B37F_B6D75E155C0C]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4DA6852D_7749_4178_928F_F2004FABABCE]} * * @param productDescriptionId The value of productDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductInfo.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductInfo.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductInfo.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productInfoId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9993D476_B5B5_49CC_8ADE_EBA1CE9A9125]} */ + /** The value of productInfoId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8041627D_F7ED_4DAC_8329_9646CB5790C6]} */ protected java.math.BigDecimal _productInfoId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -329,12 +329,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9993D476_B5B5_49CC_8ADE_EBA1CE9A9125]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8041627D_F7ED_4DAC_8329_9646CB5790C6]} */ public static final String productInfoId_COLUMN = "PRODUCT_INFO_ID"; /** * Get the value of productInfoId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9993D476_B5B5_49CC_8ADE_EBA1CE9A9125]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8041627D_F7ED_4DAC_8329_9646CB5790C6]} * * @return The value of productInfoId. (Nullable) */ @@ -344,7 +344,7 @@ /** * Set the value of productInfoId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9993D476_B5B5_49CC_8ADE_EBA1CE9A9125]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8041627D_F7ED_4DAC_8329_9646CB5790C6]} * * @param productInfoId The value of productInfoId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOption.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOption.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOption.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productOptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6903EF6A_CC3D_43CF_81E5_E3D4AC0C5FC4]} */ + /** The value of productOptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_940904FB_500A_4755_9955_FC3B027A8B8A]} */ protected java.math.BigDecimal _productOptionId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -395,12 +395,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6903EF6A_CC3D_43CF_81E5_E3D4AC0C5FC4]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_940904FB_500A_4755_9955_FC3B027A8B8A]} */ public static final String productOptionId_COLUMN = "PRODUCT_OPTION_ID"; /** * Get the value of productOptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6903EF6A_CC3D_43CF_81E5_E3D4AC0C5FC4]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_940904FB_500A_4755_9955_FC3B027A8B8A]} * * @return The value of productOptionId. (Nullable) */ @@ -410,7 +410,7 @@ /** * Set the value of productOptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6903EF6A_CC3D_43CF_81E5_E3D4AC0C5FC4]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_940904FB_500A_4755_9955_FC3B027A8B8A]} * * @param productOptionId The value of productOptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productOptionDescriptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_43A5118F_243D_4D3C_935E_299F8EED5E52]} */ + /** The value of productOptionDescriptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_81904327_A675_4673_9624_DCF0CBE4B8A8]} */ protected java.math.BigDecimal _productOptionDescriptionId; /** The value of productOptionId. {BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_43A5118F_243D_4D3C_935E_299F8EED5E52]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_81904327_A675_4673_9624_DCF0CBE4B8A8]} */ public static final String productOptionDescriptionId_COLUMN = "PRODUCT_OPTION_DESCRIPTION_ID"; /** * Get the value of productOptionDescriptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_43A5118F_243D_4D3C_935E_299F8EED5E52]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_81904327_A675_4673_9624_DCF0CBE4B8A8]} * * @return The value of productOptionDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of productOptionDescriptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_43A5118F_243D_4D3C_935E_299F8EED5E52]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_81904327_A675_4673_9624_DCF0CBE4B8A8]} * * @param productOptionDescriptionId The value of productOptionDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValue.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValue.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValue.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productOptionValueId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F23FF2B3_EED2_4FEE_9ED0_E9C5655FE122]} */ + /** The value of productOptionValueId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0C947A89_3C09_42B9_BBA5_C45460C33F8C]} */ protected java.math.BigDecimal _productOptionValueId; /** The value of productOptionId. {BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION} */ @@ -438,12 +438,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F23FF2B3_EED2_4FEE_9ED0_E9C5655FE122]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0C947A89_3C09_42B9_BBA5_C45460C33F8C]} */ public static final String productOptionValueId_COLUMN = "PRODUCT_OPTION_VALUE_ID"; /** * Get the value of productOptionValueId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F23FF2B3_EED2_4FEE_9ED0_E9C5655FE122]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0C947A89_3C09_42B9_BBA5_C45460C33F8C]} * * @return The value of productOptionValueId. (Nullable) */ @@ -453,7 +453,7 @@ /** * Set the value of productOptionValueId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F23FF2B3_EED2_4FEE_9ED0_E9C5655FE122]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0C947A89_3C09_42B9_BBA5_C45460C33F8C]} * * @param productOptionValueId The value of productOptionValueId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValueDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValueDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProductOptionValueDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of productOptionValueDescriptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_19809486_4B46_4518_9993_D8F7C0022152]} */ + /** The value of productOptionValueDescriptionId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_45F180FB_67A4_4AAD_93C8_637AD06D42A5]} */ protected java.math.BigDecimal _productOptionValueDescriptionId; /** The value of productOptionValueId. {BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION_VALUE} */ @@ -321,12 +321,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_19809486_4B46_4518_9993_D8F7C0022152]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_45F180FB_67A4_4AAD_93C8_637AD06D42A5]} */ public static final String productOptionValueDescriptionId_COLUMN = "PRODUCT_OPTION_VALUE_DESCRIPTION_ID"; /** * Get the value of productOptionValueDescriptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_19809486_4B46_4518_9993_D8F7C0022152]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_45F180FB_67A4_4AAD_93C8_637AD06D42A5]} * * @return The value of productOptionValueDescriptionId. (Nullable) */ @@ -336,7 +336,7 @@ /** * Set the value of productOptionValueDescriptionId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_19809486_4B46_4518_9993_D8F7C0022152]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_45F180FB_67A4_4AAD_93C8_637AD06D42A5]} * * @param productOptionValueDescriptionId The value of productOptionValueDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReview.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReview.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsReview.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of reviewId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D85D1640_DC82_4764_AC1E_54AD6993A863]} */ + /** The value of reviewId. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65AB13F6_B094_46A9_AB54_971D78C1786C]} */ protected java.math.BigDecimal _reviewId; /** The value of productId. {BIGINT : NotNull : Default=[] : FK to PRODUCT} */ @@ -493,12 +493,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D85D1640_DC82_4764_AC1E_54AD6993A863]} */ + /** Column Annotation for S2Dao. {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65AB13F6_B094_46A9_AB54_971D78C1786C]} */ public static final String reviewId_COLUMN = "REVIEW_ID"; /** * Get the value of reviewId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D85D1640_DC82_4764_AC1E_54AD6993A863]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65AB13F6_B094_46A9_AB54_971D78C1786C]} * * @return The value of reviewId. (Nullable) */ @@ -508,7 +508,7 @@ /** * Set the value of reviewId.
- * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D85D1640_DC82_4764_AC1E_54AD6993A863]} + * {PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65AB13F6_B094_46A9_AB54_971D78C1786C]} * * @param reviewId The value of reviewId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxType.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxType.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxType.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of taxTypeId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3D9E5BA9_1EC6_4B79_8EAA_647BBE1BFC6B]} */ + /** The value of taxTypeId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9A8A4772_33E6_47D4_9215_C2BFFA2BE3AC]} */ protected java.math.BigDecimal _taxTypeId; /** The value of code. {VARCHAR(40) : NotNull : Default=[]} */ @@ -343,12 +343,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3D9E5BA9_1EC6_4B79_8EAA_647BBE1BFC6B]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9A8A4772_33E6_47D4_9215_C2BFFA2BE3AC]} */ public static final String taxTypeId_COLUMN = "TAX_TYPE_ID"; /** * Get the value of taxTypeId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3D9E5BA9_1EC6_4B79_8EAA_647BBE1BFC6B]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9A8A4772_33E6_47D4_9215_C2BFFA2BE3AC]} * * @return The value of taxTypeId. (Nullable) */ @@ -358,7 +358,7 @@ /** * Set the value of taxTypeId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3D9E5BA9_1EC6_4B79_8EAA_647BBE1BFC6B]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9A8A4772_33E6_47D4_9215_C2BFFA2BE3AC]} * * @param taxTypeId The value of taxTypeId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxTypeDescription.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxTypeDescription.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsTaxTypeDescription.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,7 +58,7 @@ /** Entity modified properties. (for S2Dao) */ protected EntityModifiedProperties _modifiedProperties = newEntityModifiedProperties(); - /** The value of taxTypeDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5FE6253A_8E3B_4B89_AA6E_EB8B3A8E6236]} */ + /** The value of taxTypeDescriptionId. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F69A7535_43D6_47C0_A194_89836EB84BB8]} */ protected java.math.BigDecimal _taxTypeDescriptionId; /** The value of taxTypeId. {INTEGER : NotNull : Default=[] : FK to TAX_TYPE} */ @@ -325,12 +325,12 @@ // Accessor // ======== - /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5FE6253A_8E3B_4B89_AA6E_EB8B3A8E6236]} */ + /** Column Annotation for S2Dao. {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F69A7535_43D6_47C0_A194_89836EB84BB8]} */ public static final String taxTypeDescriptionId_COLUMN = "TAX_TYPE_DESCRIPTION_ID"; /** * Get the value of taxTypeDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5FE6253A_8E3B_4B89_AA6E_EB8B3A8E6236]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F69A7535_43D6_47C0_A194_89836EB84BB8]} * * @return The value of taxTypeDescriptionId. (Nullable) */ @@ -340,7 +340,7 @@ /** * Set the value of taxTypeDescriptionId.
- * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5FE6253A_8E3B_4B89_AA6E_EB8B3A8E6236]} + * {PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F69A7535_43D6_47C0_A194_89836EB84BB8]} * * @param taxTypeDescriptionId The value of taxTypeDescriptionId. (Nullable) */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ADDRESS_BOOK_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B2AB219C_D4F1_452C_B099_AD486A390F59] */ + /** DB name of ADDRESS_BOOK_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_808D4A71_93E0_4FA1_A942_87936FD75DF1] */ public static final String DB_NAME_ADDRESS_BOOK_ID = "ADDRESS_BOOK_ID"; /** DB name of CUSTOMER_ID. BIGINT : NotNull : Default=[] : FK to CUSTOMER */ @@ -155,7 +155,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of addressBookId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B2AB219C_D4F1_452C_B099_AD486A390F59] */ + /** Property name(JavaBeansRule) of addressBookId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_808D4A71_93E0_4FA1_A942_87936FD75DF1] */ public static final String PROPERTY_NAME_addressBookId = "addressBookId"; /** Property name(JavaBeansRule) of customerId. BIGINT : NotNull : Default=[] : FK to CUSTOMER */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BargainDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BargainDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BargainDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of BARGAIN_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_41EE8F2A_146E_43EA_AEA0_14E70D67CD8F] */ + /** DB name of BARGAIN_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA035F66_12AF_4013_8E9B_1D071C2AF23D] */ public static final String DB_NAME_BARGAIN_ID = "BARGAIN_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -122,7 +122,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of bargainId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_41EE8F2A_146E_43EA_AEA0_14E70D67CD8F] */ + /** Property name(JavaBeansRule) of bargainId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA035F66_12AF_4013_8E9B_1D071C2AF23D] */ public static final String PROPERTY_NAME_bargainId = "bargainId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of BASKET_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BD92529C_24B2_40C3_A935_007DDC28CCAC] */ + /** DB name of BASKET_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C81A57D4_EF48_44BD_82F6_EA8B07B4C91D] */ public static final String DB_NAME_BASKET_ID = "BASKET_ID"; /** DB name of CUSTOMER_ID. BIGINT : NotNull : Default=[] : FK to CUSTOMER */ @@ -116,7 +116,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of basketId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BD92529C_24B2_40C3_A935_007DDC28CCAC] */ + /** Property name(JavaBeansRule) of basketId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C81A57D4_EF48_44BD_82F6_EA8B07B4C91D] */ public static final String PROPERTY_NAME_basketId = "basketId"; /** Property name(JavaBeansRule) of customerId. BIGINT : NotNull : Default=[] : FK to CUSTOMER */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketProductOptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketProductOptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/BasketProductOptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of BASKET_PRODUCT_OPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_312062F6_5D59_4533_B414_06ECBBBD36D5] */ + /** DB name of BASKET_PRODUCT_OPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9CC3076A_1B2D_4E23_ADAB_AF5045FCCBB9] */ public static final String DB_NAME_BASKET_PRODUCT_OPTION_ID = "BASKET_PRODUCT_OPTION_ID"; /** DB name of BASKET_ID. BIGINT : NotNull : Default=[] : FK to BASKET */ @@ -107,7 +107,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of basketProductOptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_312062F6_5D59_4533_B414_06ECBBBD36D5] */ + /** Property name(JavaBeansRule) of basketProductOptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9CC3076A_1B2D_4E23_ADAB_AF5045FCCBB9] */ public static final String PROPERTY_NAME_basketProductOptionId = "basketProductOptionId"; /** Property name(JavaBeansRule) of basketId. BIGINT : NotNull : Default=[] : FK to BASKET */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CardTypeDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of CARD_TYPE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3B3C8382_1ECF_4D16_971A_A76CB729A43C] */ + /** DB name of CARD_TYPE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_74FC7C9E_0ED7_46ED_AB5A_96F2637F9F62] */ public static final String DB_NAME_CARD_TYPE_ID = "CARD_TYPE_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of cardTypeId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3B3C8382_1ECF_4D16_971A_A76CB729A43C] */ + /** Property name(JavaBeansRule) of cardTypeId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_74FC7C9E_0ED7_46ED_AB5A_96F2637F9F62] */ public static final String PROPERTY_NAME_cardTypeId = "cardTypeId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryContentDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryContentDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryContentDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of CATEGORY_CONTENT_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A3BB881_B47B_401B_9EA5_7FEDC1329AE3] */ + /** DB name of CATEGORY_CONTENT_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4C98039A_6237_4531_A90F_C0A50380C310] */ public static final String DB_NAME_CATEGORY_CONTENT_ID = "CATEGORY_CONTENT_ID"; /** DB name of CATEGORY_ID. INTEGER : NotNull : Default=[] : FK to CATEGORY */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of categoryContentId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A3BB881_B47B_401B_9EA5_7FEDC1329AE3] */ + /** Property name(JavaBeansRule) of categoryContentId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4C98039A_6237_4531_A90F_C0A50380C310] */ public static final String PROPERTY_NAME_categoryContentId = "categoryContentId"; /** Property name(JavaBeansRule) of categoryId. INTEGER : NotNull : Default=[] : FK to CATEGORY */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -21,10 +21,10 @@ * CATEGORY_ID * * [column-property] - * CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE + * CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE * * [foreign-property] - * categorySelf + * categorySelf, fileData * * [referrer-property] * categorySelfList, categoryContentList, categoryInfoList, categoryPageInfoList, productToCategoryList @@ -94,12 +94,15 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of CATEGORY_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2776E811_0F4F_4C4B_9D91_EACBF999E2AE] */ + /** DB name of CATEGORY_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EFD2FD88_D7B6_478E_8C53_D744202F6C4E] */ public static final String DB_NAME_CATEGORY_ID = "CATEGORY_ID"; /** DB name of PARENT_CATEGORY_ID. INTEGER : NotNull : Default=[0] : FK to CATEGORY */ public static final String DB_NAME_PARENT_CATEGORY_ID = "PARENT_CATEGORY_ID"; + /** DB name of FILE_DATA_ID. BIGINT : Default=[] : FK to FILE_DATA */ + public static final String DB_NAME_FILE_DATA_ID = "FILE_DATA_ID"; + /** DB name of NUM_OF_PRODUCT. INTEGER : Default=[] */ public static final String DB_NAME_NUM_OF_PRODUCT = "NUM_OF_PRODUCT"; @@ -116,12 +119,15 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of categoryId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2776E811_0F4F_4C4B_9D91_EACBF999E2AE] */ + /** Property name(JavaBeansRule) of categoryId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EFD2FD88_D7B6_478E_8C53_D744202F6C4E] */ public static final String PROPERTY_NAME_categoryId = "categoryId"; /** Property name(JavaBeansRule) of parentCategoryId. INTEGER : NotNull : Default=[0] : FK to CATEGORY */ public static final String PROPERTY_NAME_parentCategoryId = "parentCategoryId"; + /** Property name(JavaBeansRule) of fileDataId. BIGINT : Default=[] : FK to FILE_DATA */ + public static final String PROPERTY_NAME_fileDataId = "fileDataId"; + /** Property name(JavaBeansRule) of numOfProduct. INTEGER : Default=[] */ public static final String PROPERTY_NAME_numOfProduct = "numOfProduct"; @@ -140,6 +146,9 @@ /** The foreign property name(JavaBeansRule) of categorySelf. */ public static final String FOREIGN_PROPERTY_NAME_categorySelf = "categorySelf"; + /** The foreign property name(JavaBeansRule) of fileData. */ + public static final String FOREIGN_PROPERTY_NAME_fileData = "fileData"; + // ----------------------------------------------------- // Referrer Name // ------------- @@ -168,6 +177,7 @@ map.put(DB_NAME_CATEGORY_ID.toLowerCase(), PROPERTY_NAME_categoryId); map.put(DB_NAME_PARENT_CATEGORY_ID.toLowerCase(), PROPERTY_NAME_parentCategoryId); + map.put(DB_NAME_FILE_DATA_ID.toLowerCase(), PROPERTY_NAME_fileDataId); map.put(DB_NAME_NUM_OF_PRODUCT.toLowerCase(), PROPERTY_NAME_numOfProduct); map.put(DB_NAME_STATUS.toLowerCase(), PROPERTY_NAME_status); map.put(DB_NAME_SORT_ORDER.toLowerCase(), PROPERTY_NAME_sortOrder); @@ -188,6 +198,7 @@ map.put(PROPERTY_NAME_categoryId.toLowerCase(), DB_NAME_CATEGORY_ID); map.put(PROPERTY_NAME_parentCategoryId.toLowerCase(), DB_NAME_PARENT_CATEGORY_ID); + map.put(PROPERTY_NAME_fileDataId.toLowerCase(), DB_NAME_FILE_DATA_ID); map.put(PROPERTY_NAME_numOfProduct.toLowerCase(), DB_NAME_NUM_OF_PRODUCT); map.put(PROPERTY_NAME_status.toLowerCase(), DB_NAME_STATUS); map.put(PROPERTY_NAME_sortOrder.toLowerCase(), DB_NAME_SORT_ORDER); @@ -325,6 +336,7 @@ final List columnInfoList = new ArrayList(); columnInfoList.add(columnCategoryId()); columnInfoList.add(columnParentCategoryId()); + columnInfoList.add(columnFileDataId()); columnInfoList.add(columnNumOfProduct()); columnInfoList.add(columnStatus()); columnInfoList.add(columnSortOrder()); @@ -340,6 +352,10 @@ public ColumnInfo columnParentCategoryId() { return new ColumnInfo(this, "PARENT_CATEGORY_ID", "parentCategoryId", java.math.BigDecimal.class, false, null, null); } + /** @return The column information of fileDataId. (NotNull) */ + public ColumnInfo columnFileDataId() { + return new ColumnInfo(this, "FILE_DATA_ID", "fileDataId", java.math.BigDecimal.class, false, null, null); + } /** @return The column information of numOfProduct. (NotNull) */ public ColumnInfo columnNumOfProduct() { return new ColumnInfo(this, "NUM_OF_PRODUCT", "numOfProduct", java.math.BigDecimal.class, false, null, null); @@ -417,6 +433,23 @@ foreignInfo.setOneToOne(false); return foreignInfo; } + /** + * Get foreign information of fileData. + * + * @return Foreign information. (NotNull) + */ + public jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo foreignFileData() { + final jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo foreignInfo = new jp.sf.pal.pompei.allcommon.dbmeta.info.ForeignInfo(); + foreignInfo.setForeignPropertyName("fileData"); + foreignInfo.setLocalDBMeta(CategoryDbm.getInstance()); + foreignInfo.setForeignDBMeta(FileDataDbm.getInstance()); + final Map map = new java.util.LinkedHashMap(); + map.put(columnFileDataId(), FileDataDbm.getInstance().columnFileDataId()); + foreignInfo.setLocalForeignColumnInfoMap(map); + foreignInfo.setRelationNo(1); + foreignInfo.setOneToOne(false); + return foreignInfo; + } /** * Get foreign information of categoryPageInfoAsOne. @@ -431,7 +464,7 @@ final java.util.Map map = new java.util.LinkedHashMap(); map.put(columnCategoryId(), CategoryPageInfoDbm.getInstance().columnCategoryId()); foreignInfo.setLocalForeignColumnInfoMap(map); - foreignInfo.setRelationNo(1); + foreignInfo.setRelationNo(2); foreignInfo.setOneToOne(true); return foreignInfo; } @@ -607,6 +640,11 @@ _relationList.add(CategoryDbm.getInstance().foreignCategorySelf()); return CategoryDbm.getInstance().createRelationTrace(_relationList, _relationTraceList); } + + public FileDataDbm.FileDataRelationTrace foreignFileData() { + _relationList.add(CategoryDbm.getInstance().foreignFileData()); + return FileDataDbm.getInstance().createRelationTrace(_relationList, _relationTraceList); + } public CategoryPageInfoDbm.CategoryPageInfoRelationTrace foreignCategoryPageInfoAsOne() { _relationList.add(CategoryDbm.getInstance().foreignCategoryPageInfoAsOne()); @@ -650,6 +688,7 @@ public RelationTrace columnCategoryId() { return fixTrace(_relationList, CategoryDbm.getInstance().columnCategoryId()); } public RelationTrace columnParentCategoryId() { return fixTrace(_relationList, CategoryDbm.getInstance().columnParentCategoryId()); } + public RelationTrace columnFileDataId() { return fixTrace(_relationList, CategoryDbm.getInstance().columnFileDataId()); } public RelationTrace columnNumOfProduct() { return fixTrace(_relationList, CategoryDbm.getInstance().columnNumOfProduct()); } public RelationTrace columnStatus() { return fixTrace(_relationList, CategoryDbm.getInstance().columnStatus()); } public RelationTrace columnSortOrder() { return fixTrace(_relationList, CategoryDbm.getInstance().columnSortOrder()); } @@ -746,6 +785,7 @@ if (analyzer.init("CATEGORY_ID", "categoryId", "categoryId")) { myEntity.setCategoryId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("PARENT_CATEGORY_ID", "parentCategoryId", "parentCategoryId")) { myEntity.setParentCategoryId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } + if (analyzer.init("FILE_DATA_ID", "fileDataId", "fileDataId")) { myEntity.setFileDataId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("NUM_OF_PRODUCT", "numOfProduct", "numOfProduct")) { myEntity.setNumOfProduct(analyzer.analyzeNumber(java.math.BigDecimal.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)); } @@ -822,6 +862,7 @@ final StringBuffer sb = new StringBuffer(); helpAppendingColumnValueString(sb, delimiter, equal, "CATEGORY_ID", myEntity.getCategoryId()); helpAppendingColumnValueString(sb, delimiter, equal, "PARENT_CATEGORY_ID", myEntity.getParentCategoryId()); + helpAppendingColumnValueString(sb, delimiter, equal, "FILE_DATA_ID", myEntity.getFileDataId()); helpAppendingColumnValueString(sb, delimiter, equal, "NUM_OF_PRODUCT", myEntity.getNumOfProduct()); helpAppendingColumnValueString(sb, delimiter, equal, "STATUS", myEntity.getStatus()); helpAppendingColumnValueString(sb, delimiter, equal, "SORT_ORDER", myEntity.getSortOrder()); @@ -882,6 +923,7 @@ final Map valueMap = new LinkedHashMap(); valueMap.put("CATEGORY_ID", myEntity.getCategoryId()); valueMap.put("PARENT_CATEGORY_ID", myEntity.getParentCategoryId()); + valueMap.put("FILE_DATA_ID", myEntity.getFileDataId()); valueMap.put("NUM_OF_PRODUCT", myEntity.getNumOfProduct()); valueMap.put("STATUS", myEntity.getStatus()); valueMap.put("SORT_ORDER", myEntity.getSortOrder()); @@ -910,6 +952,7 @@ final Map valueMap = new LinkedHashMap(); valueMap.put("CATEGORY_ID", helpGettingColumnStringValue(myEntity.getCategoryId())); valueMap.put("PARENT_CATEGORY_ID", helpGettingColumnStringValue(myEntity.getParentCategoryId())); + valueMap.put("FILE_DATA_ID", helpGettingColumnStringValue(myEntity.getFileDataId())); valueMap.put("NUM_OF_PRODUCT", helpGettingColumnStringValue(myEntity.getNumOfProduct())); valueMap.put("STATUS", helpGettingColumnStringValue(myEntity.getStatus())); valueMap.put("SORT_ORDER", helpGettingColumnStringValue(myEntity.getSortOrder())); @@ -938,9 +981,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "CATEGORY(CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE) values(? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "CATEGORY(CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE) values(? , ? , ? , ? , ? , ? , ? )"; } - return "insert into CATEGORY(CATEGORY_ID, PARENT_CATEGORY_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE) values(? , ? , ? , ? , ? , ? )"; + return "insert into CATEGORY(CATEGORY_ID, PARENT_CATEGORY_ID, FILE_DATA_ID, NUM_OF_PRODUCT, STATUS, SORT_ORDER, UPDATED_DATE) values(? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== @@ -952,6 +995,7 @@ { registerEntityPropertySetupper("CATEGORY_ID", "categoryId", new EntityPropertyCategoryIdSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("PARENT_CATEGORY_ID", "parentCategoryId", new EntityPropertyParentCategoryIdSetupper(), _entityPropertySetupperMap); + registerEntityPropertySetupper("FILE_DATA_ID", "fileDataId", new EntityPropertyFileDataIdSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("NUM_OF_PRODUCT", "numOfProduct", new EntityPropertyNumOfProductSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("STATUS", "status", new EntityPropertyStatusSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("SORT_ORDER", "sortOrder", new EntityPropertySortOrderSetupper(), _entityPropertySetupperMap); @@ -991,6 +1035,9 @@ public class EntityPropertyParentCategoryIdSetupper implements EntityPropertySetupper { public void setup(Category entity, Object value) { entity.setParentCategoryId((java.math.BigDecimal)value); } } + public class EntityPropertyFileDataIdSetupper implements EntityPropertySetupper { + public void setup(Category entity, Object value) { entity.setFileDataId((java.math.BigDecimal)value); } + } public class EntityPropertyNumOfProductSetupper implements EntityPropertySetupper { public void setup(Category entity, Object value) { entity.setNumOfProduct((java.math.BigDecimal)value); } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryInfoDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryInfoDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CategoryInfoDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of CATEGORY_INFO_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C3387DA9_485D_4755_A8BB_8B5A1E89734B] */ + /** DB name of CATEGORY_INFO_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4D31DB8A_4A1B_4D8D_88D5_6A20F62BE48F] */ public static final String DB_NAME_CATEGORY_INFO_ID = "CATEGORY_INFO_ID"; /** DB name of CATEGORY_ID. INTEGER : NotNull : Default=[] : FK to CATEGORY */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of categoryInfoId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C3387DA9_485D_4755_A8BB_8B5A1E89734B] */ + /** Property name(JavaBeansRule) of categoryInfoId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4D31DB8A_4A1B_4D8D_88D5_6A20F62BE48F] */ public static final String PROPERTY_NAME_categoryInfoId = "categoryInfoId"; /** Property name(JavaBeansRule) of categoryId. INTEGER : NotNull : Default=[] : FK to CATEGORY */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of COUNTRY_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6AB0C81F_09E2_4F79_9D1F_F46C8C2CFD55] */ + /** DB name of COUNTRY_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3347384_761A_465D_A9E5_0D1BF6B4BC31] */ public static final String DB_NAME_COUNTRY_ID = "COUNTRY_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of countryId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6AB0C81F_09E2_4F79_9D1F_F46C8C2CFD55] */ + /** Property name(JavaBeansRule) of countryId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B3347384_761A_465D_A9E5_0D1BF6B4BC31] */ public static final String PROPERTY_NAME_countryId = "countryId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CountryDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of COUNTRY_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B411FF2_6103_4E79_87B6_7903709FA783] */ + /** DB name of COUNTRY_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5DDEE634_838F_4FB5_B473_D62BB86B5C7E] */ public static final String DB_NAME_COUNTRY_DESCRIPTION_ID = "COUNTRY_DESCRIPTION_ID"; /** DB name of COUNTRY_ID. INTEGER : NotNull : Default=[] : FK to COUNTRY */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of countryDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0B411FF2_6103_4E79_87B6_7903709FA783] */ + /** Property name(JavaBeansRule) of countryDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5DDEE634_838F_4FB5_B473_D62BB86B5C7E] */ public static final String PROPERTY_NAME_countryDescriptionId = "countryDescriptionId"; /** Property name(JavaBeansRule) of countryId. INTEGER : NotNull : Default=[] : FK to COUNTRY */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of CUSTOMER_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_29635FE2_B951_464C_BC9A_3B9C0D5C4538] */ + /** DB name of CUSTOMER_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65D35573_EB70_445A_AFF1_2FC92C088EA9] */ public static final String DB_NAME_CUSTOMER_ID = "CUSTOMER_ID"; /** DB name of PORTAL_ID. VARCHAR(255) : NotNull : Default=[] */ @@ -134,7 +134,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of customerId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_29635FE2_B951_464C_BC9A_3B9C0D5C4538] */ + /** Property name(JavaBeansRule) of customerId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65D35573_EB70_445A_AFF1_2FC92C088EA9] */ public static final String PROPERTY_NAME_customerId = "customerId"; /** Property name(JavaBeansRule) of portalId. VARCHAR(255) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_METHOD_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BBB18455_B665_4B52_9728_9AFC3FF3BDFD] */ + /** DB name of DELIVERY_METHOD_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CF59FC79_99DD_4F91_BA52_20E25D3FE7DC] */ public static final String DB_NAME_DELIVERY_METHOD_ID = "DELIVERY_METHOD_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -116,7 +116,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryMethodId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BBB18455_B665_4B52_9728_9AFC3FF3BDFD] */ + /** Property name(JavaBeansRule) of deliveryMethodId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CF59FC79_99DD_4F91_BA52_20E25D3FE7DC] */ public static final String PROPERTY_NAME_deliveryMethodId = "deliveryMethodId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryMethodDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_METHOD_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6688B9F_0B09_4F21_ABFF_9C0952F602B7] */ + /** DB name of DELIVERY_METHOD_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1F2A2DC2_C76B_43E3_A1FD_A245D6595158] */ public static final String DB_NAME_DELIVERY_METHOD_DESCRIPTION_ID = "DELIVERY_METHOD_DESCRIPTION_ID"; /** DB name of DELIVERY_METHOD_ID. INTEGER : NotNull : Default=[0] : FK to DELIVERY_METHOD */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryMethodDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6688B9F_0B09_4F21_ABFF_9C0952F602B7] */ + /** Property name(JavaBeansRule) of deliveryMethodDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1F2A2DC2_C76B_43E3_A1FD_A245D6595158] */ public static final String PROPERTY_NAME_deliveryMethodDescriptionId = "deliveryMethodDescriptionId"; /** Property name(JavaBeansRule) of deliveryMethodId. INTEGER : NotNull : Default=[0] : FK to DELIVERY_METHOD */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA851A25_775C_4EFF_ABB2_49C6C4B07449] */ + /** DB name of DELIVERY_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FEEA775_C06C_4886_8D86_550DB02172BE] */ public static final String DB_NAME_DELIVERY_STATUS_ID = "DELIVERY_STATUS_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryStatusId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA851A25_775C_4EFF_ABB2_49C6C4B07449] */ + /** Property name(JavaBeansRule) of deliveryStatusId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FEEA775_C06C_4886_8D86_550DB02172BE] */ public static final String PROPERTY_NAME_deliveryStatusId = "deliveryStatusId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryStatusDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_STATUS_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E7F2D0F7_94F6_43BA_8F1C_74434F89ACF4] */ + /** DB name of DELIVERY_STATUS_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6ED016D_35D5_4EF2_864A_6ABD19BE70A6] */ public static final String DB_NAME_DELIVERY_STATUS_DESCRIPTION_ID = "DELIVERY_STATUS_DESCRIPTION_ID"; /** DB name of DELIVERY_STATUS_ID. INTEGER : NotNull : Default=[] : FK to DELIVERY_STATUS */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryStatusDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E7F2D0F7_94F6_43BA_8F1C_74434F89ACF4] */ + /** Property name(JavaBeansRule) of deliveryStatusDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C6ED016D_35D5_4EF2_864A_6ABD19BE70A6] */ public static final String PROPERTY_NAME_deliveryStatusDescriptionId = "deliveryStatusDescriptionId"; /** Property name(JavaBeansRule) of deliveryStatusId. INTEGER : NotNull : Default=[] : FK to DELIVERY_STATUS */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_TYPE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE3303C_DD6F_4FEB_8AEA_697E4BCAE7DA] */ + /** DB name of DELIVERY_TYPE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE9392C_413F_4D00_BEB3_90F49FB5A8A2] */ public static final String DB_NAME_DELIVERY_TYPE_ID = "DELIVERY_TYPE_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryTypeId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE3303C_DD6F_4FEB_8AEA_697E4BCAE7DA] */ + /** Property name(JavaBeansRule) of deliveryTypeId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0CE9392C_413F_4D00_BEB3_90F49FB5A8A2] */ public static final String PROPERTY_NAME_deliveryTypeId = "deliveryTypeId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryTypeDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_TYPE_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_513D9D3C_8F0C_4367_B3DA_2863C987246D] */ + /** DB name of DELIVERY_TYPE_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38F192ED_EDB3_4717_BFFC_B2E1BDF57C25] */ public static final String DB_NAME_DELIVERY_TYPE_DESCRIPTION_ID = "DELIVERY_TYPE_DESCRIPTION_ID"; /** DB name of DELIVERY_TYPE_ID. INTEGER : NotNull : Default=[] : FK to DELIVERY_TYPE */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryTypeDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_513D9D3C_8F0C_4367_B3DA_2863C987246D] */ + /** Property name(JavaBeansRule) of deliveryTypeDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38F192ED_EDB3_4717_BFFC_B2E1BDF57C25] */ public static final String PROPERTY_NAME_deliveryTypeDescriptionId = "deliveryTypeDescriptionId"; /** Property name(JavaBeansRule) of deliveryTypeId. INTEGER : NotNull : Default=[] : FK to DELIVERY_TYPE */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_ZONE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B7E56541_CE09_4B7E_A125_001EA5B198D1] */ + /** DB name of DELIVERY_ZONE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA74016E_FAE7_439E_B12B_58A30A49B460] */ public static final String DB_NAME_DELIVERY_ZONE_ID = "DELIVERY_ZONE_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryZoneId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B7E56541_CE09_4B7E_A125_001EA5B198D1] */ + /** Property name(JavaBeansRule) of deliveryZoneId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EA74016E_FAE7_439E_B12B_58A30A49B460] */ public static final String PROPERTY_NAME_deliveryZoneId = "deliveryZoneId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/DeliveryZoneDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of DELIVERY_ZONE_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AF2C82E5_D881_4C61_B096_8667C945FD08] */ + /** DB name of DELIVERY_ZONE_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BB2396D3_E0E1_4B99_B786_0F09CE6BB3EF] */ public static final String DB_NAME_DELIVERY_ZONE_DESCRIPTION_ID = "DELIVERY_ZONE_DESCRIPTION_ID"; /** DB name of DELIVERY_ZONE_ID. INTEGER : NotNull : Default=[] : FK to DELIVERY_ZONE */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of deliveryZoneDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_AF2C82E5_D881_4C61_B096_8667C945FD08] */ + /** Property name(JavaBeansRule) of deliveryZoneDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_BB2396D3_E0E1_4B99_B786_0F09CE6BB3EF] */ public static final String PROPERTY_NAME_deliveryZoneDescriptionId = "deliveryZoneDescriptionId"; /** Property name(JavaBeansRule) of deliveryZoneId. INTEGER : NotNull : Default=[] : FK to DELIVERY_ZONE */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileDataDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileDataDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileDataDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -27,7 +27,7 @@ * * * [referrer-property] - * fileTagToFileDataList, imageDataList, manufacturerList, productList + * categoryList, fileTagToFileDataList, imageDataList, manufacturerList, productList * * [sequence] * @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of FILE_DATA_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2A0E9AB9_771C_44B3_910E_4B8C8345E7B2] */ + /** DB name of FILE_DATA_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38D221B4_8B92_4D84_8BB0_5F0F5C0EAD26] */ public static final String DB_NAME_FILE_DATA_ID = "FILE_DATA_ID"; /** DB name of NAME. VARCHAR(100) : NotNull : Default=[] */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of fileDataId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2A0E9AB9_771C_44B3_910E_4B8C8345E7B2] */ + /** Property name(JavaBeansRule) of fileDataId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_38D221B4_8B92_4D84_8BB0_5F0F5C0EAD26] */ public static final String PROPERTY_NAME_fileDataId = "fileDataId"; /** Property name(JavaBeansRule) of name. VARCHAR(100) : NotNull : Default=[] */ @@ -134,6 +134,8 @@ // ----------------------------------------------------- // Referrer Name // ------------- + /** The referrer property name(JavaBeansRule) of categoryList. */ + public static final String REFERRER_PROPERTY_NAME_categoryList = "categoryList"; /** The referrer property name(JavaBeansRule) of fileTagToFileDataList. */ public static final String REFERRER_PROPERTY_NAME_fileTagToFileDataList = "fileTagToFileDataList"; /** The referrer property name(JavaBeansRule) of imageDataList. */ @@ -406,6 +408,29 @@ // ---------------- /** * @return Referrer information. (NotNull) + * @deprecated Please use referrerCategoryList(). + */ + public jp.sf.pal.pompei.allcommon.dbmeta.info.ReferrerInfo refererCategoryList() { + return referrerCategoryList(); + } + /** + * Get referrer information of categoryList. + * + * @return Referrer information. (NotNull) + */ + public jp.sf.pal.pompei.allcommon.dbmeta.info.ReferrerInfo referrerCategoryList() { + final jp.sf.pal.pompei.allcommon.dbmeta.info.ReferrerInfo referrerInfo = new jp.sf.pal.pompei.allcommon.dbmeta.info.ReferrerInfo(); + referrerInfo.setReferrerPropertyName("categoryList"); + referrerInfo.setLocalDBMeta(FileDataDbm.getInstance()); + referrerInfo.setReferrerDBMeta(CategoryDbm.getInstance()); + final java.util.Map map = new java.util.LinkedHashMap(); + map.put(columnFileDataId(), CategoryDbm.getInstance().columnFileDataId()); + referrerInfo.setLocalReferrerColumnInfoMap(map); + referrerInfo.setOneToOne(false); + return referrerInfo; + } + /** + * @return Referrer information. (NotNull) * @deprecated Please use referrerFileTagToFileDataList(). */ public jp.sf.pal.pompei.allcommon.dbmeta.info.ReferrerInfo refererFileTagToFileDataList() { @@ -544,12 +569,19 @@ public FileDataRelationTrace(java.util.List relationList, java.util.List relationTraceList) { super(relationList, relationTraceList); } - + public ImageDataDbm.ImageDataRelationTrace foreignImageDataAsOne() { _relationList.add(FileDataDbm.getInstance().foreignImageDataAsOne()); return ImageDataDbm.getInstance().createRelationTrace(_relationList, _relationTraceList); } - public FileTagToFileDataDbm.FileTagToFileDataRelationTrace refererFileTagToFileDataList() { + public CategoryDbm.CategoryRelationTrace refererCategoryList() { + return referrerCategoryList(); + } + public CategoryDbm.CategoryRelationTrace referrerCategoryList() { + _relationList.add(FileDataDbm.getInstance().referrerCategoryList()); + return CategoryDbm.getInstance().createRelationTrace(_relationList, _relationTraceList); + } + public FileTagToFileDataDbm.FileTagToFileDataRelationTrace refererFileTagToFileDataList() { return referrerFileTagToFileDataList(); } public FileTagToFileDataDbm.FileTagToFileDataRelationTrace referrerFileTagToFileDataList() { Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileTagDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileTagDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/FileTagDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of FILE_TAG_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1D4C5B93_A4EF_4BD8_82A8_96C55C046F98] */ + /** DB name of FILE_TAG_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3829C625_F661_4D38_B5B5_67D2347121EB] */ public static final String DB_NAME_FILE_TAG_ID = "FILE_TAG_ID"; /** DB name of NAME. VARCHAR(100) : NotNull : Default=[] */ @@ -104,7 +104,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of fileTagId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1D4C5B93_A4EF_4BD8_82A8_96C55C046F98] */ + /** Property name(JavaBeansRule) of fileTagId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3829C625_F661_4D38_B5B5_67D2347121EB] */ public static final String PROPERTY_NAME_fileTagId = "fileTagId"; /** Property name(JavaBeansRule) of name. VARCHAR(100) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ImageDataDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ImageDataDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ImageDataDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of FILE_DATA_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B575C1_8C44_4C92_B3A9_FD08C9ED1C56] : FK to FILE_DATA */ + /** DB name of FILE_DATA_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_66963A12_0B02_4F1B_887F_6330FE2597CA] : FK to FILE_DATA */ public static final String DB_NAME_FILE_DATA_ID = "FILE_DATA_ID"; /** DB name of SIZE. INTEGER : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of fileDataId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A3B575C1_8C44_4C92_B3A9_FD08C9ED1C56] : FK to FILE_DATA */ + /** Property name(JavaBeansRule) of fileDataId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_66963A12_0B02_4F1B_887F_6330FE2597CA] : FK to FILE_DATA */ public static final String PROPERTY_NAME_fileDataId = "fileDataId"; /** Property name(JavaBeansRule) of size. INTEGER : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of MANUFACTURER_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C12F970E_8F1F_444E_81FE_5119267871E5] */ + /** DB name of MANUFACTURER_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6AE78A2_ED57_48EB_B856_54EDE7606F3F] */ public static final String DB_NAME_MANUFACTURER_ID = "MANUFACTURER_ID"; /** DB name of FILE_DATA_ID. BIGINT : Default=[] : FK to FILE_DATA */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of manufacturerId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_C12F970E_8F1F_444E_81FE_5119267871E5] */ + /** Property name(JavaBeansRule) of manufacturerId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A6AE78A2_ED57_48EB_B856_54EDE7606F3F] */ public static final String PROPERTY_NAME_manufacturerId = "manufacturerId"; /** Property name(JavaBeansRule) of fileDataId. BIGINT : Default=[] : FK to FILE_DATA */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -21,7 +21,7 @@ * MANUFACTURER_DESCRIPTION_ID * * [column-property] - * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE + * MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE * * [foreign-property] * manufacturer @@ -94,14 +94,14 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of MANUFACTURER_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FB14852_D548_492E_A546_D94CFE117480] */ + /** DB name of MANUFACTURER_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B00AC5CA_F645_4F81_AA2D_C6372A3892D8] */ public static final String DB_NAME_MANUFACTURER_DESCRIPTION_ID = "MANUFACTURER_DESCRIPTION_ID"; /** DB name of MANUFACTURER_ID. INTEGER : NotNull : Default=[] : FK to MANUFACTURER */ public static final String DB_NAME_MANUFACTURER_ID = "MANUFACTURER_ID"; - /** DB name of CONTENT. CLOB : Default=[] */ - public static final String DB_NAME_CONTENT = "CONTENT"; + /** DB name of DESCRIPTION. CLOB : Default=[] */ + public static final String DB_NAME_DESCRIPTION = "DESCRIPTION"; /** DB name of LANGUAGE. VARCHAR(20) : NotNull : Default=[] */ public static final String DB_NAME_LANGUAGE = "LANGUAGE"; @@ -110,14 +110,14 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of manufacturerDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2FB14852_D548_492E_A546_D94CFE117480] */ + /** Property name(JavaBeansRule) of manufacturerDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B00AC5CA_F645_4F81_AA2D_C6372A3892D8] */ public static final String PROPERTY_NAME_manufacturerDescriptionId = "manufacturerDescriptionId"; /** Property name(JavaBeansRule) of manufacturerId. INTEGER : NotNull : Default=[] : FK to MANUFACTURER */ public static final String PROPERTY_NAME_manufacturerId = "manufacturerId"; - /** Property name(JavaBeansRule) of content. CLOB : Default=[] */ - public static final String PROPERTY_NAME_content = "content"; + /** Property name(JavaBeansRule) of description. CLOB : Default=[] */ + public static final String PROPERTY_NAME_description = "description"; /** Property name(JavaBeansRule) of language. VARCHAR(20) : NotNull : Default=[] */ public static final String PROPERTY_NAME_language = "language"; @@ -146,7 +146,7 @@ map.put(DB_NAME_MANUFACTURER_DESCRIPTION_ID.toLowerCase(), PROPERTY_NAME_manufacturerDescriptionId); map.put(DB_NAME_MANUFACTURER_ID.toLowerCase(), PROPERTY_NAME_manufacturerId); - map.put(DB_NAME_CONTENT.toLowerCase(), PROPERTY_NAME_content); + map.put(DB_NAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_description); map.put(DB_NAME_LANGUAGE.toLowerCase(), PROPERTY_NAME_language); _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map); @@ -164,7 +164,7 @@ map.put(PROPERTY_NAME_manufacturerDescriptionId.toLowerCase(), DB_NAME_MANUFACTURER_DESCRIPTION_ID); map.put(PROPERTY_NAME_manufacturerId.toLowerCase(), DB_NAME_MANUFACTURER_ID); - map.put(PROPERTY_NAME_content.toLowerCase(), DB_NAME_CONTENT); + map.put(PROPERTY_NAME_description.toLowerCase(), DB_NAME_DESCRIPTION); map.put(PROPERTY_NAME_language.toLowerCase(), DB_NAME_LANGUAGE); _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map); @@ -299,7 +299,7 @@ final List columnInfoList = new ArrayList(); columnInfoList.add(columnManufacturerDescriptionId()); columnInfoList.add(columnManufacturerId()); - columnInfoList.add(columnContent()); + columnInfoList.add(columnDescription()); columnInfoList.add(columnLanguage()); return columnInfoList; } @@ -312,9 +312,9 @@ public ColumnInfo columnManufacturerId() { return new ColumnInfo(this, "MANUFACTURER_ID", "manufacturerId", java.math.BigDecimal.class, false, null, null); } - /** @return The column information of content. (NotNull) */ - public ColumnInfo columnContent() { - return new ColumnInfo(this, "CONTENT", "content", String.class, false, null, null); + /** @return The column information of description. (NotNull) */ + public ColumnInfo columnDescription() { + return new ColumnInfo(this, "DESCRIPTION", "description", String.class, false, null, null); } /** @return The column information of language. (NotNull) */ public ColumnInfo columnLanguage() { @@ -442,7 +442,7 @@ public RelationTrace columnManufacturerDescriptionId() { return fixTrace(_relationList, ManufacturerDescriptionDbm.getInstance().columnManufacturerDescriptionId()); } public RelationTrace columnManufacturerId() { return fixTrace(_relationList, ManufacturerDescriptionDbm.getInstance().columnManufacturerId()); } - public RelationTrace columnContent() { return fixTrace(_relationList, ManufacturerDescriptionDbm.getInstance().columnContent()); } + public RelationTrace columnDescription() { return fixTrace(_relationList, ManufacturerDescriptionDbm.getInstance().columnDescription()); } public RelationTrace columnLanguage() { return fixTrace(_relationList, ManufacturerDescriptionDbm.getInstance().columnLanguage()); } } @@ -536,7 +536,7 @@ if (analyzer.init("MANUFACTURER_DESCRIPTION_ID", "manufacturerDescriptionId", "manufacturerDescriptionId")) { myEntity.setManufacturerDescriptionId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("MANUFACTURER_ID", "manufacturerId", "manufacturerId")) { myEntity.setManufacturerId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } - if (analyzer.init("CONTENT", "content", "content")) { myEntity.setContent(analyzer.analyzeString(String.class)); } + if (analyzer.init("DESCRIPTION", "description", "description")) { myEntity.setDescription(analyzer.analyzeString(String.class)); } if (analyzer.init("LANGUAGE", "language", "language")) { myEntity.setLanguage(analyzer.analyzeString(String.class)); } } @@ -610,7 +610,7 @@ final StringBuffer sb = new StringBuffer(); helpAppendingColumnValueString(sb, delimiter, equal, "MANUFACTURER_DESCRIPTION_ID", myEntity.getManufacturerDescriptionId()); helpAppendingColumnValueString(sb, delimiter, equal, "MANUFACTURER_ID", myEntity.getManufacturerId()); - helpAppendingColumnValueString(sb, delimiter, equal, "CONTENT", myEntity.getContent()); + helpAppendingColumnValueString(sb, delimiter, equal, "DESCRIPTION", myEntity.getDescription()); helpAppendingColumnValueString(sb, delimiter, equal, "LANGUAGE", myEntity.getLanguage()); sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace); @@ -668,7 +668,7 @@ final Map valueMap = new LinkedHashMap(); valueMap.put("MANUFACTURER_DESCRIPTION_ID", myEntity.getManufacturerDescriptionId()); valueMap.put("MANUFACTURER_ID", myEntity.getManufacturerId()); - valueMap.put("CONTENT", myEntity.getContent()); + valueMap.put("DESCRIPTION", myEntity.getDescription()); valueMap.put("LANGUAGE", myEntity.getLanguage()); return valueMap; } @@ -694,7 +694,7 @@ final Map valueMap = new LinkedHashMap(); valueMap.put("MANUFACTURER_DESCRIPTION_ID", helpGettingColumnStringValue(myEntity.getManufacturerDescriptionId())); valueMap.put("MANUFACTURER_ID", helpGettingColumnStringValue(myEntity.getManufacturerId())); - valueMap.put("CONTENT", helpGettingColumnStringValue(myEntity.getContent())); + valueMap.put("DESCRIPTION", helpGettingColumnStringValue(myEntity.getDescription())); valueMap.put("LANGUAGE", helpGettingColumnStringValue(myEntity.getLanguage())); return valueMap; } @@ -720,9 +720,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "MANUFACTURER_DESCRIPTION(MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE) values(? , ? , ? , ? )"; + return "insert into " + tablePrefix + "MANUFACTURER_DESCRIPTION(MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE) values(? , ? , ? , ? )"; } - return "insert into MANUFACTURER_DESCRIPTION(MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, CONTENT, LANGUAGE) values(? , ? , ? , ? )"; + return "insert into MANUFACTURER_DESCRIPTION(MANUFACTURER_DESCRIPTION_ID, MANUFACTURER_ID, DESCRIPTION, LANGUAGE) values(? , ? , ? , ? )"; } // =================================================================================== @@ -734,7 +734,7 @@ { registerEntityPropertySetupper("MANUFACTURER_DESCRIPTION_ID", "manufacturerDescriptionId", new EntityPropertyManufacturerDescriptionIdSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("MANUFACTURER_ID", "manufacturerId", new EntityPropertyManufacturerIdSetupper(), _entityPropertySetupperMap); - registerEntityPropertySetupper("CONTENT", "content", new EntityPropertyContentSetupper(), _entityPropertySetupperMap); + registerEntityPropertySetupper("DESCRIPTION", "description", new EntityPropertyDescriptionSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("LANGUAGE", "language", new EntityPropertyLanguageSetupper(), _entityPropertySetupperMap); } @@ -771,8 +771,8 @@ public class EntityPropertyManufacturerIdSetupper implements EntityPropertySetupper { public void setup(ManufacturerDescription entity, Object value) { entity.setManufacturerId((java.math.BigDecimal)value); } } - public class EntityPropertyContentSetupper implements EntityPropertySetupper { - public void setup(ManufacturerDescription entity, Object value) { entity.setContent((String)value); } + public class EntityPropertyDescriptionSetupper implements EntityPropertySetupper { + public void setup(ManufacturerDescription entity, Object value) { entity.setDescription((String)value); } } public class EntityPropertyLanguageSetupper implements EntityPropertySetupper { public void setup(ManufacturerDescription entity, Object value) { entity.setLanguage((String)value); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerInfoDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerInfoDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ManufacturerInfoDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of MANUFACTURER_INFO_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F63EF95_2A3B_4D50_A9E6_CBD0A2F58A9D] */ + /** DB name of MANUFACTURER_INFO_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D899A060_636B_445D_87E6_0F22ED18FACD] */ public static final String DB_NAME_MANUFACTURER_INFO_ID = "MANUFACTURER_INFO_ID"; /** DB name of MANUFACTURER_ID. INTEGER : NotNull : Default=[] : FK to MANUFACTURER */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of manufacturerInfoId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2F63EF95_2A3B_4D50_A9E6_CBD0A2F58A9D] */ + /** Property name(JavaBeansRule) of manufacturerInfoId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D899A060_636B_445D_87E6_0F22ED18FACD] */ public static final String PROPERTY_NAME_manufacturerInfoId = "manufacturerInfoId"; /** Property name(JavaBeansRule) of manufacturerId. INTEGER : NotNull : Default=[] : FK to MANUFACTURER */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCardInfoDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_FORM_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CA7695D_D15F_4F2B_9051_506B115F603E] */ + /** DB name of ORDER_FORM_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8025507D_BC2F_4AC6_A3E4_87F4CAC6CD3B] */ public static final String DB_NAME_ORDER_FORM_ID = "ORDER_FORM_ID"; /** DB name of CARD_TYPE_ID. INTEGER : Default=[] : FK to CARD_TYPE */ @@ -119,7 +119,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderFormId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CA7695D_D15F_4F2B_9051_506B115F603E] */ + /** Property name(JavaBeansRule) of orderFormId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8025507D_BC2F_4AC6_A3E4_87F4CAC6CD3B] */ public static final String PROPERTY_NAME_orderFormId = "orderFormId"; /** Property name(JavaBeansRule) of cardTypeId. INTEGER : Default=[] : FK to CARD_TYPE */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderCommentDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_COMMENT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53709283_8417_4D26_9790_CEE2549C20F0] */ + /** DB name of ORDER_COMMENT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_509E62A5_5887_4863_B360_A4AC2C632E4F] */ public static final String DB_NAME_ORDER_COMMENT_ID = "ORDER_COMMENT_ID"; /** DB name of ORDER_FORM_ID. BIGINT : NotNull : Default=[] : FK to ORDER_FORM */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderCommentId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53709283_8417_4D26_9790_CEE2549C20F0] */ + /** Property name(JavaBeansRule) of orderCommentId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_509E62A5_5887_4863_B360_A4AC2C632E4F] */ public static final String PROPERTY_NAME_orderCommentId = "orderCommentId"; /** Property name(JavaBeansRule) of orderFormId. BIGINT : NotNull : Default=[] : FK to ORDER_FORM */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -21,7 +21,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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE + * 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE * * [foreign-property] * customer, orderStatus @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_FORM_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E1DFBFB_6E87_4AFF_B190_B7582A1DAF58] */ + /** DB name of ORDER_FORM_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D028B5F8_30A1_4068_B44A_15B15660D6A7] */ public static final String DB_NAME_ORDER_FORM_ID = "ORDER_FORM_ID"; /** DB name of ORDER_FORM_NUMBER. VARCHAR(40) : NotNull : Default=[] */ @@ -193,8 +193,8 @@ /** DB name of BILLING_COUNTRY_CODE. VARCHAR(40) : NotNull : Default=[] */ public static final String DB_NAME_BILLING_COUNTRY_CODE = "BILLING_COUNTRY_CODE"; - /** DB name of BILLING_LOCALE_NAME. VARCHAR(20) : NotNull : Default=[] */ - public static final String DB_NAME_BILLING_LOCALE_NAME = "BILLING_LOCALE_NAME"; + /** DB name of BILLING_LANGUAGE. VARCHAR(20) : NotNull : Default=[] */ + public static final String DB_NAME_BILLING_LANGUAGE = "BILLING_LANGUAGE"; /** DB name of ORDER_STATUS_ID. INTEGER : NotNull : Default=[] : FK to ORDER_STATUS */ public static final String DB_NAME_ORDER_STATUS_ID = "ORDER_STATUS_ID"; @@ -212,7 +212,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderFormId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E1DFBFB_6E87_4AFF_B190_B7582A1DAF58] */ + /** Property name(JavaBeansRule) of orderFormId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D028B5F8_30A1_4068_B44A_15B15660D6A7] */ public static final String PROPERTY_NAME_orderFormId = "orderFormId"; /** Property name(JavaBeansRule) of orderFormNumber. VARCHAR(40) : NotNull : Default=[] */ @@ -311,8 +311,8 @@ /** Property name(JavaBeansRule) of billingCountryCode. VARCHAR(40) : NotNull : Default=[] */ public static final String PROPERTY_NAME_billingCountryCode = "billingCountryCode"; - /** Property name(JavaBeansRule) of billingLocaleName. VARCHAR(20) : NotNull : Default=[] */ - public static final String PROPERTY_NAME_billingLocaleName = "billingLocaleName"; + /** Property name(JavaBeansRule) of billingLanguage. VARCHAR(20) : NotNull : Default=[] */ + public static final String PROPERTY_NAME_billingLanguage = "billingLanguage"; /** Property name(JavaBeansRule) of orderStatusId. INTEGER : NotNull : Default=[] : FK to ORDER_STATUS */ public static final String PROPERTY_NAME_orderStatusId = "orderStatusId"; @@ -394,7 +394,7 @@ map.put(DB_NAME_BILLING_POSTCODE.toLowerCase(), PROPERTY_NAME_billingPostcode); map.put(DB_NAME_BILLING_TELEPHONE.toLowerCase(), PROPERTY_NAME_billingTelephone); map.put(DB_NAME_BILLING_COUNTRY_CODE.toLowerCase(), PROPERTY_NAME_billingCountryCode); - map.put(DB_NAME_BILLING_LOCALE_NAME.toLowerCase(), PROPERTY_NAME_billingLocaleName); + map.put(DB_NAME_BILLING_LANGUAGE.toLowerCase(), PROPERTY_NAME_billingLanguage); map.put(DB_NAME_ORDER_STATUS_ID.toLowerCase(), PROPERTY_NAME_orderStatusId); map.put(DB_NAME_UPDATED_DATE.toLowerCase(), PROPERTY_NAME_updatedDate); map.put(DB_NAME_PURCHASED_DATE.toLowerCase(), PROPERTY_NAME_purchasedDate); @@ -446,7 +446,7 @@ map.put(PROPERTY_NAME_billingPostcode.toLowerCase(), DB_NAME_BILLING_POSTCODE); map.put(PROPERTY_NAME_billingTelephone.toLowerCase(), DB_NAME_BILLING_TELEPHONE); map.put(PROPERTY_NAME_billingCountryCode.toLowerCase(), DB_NAME_BILLING_COUNTRY_CODE); - map.put(PROPERTY_NAME_billingLocaleName.toLowerCase(), DB_NAME_BILLING_LOCALE_NAME); + map.put(PROPERTY_NAME_billingLanguage.toLowerCase(), DB_NAME_BILLING_LANGUAGE); map.put(PROPERTY_NAME_orderStatusId.toLowerCase(), DB_NAME_ORDER_STATUS_ID); map.put(PROPERTY_NAME_updatedDate.toLowerCase(), DB_NAME_UPDATED_DATE); map.put(PROPERTY_NAME_purchasedDate.toLowerCase(), DB_NAME_PURCHASED_DATE); @@ -615,7 +615,7 @@ columnInfoList.add(columnBillingPostcode()); columnInfoList.add(columnBillingTelephone()); columnInfoList.add(columnBillingCountryCode()); - columnInfoList.add(columnBillingLocaleName()); + columnInfoList.add(columnBillingLanguage()); columnInfoList.add(columnOrderStatusId()); columnInfoList.add(columnUpdatedDate()); columnInfoList.add(columnPurchasedDate()); @@ -755,9 +755,9 @@ public ColumnInfo columnBillingCountryCode() { return new ColumnInfo(this, "BILLING_COUNTRY_CODE", "billingCountryCode", String.class, false, Integer.valueOf("40"), Integer.valueOf("0")); } - /** @return The column information of billingLocaleName. (NotNull) */ - public ColumnInfo columnBillingLocaleName() { - return new ColumnInfo(this, "BILLING_LOCALE_NAME", "billingLocaleName", String.class, false, Integer.valueOf("20"), Integer.valueOf("0")); + /** @return The column information of billingLanguage. (NotNull) */ + public ColumnInfo columnBillingLanguage() { + return new ColumnInfo(this, "BILLING_LANGUAGE", "billingLanguage", String.class, false, Integer.valueOf("20"), Integer.valueOf("0")); } /** @return The column information of orderStatusId. (NotNull) */ public ColumnInfo columnOrderStatusId() { @@ -1144,7 +1144,7 @@ public RelationTrace columnBillingPostcode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingPostcode()); } public RelationTrace columnBillingTelephone() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingTelephone()); } public RelationTrace columnBillingCountryCode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingCountryCode()); } - public RelationTrace columnBillingLocaleName() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingLocaleName()); } + public RelationTrace columnBillingLanguage() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingLanguage()); } public RelationTrace columnOrderStatusId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderStatusId()); } public RelationTrace columnUpdatedDate() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnUpdatedDate()); } public RelationTrace columnPurchasedDate() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnPurchasedDate()); } @@ -1272,7 +1272,7 @@ if (analyzer.init("BILLING_POSTCODE", "billingPostcode", "billingPostcode")) { myEntity.setBillingPostcode(analyzer.analyzeString(String.class)); } if (analyzer.init("BILLING_TELEPHONE", "billingTelephone", "billingTelephone")) { myEntity.setBillingTelephone(analyzer.analyzeString(String.class)); } if (analyzer.init("BILLING_COUNTRY_CODE", "billingCountryCode", "billingCountryCode")) { myEntity.setBillingCountryCode(analyzer.analyzeString(String.class)); } - if (analyzer.init("BILLING_LOCALE_NAME", "billingLocaleName", "billingLocaleName")) { myEntity.setBillingLocaleName(analyzer.analyzeString(String.class)); } + if (analyzer.init("BILLING_LANGUAGE", "billingLanguage", "billingLanguage")) { myEntity.setBillingLanguage(analyzer.analyzeString(String.class)); } if (analyzer.init("ORDER_STATUS_ID", "orderStatusId", "orderStatusId")) { myEntity.setOrderStatusId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("UPDATED_DATE", "updatedDate", "updatedDate")) { myEntity.setUpdatedDate(analyzer.analyzeDate(java.sql.Timestamp.class)); } if (analyzer.init("PURCHASED_DATE", "purchasedDate", "purchasedDate")) { myEntity.setPurchasedDate(analyzer.analyzeDate(java.sql.Timestamp.class)); } @@ -1380,7 +1380,7 @@ helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_POSTCODE", myEntity.getBillingPostcode()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_TELEPHONE", myEntity.getBillingTelephone()); helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_COUNTRY_CODE", myEntity.getBillingCountryCode()); - helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_LOCALE_NAME", myEntity.getBillingLocaleName()); + helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_LANGUAGE", myEntity.getBillingLanguage()); helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_STATUS_ID", myEntity.getOrderStatusId()); helpAppendingColumnValueString(sb, delimiter, equal, "UPDATED_DATE", myEntity.getUpdatedDate()); helpAppendingColumnValueString(sb, delimiter, equal, "PURCHASED_DATE", myEntity.getPurchasedDate()); @@ -1472,7 +1472,7 @@ valueMap.put("BILLING_POSTCODE", myEntity.getBillingPostcode()); valueMap.put("BILLING_TELEPHONE", myEntity.getBillingTelephone()); valueMap.put("BILLING_COUNTRY_CODE", myEntity.getBillingCountryCode()); - valueMap.put("BILLING_LOCALE_NAME", myEntity.getBillingLocaleName()); + valueMap.put("BILLING_LANGUAGE", myEntity.getBillingLanguage()); valueMap.put("ORDER_STATUS_ID", myEntity.getOrderStatusId()); valueMap.put("UPDATED_DATE", myEntity.getUpdatedDate()); valueMap.put("PURCHASED_DATE", myEntity.getPurchasedDate()); @@ -1532,7 +1532,7 @@ valueMap.put("BILLING_POSTCODE", helpGettingColumnStringValue(myEntity.getBillingPostcode())); valueMap.put("BILLING_TELEPHONE", helpGettingColumnStringValue(myEntity.getBillingTelephone())); valueMap.put("BILLING_COUNTRY_CODE", helpGettingColumnStringValue(myEntity.getBillingCountryCode())); - valueMap.put("BILLING_LOCALE_NAME", helpGettingColumnStringValue(myEntity.getBillingLocaleName())); + valueMap.put("BILLING_LANGUAGE", helpGettingColumnStringValue(myEntity.getBillingLanguage())); valueMap.put("ORDER_STATUS_ID", helpGettingColumnStringValue(myEntity.getOrderStatusId())); valueMap.put("UPDATED_DATE", helpGettingColumnStringValue(myEntity.getUpdatedDate())); valueMap.put("PURCHASED_DATE", helpGettingColumnStringValue(myEntity.getPurchasedDate())); @@ -1561,9 +1561,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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE) 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE) 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LOCALE_NAME, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE) 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_TELEPHONE, CUSTOMER_COUNTRY_CODE, CUSTOMER_LANGUAGE, 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_TELEPHONE, BILLING_COUNTRY_CODE, BILLING_LANGUAGE, ORDER_STATUS_ID, UPDATED_DATE, PURCHASED_DATE, FINISHED_DATE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== @@ -1606,7 +1606,7 @@ registerEntityPropertySetupper("BILLING_POSTCODE", "billingPostcode", new EntityPropertyBillingPostcodeSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("BILLING_TELEPHONE", "billingTelephone", new EntityPropertyBillingTelephoneSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("BILLING_COUNTRY_CODE", "billingCountryCode", new EntityPropertyBillingCountryCodeSetupper(), _entityPropertySetupperMap); - registerEntityPropertySetupper("BILLING_LOCALE_NAME", "billingLocaleName", new EntityPropertyBillingLocaleNameSetupper(), _entityPropertySetupperMap); + registerEntityPropertySetupper("BILLING_LANGUAGE", "billingLanguage", new EntityPropertyBillingLanguageSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("ORDER_STATUS_ID", "orderStatusId", new EntityPropertyOrderStatusIdSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("UPDATED_DATE", "updatedDate", new EntityPropertyUpdatedDateSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("PURCHASED_DATE", "purchasedDate", new EntityPropertyPurchasedDateSetupper(), _entityPropertySetupperMap); @@ -1739,8 +1739,8 @@ public class EntityPropertyBillingCountryCodeSetupper implements EntityPropertySetupper { public void setup(OrderForm entity, Object value) { entity.setBillingCountryCode((String)value); } } - public class EntityPropertyBillingLocaleNameSetupper implements EntityPropertySetupper { - public void setup(OrderForm entity, Object value) { entity.setBillingLocaleName((String)value); } + public class EntityPropertyBillingLanguageSetupper implements EntityPropertySetupper { + public void setup(OrderForm entity, Object value) { entity.setBillingLanguage((String)value); } } public class EntityPropertyOrderStatusIdSetupper implements EntityPropertySetupper { public void setup(OrderForm entity, Object value) { entity.setOrderStatusId((java.math.BigDecimal)value); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderNotificationDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_NOTIFICATION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5EC32B11_0D84_4CE1_A08D_11E0C96B55D6] */ + /** DB name of ORDER_NOTIFICATION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E10C6D3C_63F1_4367_966E_F57D333ABD11] */ public static final String DB_NAME_ORDER_NOTIFICATION_ID = "ORDER_NOTIFICATION_ID"; /** DB name of ORDER_STATUS_ID. INTEGER : NotNull : Default=[] : FK to ORDER_STATUS */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderNotificationId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5EC32B11_0D84_4CE1_A08D_11E0C96B55D6] */ + /** Property name(JavaBeansRule) of orderNotificationId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_E10C6D3C_63F1_4367_966E_F57D333ABD11] */ public static final String PROPERTY_NAME_orderNotificationId = "orderNotificationId"; /** Property name(JavaBeansRule) of orderStatusId. INTEGER : NotNull : Default=[] : FK to ORDER_STATUS */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderPaymentDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderPaymentDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderPaymentDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -21,7 +21,7 @@ * ORDER_FORM_ID * * [column-property] - * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE + * ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE * * [foreign-property] * orderForm, paymentMethod, paymentStatus @@ -109,9 +109,6 @@ /** DB name of PAYMENT_STATUS_ID. INTEGER : Default=[] : FK to PAYMENT_STATUS */ public static final String DB_NAME_PAYMENT_STATUS_ID = "PAYMENT_STATUS_ID"; - /** DB name of UPDATED_DATE. TIMESTAMP : Default=[] */ - public static final String DB_NAME_UPDATED_DATE = "UPDATED_DATE"; - /** DB name of SUB_TOTAL_PRICE. DECIMAL(14, 6) : Default=[] */ public static final String DB_NAME_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE"; @@ -146,9 +143,6 @@ /** Property name(JavaBeansRule) of paymentStatusId. INTEGER : Default=[] : FK to PAYMENT_STATUS */ public static final String PROPERTY_NAME_paymentStatusId = "paymentStatusId"; - /** Property name(JavaBeansRule) of updatedDate. TIMESTAMP : Default=[] */ - public static final String PROPERTY_NAME_updatedDate = "updatedDate"; - /** Property name(JavaBeansRule) of subTotalPrice. DECIMAL(14, 6) : Default=[] */ public static final String PROPERTY_NAME_subTotalPrice = "subTotalPrice"; @@ -197,7 +191,6 @@ map.put(DB_NAME_PAYMENT_METHOD_CODE.toLowerCase(), PROPERTY_NAME_paymentMethodCode); map.put(DB_NAME_ORDER_CARD_INFO_ID.toLowerCase(), PROPERTY_NAME_orderCardInfoId); map.put(DB_NAME_PAYMENT_STATUS_ID.toLowerCase(), PROPERTY_NAME_paymentStatusId); - map.put(DB_NAME_UPDATED_DATE.toLowerCase(), PROPERTY_NAME_updatedDate); 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); @@ -222,7 +215,6 @@ map.put(PROPERTY_NAME_paymentMethodCode.toLowerCase(), DB_NAME_PAYMENT_METHOD_CODE); map.put(PROPERTY_NAME_orderCardInfoId.toLowerCase(), DB_NAME_ORDER_CARD_INFO_ID); map.put(PROPERTY_NAME_paymentStatusId.toLowerCase(), DB_NAME_PAYMENT_STATUS_ID); - map.put(PROPERTY_NAME_updatedDate.toLowerCase(), DB_NAME_UPDATED_DATE); 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); @@ -364,7 +356,6 @@ columnInfoList.add(columnPaymentMethodCode()); columnInfoList.add(columnOrderCardInfoId()); columnInfoList.add(columnPaymentStatusId()); - columnInfoList.add(columnUpdatedDate()); columnInfoList.add(columnSubTotalPrice()); columnInfoList.add(columnTax()); columnInfoList.add(columnDeliveryPrice()); @@ -393,10 +384,6 @@ public ColumnInfo columnPaymentStatusId() { return new ColumnInfo(this, "PAYMENT_STATUS_ID", "paymentStatusId", java.math.BigDecimal.class, false, null, null); } - /** @return The column information of updatedDate. (NotNull) */ - public ColumnInfo columnUpdatedDate() { - return new ColumnInfo(this, "UPDATED_DATE", "updatedDate", java.sql.Timestamp.class, false, null, null); - } /** @return The column information of subTotalPrice. (NotNull) */ public ColumnInfo columnSubTotalPrice() { return new ColumnInfo(this, "SUB_TOTAL_PRICE", "subTotalPrice", java.math.BigDecimal.class, false, Integer.valueOf("14"), Integer.valueOf("6")); @@ -586,7 +573,6 @@ public RelationTrace columnPaymentMethodCode() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnPaymentMethodCode()); } public RelationTrace columnOrderCardInfoId() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnOrderCardInfoId()); } public RelationTrace columnPaymentStatusId() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnPaymentStatusId()); } - public RelationTrace columnUpdatedDate() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnUpdatedDate()); } public RelationTrace columnSubTotalPrice() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnSubTotalPrice()); } public RelationTrace columnTax() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnTax()); } public RelationTrace columnDeliveryPrice() { return fixTrace(_relationList, OrderPaymentDbm.getInstance().columnDeliveryPrice()); } @@ -687,7 +673,6 @@ if (analyzer.init("PAYMENT_METHOD_CODE", "paymentMethodCode", "paymentMethodCode")) { myEntity.setPaymentMethodCode(analyzer.analyzeString(String.class)); } if (analyzer.init("ORDER_CARD_INFO_ID", "orderCardInfoId", "orderCardInfoId")) { myEntity.setOrderCardInfoId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("PAYMENT_STATUS_ID", "paymentStatusId", "paymentStatusId")) { myEntity.setPaymentStatusId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } - if (analyzer.init("UPDATED_DATE", "updatedDate", "updatedDate")) { myEntity.setUpdatedDate(analyzer.analyzeDate(java.sql.Timestamp.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)); } @@ -768,7 +753,6 @@ helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_METHOD_CODE", myEntity.getPaymentMethodCode()); helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId()); helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_STATUS_ID", myEntity.getPaymentStatusId()); - helpAppendingColumnValueString(sb, delimiter, equal, "UPDATED_DATE", myEntity.getUpdatedDate()); helpAppendingColumnValueString(sb, delimiter, equal, "SUB_TOTAL_PRICE", myEntity.getSubTotalPrice()); helpAppendingColumnValueString(sb, delimiter, equal, "TAX", myEntity.getTax()); helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_PRICE", myEntity.getDeliveryPrice()); @@ -833,7 +817,6 @@ valueMap.put("PAYMENT_METHOD_CODE", myEntity.getPaymentMethodCode()); valueMap.put("ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId()); valueMap.put("PAYMENT_STATUS_ID", myEntity.getPaymentStatusId()); - valueMap.put("UPDATED_DATE", myEntity.getUpdatedDate()); valueMap.put("SUB_TOTAL_PRICE", myEntity.getSubTotalPrice()); valueMap.put("TAX", myEntity.getTax()); valueMap.put("DELIVERY_PRICE", myEntity.getDeliveryPrice()); @@ -866,7 +849,6 @@ valueMap.put("PAYMENT_METHOD_CODE", helpGettingColumnStringValue(myEntity.getPaymentMethodCode())); valueMap.put("ORDER_CARD_INFO_ID", helpGettingColumnStringValue(myEntity.getOrderCardInfoId())); valueMap.put("PAYMENT_STATUS_ID", helpGettingColumnStringValue(myEntity.getPaymentStatusId())); - valueMap.put("UPDATED_DATE", helpGettingColumnStringValue(myEntity.getUpdatedDate())); valueMap.put("SUB_TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getSubTotalPrice())); valueMap.put("TAX", helpGettingColumnStringValue(myEntity.getTax())); valueMap.put("DELIVERY_PRICE", helpGettingColumnStringValue(myEntity.getDeliveryPrice())); @@ -896,9 +878,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "ORDER_PAYMENT(ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "ORDER_PAYMENT(ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into ORDER_PAYMENT(ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, UPDATED_DATE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into ORDER_PAYMENT(ORDER_FORM_ID, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, PAYMENT_STATUS_ID, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== @@ -913,7 +895,6 @@ registerEntityPropertySetupper("PAYMENT_METHOD_CODE", "paymentMethodCode", new EntityPropertyPaymentMethodCodeSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("ORDER_CARD_INFO_ID", "orderCardInfoId", new EntityPropertyOrderCardInfoIdSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("PAYMENT_STATUS_ID", "paymentStatusId", new EntityPropertyPaymentStatusIdSetupper(), _entityPropertySetupperMap); - registerEntityPropertySetupper("UPDATED_DATE", "updatedDate", new EntityPropertyUpdatedDateSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("SUB_TOTAL_PRICE", "subTotalPrice", new EntityPropertySubTotalPriceSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("TAX", "tax", new EntityPropertyTaxSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("DELIVERY_PRICE", "deliveryPrice", new EntityPropertyDeliveryPriceSetupper(), _entityPropertySetupperMap); @@ -963,9 +944,6 @@ public class EntityPropertyPaymentStatusIdSetupper implements EntityPropertySetupper { public void setup(OrderPayment entity, Object value) { entity.setPaymentStatusId((java.math.BigDecimal)value); } } - public class EntityPropertyUpdatedDateSetupper implements EntityPropertySetupper { - public void setup(OrderPayment entity, Object value) { entity.setUpdatedDate((java.sql.Timestamp)value); } - } public class EntityPropertySubTotalPriceSetupper implements EntityPropertySetupper { public void setup(OrderPayment entity, Object value) { entity.setSubTotalPrice((java.math.BigDecimal)value); } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_PRODUCT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6A0998C7_E994_4EAD_82DA_CD13DD6F3FDB] */ + /** DB name of ORDER_PRODUCT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E7663C8_2AA3_4A71_BA3C_9FB60F8CD5F4] */ public static final String DB_NAME_ORDER_PRODUCT_ID = "ORDER_PRODUCT_ID"; /** DB name of ORDER_FORM_ID. BIGINT : NotNull : Default=[] : FK to ORDER_FORM */ @@ -137,7 +137,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderProductId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6A0998C7_E994_4EAD_82DA_CD13DD6F3FDB] */ + /** Property name(JavaBeansRule) of orderProductId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0E7663C8_2AA3_4A71_BA3C_9FB60F8CD5F4] */ public static final String PROPERTY_NAME_orderProductId = "orderProductId"; /** Property name(JavaBeansRule) of orderFormId. BIGINT : NotNull : Default=[] : FK to ORDER_FORM */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductOptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductOptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductOptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_PRODUCT_OPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FE7F2B02_B5E2_4245_A033_EBF6D16F6F7A] */ + /** DB name of ORDER_PRODUCT_OPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_34BAF4A8_D116_4023_BC0A_AEA573B5280F] */ public static final String DB_NAME_ORDER_PRODUCT_OPTION_ID = "ORDER_PRODUCT_OPTION_ID"; /** DB name of ORDER_PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to ORDER_PRODUCT */ @@ -125,7 +125,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderProductOptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FE7F2B02_B5E2_4245_A033_EBF6D16F6F7A] */ + /** Property name(JavaBeansRule) of orderProductOptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_34BAF4A8_D116_4023_BC0A_AEA573B5280F] */ public static final String PROPERTY_NAME_orderProductOptionId = "orderProductOptionId"; /** Property name(JavaBeansRule) of orderProductId. BIGINT : NotNull : Default=[] : FK to ORDER_PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_50CD49BE_2DFF_4EBC_B0A3_352D3224CD8E] */ + /** DB name of ORDER_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E39CF5F_3F03_4CD2_93AF_D5271B7A9CD4] */ public static final String DB_NAME_ORDER_STATUS_ID = "ORDER_STATUS_ID"; /** DB name of TYPE. INTEGER : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderStatusId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_50CD49BE_2DFF_4EBC_B0A3_352D3224CD8E] */ + /** Property name(JavaBeansRule) of orderStatusId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6E39CF5F_3F03_4CD2_93AF_D5271B7A9CD4] */ public static final String PROPERTY_NAME_orderStatusId = "orderStatusId"; /** Property name(JavaBeansRule) of type. INTEGER : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_STATUS_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57005BDB_8F67_48C9_8FA8_A5873EE74109] */ + /** DB name of ORDER_STATUS_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CFF5800_E0F8_4DFD_B8E7_DD338204FCF2] */ public static final String DB_NAME_ORDER_STATUS_DESCRIPTION_ID = "ORDER_STATUS_DESCRIPTION_ID"; /** DB name of ORDER_STATUS_ID. INTEGER : NotNull : Default=[] : FK to ORDER_STATUS */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderStatusDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_57005BDB_8F67_48C9_8FA8_A5873EE74109] */ + /** Property name(JavaBeansRule) of orderStatusDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6CFF5800_E0F8_4DFD_B8E7_DD338204FCF2] */ public static final String PROPERTY_NAME_orderStatusDescriptionId = "orderStatusDescriptionId"; /** Property name(JavaBeansRule) of orderStatusId. INTEGER : NotNull : Default=[] : FK to ORDER_STATUS */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderStatusHistoryDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of ORDER_STATUS_HISTORY_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A1233B6_C86A_4560_9F95_D174C0F8AECD] */ + /** DB name of ORDER_STATUS_HISTORY_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EAC40217_D574_4478_888A_8632E9DF0DDC] */ public static final String DB_NAME_ORDER_STATUS_HISTORY_ID = "ORDER_STATUS_HISTORY_ID"; /** DB name of ORDER_FORM_ID. BIGINT : NotNull : Default=[] : FK to ORDER_FORM */ @@ -116,7 +116,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of orderStatusHistoryId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5A1233B6_C86A_4560_9F95_D174C0F8AECD] */ + /** Property name(JavaBeansRule) of orderStatusHistoryId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_EAC40217_D574_4478_888A_8632E9DF0DDC] */ public static final String PROPERTY_NAME_orderStatusHistoryId = "orderStatusHistoryId"; /** Property name(JavaBeansRule) of orderFormId. BIGINT : NotNull : Default=[] : FK to ORDER_FORM */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PAYMENT_METHOD_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A860291A_CEB7_4C33_B2C5_E17DDFF29780] */ + /** DB name of PAYMENT_METHOD_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1ACB50B5_1334_4789_83C3_F4D2B67AE926] */ public static final String DB_NAME_PAYMENT_METHOD_ID = "PAYMENT_METHOD_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -116,7 +116,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of paymentMethodId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A860291A_CEB7_4C33_B2C5_E17DDFF29780] */ + /** Property name(JavaBeansRule) of paymentMethodId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_1ACB50B5_1334_4789_83C3_F4D2B67AE926] */ public static final String PROPERTY_NAME_paymentMethodId = "paymentMethodId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PAYMENT_METHOD_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FCCE10D1_1C23_4261_8F63_ACC2E84661E5] */ + /** DB name of PAYMENT_METHOD_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4F0976EF_3F52_43FD_A80E_0BE4F5CB6B09] */ public static final String DB_NAME_PAYMENT_METHOD_DESCRIPTION_ID = "PAYMENT_METHOD_DESCRIPTION_ID"; /** DB name of PAYMENT_METHOD_ID. INTEGER : NotNull : Default=[] : FK to PAYMENT_METHOD */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of paymentMethodDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FCCE10D1_1C23_4261_8F63_ACC2E84661E5] */ + /** Property name(JavaBeansRule) of paymentMethodDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4F0976EF_3F52_43FD_A80E_0BE4F5CB6B09] */ public static final String PROPERTY_NAME_paymentMethodDescriptionId = "paymentMethodDescriptionId"; /** Property name(JavaBeansRule) of paymentMethodId. INTEGER : NotNull : Default=[] : FK to PAYMENT_METHOD */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PAYMENT_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_07F04D5F_8DEB_4F29_802E_787FF0C257F7] */ + /** DB name of PAYMENT_STATUS_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A2F7FC55_6332_417D_8BF0_AA4E09968224] */ public static final String DB_NAME_PAYMENT_STATUS_ID = "PAYMENT_STATUS_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of paymentStatusId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_07F04D5F_8DEB_4F29_802E_787FF0C257F7] */ + /** Property name(JavaBeansRule) of paymentStatusId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_A2F7FC55_6332_417D_8BF0_AA4E09968224] */ public static final String PROPERTY_NAME_paymentStatusId = "paymentStatusId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentStatusDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PAYMENT_STATUS_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0FA0CE4E_1A66_4141_BB8C_DEF9F3002150] */ + /** DB name of PAYMENT_STATUS_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD3A4F90_5DB1_4753_8E86_CEFC8E032F6E] */ public static final String DB_NAME_PAYMENT_STATUS_DESCRIPTION_ID = "PAYMENT_STATUS_DESCRIPTION_ID"; /** DB name of PAYMENT_STATUS_ID. INTEGER : NotNull : Default=[] : FK to PAYMENT_STATUS */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of paymentStatusDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0FA0CE4E_1A66_4141_BB8C_DEF9F3002150] */ + /** Property name(JavaBeansRule) of paymentStatusDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FD3A4F90_5DB1_4753_8E86_CEFC8E032F6E] */ public static final String PROPERTY_NAME_paymentStatusDescriptionId = "paymentStatusDescriptionId"; /** Property name(JavaBeansRule) of paymentStatusId. INTEGER : NotNull : Default=[] : FK to PAYMENT_STATUS */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductAttributeDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductAttributeDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductAttributeDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_ATTRIBUTE_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2610CCC8_5F78_4EB1_9A12_0AC2591CAA82] */ + /** DB name of PRODUCT_ATTRIBUTE_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_68ADF6E2_A268_4D8C_8EAB_FCFA9F4C21E5] */ public static final String DB_NAME_PRODUCT_ATTRIBUTE_ID = "PRODUCT_ATTRIBUTE_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productAttributeId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_2610CCC8_5F78_4EB1_9A12_0AC2591CAA82] */ + /** Property name(JavaBeansRule) of productAttributeId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_68ADF6E2_A268_4D8C_8EAB_FCFA9F4C21E5] */ public static final String PROPERTY_NAME_productAttributeId = "productAttributeId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductContentDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductContentDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductContentDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_CONTENT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B293D68B_28E4_4793_9AF6_F0349ECD15DD] */ + /** DB name of PRODUCT_CONTENT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CCD79C7E_3A54_4424_B91D_A9E7FBDBFF59] */ public static final String DB_NAME_PRODUCT_CONTENT_ID = "PRODUCT_CONTENT_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productContentId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_B293D68B_28E4_4793_9AF6_F0349ECD15DD] */ + /** Property name(JavaBeansRule) of productContentId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_CCD79C7E_3A54_4424_B91D_A9E7FBDBFF59] */ public static final String PROPERTY_NAME_productContentId = "productContentId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -21,7 +21,7 @@ * PRODUCT_ID * * [column-property] - * PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE + * PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE * * [foreign-property] * deliveryType, fileData, manufacturer, taxType @@ -94,18 +94,24 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53F43142_633D_4D33_B998_7660EB2AAA6E] */ + /** DB name of PRODUCT_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_401D882C_D7F7_4467_952C_FF7279D1F245] */ public static final String DB_NAME_PRODUCT_ID = "PRODUCT_ID"; - /** DB name of MODEL. VARCHAR(80) : Default=[] */ - public static final String DB_NAME_MODEL = "MODEL"; + /** DB name of PRODUCT_MODE. INTEGER : NotNull : Default=[] */ + public static final String DB_NAME_PRODUCT_MODE = "PRODUCT_MODE"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ public static final String DB_NAME_CODE = "CODE"; + /** DB name of MODEL. VARCHAR(80) : Default=[] */ + public static final String DB_NAME_MODEL = "MODEL"; + /** DB name of STOCK. INTEGER : Default=[] */ public static final String DB_NAME_STOCK = "STOCK"; + /** DB name of CATALOG_PRICE. DECIMAL(15, 4) : Default=[] */ + public static final String DB_NAME_CATALOG_PRICE = "CATALOG_PRICE"; + /** DB name of PRICE. DECIMAL(15, 4) : NotNull : Default=[] */ public static final String DB_NAME_PRICE = "PRICE"; @@ -152,18 +158,24 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_53F43142_633D_4D33_B998_7660EB2AAA6E] */ + /** Property name(JavaBeansRule) of productId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_401D882C_D7F7_4467_952C_FF7279D1F245] */ public static final String PROPERTY_NAME_productId = "productId"; - /** Property name(JavaBeansRule) of model. VARCHAR(80) : Default=[] */ - public static final String PROPERTY_NAME_model = "model"; + /** Property name(JavaBeansRule) of productMode. INTEGER : NotNull : Default=[] */ + public static final String PROPERTY_NAME_productMode = "productMode"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ public static final String PROPERTY_NAME_code = "code"; + /** Property name(JavaBeansRule) of model. VARCHAR(80) : Default=[] */ + public static final String PROPERTY_NAME_model = "model"; + /** Property name(JavaBeansRule) of stock. INTEGER : Default=[] */ public static final String PROPERTY_NAME_stock = "stock"; + /** Property name(JavaBeansRule) of catalogPrice. DECIMAL(15, 4) : Default=[] */ + public static final String PROPERTY_NAME_catalogPrice = "catalogPrice"; + /** Property name(JavaBeansRule) of price. DECIMAL(15, 4) : NotNull : Default=[] */ public static final String PROPERTY_NAME_price = "price"; @@ -266,9 +278,11 @@ map.put(TABLE_DB_NAME.toLowerCase(), TABLE_PROPERTY_NAME); map.put(DB_NAME_PRODUCT_ID.toLowerCase(), PROPERTY_NAME_productId); + map.put(DB_NAME_PRODUCT_MODE.toLowerCase(), PROPERTY_NAME_productMode); + map.put(DB_NAME_CODE.toLowerCase(), PROPERTY_NAME_code); map.put(DB_NAME_MODEL.toLowerCase(), PROPERTY_NAME_model); - map.put(DB_NAME_CODE.toLowerCase(), PROPERTY_NAME_code); map.put(DB_NAME_STOCK.toLowerCase(), PROPERTY_NAME_stock); + map.put(DB_NAME_CATALOG_PRICE.toLowerCase(), PROPERTY_NAME_catalogPrice); map.put(DB_NAME_PRICE.toLowerCase(), PROPERTY_NAME_price); map.put(DB_NAME_WEIGHT.toLowerCase(), PROPERTY_NAME_weight); map.put(DB_NAME_SIZE.toLowerCase(), PROPERTY_NAME_size); @@ -298,9 +312,11 @@ map.put(TABLE_PROPERTY_NAME.toLowerCase(), TABLE_DB_NAME); map.put(PROPERTY_NAME_productId.toLowerCase(), DB_NAME_PRODUCT_ID); + map.put(PROPERTY_NAME_productMode.toLowerCase(), DB_NAME_PRODUCT_MODE); + map.put(PROPERTY_NAME_code.toLowerCase(), DB_NAME_CODE); map.put(PROPERTY_NAME_model.toLowerCase(), DB_NAME_MODEL); - map.put(PROPERTY_NAME_code.toLowerCase(), DB_NAME_CODE); map.put(PROPERTY_NAME_stock.toLowerCase(), DB_NAME_STOCK); + map.put(PROPERTY_NAME_catalogPrice.toLowerCase(), DB_NAME_CATALOG_PRICE); map.put(PROPERTY_NAME_price.toLowerCase(), DB_NAME_PRICE); map.put(PROPERTY_NAME_weight.toLowerCase(), DB_NAME_WEIGHT); map.put(PROPERTY_NAME_size.toLowerCase(), DB_NAME_SIZE); @@ -447,9 +463,11 @@ public List getColumnInfoList() { final List columnInfoList = new ArrayList(); columnInfoList.add(columnProductId()); + columnInfoList.add(columnProductMode()); + columnInfoList.add(columnCode()); columnInfoList.add(columnModel()); - columnInfoList.add(columnCode()); columnInfoList.add(columnStock()); + columnInfoList.add(columnCatalogPrice()); columnInfoList.add(columnPrice()); columnInfoList.add(columnWeight()); columnInfoList.add(columnSize()); @@ -471,18 +489,26 @@ public ColumnInfo columnProductId() { return new ColumnInfo(this, "PRODUCT_ID", "productId", java.math.BigDecimal.class, true, null, null); } - /** @return The column information of model. (NotNull) */ - public ColumnInfo columnModel() { - return new ColumnInfo(this, "MODEL", "model", String.class, false, Integer.valueOf("80"), Integer.valueOf("0")); + /** @return The column information of productMode. (NotNull) */ + public ColumnInfo columnProductMode() { + return new ColumnInfo(this, "PRODUCT_MODE", "productMode", java.math.BigDecimal.class, false, null, null); } /** @return The column information of code. (NotNull) */ public ColumnInfo columnCode() { return new ColumnInfo(this, "CODE", "code", String.class, false, Integer.valueOf("40"), Integer.valueOf("0")); } + /** @return The column information of model. (NotNull) */ + public ColumnInfo columnModel() { + return new ColumnInfo(this, "MODEL", "model", String.class, false, Integer.valueOf("80"), Integer.valueOf("0")); + } /** @return The column information of stock. (NotNull) */ public ColumnInfo columnStock() { return new ColumnInfo(this, "STOCK", "stock", java.math.BigDecimal.class, false, null, null); } + /** @return The column information of catalogPrice. (NotNull) */ + public ColumnInfo columnCatalogPrice() { + return new ColumnInfo(this, "CATALOG_PRICE", "catalogPrice", java.math.BigDecimal.class, false, Integer.valueOf("15"), Integer.valueOf("4")); + } /** @return The column information of price. (NotNull) */ public ColumnInfo columnPrice() { return new ColumnInfo(this, "PRICE", "price", java.math.BigDecimal.class, false, Integer.valueOf("15"), Integer.valueOf("4")); @@ -1190,9 +1216,11 @@ } public RelationTrace columnProductId() { return fixTrace(_relationList, ProductDbm.getInstance().columnProductId()); } + public RelationTrace columnProductMode() { return fixTrace(_relationList, ProductDbm.getInstance().columnProductMode()); } + public RelationTrace columnCode() { return fixTrace(_relationList, ProductDbm.getInstance().columnCode()); } public RelationTrace columnModel() { return fixTrace(_relationList, ProductDbm.getInstance().columnModel()); } - public RelationTrace columnCode() { return fixTrace(_relationList, ProductDbm.getInstance().columnCode()); } public RelationTrace columnStock() { return fixTrace(_relationList, ProductDbm.getInstance().columnStock()); } + public RelationTrace columnCatalogPrice() { return fixTrace(_relationList, ProductDbm.getInstance().columnCatalogPrice()); } public RelationTrace columnPrice() { return fixTrace(_relationList, ProductDbm.getInstance().columnPrice()); } public RelationTrace columnWeight() { return fixTrace(_relationList, ProductDbm.getInstance().columnWeight()); } public RelationTrace columnSize() { return fixTrace(_relationList, ProductDbm.getInstance().columnSize()); } @@ -1298,9 +1326,11 @@ final MapStringValueAnalyzer analyzer = new MapStringValueAnalyzer(columnValueMap, entity.getModifiedPropertyNames()); if (analyzer.init("PRODUCT_ID", "productId", "productId")) { myEntity.setProductId(analyzer.analyzeNumber(java.math.BigDecimal.class)); } + if (analyzer.init("PRODUCT_MODE", "productMode", "productMode")) { myEntity.setProductMode(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("CODE", "code", "code")) { myEntity.setCode(analyzer.analyzeString(String.class)); } if (analyzer.init("STOCK", "stock", "stock")) { myEntity.setStock(analyzer.analyzeNumber(java.math.BigDecimal.class)); } + if (analyzer.init("CATALOG_PRICE", "catalogPrice", "catalogPrice")) { myEntity.setCatalogPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("PRICE", "price", "price")) { myEntity.setPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("WEIGHT", "weight", "weight")) { myEntity.setWeight(analyzer.analyzeNumber(java.math.BigDecimal.class)); } if (analyzer.init("SIZE", "size", "size")) { myEntity.setSize(analyzer.analyzeString(String.class)); } @@ -1386,9 +1416,11 @@ final String mapMarkAndStartBrace = MAP_STRING_MAP_MARK + startBrace; final StringBuffer sb = new StringBuffer(); helpAppendingColumnValueString(sb, delimiter, equal, "PRODUCT_ID", myEntity.getProductId()); + helpAppendingColumnValueString(sb, delimiter, equal, "PRODUCT_MODE", myEntity.getProductMode()); + helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode()); helpAppendingColumnValueString(sb, delimiter, equal, "MODEL", myEntity.getModel()); - helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode()); helpAppendingColumnValueString(sb, delimiter, equal, "STOCK", myEntity.getStock()); + helpAppendingColumnValueString(sb, delimiter, equal, "CATALOG_PRICE", myEntity.getCatalogPrice()); helpAppendingColumnValueString(sb, delimiter, equal, "PRICE", myEntity.getPrice()); helpAppendingColumnValueString(sb, delimiter, equal, "WEIGHT", myEntity.getWeight()); helpAppendingColumnValueString(sb, delimiter, equal, "SIZE", myEntity.getSize()); @@ -1458,9 +1490,11 @@ final Product myEntity = downcast(entity); final Map valueMap = new LinkedHashMap(); valueMap.put("PRODUCT_ID", myEntity.getProductId()); + valueMap.put("PRODUCT_MODE", myEntity.getProductMode()); + valueMap.put("CODE", myEntity.getCode()); valueMap.put("MODEL", myEntity.getModel()); - valueMap.put("CODE", myEntity.getCode()); valueMap.put("STOCK", myEntity.getStock()); + valueMap.put("CATALOG_PRICE", myEntity.getCatalogPrice()); valueMap.put("PRICE", myEntity.getPrice()); valueMap.put("WEIGHT", myEntity.getWeight()); valueMap.put("SIZE", myEntity.getSize()); @@ -1498,9 +1532,11 @@ final Product myEntity = downcast(entity); final Map valueMap = new LinkedHashMap(); valueMap.put("PRODUCT_ID", helpGettingColumnStringValue(myEntity.getProductId())); + valueMap.put("PRODUCT_MODE", helpGettingColumnStringValue(myEntity.getProductMode())); + valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode())); valueMap.put("MODEL", helpGettingColumnStringValue(myEntity.getModel())); - valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode())); valueMap.put("STOCK", helpGettingColumnStringValue(myEntity.getStock())); + valueMap.put("CATALOG_PRICE", helpGettingColumnStringValue(myEntity.getCatalogPrice())); valueMap.put("PRICE", helpGettingColumnStringValue(myEntity.getPrice())); valueMap.put("WEIGHT", helpGettingColumnStringValue(myEntity.getWeight())); valueMap.put("SIZE", helpGettingColumnStringValue(myEntity.getSize())); @@ -1539,9 +1575,9 @@ public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) { if (preparedInsertClauseOption.getTablePrefix() != null) { final String tablePrefix = preparedInsertClauseOption.getTablePrefix(); - return "insert into " + tablePrefix + "PRODUCT(PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into " + tablePrefix + "PRODUCT(PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } - return "insert into PRODUCT(PRODUCT_ID, MODEL, CODE, STOCK, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; + return "insert into PRODUCT(PRODUCT_ID, PRODUCT_MODE, CODE, MODEL, STOCK, CATALOG_PRICE, PRICE, WEIGHT, SIZE, STATUS, LIMIT_PURCHASE, RELEASE_DATE, START_DATE, END_DATE, FILE_DATA_ID, MANUFACTURER_ID, TAX_TYPE_ID, DELIVERY_TYPE_ID, CREATED_DATE, UPDATED_DATE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )"; } // =================================================================================== @@ -1552,9 +1588,11 @@ protected Map> _entityPropertySetupperMap = new HashMap>(); { registerEntityPropertySetupper("PRODUCT_ID", "productId", new EntityPropertyProductIdSetupper(), _entityPropertySetupperMap); + registerEntityPropertySetupper("PRODUCT_MODE", "productMode", new EntityPropertyProductModeSetupper(), _entityPropertySetupperMap); + registerEntityPropertySetupper("CODE", "code", new EntityPropertyCodeSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("MODEL", "model", new EntityPropertyModelSetupper(), _entityPropertySetupperMap); - registerEntityPropertySetupper("CODE", "code", new EntityPropertyCodeSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("STOCK", "stock", new EntityPropertyStockSetupper(), _entityPropertySetupperMap); + registerEntityPropertySetupper("CATALOG_PRICE", "catalogPrice", new EntityPropertyCatalogPriceSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("PRICE", "price", new EntityPropertyPriceSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("WEIGHT", "weight", new EntityPropertyWeightSetupper(), _entityPropertySetupperMap); registerEntityPropertySetupper("SIZE", "size", new EntityPropertySizeSetupper(), _entityPropertySetupperMap); @@ -1601,15 +1639,21 @@ public class EntityPropertyProductIdSetupper implements EntityPropertySetupper { public void setup(Product entity, Object value) { entity.setProductId((java.math.BigDecimal)value); } } - public class EntityPropertyModelSetupper implements EntityPropertySetupper { - public void setup(Product entity, Object value) { entity.setModel((String)value); } + public class EntityPropertyProductModeSetupper implements EntityPropertySetupper { + public void setup(Product entity, Object value) { entity.setProductMode((java.math.BigDecimal)value); } } public class EntityPropertyCodeSetupper implements EntityPropertySetupper { public void setup(Product entity, Object value) { entity.setCode((String)value); } } + public class EntityPropertyModelSetupper implements EntityPropertySetupper { + public void setup(Product entity, Object value) { entity.setModel((String)value); } + } public class EntityPropertyStockSetupper implements EntityPropertySetupper { public void setup(Product entity, Object value) { entity.setStock((java.math.BigDecimal)value); } } + public class EntityPropertyCatalogPriceSetupper implements EntityPropertySetupper { + public void setup(Product entity, Object value) { entity.setCatalogPrice((java.math.BigDecimal)value); } + } public class EntityPropertyPriceSetupper implements EntityPropertySetupper { public void setup(Product entity, Object value) { entity.setPrice((java.math.BigDecimal)value); } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_DESCRIPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FB791960_CC5F_45D5_B37F_B6D75E155C0C] */ + /** DB name of PRODUCT_DESCRIPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4DA6852D_7749_4178_928F_F2004FABABCE] */ public static final String DB_NAME_PRODUCT_DESCRIPTION_ID = "PRODUCT_DESCRIPTION_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productDescriptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_FB791960_CC5F_45D5_B37F_B6D75E155C0C] */ + /** Property name(JavaBeansRule) of productDescriptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_4DA6852D_7749_4178_928F_F2004FABABCE] */ public static final String PROPERTY_NAME_productDescriptionId = "productDescriptionId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductInfoDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductInfoDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductInfoDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_INFO_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9993D476_B5B5_49CC_8ADE_EBA1CE9A9125] */ + /** DB name of PRODUCT_INFO_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8041627D_F7ED_4DAC_8329_9646CB5790C6] */ public static final String DB_NAME_PRODUCT_INFO_ID = "PRODUCT_INFO_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -116,7 +116,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productInfoId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9993D476_B5B5_49CC_8ADE_EBA1CE9A9125] */ + /** Property name(JavaBeansRule) of productInfoId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_8041627D_F7ED_4DAC_8329_9646CB5790C6] */ public static final String PROPERTY_NAME_productInfoId = "productInfoId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_OPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6903EF6A_CC3D_43CF_81E5_E3D4AC0C5FC4] */ + /** DB name of PRODUCT_OPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_940904FB_500A_4755_9955_FC3B027A8B8A] */ public static final String DB_NAME_PRODUCT_OPTION_ID = "PRODUCT_OPTION_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -107,7 +107,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productOptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_6903EF6A_CC3D_43CF_81E5_E3D4AC0C5FC4] */ + /** Property name(JavaBeansRule) of productOptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_940904FB_500A_4755_9955_FC3B027A8B8A] */ public static final String PROPERTY_NAME_productOptionId = "productOptionId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_OPTION_DESCRIPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_43A5118F_243D_4D3C_935E_299F8EED5E52] */ + /** DB name of PRODUCT_OPTION_DESCRIPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_81904327_A675_4673_9624_DCF0CBE4B8A8] */ public static final String DB_NAME_PRODUCT_OPTION_DESCRIPTION_ID = "PRODUCT_OPTION_DESCRIPTION_ID"; /** DB name of PRODUCT_OPTION_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productOptionDescriptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_43A5118F_243D_4D3C_935E_299F8EED5E52] */ + /** Property name(JavaBeansRule) of productOptionDescriptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_81904327_A675_4673_9624_DCF0CBE4B8A8] */ public static final String PROPERTY_NAME_productOptionDescriptionId = "productOptionDescriptionId"; /** Property name(JavaBeansRule) of productOptionId. BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_OPTION_VALUE_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F23FF2B3_EED2_4FEE_9ED0_E9C5655FE122] */ + /** DB name of PRODUCT_OPTION_VALUE_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0C947A89_3C09_42B9_BBA5_C45460C33F8C] */ public static final String DB_NAME_PRODUCT_OPTION_VALUE_ID = "PRODUCT_OPTION_VALUE_ID"; /** DB name of PRODUCT_OPTION_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productOptionValueId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F23FF2B3_EED2_4FEE_9ED0_E9C5655FE122] */ + /** Property name(JavaBeansRule) of productOptionValueId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_0C947A89_3C09_42B9_BBA5_C45460C33F8C] */ public static final String PROPERTY_NAME_productOptionValueId = "productOptionValueId"; /** Property name(JavaBeansRule) of productOptionId. BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductOptionValueDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of PRODUCT_OPTION_VALUE_DESCRIPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_19809486_4B46_4518_9993_D8F7C0022152] */ + /** DB name of PRODUCT_OPTION_VALUE_DESCRIPTION_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_45F180FB_67A4_4AAD_93C8_637AD06D42A5] */ public static final String DB_NAME_PRODUCT_OPTION_VALUE_DESCRIPTION_ID = "PRODUCT_OPTION_VALUE_DESCRIPTION_ID"; /** DB name of PRODUCT_OPTION_VALUE_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION_VALUE */ @@ -110,7 +110,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of productOptionValueDescriptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_19809486_4B46_4518_9993_D8F7C0022152] */ + /** Property name(JavaBeansRule) of productOptionValueDescriptionId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_45F180FB_67A4_4AAD_93C8_637AD06D42A5] */ public static final String PROPERTY_NAME_productOptionValueDescriptionId = "productOptionValueDescriptionId"; /** Property name(JavaBeansRule) of productOptionValueId. BIGINT : NotNull : Default=[] : FK to PRODUCT_OPTION_VALUE */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ReviewDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of REVIEW_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D85D1640_DC82_4764_AC1E_54AD6993A863] */ + /** DB name of REVIEW_ID. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65AB13F6_B094_46A9_AB54_971D78C1786C] */ public static final String DB_NAME_REVIEW_ID = "REVIEW_ID"; /** DB name of PRODUCT_ID. BIGINT : NotNull : Default=[] : FK to PRODUCT */ @@ -119,7 +119,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of reviewId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_D85D1640_DC82_4764_AC1E_54AD6993A863] */ + /** Property name(JavaBeansRule) of reviewId. PK : INC : BIGINT : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_65AB13F6_B094_46A9_AB54_971D78C1786C] */ public static final String PROPERTY_NAME_reviewId = "reviewId"; /** Property name(JavaBeansRule) of productId. BIGINT : NotNull : Default=[] : FK to PRODUCT */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of TAX_TYPE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3D9E5BA9_1EC6_4B79_8EAA_647BBE1BFC6B] */ + /** DB name of TAX_TYPE_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9A8A4772_33E6_47D4_9215_C2BFFA2BE3AC] */ public static final String DB_NAME_TAX_TYPE_ID = "TAX_TYPE_ID"; /** DB name of CODE. VARCHAR(40) : NotNull : Default=[] */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of taxTypeId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_3D9E5BA9_1EC6_4B79_8EAA_647BBE1BFC6B] */ + /** Property name(JavaBeansRule) of taxTypeId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_9A8A4772_33E6_47D4_9215_C2BFFA2BE3AC] */ public static final String PROPERTY_NAME_taxTypeId = "taxTypeId"; /** Property name(JavaBeansRule) of code. VARCHAR(40) : NotNull : Default=[] */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDescriptionDbm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDescriptionDbm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/TaxTypeDescriptionDbm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -94,7 +94,7 @@ // ----------------------------------------------------- // Column DB Name // -------------- - /** DB name of TAX_TYPE_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5FE6253A_8E3B_4B89_AA6E_EB8B3A8E6236] */ + /** DB name of TAX_TYPE_DESCRIPTION_ID. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F69A7535_43D6_47C0_A194_89836EB84BB8] */ public static final String DB_NAME_TAX_TYPE_DESCRIPTION_ID = "TAX_TYPE_DESCRIPTION_ID"; /** DB name of TAX_TYPE_ID. INTEGER : NotNull : Default=[] : FK to TAX_TYPE */ @@ -113,7 +113,7 @@ // Column Property Name // (JavaBeansRule) // -------------------- - /** Property name(JavaBeansRule) of taxTypeDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_5FE6253A_8E3B_4B89_AA6E_EB8B3A8E6236] */ + /** Property name(JavaBeansRule) of taxTypeDescriptionId. PK : INC : INTEGER : NotNull : Default=[NEXT VALUE FOR PUBLIC.SYSTEM_SEQUENCE_F69A7535_43D6_47C0_A194_89836EB84BB8] */ public static final String PROPERTY_NAME_taxTypeDescriptionId = "taxTypeDescriptionId"; /** Property name(JavaBeansRule) of taxTypeId. INTEGER : NotNull : Default=[] : FK to TAX_TYPE */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCategoryCB.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCategoryCB.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsCategoryCB.java 2008-04-08 04:39:30 UTC (rev 878) @@ -218,6 +218,43 @@ limitSelect_Off(); return _nssCategorySelf; } + + // /* * * * * * * * * * * * * * * * * * * * * * * + // ForeignTable = [FILE_DATA] + // ForeignProperty = [fileData] + // * * * * * * * * */ + + /** Nest select setupper for fileData. */ + protected jp.sf.pal.pompei.cbean.nss.FileDataNss _nssFileData; + + /** + * Get nest select setupper for fileData. {For Internal} + * + * @return Nest select setupper. (NotNull) + */ + public jp.sf.pal.pompei.cbean.nss.FileDataNss getNssFileData() { + if (_nssFileData == null) { + _nssFileData = new jp.sf.pal.pompei.cbean.nss.FileDataNss(null);// for Dummy + } + return _nssFileData; + } + /** + * Set up select for fileData. + * If you invoke this, this entity is target of select. + * + * @return Nest select setupper for fileData. (NotNull) + */ + public jp.sf.pal.pompei.cbean.nss.FileDataNss setupSelect_FileData() { + final String foreignTableAliasName = query().queryFileData().getRealAliasName(); + final String localRelationPath = query().getRelationPath(); + getSqlClause().registerSelectedSelectColumn(foreignTableAliasName, "CATEGORY", "fileData", localRelationPath); + getSqlClause().registerSelectedForeignInfo(query().queryFileData().getRelationPath(), "fileData"); + if (_nssFileData == null || !_nssFileData.hasConditionQuery()) { + _nssFileData = new jp.sf.pal.pompei.cbean.nss.FileDataNss(query().queryFileData()); + } + limitSelect_Off(); + return _nssFileData; + } // /* * * * * * * * * * * * * * * * * * * * * * * {as one} // ReferrerTable = [CATEGORY_PAGE_INFO] Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsFileDataCB.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsFileDataCB.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/bs/BsFileDataCB.java 2008-04-08 04:39:30 UTC (rev 878) @@ -181,7 +181,7 @@ // =================================================================================== // Setup Select // ============ - + // /* * * * * * * * * * * * * * * * * * * * * * * {as one} // ReferrerTable = [IMAGE_DATA] // ReferrerProperty = [imageDataAsOne] Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCategoryCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCategoryCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCategoryCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -429,6 +429,133 @@ abstract protected ConditionValue getCValueParentCategoryId(); /** + * Set the value of fileDataId using equal. { = } + * + * @param fileDataId The value of fileDataId as equal. + */ + public void setFileDataId_Equal(java.math.BigDecimal fileDataId) { + registerFileDataId(ConditionKey.CK_EQUAL, fileDataId); + } + + /** + * Set the value of fileDataId using notEqual. { != } + * + * @param fileDataId The value of fileDataId as notEqual. + */ + public void setFileDataId_NotEqual(java.math.BigDecimal fileDataId) { + registerFileDataId(ConditionKey.CK_NOT_EQUAL, fileDataId); + } + + /** + * Set the value of fileDataId using greaterThan. { > } + * + * @param fileDataId The value of fileDataId as greaterThan. + */ + public void setFileDataId_GreaterThan(java.math.BigDecimal fileDataId) { + registerFileDataId(ConditionKey.CK_GREATER_THAN, fileDataId); + } + + /** + * Set the value of fileDataId using lessThan. { < } + * + * @param fileDataId The value of fileDataId as lessThan. + */ + public void setFileDataId_LessThan(java.math.BigDecimal fileDataId) { + registerFileDataId(ConditionKey.CK_LESS_THAN, fileDataId); + } + + /** + * Set the value of fileDataId using greaterEqual. { >= } + * + * @param fileDataId The value of fileDataId as greaterEqual. + */ + public void setFileDataId_GreaterEqual(java.math.BigDecimal fileDataId) { + registerFileDataId(ConditionKey.CK_GREATER_EQUAL, fileDataId); + } + + /** + * Set the value of fileDataId using lessEqual. { <= } + * + * @param fileDataId The value of fileDataId as lessEqual. + */ + public void setFileDataId_LessEqual(java.math.BigDecimal fileDataId) { + registerFileDataId(ConditionKey.CK_LESS_EQUAL, fileDataId); + } + + /** + * Set the value of fileDataId using inScope. { in (a, b) } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param fileDataIdList The value of fileDataId as inScope. + */ + public void setFileDataId_InScope(java.util.Collection fileDataIdList) { + registerFileDataId(ConditionKey.CK_IN_SCOPE, convertToList(fileDataIdList)); + } + + /** + * Set the value of fileDataId using notInScope. { not in (a, b) } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param fileDataIdList The value of fileDataId as notInScope. + */ + public void setFileDataId_NotInScope(java.util.Collection fileDataIdList) { + registerFileDataId(ConditionKey.CK_NOT_IN_SCOPE, convertToList(fileDataIdList)); + } + + /** + * Set the sub-query of FileDataId_InScopeSubQuery_FileData using inScopeSubQuery. + * { in (select xxx.FILE_DATA_ID from FILE_DATA where ...) } + * This method use from clause and where clause of the sub-query instance. + * this query keep the sub-query instance for query-value. + * After you invoke this, If you set query in the argument[subQuery], the query is ignored. + * + * @param fileDataCBquery The sub-query of FileDataId_InScopeSubQuery_FileData using inScopeSubQuery. (NotNull) + */ + public void setFileDataId_InScopeSubQuery_FileData(jp.sf.pal.pompei.cbean.cq.FileDataCQ fileDataCBquery) { + assertObjectNotNull("fileDataCBquery", fileDataCBquery); + final String subQueryPropertyName = keepFileDataId_InScopeSubQuery_FileData(fileDataCBquery);// for saving query-value. + registerInScopeSubQuery(fileDataCBquery, "FILE_DATA_ID", "FILE_DATA_ID", subQueryPropertyName); + } + + abstract public String keepFileDataId_InScopeSubQuery_FileData(jp.sf.pal.pompei.cbean.cq.FileDataCQ subQuery); + + /** + * Set the value of fileDataId using isNull. { is null } + */ + public void setFileDataId_IsNull() { + registerFileDataId(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of fileDataId using isNotNull. { is not null } + */ + public void setFileDataId_IsNotNull() { + registerFileDataId(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of fileDataId. + * + * @param key Condition key. (NotNull) + * @param value The value of fileDataId. (Nullable) + */ + protected void registerFileDataId(ConditionKey key, Object value) { + registerQuery(key, value, getCValueFileDataId(), "FILE_DATA_ID", "FileDataId", "fileDataId"); + } + + /** + * Register inline condition of fileDataId. + * + * @param key Condition key. (NotNull) + * @param value The value of fileDataId. (Nullable) + */ + protected void registerInlineFileDataId(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueFileDataId(), "FILE_DATA_ID", "FileDataId", "fileDataId"); + } + + abstract protected ConditionValue getCValueFileDataId(); + + /** * Set the value of numOfProduct using equal. { = } * * @param numOfProduct The value of numOfProduct as equal. Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsFileDataCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsFileDataCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsFileDataCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -124,6 +124,23 @@ } /** + * Set the sub-query of FileDataId_InScopeSubQuery_CategoryList using inScopeSubQuery. + * { in (select xxx.FILE_DATA_ID from CATEGORY where ...) } + * This method use from clause and where clause of the sub-query instance. + * this query keep the sub-query instance for query-value. + * After you invoke this, If you set query in the argument[subQuery], the query is ignored. + * + * @param categoryCBquery The sub-query of FileDataId_InScopeSubQuery_CategoryList using inScopeSubQuery. (NotNull) + */ + public void setFileDataId_InScopeSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ categoryCBquery) { + assertObjectNotNull("categoryCBquery", categoryCBquery); + final String subQueryPropertyName = keepFileDataId_InScopeSubQuery_CategoryList(categoryCBquery);// for saving query-value. + registerInScopeSubQuery(categoryCBquery, "FILE_DATA_ID", "FILE_DATA_ID", subQueryPropertyName); + } + + abstract public String keepFileDataId_InScopeSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ subQuery); + + /** * Set the sub-query of FileDataId_InScopeSubQuery_FileTagToFileDataList using inScopeSubQuery. * { in (select xxx.FILE_DATA_ID from FILE_TAG_TO_FILE_DATA where ...) } * This method use from clause and where clause of the sub-query instance. @@ -192,6 +209,23 @@ abstract public String keepFileDataId_InScopeSubQuery_ProductList(jp.sf.pal.pompei.cbean.cq.ProductCQ subQuery); /** + * Set the sub-query of FileDataId_ExistsSubQuery_CategoryList using existsSubQuery. + * { exists (select xxx.FILE_DATA_ID from CATEGORY where ...) } + * This method use from clause and where clause of the sub-query instance. + * this query keep the sub-query instance for query-value. + * After you invoke this, If you set query in the argument[subQuery], the query is ignored. + * + * @param categoryCBquery The sub-query of FileDataId_ExistsSubQuery_CategoryList using existsSubQuery. (NotNull) + */ + public void setFileDataId_ExistsSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ categoryCBquery) { + assertObjectNotNull("categoryCBquery", categoryCBquery); + final String subQueryPropertyName = keepFileDataId_ExistsSubQuery_CategoryList(categoryCBquery);// for saving query-value. + registerExistsSubQuery(categoryCBquery, "FILE_DATA_ID", "FILE_DATA_ID", subQueryPropertyName); + } + + abstract public String keepFileDataId_ExistsSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ subQuery); + + /** * Set the sub-query of FileDataId_ExistsSubQuery_FileTagToFileDataList using existsSubQuery. * { exists (select xxx.FILE_DATA_ID from FILE_TAG_TO_FILE_DATA where ...) } * This method use from clause and where clause of the sub-query instance. Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsManufacturerDescriptionCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsManufacturerDescriptionCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsManufacturerDescriptionCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -259,153 +259,153 @@ abstract protected ConditionValue getCValueManufacturerId(); /** - * Set the value of content using equal. { = } + * Set the value of description using equal. { = } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as equal. + * @param description The value of description as equal. */ - public void setContent_Equal(String content) { - registerContent(ConditionKey.CK_EQUAL, filterRemoveEmptyString(content)); + public void setDescription_Equal(String description) { + registerDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(description)); } /** - * Set the value of content using notEqual. { != } + * Set the value of description using notEqual. { != } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as notEqual. + * @param description The value of description as notEqual. */ - public void setContent_NotEqual(String content) { - registerContent(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(content)); + public void setDescription_NotEqual(String description) { + registerDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(description)); } /** - * Set the value of content using greaterThan. { > } + * Set the value of description using greaterThan. { > } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as greaterThan. + * @param description The value of description as greaterThan. */ - public void setContent_GreaterThan(String content) { - registerContent(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(content)); + public void setDescription_GreaterThan(String description) { + registerDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(description)); } /** - * Set the value of content using lessThan. { < } + * Set the value of description using lessThan. { < } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as lessThan. + * @param description The value of description as lessThan. */ - public void setContent_LessThan(String content) { - registerContent(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(content)); + public void setDescription_LessThan(String description) { + registerDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(description)); } /** - * Set the value of content using greaterEqual. { >= } + * Set the value of description using greaterEqual. { >= } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as greaterEqual. + * @param description The value of description as greaterEqual. */ - public void setContent_GreaterEqual(String content) { - registerContent(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(content)); + public void setDescription_GreaterEqual(String description) { + registerDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(description)); } /** - * Set the value of content using lessEqual. { <= } + * Set the value of description using lessEqual. { <= } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as lessEqual. + * @param description The value of description as lessEqual. */ - public void setContent_LessEqual(String content) { - registerContent(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(content)); + public void setDescription_LessEqual(String description) { + registerDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(description)); } /** - * Set the value of content using prefixSearch. { like 'xxx%' } + * Set the value of description using prefixSearch. { like 'xxx%' } * If the value is null or empty-string, this condition is ignored. * - * @param content The value of content as prefixSearch. + * @param description The value of description as prefixSearch. */ - public void setContent_PrefixSearch(String content) { - registerContent(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(content)); + public void setDescription_PrefixSearch(String description) { + registerDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(description)); } /** - * Set the value of content using likeSearch. { like '%xxx%' } + * Set the value of description 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 content The value of content as likeSearch. + * @param description The value of description as likeSearch. * @param likeSearchOption The option of like-search. (NotNull) */ - public void setContent_LikeSearch(String content, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { - registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(content), getCValueContent(), "CONTENT", "Content", "content", likeSearchOption); + public void setDescription_LikeSearch(String description, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(description), getCValueDescription(), "DESCRIPTION", "Description", "description", likeSearchOption); } /** - * Set the value of content using inScope. { in ('a', 'b') } + * Set the value of description using inScope. { in ('a', 'b') } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param contentList The value of content as inScope. + * @param descriptionList The value of description as inScope. */ - public void setContent_InScope(java.util.Collection contentList) { - registerContent(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(contentList))); + public void setDescription_InScope(java.util.Collection descriptionList) { + registerDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(descriptionList))); } /** - * Set the value of content using inScope. { in ('a', 'b') } + * Set the value of description using inScope. { in ('a', 'b') } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param content The value of content as inScope. + * @param description The value of description as inScope. * @param inScopeOption The option of in-scope. (NotNull) */ - public void setContent_InScope(String content, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { - registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(content), getCValueContent(), "CONTENT", "Content", "content", inScopeOption); + public void setDescription_InScope(String description, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(description), getCValueDescription(), "DESCRIPTION", "Description", "description", inScopeOption); } /** - * Set the value of content using notInScope. { not in ('a', 'b') } + * Set the value of description using notInScope. { not in ('a', 'b') } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param contentList The value of content as notInScope. + * @param descriptionList The value of description as notInScope. */ - public void setContent_NotInScope(java.util.Collection contentList) { - registerContent(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(contentList))); + public void setDescription_NotInScope(java.util.Collection descriptionList) { + registerDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(descriptionList))); } /** - * Set the value of content using isNull. { is null } + * Set the value of description using isNull. { is null } */ - public void setContent_IsNull() { - registerContent(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + public void setDescription_IsNull() { + registerDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); } /** - * Set the value of content using isNotNull. { is not null } + * Set the value of description using isNotNull. { is not null } */ - public void setContent_IsNotNull() { - registerContent(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + public void setDescription_IsNotNull() { + registerDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); } /** - * Register condition of content. + * Register condition of description. * * @param key Condition key. (NotNull) - * @param value The value of content. (Nullable) + * @param value The value of description. (Nullable) */ - protected void registerContent(ConditionKey key, Object value) { - registerQuery(key, value, getCValueContent(), "CONTENT", "Content", "content"); + protected void registerDescription(ConditionKey key, Object value) { + registerQuery(key, value, getCValueDescription(), "DESCRIPTION", "Description", "description"); } /** - * Register inline condition of content. + * Register inline condition of description. * * @param key Condition key. (NotNull) - * @param value The value of content. (Nullable) + * @param value The value of description. (Nullable) */ - protected void registerInlineContent(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueContent(), "CONTENT", "Content", "content"); + protected void registerInlineDescription(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueDescription(), "DESCRIPTION", "Description", "description"); } - abstract protected ConditionValue getCValueContent(); + abstract protected ConditionValue getCValueDescription(); /** * Set the value of language using equal. { = } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -4786,139 +4786,139 @@ abstract protected ConditionValue getCValueBillingCountryCode(); /** - * Set the value of billingLocaleName using equal. { = } + * Set the value of billingLanguage using equal. { = } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as equal. + * @param billingLanguage The value of billingLanguage as equal. */ - public void setBillingLocaleName_Equal(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_EQUAL, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_Equal(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_EQUAL, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using notEqual. { != } + * Set the value of billingLanguage using notEqual. { != } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as notEqual. + * @param billingLanguage The value of billingLanguage as notEqual. */ - public void setBillingLocaleName_NotEqual(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_NotEqual(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using greaterThan. { > } + * Set the value of billingLanguage using greaterThan. { > } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as greaterThan. + * @param billingLanguage The value of billingLanguage as greaterThan. */ - public void setBillingLocaleName_GreaterThan(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_GreaterThan(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using lessThan. { < } + * Set the value of billingLanguage using lessThan. { < } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as lessThan. + * @param billingLanguage The value of billingLanguage as lessThan. */ - public void setBillingLocaleName_LessThan(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_LessThan(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using greaterEqual. { >= } + * Set the value of billingLanguage using greaterEqual. { >= } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as greaterEqual. + * @param billingLanguage The value of billingLanguage as greaterEqual. */ - public void setBillingLocaleName_GreaterEqual(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_GreaterEqual(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using lessEqual. { <= } + * Set the value of billingLanguage using lessEqual. { <= } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as lessEqual. + * @param billingLanguage The value of billingLanguage as lessEqual. */ - public void setBillingLocaleName_LessEqual(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_LessEqual(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using prefixSearch. { like 'xxx%' } + * Set the value of billingLanguage using prefixSearch. { like 'xxx%' } * If the value is null or empty-string, this condition is ignored. * - * @param billingLocaleName The value of billingLocaleName as prefixSearch. + * @param billingLanguage The value of billingLanguage as prefixSearch. */ - public void setBillingLocaleName_PrefixSearch(String billingLocaleName) { - registerBillingLocaleName(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(billingLocaleName)); + public void setBillingLanguage_PrefixSearch(String billingLanguage) { + registerBillingLanguage(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(billingLanguage)); } /** - * Set the value of billingLocaleName using likeSearch. { like '%xxx%' } + * Set the value of billingLanguage 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 billingLocaleName The value of billingLocaleName as likeSearch. + * @param billingLanguage The value of billingLanguage as likeSearch. * @param likeSearchOption The option of like-search. (NotNull) */ - public void setBillingLocaleName_LikeSearch(String billingLocaleName, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { - registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(billingLocaleName), getCValueBillingLocaleName(), "BILLING_LOCALE_NAME", "BillingLocaleName", "billingLocaleName", likeSearchOption); + public void setBillingLanguage_LikeSearch(String billingLanguage, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(billingLanguage), getCValueBillingLanguage(), "BILLING_LANGUAGE", "BillingLanguage", "billingLanguage", likeSearchOption); } /** - * Set the value of billingLocaleName using inScope. { in ('a', 'b') } + * Set the value of billingLanguage using inScope. { in ('a', 'b') } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param billingLocaleNameList The value of billingLocaleName as inScope. + * @param billingLanguageList The value of billingLanguage as inScope. */ - public void setBillingLocaleName_InScope(java.util.Collection billingLocaleNameList) { - registerBillingLocaleName(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(billingLocaleNameList))); + public void setBillingLanguage_InScope(java.util.Collection billingLanguageList) { + registerBillingLanguage(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(billingLanguageList))); } /** - * Set the value of billingLocaleName using inScope. { in ('a', 'b') } + * Set the value of billingLanguage using inScope. { in ('a', 'b') } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param billingLocaleName The value of billingLocaleName as inScope. + * @param billingLanguage The value of billingLanguage as inScope. * @param inScopeOption The option of in-scope. (NotNull) */ - public void setBillingLocaleName_InScope(String billingLocaleName, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { - registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(billingLocaleName), getCValueBillingLocaleName(), "BILLING_LOCALE_NAME", "BillingLocaleName", "billingLocaleName", inScopeOption); + public void setBillingLanguage_InScope(String billingLanguage, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(billingLanguage), getCValueBillingLanguage(), "BILLING_LANGUAGE", "BillingLanguage", "billingLanguage", inScopeOption); } /** - * Set the value of billingLocaleName using notInScope. { not in ('a', 'b') } + * Set the value of billingLanguage using notInScope. { not in ('a', 'b') } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param billingLocaleNameList The value of billingLocaleName as notInScope. + * @param billingLanguageList The value of billingLanguage as notInScope. */ - public void setBillingLocaleName_NotInScope(java.util.Collection billingLocaleNameList) { - registerBillingLocaleName(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(billingLocaleNameList))); + public void setBillingLanguage_NotInScope(java.util.Collection billingLanguageList) { + registerBillingLanguage(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(billingLanguageList))); } /** - * Register condition of billingLocaleName. + * Register condition of billingLanguage. * * @param key Condition key. (NotNull) - * @param value The value of billingLocaleName. (Nullable) + * @param value The value of billingLanguage. (Nullable) */ - protected void registerBillingLocaleName(ConditionKey key, Object value) { - registerQuery(key, value, getCValueBillingLocaleName(), "BILLING_LOCALE_NAME", "BillingLocaleName", "billingLocaleName"); + protected void registerBillingLanguage(ConditionKey key, Object value) { + registerQuery(key, value, getCValueBillingLanguage(), "BILLING_LANGUAGE", "BillingLanguage", "billingLanguage"); } /** - * Register inline condition of billingLocaleName. + * Register inline condition of billingLanguage. * * @param key Condition key. (NotNull) - * @param value The value of billingLocaleName. (Nullable) + * @param value The value of billingLanguage. (Nullable) */ - protected void registerInlineBillingLocaleName(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueBillingLocaleName(), "BILLING_LOCALE_NAME", "BillingLocaleName", "billingLocaleName"); + protected void registerInlineBillingLanguage(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueBillingLanguage(), "BILLING_LANGUAGE", "BillingLanguage", "billingLanguage"); } - abstract protected ConditionValue getCValueBillingLocaleName(); + abstract protected ConditionValue getCValueBillingLanguage(); /** * Set the value of orderStatusId using equal. { = } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderPaymentCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderPaymentCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderPaymentCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -660,117 +660,6 @@ } abstract protected ConditionValue getCValuePaymentStatusId(); - - /** - * Set the value of updatedDate using equal. { = } - * - * @param updatedDate The value of updatedDate as equal. - */ - public void setUpdatedDate_Equal(java.sql.Timestamp updatedDate) { - registerUpdatedDate(ConditionKey.CK_EQUAL, updatedDate); - } - - /** - * Set the value of updatedDate using notEqual. { != } - * - * @param updatedDate The value of updatedDate as notEqual. - */ - public void setUpdatedDate_NotEqual(java.sql.Timestamp updatedDate) { - registerUpdatedDate(ConditionKey.CK_NOT_EQUAL, updatedDate); - } - - /** - * Set the value of updatedDate using greaterThan. { > } - * - * @param updatedDate The value of updatedDate as greaterThan. - */ - public void setUpdatedDate_GreaterThan(java.sql.Timestamp updatedDate) { - registerUpdatedDate(ConditionKey.CK_GREATER_THAN, updatedDate); - } - - /** - * Set the value of updatedDate using lessThan. { < } - * - * @param updatedDate The value of updatedDate as lessThan. - */ - public void setUpdatedDate_LessThan(java.sql.Timestamp updatedDate) { - registerUpdatedDate(ConditionKey.CK_LESS_THAN, updatedDate); - } - - /** - * Set the value of updatedDate using greaterEqual. { >= } - * - * @param updatedDate The value of updatedDate as greaterEqual. - */ - public void setUpdatedDate_GreaterEqual(java.sql.Timestamp updatedDate) { - registerUpdatedDate(ConditionKey.CK_GREATER_EQUAL, updatedDate); - } - - /** - * Set the value of updatedDate using lessEqual. { <= } - * - * @param updatedDate The value of updatedDate as lessEqual. - */ - public void setUpdatedDate_LessEqual(java.sql.Timestamp updatedDate) { - registerUpdatedDate(ConditionKey.CK_LESS_EQUAL, updatedDate); - } - - /** - * Set the value of updatedDate using from-to. { $fromDate <= COLUMN_NAME <= $toDate } - * - * @param fromDate The from-date of updatedDate. (Nullable) - * @param toDate The to-date of updatedDate. (Nullable) - * @param fromToOption The option of from-to. (NotNull) - */ - public void setUpdatedDate_FromTo(java.util.Date fromDate, java.util.Date toDate, jp.sf.pal.pompei.allcommon.cbean.coption.FromToOption fromToOption) { - registerFromToQuery((fromDate != null ? new java.sql.Timestamp(fromDate.getTime()) : null), (toDate != null ? new java.sql.Timestamp(toDate.getTime()) : null), getCValueUpdatedDate(), "UPDATED_DATE", "UpdatedDate", "updatedDate", fromToOption); - } - - /** - * Set the value of updatedDate using from-to as date. { $fromDate <= COLUMN_NAME < $toDate + 1 } - * - * @param fromDate The from-date of updatedDate. (Nullable) - * @param toDate The to-date of updatedDate. (Nullable) - */ - public void setUpdatedDate_DateFromTo(java.util.Date fromDate, java.util.Date toDate) { - setUpdatedDate_FromTo(fromDate, toDate, new jp.sf.pal.pompei.allcommon.cbean.coption.DateFromToOption()); - } - - /** - * Set the value of updatedDate using isNull. { is null } - */ - public void setUpdatedDate_IsNull() { - registerUpdatedDate(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); - } - - /** - * Set the value of updatedDate using isNotNull. { is not null } - */ - public void setUpdatedDate_IsNotNull() { - registerUpdatedDate(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); - } - - /** - * Register condition of updatedDate. - * - * @param key Condition key. (NotNull) - * @param value The value of updatedDate. (Nullable) - */ - protected void registerUpdatedDate(ConditionKey key, Object value) { - registerQuery(key, value, getCValueUpdatedDate(), "UPDATED_DATE", "UpdatedDate", "updatedDate"); - } - - /** - * Register inline condition of updatedDate. - * - * @param key Condition key. (NotNull) - * @param value The value of updatedDate. (Nullable) - */ - protected void registerInlineUpdatedDate(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueUpdatedDate(), "UPDATED_DATE", "UpdatedDate", "updatedDate"); - } - - abstract protected ConditionValue getCValueUpdatedDate(); /** * Set the value of subTotalPrice using equal. { = } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -620,155 +620,102 @@ } abstract protected ConditionValue getCValueProductId(); - + /** - * Set the value of model using equal. { = } - * If the value is null or empty-string, this condition is ignored. + * Set the value of productMode using equal. { = } * - * @param model The value of model as equal. + * @param productMode The value of productMode as equal. */ - public void setModel_Equal(String model) { - registerModel(ConditionKey.CK_EQUAL, filterRemoveEmptyString(model)); + public void setProductMode_Equal(java.math.BigDecimal productMode) { + registerProductMode(ConditionKey.CK_EQUAL, productMode); } - + /** - * Set the value of model using notEqual. { != } - * If the value is null or empty-string, this condition is ignored. + * Set the value of productMode using notEqual. { != } * - * @param model The value of model as notEqual. + * @param productMode The value of productMode as notEqual. */ - public void setModel_NotEqual(String model) { - registerModel(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(model)); + public void setProductMode_NotEqual(java.math.BigDecimal productMode) { + registerProductMode(ConditionKey.CK_NOT_EQUAL, productMode); } /** - * Set the value of model using greaterThan. { > } - * If the value is null or empty-string, this condition is ignored. + * Set the value of productMode using greaterThan. { > } * - * @param model The value of model as greaterThan. + * @param productMode The value of productMode as greaterThan. */ - public void setModel_GreaterThan(String model) { - registerModel(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(model)); + public void setProductMode_GreaterThan(java.math.BigDecimal productMode) { + registerProductMode(ConditionKey.CK_GREATER_THAN, productMode); } /** - * Set the value of model using lessThan. { < } - * If the value is null or empty-string, this condition is ignored. + * Set the value of productMode using lessThan. { < } * - * @param model The value of model as lessThan. + * @param productMode The value of productMode as lessThan. */ - public void setModel_LessThan(String model) { - registerModel(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(model)); + public void setProductMode_LessThan(java.math.BigDecimal productMode) { + registerProductMode(ConditionKey.CK_LESS_THAN, productMode); } /** - * Set the value of model using greaterEqual. { >= } - * If the value is null or empty-string, this condition is ignored. + * Set the value of productMode using greaterEqual. { >= } * - * @param model The value of model as greaterEqual. + * @param productMode The value of productMode as greaterEqual. */ - public void setModel_GreaterEqual(String model) { - registerModel(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(model)); + public void setProductMode_GreaterEqual(java.math.BigDecimal productMode) { + registerProductMode(ConditionKey.CK_GREATER_EQUAL, productMode); } /** - * Set the value of model using lessEqual. { <= } - * If the value is null or empty-string, this condition is ignored. + * Set the value of productMode using lessEqual. { <= } * - * @param model The value of model as lessEqual. + * @param productMode The value of productMode as lessEqual. */ - public void setModel_LessEqual(String model) { - registerModel(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(model)); + public void setProductMode_LessEqual(java.math.BigDecimal productMode) { + registerProductMode(ConditionKey.CK_LESS_EQUAL, productMode); } - + /** - * Set the value of model using prefixSearch. { like 'xxx%' } - * If the value is null or empty-string, this condition is ignored. - * - * @param model The value of model as prefixSearch. - */ - public void setModel_PrefixSearch(String model) { - registerModel(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(model)); - } - - /** - * Set the value of model using likeSearch. { like '%xxx%' } - * If the value is null or empty-string, this condition is ignored. - * You can invoke this method several times and the conditions are set up. - * - * @param model The value of model as likeSearch. - * @param likeSearchOption The option of like-search. (NotNull) - */ - public void setModel_LikeSearch(String model, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { - registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(model), getCValueModel(), "MODEL", "Model", "model", likeSearchOption); - } - - /** - * Set the value of model using inScope. { in ('a', 'b') } + * Set the value of productMode using inScope. { in (a, b) } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param modelList The value of model as inScope. + * @param productModeList The value of productMode as inScope. */ - public void setModel_InScope(java.util.Collection modelList) { - registerModel(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(modelList))); + public void setProductMode_InScope(java.util.Collection productModeList) { + registerProductMode(ConditionKey.CK_IN_SCOPE, convertToList(productModeList)); } - - /** - * Set the value of model using inScope. { in ('a', 'b') } - * If the element in the collection is null or empty-string, the condition-element is ignored. - * - * @param model The value of model as inScope. - * @param inScopeOption The option of in-scope. (NotNull) - */ - public void setModel_InScope(String model, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { - registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(model), getCValueModel(), "MODEL", "Model", "model", inScopeOption); - } /** - * Set the value of model using notInScope. { not in ('a', 'b') } + * Set the value of productMode using notInScope. { not in (a, b) } * If the element in the collection is null or empty-string, the condition-element is ignored. * - * @param modelList The value of model as notInScope. + * @param productModeList The value of productMode as notInScope. */ - public void setModel_NotInScope(java.util.Collection modelList) { - registerModel(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(modelList))); + public void setProductMode_NotInScope(java.util.Collection productModeList) { + registerProductMode(ConditionKey.CK_NOT_IN_SCOPE, convertToList(productModeList)); } /** - * Set the value of model using isNull. { is null } - */ - public void setModel_IsNull() { - registerModel(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); - } - - /** - * Set the value of model using isNotNull. { is not null } - */ - public void setModel_IsNotNull() { - registerModel(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); - } - - /** - * Register condition of model. + * Register condition of productMode. * * @param key Condition key. (NotNull) - * @param value The value of model. (Nullable) + * @param value The value of productMode. (Nullable) */ - protected void registerModel(ConditionKey key, Object value) { - registerQuery(key, value, getCValueModel(), "MODEL", "Model", "model"); + protected void registerProductMode(ConditionKey key, Object value) { + registerQuery(key, value, getCValueProductMode(), "PRODUCT_MODE", "ProductMode", "productMode"); } /** - * Register inline condition of model. + * Register inline condition of productMode. * * @param key Condition key. (NotNull) - * @param value The value of model. (Nullable) + * @param value The value of productMode. (Nullable) */ - protected void registerInlineModel(ConditionKey key, Object value) { - registerInlineQuery(key, value, getCValueModel(), "MODEL", "Model", "model"); + protected void registerInlineProductMode(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueProductMode(), "PRODUCT_MODE", "ProductMode", "productMode"); } - abstract protected ConditionValue getCValueModel(); + abstract protected ConditionValue getCValueProductMode(); /** * Set the value of code using equal. { = } @@ -904,6 +851,155 @@ } abstract protected ConditionValue getCValueCode(); + + /** + * Set the value of model using equal. { = } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as equal. + */ + public void setModel_Equal(String model) { + registerModel(ConditionKey.CK_EQUAL, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using notEqual. { != } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as notEqual. + */ + public void setModel_NotEqual(String model) { + registerModel(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using greaterThan. { > } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as greaterThan. + */ + public void setModel_GreaterThan(String model) { + registerModel(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using lessThan. { < } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as lessThan. + */ + public void setModel_LessThan(String model) { + registerModel(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using greaterEqual. { >= } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as greaterEqual. + */ + public void setModel_GreaterEqual(String model) { + registerModel(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using lessEqual. { <= } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as lessEqual. + */ + public void setModel_LessEqual(String model) { + registerModel(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using prefixSearch. { like 'xxx%' } + * If the value is null or empty-string, this condition is ignored. + * + * @param model The value of model as prefixSearch. + */ + public void setModel_PrefixSearch(String model) { + registerModel(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(model)); + } + + /** + * Set the value of model using likeSearch. { like '%xxx%' } + * If the value is null or empty-string, this condition is ignored. + * You can invoke this method several times and the conditions are set up. + * + * @param model The value of model as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setModel_LikeSearch(String model, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(model), getCValueModel(), "MODEL", "Model", "model", likeSearchOption); + } + + /** + * Set the value of model using inScope. { in ('a', 'b') } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param modelList The value of model as inScope. + */ + public void setModel_InScope(java.util.Collection modelList) { + registerModel(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(modelList))); + } + + /** + * Set the value of model using inScope. { in ('a', 'b') } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param model The value of model as inScope. + * @param inScopeOption The option of in-scope. (NotNull) + */ + public void setModel_InScope(String model, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) { + registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(model), getCValueModel(), "MODEL", "Model", "model", inScopeOption); + } + + /** + * Set the value of model using notInScope. { not in ('a', 'b') } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param modelList The value of model as notInScope. + */ + public void setModel_NotInScope(java.util.Collection modelList) { + registerModel(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(convertToList(modelList))); + } + + /** + * Set the value of model using isNull. { is null } + */ + public void setModel_IsNull() { + registerModel(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of model using isNotNull. { is not null } + */ + public void setModel_IsNotNull() { + registerModel(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of model. + * + * @param key Condition key. (NotNull) + * @param value The value of model. (Nullable) + */ + protected void registerModel(ConditionKey key, Object value) { + registerQuery(key, value, getCValueModel(), "MODEL", "Model", "model"); + } + + /** + * Register inline condition of model. + * + * @param key Condition key. (NotNull) + * @param value The value of model. (Nullable) + */ + protected void registerInlineModel(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueModel(), "MODEL", "Model", "model"); + } + + abstract protected ConditionValue getCValueModel(); /** * Set the value of stock using equal. { = } @@ -1016,6 +1112,116 @@ abstract protected ConditionValue getCValueStock(); /** + * Set the value of catalogPrice using equal. { = } + * + * @param catalogPrice The value of catalogPrice as equal. + */ + public void setCatalogPrice_Equal(java.math.BigDecimal catalogPrice) { + registerCatalogPrice(ConditionKey.CK_EQUAL, catalogPrice); + } + + /** + * Set the value of catalogPrice using notEqual. { != } + * + * @param catalogPrice The value of catalogPrice as notEqual. + */ + public void setCatalogPrice_NotEqual(java.math.BigDecimal catalogPrice) { + registerCatalogPrice(ConditionKey.CK_NOT_EQUAL, catalogPrice); + } + + /** + * Set the value of catalogPrice using greaterThan. { > } + * + * @param catalogPrice The value of catalogPrice as greaterThan. + */ + public void setCatalogPrice_GreaterThan(java.math.BigDecimal catalogPrice) { + registerCatalogPrice(ConditionKey.CK_GREATER_THAN, catalogPrice); + } + + /** + * Set the value of catalogPrice using lessThan. { < } + * + * @param catalogPrice The value of catalogPrice as lessThan. + */ + public void setCatalogPrice_LessThan(java.math.BigDecimal catalogPrice) { + registerCatalogPrice(ConditionKey.CK_LESS_THAN, catalogPrice); + } + + /** + * Set the value of catalogPrice using greaterEqual. { >= } + * + * @param catalogPrice The value of catalogPrice as greaterEqual. + */ + public void setCatalogPrice_GreaterEqual(java.math.BigDecimal catalogPrice) { + registerCatalogPrice(ConditionKey.CK_GREATER_EQUAL, catalogPrice); + } + + /** + * Set the value of catalogPrice using lessEqual. { <= } + * + * @param catalogPrice The value of catalogPrice as lessEqual. + */ + public void setCatalogPrice_LessEqual(java.math.BigDecimal catalogPrice) { + registerCatalogPrice(ConditionKey.CK_LESS_EQUAL, catalogPrice); + } + + /** + * Set the value of catalogPrice using inScope. { in (a, b) } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param catalogPriceList The value of catalogPrice as inScope. + */ + public void setCatalogPrice_InScope(java.util.Collection catalogPriceList) { + registerCatalogPrice(ConditionKey.CK_IN_SCOPE, convertToList(catalogPriceList)); + } + + /** + * Set the value of catalogPrice using notInScope. { not in (a, b) } + * If the element in the collection is null or empty-string, the condition-element is ignored. + * + * @param catalogPriceList The value of catalogPrice as notInScope. + */ + public void setCatalogPrice_NotInScope(java.util.Collection catalogPriceList) { + registerCatalogPrice(ConditionKey.CK_NOT_IN_SCOPE, convertToList(catalogPriceList)); + } + + /** + * Set the value of catalogPrice using isNull. { is null } + */ + public void setCatalogPrice_IsNull() { + registerCatalogPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT); + } + + /** + * Set the value of catalogPrice using isNotNull. { is not null } + */ + public void setCatalogPrice_IsNotNull() { + registerCatalogPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT); + } + + /** + * Register condition of catalogPrice. + * + * @param key Condition key. (NotNull) + * @param value The value of catalogPrice. (Nullable) + */ + protected void registerCatalogPrice(ConditionKey key, Object value) { + registerQuery(key, value, getCValueCatalogPrice(), "CATALOG_PRICE", "CatalogPrice", "catalogPrice"); + } + + /** + * Register inline condition of catalogPrice. + * + * @param key Condition key. (NotNull) + * @param value The value of catalogPrice. (Nullable) + */ + protected void registerInlineCatalogPrice(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueCatalogPrice(), "CATALOG_PRICE", "CatalogPrice", "catalogPrice"); + } + + abstract protected ConditionValue getCValueCatalogPrice(); + + /** * Set the value of price using equal. { = } * * @param price The value of price as equal. Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCategoryCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCategoryCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCategoryCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -78,6 +78,8 @@ public void includeAsMine_CategoryId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("CATEGORY_ID")); } public void includeAsMine_ParentCategoryId() { registerIncludedSelectColumn("ParentCategoryId", getRealColumnName("PARENT_CATEGORY_ID")); } public void includeAsMine_ParentCategoryId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("PARENT_CATEGORY_ID")); } + public void includeAsMine_FileDataId() { registerIncludedSelectColumn("FileDataId", getRealColumnName("FILE_DATA_ID")); } + public void includeAsMine_FileDataId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("FILE_DATA_ID")); } public void includeAsMine_NumOfProduct() { registerIncludedSelectColumn("NumOfProduct", getRealColumnName("NUM_OF_PRODUCT")); } public void includeAsMine_NumOfProduct(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("NUM_OF_PRODUCT")); } public void includeAsMine_Status() { registerIncludedSelectColumn("Status", getRealColumnName("STATUS")); } @@ -385,6 +387,67 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [FILE_DATA_ID] + // - - - - - - - - -/ + + /** The attribute of fileDataId. */ + protected ConditionValue _fileDataId; + + /** + * Get the value of fileDataId. + * + * @return The value of fileDataId. + */ + public ConditionValue getFileDataId() { + if (_fileDataId == null) { + _fileDataId = new ConditionValue(); + } + return _fileDataId; + } + + protected ConditionValue getCValueFileDataId() { + return getFileDataId(); + } + + + /** The sub-query of FileDataId_InScopeSubQuery_FileData using inScopeSubQuery. */ + protected java.util.Map _fileDataId_InScopeSubQuery_FileDataMap; + + /** + * Get the sub-query of FileDataId_InScopeSubQuery_FileData using inScopeSubQuery. + * + * @return The sub-query of FileDataId_InScopeSubQuery_FileData using inScopeSubQuery. (Nullable) + */ + public java.util.Map getFileDataId_InScopeSubQuery_FileData() { + return _fileDataId_InScopeSubQuery_FileDataMap; + } + + public String keepFileDataId_InScopeSubQuery_FileData(jp.sf.pal.pompei.cbean.cq.FileDataCQ subQuery) { + if (_fileDataId_InScopeSubQuery_FileDataMap == null) { _fileDataId_InScopeSubQuery_FileDataMap = new java.util.LinkedHashMap(); } + final String key = "subQueryMapKey" + (_fileDataId_InScopeSubQuery_FileDataMap.size() + 1); + _fileDataId_InScopeSubQuery_FileDataMap.put(key, subQuery); + return "fileDataId_InScopeSubQuery_FileData." + key; + } + + /** + * Add order-by of fileDataId as ASC. + * + * @return this. (NotNull) + */ + public BsCategoryCQ addOrderBy_FileDataId_Asc() { + getSqlClause().registerOrderBy(getRealColumnName("FILE_DATA_ID"), null, true);return this; + } + + /** + * Add order-by of fileDataId as DESC. + * + * @return this. (NotNull) + */ + public BsCategoryCQ addOrderBy_FileDataId_Desc() { + getSqlClause().registerOrderBy(getRealColumnName("FILE_DATA_ID"), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [NUM_OF_PRODUCT] // - - - - - - - - -/ @@ -561,6 +624,9 @@ if (baseQuery.hasConditionQueryCategorySelf()) { unionQuery.queryCategorySelf().reflectRelationOnUnionQuery(baseQuery.queryCategorySelf(), unionQuery.queryCategorySelf()); } + if (baseQuery.hasConditionQueryFileData()) { + unionQuery.queryFileData().reflectRelationOnUnionQuery(baseQuery.queryFileData(), unionQuery.queryFileData()); + } if (baseQuery.hasConditionQueryCategoryPageInfoAsOne()) { unionQuery.queryCategoryPageInfoAsOne().reflectRelationOnUnionQuery(baseQuery.queryCategoryPageInfoAsOne(), unionQuery.queryCategoryPageInfoAsOne()); } @@ -636,8 +702,74 @@ public boolean hasConditionQueryCategorySelf() { return _conditionQueryCategorySelf != null; } + + // /* * * * * * * * * * * * * * * * * * * * * * * + // ForeignTable = [FILE_DATA(TABLE)] + // ForeignProperty = [fileData] + // * * * * * * * * */ + /** + * Query for fileData. + * + * @return Instance of jp.sf.pal.pompei.cbean.cq.FileDataCQ as fileData. (NotNull) + */ + public jp.sf.pal.pompei.cbean.cq.FileDataCQ queryFileData() { + return getConditionQueryFileData(); + } + /** Condition-query for fileData. */ + protected jp.sf.pal.pompei.cbean.cq.FileDataCQ _conditionQueryFileData; + + /** + * Get condition-query for fileData. + * + * @return Instance of jp.sf.pal.pompei.cbean.cq.FileDataCQ as fileData. (NotNull) + */ + public jp.sf.pal.pompei.cbean.cq.FileDataCQ getConditionQueryFileData() { + if (_conditionQueryFileData == null) { + _conditionQueryFileData = createQueryFileData(); + setupOuterJoin_FileData(); + } + return _conditionQueryFileData; + } + + /** + * Setup outer join for ${foreignJavaBeansRulePropertyName}. + */ + protected void setupOuterJoin_FileData() { + final java.util.Map joinOnMap = new java.util.LinkedHashMap(); + joinOnMap.put(getRealColumnName("FILE_DATA_ID"), getConditionQueryFileData().getRealColumnName("FILE_DATA_ID")); + getSqlClause().registerOuterJoin("FILE_DATA", getConditionQueryFileData().getRealAliasName(), joinOnMap); + } + + /** + * Create query for fileData. + * + * @return Query for fileData. (NotNull) + */ + protected jp.sf.pal.pompei.cbean.cq.FileDataCQ createQueryFileData() { + final String nextRelationPath = resolveNextRelationPathFileData(); + final String resolvedAliasName = resolveJoinAliasName(nextRelationPath, getNextNestLevel()); + final jp.sf.pal.pompei.cbean.cq.FileDataCQ cq = new jp.sf.pal.pompei.cbean.cq.FileDataCQ(this, getSqlClause(), resolvedAliasName, getNextNestLevel()); + cq.xsetForeignPropertyName("fileData"); + cq.xsetRelationPath(nextRelationPath); + return cq; + } + + protected String resolveNextRelationPathFileData() { + return resolveNextRelationPath("CATEGORY", "fileData"); + } + + /** + * Has condition query? + * + * @return Determination. + */ + public boolean hasConditionQueryFileData() { + return _conditionQueryFileData != null; + } + + // /* * * * * * * * * * * * * * * * * * * * * * * {as one} // ReferrerTable = [CATEGORY_PAGE_INFO(TABLE)] // ReferrerProperty = [categoryPageInfoAsOne] Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsFileDataCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsFileDataCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsFileDataCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -113,6 +113,25 @@ } + /** The sub-query of FileDataId_InScopeSubQuery_CategoryList using inScopeSubQuery. */ + protected java.util.Map _fileDataId_InScopeSubQuery_CategoryListMap; + + /** + * Get the sub-query of FileDataId_InScopeSubQuery_CategoryList using inScopeSubQuery. + * + * @return The sub-query of FileDataId_InScopeSubQuery_CategoryList using inScopeSubQuery. (Nullable) + */ + public java.util.Map getFileDataId_InScopeSubQuery_CategoryList() { + return _fileDataId_InScopeSubQuery_CategoryListMap; + } + + public String keepFileDataId_InScopeSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ subQuery) { + if (_fileDataId_InScopeSubQuery_CategoryListMap == null) { _fileDataId_InScopeSubQuery_CategoryListMap = new java.util.LinkedHashMap(); } + final String key = "subQueryMapKey" + (_fileDataId_InScopeSubQuery_CategoryListMap.size() + 1); + _fileDataId_InScopeSubQuery_CategoryListMap.put(key, subQuery); + return "fileDataId_InScopeSubQuery_CategoryList." + key; + } + /** The sub-query of FileDataId_InScopeSubQuery_FileTagToFileDataList using inScopeSubQuery. */ protected java.util.Map _fileDataId_InScopeSubQuery_FileTagToFileDataListMap; @@ -189,6 +208,25 @@ return "fileDataId_InScopeSubQuery_ProductList." + key; } + /** The sub-query of FileDataId_ExistsSubQuery_CategoryList using existsSubQuery. */ + protected java.util.Map _fileDataId_ExistsSubQuery_CategoryListMap; + + /** + * Get the sub-query of FileDataId_ExistsSubQuery_CategoryList using existsSubQuery. + * + * @return The sub-query of FileDataId_ExistsSubQuery_CategoryList using existsSubQuery. (Nullable) + */ + public java.util.Map getFileDataId_ExistsSubQuery_CategoryList() { + return _fileDataId_ExistsSubQuery_CategoryListMap; + } + + public String keepFileDataId_ExistsSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ subQuery) { + if (_fileDataId_ExistsSubQuery_CategoryListMap == null) { _fileDataId_ExistsSubQuery_CategoryListMap = new java.util.LinkedHashMap(); } + final String key = "subQueryMapKey" + (_fileDataId_ExistsSubQuery_CategoryListMap.size() + 1); + _fileDataId_ExistsSubQuery_CategoryListMap.put(key, subQuery); + return "fileDataId_ExistsSubQuery_CategoryList." + key; + } + /** The sub-query of FileDataId_ExistsSubQuery_FileTagToFileDataList using existsSubQuery. */ protected java.util.Map _fileDataId_ExistsSubQuery_FileTagToFileDataListMap; Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsManufacturerDescriptionCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsManufacturerDescriptionCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsManufacturerDescriptionCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -78,8 +78,8 @@ public void includeAsMine_ManufacturerDescriptionId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("MANUFACTURER_DESCRIPTION_ID")); } public void includeAsMine_ManufacturerId() { registerIncludedSelectColumn("ManufacturerId", getRealColumnName("MANUFACTURER_ID")); } public void includeAsMine_ManufacturerId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("MANUFACTURER_ID")); } - public void includeAsMine_Content() { registerIncludedSelectColumn("Content", getRealColumnName("CONTENT")); } - public void includeAsMine_Content(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("CONTENT")); } + public void includeAsMine_Description() { registerIncludedSelectColumn("Description", getRealColumnName("DESCRIPTION")); } + public void includeAsMine_Description(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("DESCRIPTION")); } public void includeAsMine_Language() { registerIncludedSelectColumn("Language", getRealColumnName("LANGUAGE")); } public void includeAsMine_Language(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("LANGUAGE")); } @@ -191,45 +191,45 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [CONTENT] + // Column = [DESCRIPTION] // - - - - - - - - -/ - /** The attribute of content. */ - protected ConditionValue _content; + /** The attribute of description. */ + protected ConditionValue _description; /** - * Get the value of content. + * Get the value of description. * - * @return The value of content. + * @return The value of description. */ - public ConditionValue getContent() { - if (_content == null) { - _content = new ConditionValue(); + public ConditionValue getDescription() { + if (_description == null) { + _description = new ConditionValue(); } - return _content; + return _description; } - protected ConditionValue getCValueContent() { - return getContent(); + protected ConditionValue getCValueDescription() { + return getDescription(); } /** - * Add order-by of content as ASC. + * Add order-by of description as ASC. * * @return this. (NotNull) */ - public BsManufacturerDescriptionCQ addOrderBy_Content_Asc() { - getSqlClause().registerOrderBy(getRealColumnName("CONTENT"), null, true);return this; + public BsManufacturerDescriptionCQ addOrderBy_Description_Asc() { + getSqlClause().registerOrderBy(getRealColumnName("DESCRIPTION"), null, true);return this; } /** - * Add order-by of content as DESC. + * Add order-by of description as DESC. * * @return this. (NotNull) */ - public BsManufacturerDescriptionCQ addOrderBy_Content_Desc() { - getSqlClause().registerOrderBy(getRealColumnName("CONTENT"), null, false);return this; + public BsManufacturerDescriptionCQ addOrderBy_Description_Desc() { + getSqlClause().registerOrderBy(getRealColumnName("DESCRIPTION"), null, false);return this; } // /- - - - - - - - - - - - - - - - - - - - - - - Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -140,8 +140,8 @@ public void includeAsMine_BillingTelephone(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_TELEPHONE")); } public void includeAsMine_BillingCountryCode() { registerIncludedSelectColumn("BillingCountryCode", getRealColumnName("BILLING_COUNTRY_CODE")); } public void includeAsMine_BillingCountryCode(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_COUNTRY_CODE")); } - public void includeAsMine_BillingLocaleName() { registerIncludedSelectColumn("BillingLocaleName", getRealColumnName("BILLING_LOCALE_NAME")); } - public void includeAsMine_BillingLocaleName(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_LOCALE_NAME")); } + public void includeAsMine_BillingLanguage() { registerIncludedSelectColumn("BillingLanguage", getRealColumnName("BILLING_LANGUAGE")); } + public void includeAsMine_BillingLanguage(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_LANGUAGE")); } public void includeAsMine_OrderStatusId() { registerIncludedSelectColumn("OrderStatusId", getRealColumnName("ORDER_STATUS_ID")); } public void includeAsMine_OrderStatusId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("ORDER_STATUS_ID")); } public void includeAsMine_UpdatedDate() { registerIncludedSelectColumn("UpdatedDate", getRealColumnName("UPDATED_DATE")); } @@ -1751,45 +1751,45 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [BILLING_LOCALE_NAME] + // Column = [BILLING_LANGUAGE] // - - - - - - - - -/ - /** The attribute of billingLocaleName. */ - protected ConditionValue _billingLocaleName; + /** The attribute of billingLanguage. */ + protected ConditionValue _billingLanguage; /** - * Get the value of billingLocaleName. + * Get the value of billingLanguage. * - * @return The value of billingLocaleName. + * @return The value of billingLanguage. */ - public ConditionValue getBillingLocaleName() { - if (_billingLocaleName == null) { - _billingLocaleName = new ConditionValue(); + public ConditionValue getBillingLanguage() { + if (_billingLanguage == null) { + _billingLanguage = new ConditionValue(); } - return _billingLocaleName; + return _billingLanguage; } - protected ConditionValue getCValueBillingLocaleName() { - return getBillingLocaleName(); + protected ConditionValue getCValueBillingLanguage() { + return getBillingLanguage(); } /** - * Add order-by of billingLocaleName as ASC. + * Add order-by of billingLanguage as ASC. * * @return this. (NotNull) */ - public BsOrderFormCQ addOrderBy_BillingLocaleName_Asc() { - getSqlClause().registerOrderBy(getRealColumnName("BILLING_LOCALE_NAME"), null, true);return this; + public BsOrderFormCQ addOrderBy_BillingLanguage_Asc() { + getSqlClause().registerOrderBy(getRealColumnName("BILLING_LANGUAGE"), null, true);return this; } /** - * Add order-by of billingLocaleName as DESC. + * Add order-by of billingLanguage as DESC. * * @return this. (NotNull) */ - public BsOrderFormCQ addOrderBy_BillingLocaleName_Desc() { - getSqlClause().registerOrderBy(getRealColumnName("BILLING_LOCALE_NAME"), null, false);return this; + public BsOrderFormCQ addOrderBy_BillingLanguage_Desc() { + getSqlClause().registerOrderBy(getRealColumnName("BILLING_LANGUAGE"), null, false);return this; } // /- - - - - - - - - - - - - - - - - - - - - - - Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderPaymentCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderPaymentCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderPaymentCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -84,8 +84,6 @@ public void includeAsMine_OrderCardInfoId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("ORDER_CARD_INFO_ID")); } public void includeAsMine_PaymentStatusId() { registerIncludedSelectColumn("PaymentStatusId", getRealColumnName("PAYMENT_STATUS_ID")); } public void includeAsMine_PaymentStatusId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("PAYMENT_STATUS_ID")); } - public void includeAsMine_UpdatedDate() { registerIncludedSelectColumn("UpdatedDate", getRealColumnName("UPDATED_DATE")); } - public void includeAsMine_UpdatedDate(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("UPDATED_DATE")); } public void includeAsMine_SubTotalPrice() { registerIncludedSelectColumn("SubTotalPrice", getRealColumnName("SUB_TOTAL_PRICE")); } public void includeAsMine_SubTotalPrice(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("SUB_TOTAL_PRICE")); } public void includeAsMine_Tax() { registerIncludedSelectColumn("Tax", getRealColumnName("TAX")); } @@ -369,48 +367,6 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [UPDATED_DATE] - // - - - - - - - - -/ - - /** The attribute of updatedDate. */ - protected ConditionValue _updatedDate; - - /** - * Get the value of updatedDate. - * - * @return The value of updatedDate. - */ - public ConditionValue getUpdatedDate() { - if (_updatedDate == null) { - _updatedDate = new ConditionValue(); - } - return _updatedDate; - } - - protected ConditionValue getCValueUpdatedDate() { - return getUpdatedDate(); - } - - - /** - * Add order-by of updatedDate as ASC. - * - * @return this. (NotNull) - */ - public BsOrderPaymentCQ addOrderBy_UpdatedDate_Asc() { - getSqlClause().registerOrderBy(getRealColumnName("UPDATED_DATE"), null, true);return this; - } - - /** - * Add order-by of updatedDate as DESC. - * - * @return this. (NotNull) - */ - public BsOrderPaymentCQ addOrderBy_UpdatedDate_Desc() { - getSqlClause().registerOrderBy(getRealColumnName("UPDATED_DATE"), null, false);return this; - } - - // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [SUB_TOTAL_PRICE] // - - - - - - - - -/ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -76,12 +76,16 @@ // public void includeAsMine_ProductId() { registerIncludedSelectColumn("ProductId", getRealColumnName("PRODUCT_ID")); } public void includeAsMine_ProductId(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("PRODUCT_ID")); } + public void includeAsMine_ProductMode() { registerIncludedSelectColumn("ProductMode", getRealColumnName("PRODUCT_MODE")); } + public void includeAsMine_ProductMode(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("PRODUCT_MODE")); } + public void includeAsMine_Code() { registerIncludedSelectColumn("Code", getRealColumnName("CODE")); } + public void includeAsMine_Code(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("CODE")); } public void includeAsMine_Model() { registerIncludedSelectColumn("Model", getRealColumnName("MODEL")); } public void includeAsMine_Model(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("MODEL")); } - public void includeAsMine_Code() { registerIncludedSelectColumn("Code", getRealColumnName("CODE")); } - public void includeAsMine_Code(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("CODE")); } public void includeAsMine_Stock() { registerIncludedSelectColumn("Stock", getRealColumnName("STOCK")); } public void includeAsMine_Stock(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("STOCK")); } + public void includeAsMine_CatalogPrice() { registerIncludedSelectColumn("CatalogPrice", getRealColumnName("CATALOG_PRICE")); } + public void includeAsMine_CatalogPrice(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("CATALOG_PRICE")); } public void includeAsMine_Price() { registerIncludedSelectColumn("Price", getRealColumnName("PRICE")); } public void includeAsMine_Price(String aliasName) { registerIncludedSelectColumn(aliasName, getRealColumnName("PRICE")); } public void includeAsMine_Weight() { registerIncludedSelectColumn("Weight", getRealColumnName("WEIGHT")); } @@ -690,45 +694,45 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - - // Column = [MODEL] + // Column = [PRODUCT_MODE] // - - - - - - - - -/ - /** The attribute of model. */ - protected ConditionValue _model; + /** The attribute of productMode. */ + protected ConditionValue _productMode; /** - * Get the value of model. + * Get the value of productMode. * - * @return The value of model. + * @return The value of productMode. */ - public ConditionValue getModel() { - if (_model == null) { - _model = new ConditionValue(); + public ConditionValue getProductMode() { + if (_productMode == null) { + _productMode = new ConditionValue(); } - return _model; + return _productMode; } - protected ConditionValue getCValueModel() { - return getModel(); + protected ConditionValue getCValueProductMode() { + return getProductMode(); } - + /** - * Add order-by of model as ASC. + * Add order-by of productMode as ASC. * * @return this. (NotNull) */ - public BsProductCQ addOrderBy_Model_Asc() { - getSqlClause().registerOrderBy(getRealColumnName("MODEL"), null, true);return this; + public BsProductCQ addOrderBy_ProductMode_Asc() { + getSqlClause().registerOrderBy(getRealColumnName("PRODUCT_MODE"), null, true);return this; } /** - * Add order-by of model as DESC. + * Add order-by of productMode as DESC. * * @return this. (NotNull) */ - public BsProductCQ addOrderBy_Model_Desc() { - getSqlClause().registerOrderBy(getRealColumnName("MODEL"), null, false);return this; + public BsProductCQ addOrderBy_ProductMode_Desc() { + getSqlClause().registerOrderBy(getRealColumnName("PRODUCT_MODE"), null, false);return this; } // /- - - - - - - - - - - - - - - - - - - - - - - @@ -774,6 +778,48 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [MODEL] + // - - - - - - - - -/ + + /** The attribute of model. */ + protected ConditionValue _model; + + /** + * Get the value of model. + * + * @return The value of model. + */ + public ConditionValue getModel() { + if (_model == null) { + _model = new ConditionValue(); + } + return _model; + } + + protected ConditionValue getCValueModel() { + return getModel(); + } + + + /** + * Add order-by of model as ASC. + * + * @return this. (NotNull) + */ + public BsProductCQ addOrderBy_Model_Asc() { + getSqlClause().registerOrderBy(getRealColumnName("MODEL"), null, true);return this; + } + + /** + * Add order-by of model as DESC. + * + * @return this. (NotNull) + */ + public BsProductCQ addOrderBy_Model_Desc() { + getSqlClause().registerOrderBy(getRealColumnName("MODEL"), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [STOCK] // - - - - - - - - -/ @@ -816,6 +862,48 @@ } // /- - - - - - - - - - - - - - - - - - - - - - - + // Column = [CATALOG_PRICE] + // - - - - - - - - -/ + + /** The attribute of catalogPrice. */ + protected ConditionValue _catalogPrice; + + /** + * Get the value of catalogPrice. + * + * @return The value of catalogPrice. + */ + public ConditionValue getCatalogPrice() { + if (_catalogPrice == null) { + _catalogPrice = new ConditionValue(); + } + return _catalogPrice; + } + + protected ConditionValue getCValueCatalogPrice() { + return getCatalogPrice(); + } + + + /** + * Add order-by of catalogPrice as ASC. + * + * @return this. (NotNull) + */ + public BsProductCQ addOrderBy_CatalogPrice_Asc() { + getSqlClause().registerOrderBy(getRealColumnName("CATALOG_PRICE"), null, true);return this; + } + + /** + * Add order-by of catalogPrice as DESC. + * + * @return this. (NotNull) + */ + public BsProductCQ addOrderBy_CatalogPrice_Desc() { + getSqlClause().registerOrderBy(getRealColumnName("CATALOG_PRICE"), null, false);return this; + } + + // /- - - - - - - - - - - - - - - - - - - - - - - // Column = [PRICE] // - - - - - - - - -/ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CategoryCIQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CategoryCIQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CategoryCIQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -137,6 +137,15 @@ return _myCQ.keepParentCategoryId_InScopeSubQuery_CategorySelf(subQuery); } + protected ConditionValue getCValueFileDataId() { + return _myCQ.getFileDataId(); + } + + + public String keepFileDataId_InScopeSubQuery_FileData(jp.sf.pal.pompei.cbean.cq.FileDataCQ subQuery) { + return _myCQ.keepFileDataId_InScopeSubQuery_FileData(subQuery); + } + protected ConditionValue getCValueNumOfProduct() { return _myCQ.getNumOfProduct(); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/FileDataCIQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/FileDataCIQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/FileDataCIQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -83,6 +83,10 @@ } + public String keepFileDataId_InScopeSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ subQuery) { + return _myCQ.keepFileDataId_InScopeSubQuery_CategoryList(subQuery); + } + public String keepFileDataId_InScopeSubQuery_FileTagToFileDataList(jp.sf.pal.pompei.cbean.cq.FileTagToFileDataCQ subQuery) { return _myCQ.keepFileDataId_InScopeSubQuery_FileTagToFileDataList(subQuery); } @@ -99,6 +103,11 @@ return _myCQ.keepFileDataId_InScopeSubQuery_ProductList(subQuery); } + public String keepFileDataId_ExistsSubQuery_CategoryList(jp.sf.pal.pompei.cbean.cq.CategoryCQ subQuery) { + throw new UnsupportedOperationException("ExistsSubQuery at inline() is unsupported! Sorry!"); + // _myCQ.keepFileDataId_ExistsSubQuery_CategoryList(subQuery); + } + public String keepFileDataId_ExistsSubQuery_FileTagToFileDataList(jp.sf.pal.pompei.cbean.cq.FileTagToFileDataCQ subQuery) { throw new UnsupportedOperationException("ExistsSubQuery at inline() is unsupported! Sorry!"); // _myCQ.keepFileDataId_ExistsSubQuery_FileTagToFileDataList(subQuery); Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ManufacturerDescriptionCIQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ManufacturerDescriptionCIQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ManufacturerDescriptionCIQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -92,8 +92,8 @@ return _myCQ.keepManufacturerId_InScopeSubQuery_Manufacturer(subQuery); } - protected ConditionValue getCValueContent() { - return _myCQ.getContent(); + protected ConditionValue getCValueDescription() { + return _myCQ.getDescription(); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -292,8 +292,8 @@ } - protected ConditionValue getCValueBillingLocaleName() { - return _myCQ.getBillingLocaleName(); + protected ConditionValue getCValueBillingLanguage() { + return _myCQ.getBillingLanguage(); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderPaymentCIQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderPaymentCIQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderPaymentCIQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -115,11 +115,6 @@ return _myCQ.keepPaymentStatusId_InScopeSubQuery_PaymentStatus(subQuery); } - protected ConditionValue getCValueUpdatedDate() { - return _myCQ.getUpdatedDate(); - } - - protected ConditionValue getCValueSubTotalPrice() { return _myCQ.getSubTotalPrice(); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java 2008-04-08 04:39:30 UTC (rev 878) @@ -209,21 +209,31 @@ // _myCQ.keepProductId_ExistsSubQuery_ReviewList(subQuery); } - protected ConditionValue getCValueModel() { - return _myCQ.getModel(); + protected ConditionValue getCValueProductMode() { + return _myCQ.getProductMode(); } - + protected ConditionValue getCValueCode() { return _myCQ.getCode(); } + protected ConditionValue getCValueModel() { + return _myCQ.getModel(); + } + + protected ConditionValue getCValueStock() { return _myCQ.getStock(); } + protected ConditionValue getCValueCatalogPrice() { + return _myCQ.getCatalogPrice(); + } + + protected ConditionValue getCValuePrice() { return _myCQ.getPrice(); } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNss.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNss.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNss.java 2008-04-08 04:39:30 UTC (rev 878) @@ -58,6 +58,20 @@ return new CategoryNsst(_query.queryCategorySelf()); } + /** + * Set up select with fileData. + * + * @return The nest-select-setupper-terminal of foreign. (NotNull) + */ + public FileDataNsst withFileData() { + assertConditionQuery(); + final String foreignTableAliasName = _query.queryFileData().getRealAliasName(); + final String localRelationPath = _query.getRelationPath(); + _query.getSqlClause().registerSelectedSelectColumn(foreignTableAliasName, "CATEGORY", "fileData", localRelationPath); + _query.getSqlClause().registerSelectedForeignInfo(_query.queryFileData().getRelationPath(), "fileData"); + return new FileDataNsst(_query.queryFileData()); + } + // =================================================================================== // With Nested Referrer Table // ========================== Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNsst.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNsst.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/CategoryNsst.java 2008-04-08 04:39:30 UTC (rev 878) @@ -51,6 +51,13 @@ _nss.withCategorySelf(); } + /** + * Set up select with fileData. + */ + public void withFileData() { + _nss.withFileData(); + } + // =================================================================================== // With Nested Referrer Table // ========================== Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/FileDataNsst.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/FileDataNsst.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/cbean/nss/FileDataNsst.java 2008-04-08 04:39:30 UTC (rev 878) @@ -47,7 +47,7 @@ // =================================================================================== // With Nested Referrer Table // ========================== - + /** * Set up select with imageDataAsOne. */ Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/CardType.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/CardType.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/CardType.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,102 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of CARD_TYPE.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class CardType extends jp.sf.pal.pompei.bsentity.BsCardType { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private CardTypeDescription defaultCardTypeDescription; + + private void clearDefaultValues() { + defaultCardTypeDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // CardTypeDescription + + private void loadCardTypeDescription() { + if (getCardTypeDescriptionList() != null + && !getCardTypeDescriptionList().isEmpty()) { + for (CardTypeDescription cardTypeDescription : getCardTypeDescriptionList()) { + if (getLanguage().equals(cardTypeDescription.getLanguage())) { + defaultCardTypeDescription = cardTypeDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(cardTypeDescription.getLanguage())) { + defaultCardTypeDescription = cardTypeDescription; + } + } + } + } + + private void createCardTypeDescription() { + loadCardTypeDescription(); + if (getCardTypeDescriptionList() == null) { + setCardTypeDescriptionList(new ArrayList()); + } + if (defaultCardTypeDescription == null) { + defaultCardTypeDescription = new CardTypeDescription(); + defaultCardTypeDescription.setCardTypeId(getCardTypeId()); + defaultCardTypeDescription.setLanguage(getLanguage()); + getCardTypeDescriptionList().add(defaultCardTypeDescription); + } + } + + public String getName() { + if (defaultCardTypeDescription == null) { + loadCardTypeDescription(); + } + + if (defaultCardTypeDescription != null) { + return defaultCardTypeDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultCardTypeDescription == null) { + createCardTypeDescription(); + } + defaultCardTypeDescription.setName(name); + } + + public String getDescription() { + if (defaultCardTypeDescription == null) { + loadCardTypeDescription(); + } + + if (defaultCardTypeDescription != null) { + return defaultCardTypeDescription.getDescription(); + } + return null; + } + + public void setDescription(String description) { + if (defaultCardTypeDescription == null) { + createCardTypeDescription(); + } + defaultCardTypeDescription.setDescription(description); + } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Category.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Category.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Category.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,264 @@ package jp.sf.pal.pompei.exentity; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of CATEGORY.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class Category extends jp.sf.pal.pompei.bsentity.BsCategory { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private CategoryInfo defaultCategoryInfo; + + private CategoryPageInfo defaultCategoryPageInfo; + + private CategoryContent defaultCategoryContent1; + + private CategoryContent defaultCategoryContent2; + + private CategoryContent defaultCategoryContent3; + + private void clearDefaultValues() { + defaultCategoryInfo = null; + defaultCategoryPageInfo = null; + defaultCategoryContent1 = null; + defaultCategoryContent2 = null; + defaultCategoryContent3 = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + public String getName() { + if (defaultCategoryInfo != null) { + return defaultCategoryInfo.getName(); + } + + if (getCategoryInfoList() != null && !getCategoryInfoList().isEmpty()) { + for (CategoryInfo categoryInfo : getCategoryInfoList()) { + if (getLanguage().equals(categoryInfo.getLanguage())) { + defaultCategoryInfo = categoryInfo; + return defaultCategoryInfo.getName(); + } + } + } + return null; + } + + public void setName(String name) { + if (defaultCategoryInfo == null) { + defaultCategoryInfo = new CategoryInfo(); + defaultCategoryInfo.setCategoryId(getCategoryId()); + defaultCategoryInfo.setLanguage(getLanguage()); + List categoryInfoList = new ArrayList(); + categoryInfoList.add(defaultCategoryInfo); + setCategoryInfoList(categoryInfoList); + } + defaultCategoryInfo.setName(name); + } + + private void createDefaultCategoryPageInfo() { + if (defaultCategoryPageInfo == null) { + defaultCategoryPageInfo = new CategoryPageInfo(); + defaultCategoryPageInfo.setCategoryId(getCategoryId()); + setCategoryPageInfoAsOne(defaultCategoryPageInfo); + } + } + + public String getPageId() { + if (getCategoryPageInfoAsOne() != null) { + return getCategoryPageInfoAsOne().getPageId(); + } + return null; + } + + public void setPageId(String pageId) { + createDefaultCategoryPageInfo(); + defaultCategoryPageInfo.setPageId(pageId); + } + + public String getTemplateName() { + if (getCategoryPageInfoAsOne() != null) { + return getCategoryPageInfoAsOne().getTemplateName(); + } + return null; + } + + public void setTemplateName(String templateName) { + createDefaultCategoryPageInfo(); + defaultCategoryPageInfo.setTemplateName(templateName); + } + + public String getKeyword() { + if (getCategoryPageInfoAsOne() != null) { + return getCategoryPageInfoAsOne().getKeyword(); + } + return null; + } + + public void setKeyword(String keyword) { + createDefaultCategoryPageInfo(); + defaultCategoryPageInfo.setKeyword(keyword); + } + + public String getDescription() { + if (getCategoryPageInfoAsOne() != null) { + return getCategoryPageInfoAsOne().getDescription(); + } + return null; + } + + public void setDescription(String description) { + createDefaultCategoryPageInfo(); + defaultCategoryPageInfo.setDescription(description); + } + + private void loadDefaultCategoryContent() { + if (getCategoryContentList() != null + && !getCategoryContentList().isEmpty()) { + CategoryContent categoryContent1 = null; + CategoryContent categoryContent2 = null; + CategoryContent categoryContent3 = null; + for (CategoryContent categoryContent : getCategoryContentList()) { + if (getLanguage().equals(categoryContent.getLanguage())) { + if (BigDecimal.valueOf(1).equals( + categoryContent.getSortOrder())) { + defaultCategoryContent1 = categoryContent; + } else if (BigDecimal.valueOf(2).equals( + categoryContent.getSortOrder())) { + defaultCategoryContent2 = categoryContent; + } else if (BigDecimal.valueOf(3).equals( + categoryContent.getSortOrder())) { + defaultCategoryContent3 = categoryContent; + } + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(categoryContent.getLanguage())) { + if (BigDecimal.valueOf(1).equals( + categoryContent.getSortOrder())) { + categoryContent1 = categoryContent; + } else if (BigDecimal.valueOf(2).equals( + categoryContent.getSortOrder())) { + categoryContent2 = categoryContent; + } else if (BigDecimal.valueOf(3).equals( + categoryContent.getSortOrder())) { + categoryContent3 = categoryContent; + } + } + } + if (defaultCategoryContent1 == null) { + defaultCategoryContent1 = categoryContent1; + } + if (defaultCategoryContent2 == null) { + defaultCategoryContent2 = categoryContent2; + } + if (defaultCategoryContent3 == null) { + defaultCategoryContent3 = categoryContent3; + } + } + } + + private void createDefaultCategoryContent() { + if (defaultCategoryContent1 == null || defaultCategoryContent2 == null + || defaultCategoryContent3 == null) { + loadDefaultCategoryContent(); + } + if (getCategoryContentList() == null) { + setCategoryContentList(new ArrayList()); + } + if (defaultCategoryContent1 == null) { + defaultCategoryContent1 = new CategoryContent(); + defaultCategoryContent1.setCategoryId(getCategoryId()); + defaultCategoryContent1.setLanguage(getLanguage()); + defaultCategoryContent1.setSortOrder(BigDecimal.valueOf(1)); + getCategoryContentList().add(defaultCategoryContent1); + } + if (defaultCategoryContent2 == null) { + defaultCategoryContent2 = new CategoryContent(); + defaultCategoryContent2.setCategoryId(getCategoryId()); + defaultCategoryContent2.setLanguage(getLanguage()); + defaultCategoryContent2.setSortOrder(BigDecimal.valueOf(2)); + getCategoryContentList().add(defaultCategoryContent2); + } + if (defaultCategoryContent3 == null) { + defaultCategoryContent3 = new CategoryContent(); + defaultCategoryContent3.setCategoryId(getCategoryId()); + defaultCategoryContent3.setLanguage(getLanguage()); + defaultCategoryContent3.setSortOrder(BigDecimal.valueOf(3)); + getCategoryContentList().add(defaultCategoryContent3); + } + } + + public String getContent1() { + if (defaultCategoryContent1 != null) { + return defaultCategoryContent1.getContent(); + } + + loadDefaultCategoryContent(); + + if (defaultCategoryContent1 != null) { + return defaultCategoryContent1.getContent(); + } + return null; + } + + public void setContent1(String content) { + createDefaultCategoryContent(); + defaultCategoryContent1.setContent(content); + } + + public String getContent2() { + if (defaultCategoryContent2 != null) { + return defaultCategoryContent2.getContent(); + } + + loadDefaultCategoryContent(); + + if (defaultCategoryContent2 != null) { + return defaultCategoryContent2.getContent(); + } + return null; + } + + public void setContent2(String content) { + createDefaultCategoryContent(); + defaultCategoryContent2.setContent(content); + } + + public String getContent3() { + if (defaultCategoryContent3 != null) { + return defaultCategoryContent3.getContent(); + } + + loadDefaultCategoryContent(); + + if (defaultCategoryContent3 != null) { + return defaultCategoryContent3.getContent(); + } + return null; + } + + public void setContent3(String content) { + createDefaultCategoryContent(); + defaultCategoryContent3.setContent(content); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Country.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Country.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Country.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,85 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of COUNTRY.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class Country extends jp.sf.pal.pompei.bsentity.BsCountry { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private CountryDescription defaultCountryDescription; + + private void clearDefaultValues() { + defaultCountryDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // CountryDescription + + private void loadCountryDescription() { + if (getCountryDescriptionList() != null + && !getCountryDescriptionList().isEmpty()) { + for (CountryDescription countryDescription : getCountryDescriptionList()) { + if (getLanguage().equals(countryDescription.getLanguage())) { + defaultCountryDescription = countryDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(countryDescription.getLanguage())) { + defaultCountryDescription = countryDescription; + } + } + } + } + + private void createCountryDescription() { + loadCountryDescription(); + if (getCountryDescriptionList() == null) { + setCountryDescriptionList(new ArrayList()); + } + if (defaultCountryDescription == null) { + defaultCountryDescription = new CountryDescription(); + defaultCountryDescription.setCountryId(getCountryId()); + defaultCountryDescription.setLanguage(getLanguage()); + getCountryDescriptionList().add(defaultCountryDescription); + } + } + + public String getName() { + if (defaultCountryDescription == null) { + loadCountryDescription(); + } + + if (defaultCountryDescription != null) { + return defaultCountryDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultCountryDescription == null) { + createCountryDescription(); + } + defaultCountryDescription.setName(name); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Customer.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Customer.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Customer.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,174 @@ package jp.sf.pal.pompei.exentity; +import java.math.BigDecimal; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of CUSTOMER.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class Customer extends jp.sf.pal.pompei.bsentity.BsCustomer { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private AddressBook defaultAddressBook; + + public AddressBook getDefaultAddressBook() { + createAddressBook(); + return defaultAddressBook; + } + + // AddressBook + private void loadAddressBook() { + if (defaultAddressBook == null) { + if (getAddressBookList() != null && !getAddressBookList().isEmpty()) { + for (AddressBook addressBook : getAddressBookList()) { + if (PompeiDBConstants.TRUE.equals(addressBook + .getDefaultAddress())) { + defaultAddressBook = addressBook; + return; + } + } + } + } + } + + private void createAddressBook() { + loadAddressBook(); + if (getAddressBookList() == null) { + setAddressBookList(new ArrayList()); + } + if (defaultAddressBook == null) { + defaultAddressBook = new AddressBook(); + defaultAddressBook.setCustomerId(getCustomerId()); + defaultAddressBook.setDefaultAddress(PompeiDBConstants.TRUE); + getAddressBookList().add(defaultAddressBook); + } + } + + public String getCellphone() { + loadAddressBook(); + return defaultAddressBook.getCellphone(); + } + + public String getCity() { + loadAddressBook(); + return defaultAddressBook.getCity(); + } + + public String getCompany() { + loadAddressBook(); + return defaultAddressBook.getCompany(); + } + + public BigDecimal getCountryId() { + return defaultAddressBook.getCountryId(); + } + + public BigDecimal getDeliveryZoneId() { + loadAddressBook(); + return defaultAddressBook.getDeliveryZoneId(); + } + + public String getDepartment() { + loadAddressBook(); + return defaultAddressBook.getDepartment(); + } + + public String getFax() { + loadAddressBook(); + return defaultAddressBook.getFax(); + } + + public String getPostcode() { + loadAddressBook(); + return defaultAddressBook.getPostcode(); + } + + public String getState() { + loadAddressBook(); + return defaultAddressBook.getState(); + } + + public String getStreetAddress() { + loadAddressBook(); + return defaultAddressBook.getStreetAddress(); + } + + public String getSuburb() { + loadAddressBook(); + return defaultAddressBook.getSuburb(); + } + + public String getTelephone() { + loadAddressBook(); + return defaultAddressBook.getTelephone(); + } + + public void setCellphone(String cellphone) { + createAddressBook(); + defaultAddressBook.setCellphone(cellphone); + } + + public void setCity(String city) { + createAddressBook(); + defaultAddressBook.setCity(city); + } + + public void setCompany(String company) { + createAddressBook(); + defaultAddressBook.setCompany(company); + } + + public void setCountryId(BigDecimal countryId) { + createAddressBook(); + defaultAddressBook.setCountryId(countryId); + } + + public void setDeliveryZoneId(BigDecimal deliveryZoneId) { + createAddressBook(); + defaultAddressBook.setDeliveryZoneId(deliveryZoneId); + } + + public void setDepartment(String department) { + createAddressBook(); + defaultAddressBook.setDepartment(department); + } + + public void setFax(String fax) { + createAddressBook(); + defaultAddressBook.setFax(fax); + } + + public void setPostcode(String postcode) { + createAddressBook(); + defaultAddressBook.setPostcode(postcode); + } + + public void setState(String state) { + createAddressBook(); + defaultAddressBook.setState(state); + } + + public void setStreetAddress(String streetAddress) { + createAddressBook(); + defaultAddressBook.setStreetAddress(streetAddress); + } + + public void setSuburb(String suburb) { + createAddressBook(); + defaultAddressBook.setSuburb(suburb); + } + + public void setTelephone(String telephone) { + createAddressBook(); + defaultAddressBook.setTelephone(telephone); + } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryMethod.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryMethod.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryMethod.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,105 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of DELIVERY_METHOD.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class DeliveryMethod extends jp.sf.pal.pompei.bsentity.BsDeliveryMethod { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private DeliveryMethodDescription defaultDeliveryMethodDescription; + + private void clearDefaultValues() { + defaultDeliveryMethodDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // DeliveryMethodDescription + + private void loadDeliveryMethodDescription() { + if (getDeliveryMethodDescriptionList() != null + && !getDeliveryMethodDescriptionList().isEmpty()) { + for (DeliveryMethodDescription deliveryMethodDescription : getDeliveryMethodDescriptionList()) { + if (getLanguage().equals( + deliveryMethodDescription.getLanguage())) { + defaultDeliveryMethodDescription = deliveryMethodDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(deliveryMethodDescription.getLanguage())) { + defaultDeliveryMethodDescription = deliveryMethodDescription; + } + } + } + } + + private void createDeliveryMethodDescription() { + loadDeliveryMethodDescription(); + if (getDeliveryMethodDescriptionList() == null) { + setDeliveryMethodDescriptionList(new ArrayList()); + } + if (defaultDeliveryMethodDescription == null) { + defaultDeliveryMethodDescription = new DeliveryMethodDescription(); + defaultDeliveryMethodDescription + .setDeliveryMethodId(getDeliveryMethodId()); + defaultDeliveryMethodDescription.setLanguage(getLanguage()); + getDeliveryMethodDescriptionList().add( + defaultDeliveryMethodDescription); + } + } + + public String getName() { + if (defaultDeliveryMethodDescription == null) { + loadDeliveryMethodDescription(); + } + + if (defaultDeliveryMethodDescription != null) { + return defaultDeliveryMethodDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultDeliveryMethodDescription == null) { + createDeliveryMethodDescription(); + } + defaultDeliveryMethodDescription.setName(name); + } + + public String getDescription() { + if (defaultDeliveryMethodDescription == null) { + loadDeliveryMethodDescription(); + } + + if (defaultDeliveryMethodDescription != null) { + return defaultDeliveryMethodDescription.getDescription(); + } + return null; + } + + public void setDescription(String description) { + if (defaultDeliveryMethodDescription == null) { + createDeliveryMethodDescription(); + } + defaultDeliveryMethodDescription.setDescription(description); + } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryStatus.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryStatus.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryStatus.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,88 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of DELIVERY_STATUS.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class DeliveryStatus extends jp.sf.pal.pompei.bsentity.BsDeliveryStatus { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private DeliveryStatusDescription defaultDeliveryStatusDescription; + + private void clearDefaultValues() { + defaultDeliveryStatusDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // DeliveryStatusDescription + + private void loadDeliveryStatusDescription() { + if (getDeliveryStatusDescriptionList() != null + && !getDeliveryStatusDescriptionList().isEmpty()) { + for (DeliveryStatusDescription deliveryStatusDescription : getDeliveryStatusDescriptionList()) { + if (getLanguage().equals( + deliveryStatusDescription.getLanguage())) { + defaultDeliveryStatusDescription = deliveryStatusDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(deliveryStatusDescription.getLanguage())) { + defaultDeliveryStatusDescription = deliveryStatusDescription; + } + } + } + } + + private void createDeliveryStatusDescription() { + loadDeliveryStatusDescription(); + if (getDeliveryStatusDescriptionList() == null) { + setDeliveryStatusDescriptionList(new ArrayList()); + } + if (defaultDeliveryStatusDescription == null) { + defaultDeliveryStatusDescription = new DeliveryStatusDescription(); + defaultDeliveryStatusDescription + .setDeliveryStatusId(getDeliveryStatusId()); + defaultDeliveryStatusDescription.setLanguage(getLanguage()); + getDeliveryStatusDescriptionList().add( + defaultDeliveryStatusDescription); + } + } + + public String getName() { + if (defaultDeliveryStatusDescription == null) { + loadDeliveryStatusDescription(); + } + + if (defaultDeliveryStatusDescription != null) { + return defaultDeliveryStatusDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultDeliveryStatusDescription == null) { + createDeliveryStatusDescription(); + } + defaultDeliveryStatusDescription.setName(name); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryType.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryType.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryType.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,86 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of DELIVERY_TYPE.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class DeliveryType extends jp.sf.pal.pompei.bsentity.BsDeliveryType { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private DeliveryTypeDescription defaultDeliveryTypeDescription; + + private void clearDefaultValues() { + defaultDeliveryTypeDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // DeliveryTypeDescription + + private void loadDeliveryTypeDescription() { + if (getDeliveryTypeDescriptionList() != null + && !getDeliveryTypeDescriptionList().isEmpty()) { + for (DeliveryTypeDescription deliveryTypeDescription : getDeliveryTypeDescriptionList()) { + if (getLanguage().equals(deliveryTypeDescription.getLanguage())) { + defaultDeliveryTypeDescription = deliveryTypeDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(deliveryTypeDescription.getLanguage())) { + defaultDeliveryTypeDescription = deliveryTypeDescription; + } + } + } + } + + private void createDeliveryTypeDescription() { + loadDeliveryTypeDescription(); + if (getDeliveryTypeDescriptionList() == null) { + setDeliveryTypeDescriptionList(new ArrayList()); + } + if (defaultDeliveryTypeDescription == null) { + defaultDeliveryTypeDescription = new DeliveryTypeDescription(); + defaultDeliveryTypeDescription + .setDeliveryTypeId(getDeliveryTypeId()); + defaultDeliveryTypeDescription.setLanguage(getLanguage()); + getDeliveryTypeDescriptionList() + .add(defaultDeliveryTypeDescription); + } + } + + public String getName() { + if (defaultDeliveryTypeDescription == null) { + loadDeliveryTypeDescription(); + } + + if (defaultDeliveryTypeDescription != null) { + return defaultDeliveryTypeDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultDeliveryTypeDescription == null) { + createDeliveryTypeDescription(); + } + defaultDeliveryTypeDescription.setName(name); + } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryZone.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryZone.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/DeliveryZone.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,87 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of DELIVERY_ZONE.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class DeliveryZone extends jp.sf.pal.pompei.bsentity.BsDeliveryZone { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private DeliveryZoneDescription defaultDeliveryZoneDescription; + + private void clearDefaultValues() { + defaultDeliveryZoneDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // DeliveryZoneDescription + + private void loadDeliveryZoneDescription() { + if (getDeliveryZoneDescriptionList() != null + && !getDeliveryZoneDescriptionList().isEmpty()) { + for (DeliveryZoneDescription deliveryZoneDescription : getDeliveryZoneDescriptionList()) { + if (getLanguage().equals(deliveryZoneDescription.getLanguage())) { + defaultDeliveryZoneDescription = deliveryZoneDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(deliveryZoneDescription.getLanguage())) { + defaultDeliveryZoneDescription = deliveryZoneDescription; + } + } + } + } + + private void createDeliveryZoneDescription() { + loadDeliveryZoneDescription(); + if (getDeliveryZoneDescriptionList() == null) { + setDeliveryZoneDescriptionList(new ArrayList()); + } + if (defaultDeliveryZoneDescription == null) { + defaultDeliveryZoneDescription = new DeliveryZoneDescription(); + defaultDeliveryZoneDescription + .setDeliveryZoneId(getDeliveryZoneId()); + defaultDeliveryZoneDescription.setLanguage(getLanguage()); + getDeliveryZoneDescriptionList() + .add(defaultDeliveryZoneDescription); + } + } + + public String getName() { + if (defaultDeliveryZoneDescription == null) { + loadDeliveryZoneDescription(); + } + + if (defaultDeliveryZoneDescription != null) { + return defaultDeliveryZoneDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultDeliveryZoneDescription == null) { + createDeliveryZoneDescription(); + } + defaultDeliveryZoneDescription.setName(name); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Manufacturer.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Manufacturer.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Manufacturer.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,156 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of MANUFACTURER.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class Manufacturer extends jp.sf.pal.pompei.bsentity.BsManufacturer { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private ManufacturerInfo defaultManufacturerInfo; + + private ManufacturerDescription defaultManufacturerDescription; + + private void clearDefaultValues() { + defaultManufacturerInfo = null; + defaultManufacturerDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + private void loadManufacturerInfo() { + if (getManufacturerInfoList() != null + && !getManufacturerInfoList().isEmpty()) { + for (ManufacturerInfo ManufacturerInfo : getManufacturerInfoList()) { + if (getLanguage().equals(ManufacturerInfo.getLanguage())) { + defaultManufacturerInfo = ManufacturerInfo; + return; + } + } + } + } + + private void createManufacturerInfo() { + loadManufacturerInfo(); + if (getManufacturerInfoList() == null) { + setManufacturerInfoList(new ArrayList()); + } + if (defaultManufacturerInfo == null) { + defaultManufacturerInfo = new ManufacturerInfo(); + defaultManufacturerInfo.setManufacturerId(getManufacturerId()); + defaultManufacturerInfo.setLanguage(getLanguage()); + getManufacturerInfoList().add(defaultManufacturerInfo); + } + } + + public String getName() { + if (defaultManufacturerInfo != null) { + return defaultManufacturerInfo.getName(); + } + + loadManufacturerInfo(); + + if (defaultManufacturerInfo != null) { + return defaultManufacturerInfo.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultManufacturerInfo == null) { + createManufacturerInfo(); + } + defaultManufacturerInfo.setName(name); + } + + public String getUrl() { + if (defaultManufacturerInfo != null) { + return defaultManufacturerInfo.getUrl(); + } + + loadManufacturerInfo(); + + if (defaultManufacturerInfo != null) { + return defaultManufacturerInfo.getUrl(); + } + return null; + } + + public void setUrl(String url) { + if (defaultManufacturerInfo == null) { + createManufacturerInfo(); + } + defaultManufacturerInfo.setUrl(url); + } + + private void loadManufacturerDescription() { + if (getManufacturerDescriptionList() != null + && !getManufacturerDescriptionList().isEmpty()) { + for (ManufacturerDescription manufacturerDescription : getManufacturerDescriptionList()) { + if (getLanguage().equals(manufacturerDescription.getLanguage())) { + defaultManufacturerDescription = manufacturerDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(manufacturerDescription.getLanguage())) { + defaultManufacturerDescription = manufacturerDescription; + } + } + } + } + + private void createManufacturerDescription() { + loadManufacturerDescription(); + if (getManufacturerDescriptionList() == null) { + setManufacturerDescriptionList(new ArrayList()); + } + if (defaultManufacturerDescription == null) { + defaultManufacturerDescription = new ManufacturerDescription(); + defaultManufacturerDescription + .setManufacturerId(getManufacturerId()); + defaultManufacturerDescription.setLanguage(getLanguage()); + getManufacturerDescriptionList() + .add(defaultManufacturerDescription); + } + } + + public String getDescription() { + if (defaultManufacturerDescription != null) { + return defaultManufacturerDescription.getDescription(); + } + + loadManufacturerDescription(); + + if (defaultManufacturerDescription != null) { + return defaultManufacturerDescription.getDescription(); + } + return null; + } + + public void setDescription(String description) { + if (defaultManufacturerDescription == null) { + createManufacturerDescription(); + } + defaultManufacturerDescription.setDescription(description); + } + + //TODO file data } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderForm.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderForm.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderForm.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,5 +1,7 @@ package jp.sf.pal.pompei.exentity; +import java.math.BigDecimal; +import java.sql.Timestamp; /** * The entity of ORDER_FORM.
@@ -7,10 +9,454 @@ * This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class OrderForm extends jp.sf.pal.pompei.bsentity.BsOrderForm { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + // OrderDelivery + + public String getDeliveryCity() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryCity(); + } + return null; + } + + public String getDeliveryCompany() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryCompany(); + } + return null; + } + + public String getDeliveryCountryCode() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryCountryCode(); + } + return null; + } + + public BigDecimal getDeliveryCountryId() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryCountryId(); + } + return null; + } + + public String getDeliveryDepartment() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryDepartment(); + } + return null; + } + + public String getDeliveryFirstname() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryFirstname(); + } + return null; + } + + public String getDeliveryFirstnameDescription() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryFirstnameDescription(); + } + return null; + } + + public String getDeliveryLanguage() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryLanguage(); + } + return null; + } + + public String getDeliveryLastname() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryLastname(); + } + return null; + } + + public String getDeliveryLastnameDescription() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryLastnameDescription(); + } + return null; + } + + public String getDeliveryMethodCode() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryMethodCode(); + } + return null; + } + + public BigDecimal getDeliveryMethodId() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryMethodId(); + } + return null; + } + + public String getDeliveryPostcode() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryPostcode(); + } + return null; + } + + public String getDeliveryState() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryState(); + } + return null; + } + + public BigDecimal getDeliveryStatusId() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryStatusId(); + } + return null; + } + + public String getDeliveryStreetAddress() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryStreetAddress(); + } + return null; + } + + public String getDeliverySuburb() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliverySuburb(); + } + return null; + } + + public String getDeliveryTelephone() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryTelephone(); + } + return null; + } + + public BigDecimal getDeliveryZoneId() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getDeliveryZoneId(); + } + return null; + } + + public String getEnvelopeLabel() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getEnvelopeLabel(); + } + return null; + } + + public String getGiftMessage() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getGiftMessage(); + } + return null; + } + + public BigDecimal getGiftWrap() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getGiftWrap(); + } + return null; + } + + public Timestamp getReceivedDate() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getReceivedDate(); + } + return null; + } + + public Timestamp getRequestedDate() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getRequestedDate(); + } + return null; + } + + public Timestamp getSentDate() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getSentDate(); + } + return null; + } + + public String getSlipNumber() { + if (getOrderDeliveryAsOne() != null) { + return getOrderDeliveryAsOne().getSlipNumber(); + } + return null; + } + + private void createOrderDelivery() { + if (getOrderDeliveryAsOne() == null) { + OrderDelivery orderDelivery = new OrderDelivery(); + orderDelivery.setOrderFormId(getOrderFormId()); + setOrderDeliveryAsOne(orderDelivery); + } + } + + public void setDeliveryCity(String deliveryCity) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryCity(deliveryCity); + } + + public void setDeliveryCompany(String deliveryCompany) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryCompany(deliveryCompany); + } + + public void setDeliveryCountryCode(String deliveryCountryCode) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryCountryCode(deliveryCountryCode); + } + + public void setDeliveryCountryId(BigDecimal deliveryCountryId) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryCountryId(deliveryCountryId); + } + + public void setDeliveryDepartment(String deliveryDepartment) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryDepartment(deliveryDepartment); + } + + public void setDeliveryFirstname(String deliveryFirstname) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryFirstname(deliveryFirstname); + } + + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryFirstnameDescription( + deliveryFirstnameDescription); + } + + public void setDeliveryLanguage(String deliveryLanguage) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryLanguage(deliveryLanguage); + } + + public void setDeliveryLastname(String deliveryLastname) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryLastname(deliveryLastname); + } + + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryLastnameDescription( + deliveryLastnameDescription); + } + + public void setDeliveryMethodCode(String deliveryMethodCode) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryMethodCode(deliveryMethodCode); + } + + public void setDeliveryMethodId(BigDecimal deliveryMethodId) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryMethodId(deliveryMethodId); + } + + public void setDeliveryPostcode(String deliveryPostcode) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryPostcode(deliveryPostcode); + } + + public void setDeliveryState(String deliveryState) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryState(deliveryState); + } + + public void setDeliveryStatusId(BigDecimal deliveryStatusId) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryStatusId(deliveryStatusId); + } + + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryStreetAddress(deliveryStreetAddress); + } + + public void setDeliverySuburb(String deliverySuburb) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliverySuburb(deliverySuburb); + } + + public void setDeliveryTelephone(String deliveryTelephone) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryTelephone(deliveryTelephone); + } + + public void setDeliveryZoneId(BigDecimal deliveryZoneId) { + createOrderDelivery(); + getOrderDeliveryAsOne().setDeliveryZoneId(deliveryZoneId); + } + + public void setEnvelopeLabel(String envelopeLabel) { + createOrderDelivery(); + getOrderDeliveryAsOne().setEnvelopeLabel(envelopeLabel); + } + + public void setGiftMessage(String giftMessage) { + createOrderDelivery(); + getOrderDeliveryAsOne().setGiftMessage(giftMessage); + } + + public void setGiftWrap(BigDecimal giftWrap) { + createOrderDelivery(); + getOrderDeliveryAsOne().setGiftWrap(giftWrap); + } + + public void setReceivedDate(Timestamp receivedDate) { + createOrderDelivery(); + getOrderDeliveryAsOne().setReceivedDate(receivedDate); + } + + public void setRequestedDate(Timestamp requestedDate) { + createOrderDelivery(); + getOrderDeliveryAsOne().setRequestedDate(requestedDate); + } + + public void setSentDate(Timestamp sentDate) { + createOrderDelivery(); + getOrderDeliveryAsOne().setSentDate(sentDate); + } + + public void setSlipNumber(String slipNumber) { + createOrderDelivery(); + getOrderDeliveryAsOne().setSlipNumber(slipNumber); + } + + // OrderPayment + public BigDecimal getDeliveryPrice() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getDeliveryPrice(); + } + return null; + } + + public BigDecimal getOrderCardInfoId() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getOrderCardInfoId(); + } + return null; + } + + public BigDecimal getPaymentFee() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getPaymentFee(); + } + return null; + } + + public String getPaymentMethodCode() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getPaymentMethodCode(); + } + return null; + } + + public BigDecimal getPaymentMethodId() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getPaymentMethodId(); + } + return null; + } + + public BigDecimal getPaymentStatusId() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getPaymentStatusId(); + } + return null; + } + + public BigDecimal getSubTotalPrice() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getSubTotalPrice(); + } + return null; + } + + public BigDecimal getTax() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getTax(); + } + return null; + } + + public BigDecimal getTotalPrice() { + if (getOrderPaymentAsOne() != null) { + return getOrderPaymentAsOne().getTotalPrice(); + } + return null; + } + + private void createOrderPayment() { + if (getOrderPaymentAsOne() == null) { + OrderPayment orderPayment = new OrderPayment(); + orderPayment.setOrderFormId(getOrderFormId()); + setOrderPaymentAsOne(orderPayment); + } + } + + public void setDeliveryPrice(BigDecimal deliveryPrice) { + createOrderPayment(); + getOrderPaymentAsOne().setDeliveryPrice(deliveryPrice); + } + + public void setOrderCardInfoId(BigDecimal orderCardInfoId) { + createOrderPayment(); + getOrderPaymentAsOne().setOrderCardInfoId(orderCardInfoId); + } + + public void setPaymentFee(BigDecimal paymentFee) { + createOrderPayment(); + getOrderPaymentAsOne().setPaymentFee(paymentFee); + } + + public void setPaymentMethodCode(String paymentMethodCode) { + createOrderPayment(); + getOrderPaymentAsOne().setPaymentMethodCode(paymentMethodCode); + } + + public void setPaymentMethodId(BigDecimal paymentMethodId) { + createOrderPayment(); + getOrderPaymentAsOne().setPaymentMethodId(paymentMethodId); + } + + public void setPaymentStatusId(BigDecimal paymentStatusId) { + createOrderPayment(); + getOrderPaymentAsOne().setPaymentStatusId(paymentStatusId); + } + + public void setSubTotalPrice(BigDecimal subTotalPrice) { + createOrderPayment(); + getOrderPaymentAsOne().setSubTotalPrice(subTotalPrice); + } + + public void setTax(BigDecimal tax) { + createOrderPayment(); + getOrderPaymentAsOne().setTax(tax); + } + + public void setTotalPrice(BigDecimal totalPrice) { + createOrderPayment(); + getOrderPaymentAsOne().setTotalPrice(totalPrice); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderStatus.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderStatus.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/OrderStatus.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,105 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of ORDER_STATUS.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class OrderStatus extends jp.sf.pal.pompei.bsentity.BsOrderStatus { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private OrderStatusDescription defaultOrderStatusDescription; + + private void clearDefaultValues() { + defaultOrderStatusDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + private void loadOrderStatusDescription() { + if (getOrderStatusDescriptionList() != null + && !getOrderStatusDescriptionList().isEmpty()) { + for (OrderStatusDescription orderStatusDescription : getOrderStatusDescriptionList()) { + if (getLanguage().equals(orderStatusDescription.getLanguage())) { + defaultOrderStatusDescription = orderStatusDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(orderStatusDescription.getLanguage())) { + defaultOrderStatusDescription = orderStatusDescription; + } + } + } + } + + private void createOrderStatusDescription() { + loadOrderStatusDescription(); + if (getOrderStatusDescriptionList() == null) { + setOrderStatusDescriptionList(new ArrayList()); + } + if (defaultOrderStatusDescription == null) { + defaultOrderStatusDescription = new OrderStatusDescription(); + defaultOrderStatusDescription.setOrderStatusId(getOrderStatusId()); + defaultOrderStatusDescription.setLanguage(getLanguage()); + getOrderStatusDescriptionList().add(defaultOrderStatusDescription); + } + } + + public String getDescription() { + if (defaultOrderStatusDescription != null) { + return defaultOrderStatusDescription.getDescription(); + } + + loadOrderStatusDescription(); + + if (defaultOrderStatusDescription != null) { + return defaultOrderStatusDescription.getDescription(); + } + return null; + } + + public void setDescription(String description) { + if (defaultOrderStatusDescription == null) { + createOrderStatusDescription(); + } + defaultOrderStatusDescription.setDescription(description); + } + + public String getName() { + if (defaultOrderStatusDescription != null) { + return defaultOrderStatusDescription.getName(); + } + + loadOrderStatusDescription(); + + if (defaultOrderStatusDescription != null) { + return defaultOrderStatusDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultOrderStatusDescription == null) { + createOrderStatusDescription(); + } + defaultOrderStatusDescription.setName(name); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethod.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethod.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentMethod.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,105 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of PAYMENT_METHOD.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class PaymentMethod extends jp.sf.pal.pompei.bsentity.BsPaymentMethod { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private PaymentMethodDescription defaultPaymentMethodDescription; + + private void clearDefaultValues() { + defaultPaymentMethodDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // PaymentMethodDescription + + private void loadPaymentMethodDescription() { + if (getPaymentMethodDescriptionList() != null + && !getPaymentMethodDescriptionList().isEmpty()) { + for (PaymentMethodDescription paymentMethodDescription : getPaymentMethodDescriptionList()) { + if (getLanguage() + .equals(paymentMethodDescription.getLanguage())) { + defaultPaymentMethodDescription = paymentMethodDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(paymentMethodDescription.getLanguage())) { + defaultPaymentMethodDescription = paymentMethodDescription; + } + } + } + } + + private void createPaymentMethodDescription() { + loadPaymentMethodDescription(); + if (getPaymentMethodDescriptionList() == null) { + setPaymentMethodDescriptionList(new ArrayList()); + } + if (defaultPaymentMethodDescription == null) { + defaultPaymentMethodDescription = new PaymentMethodDescription(); + defaultPaymentMethodDescription + .setPaymentMethodId(getPaymentMethodId()); + defaultPaymentMethodDescription.setLanguage(getLanguage()); + getPaymentMethodDescriptionList().add( + defaultPaymentMethodDescription); + } + } + + public String getName() { + if (defaultPaymentMethodDescription == null) { + loadPaymentMethodDescription(); + } + + if (defaultPaymentMethodDescription != null) { + return defaultPaymentMethodDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultPaymentMethodDescription == null) { + createPaymentMethodDescription(); + } + defaultPaymentMethodDescription.setName(name); + } + + public String getDescription() { + if (defaultPaymentMethodDescription == null) { + loadPaymentMethodDescription(); + } + + if (defaultPaymentMethodDescription != null) { + return defaultPaymentMethodDescription.getDescription(); + } + return null; + } + + public void setDescription(String description) { + if (defaultPaymentMethodDescription == null) { + createPaymentMethodDescription(); + } + defaultPaymentMethodDescription.setDescription(description); + } } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentStatus.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentStatus.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/PaymentStatus.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,88 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of PAYMENT_STATUS.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class PaymentStatus extends jp.sf.pal.pompei.bsentity.BsPaymentStatus { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private PaymentStatusDescription defaultPaymentStatusDescription; + + private void clearDefaultValues() { + defaultPaymentStatusDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // PaymentStatusDescription + + private void loadPaymentStatusDescription() { + if (getPaymentStatusDescriptionList() != null + && !getPaymentStatusDescriptionList().isEmpty()) { + for (PaymentStatusDescription paymentStatusDescription : getPaymentStatusDescriptionList()) { + if (getLanguage() + .equals(paymentStatusDescription.getLanguage())) { + defaultPaymentStatusDescription = paymentStatusDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(paymentStatusDescription.getLanguage())) { + defaultPaymentStatusDescription = paymentStatusDescription; + } + } + } + } + + private void createPaymentStatusDescription() { + loadPaymentStatusDescription(); + if (getPaymentStatusDescriptionList() == null) { + setPaymentStatusDescriptionList(new ArrayList()); + } + if (defaultPaymentStatusDescription == null) { + defaultPaymentStatusDescription = new PaymentStatusDescription(); + defaultPaymentStatusDescription + .setPaymentStatusId(getPaymentStatusId()); + defaultPaymentStatusDescription.setLanguage(getLanguage()); + getPaymentStatusDescriptionList().add( + defaultPaymentStatusDescription); + } + } + + public String getName() { + if (defaultPaymentStatusDescription == null) { + loadPaymentStatusDescription(); + } + + if (defaultPaymentStatusDescription != null) { + return defaultPaymentStatusDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultPaymentStatusDescription == null) { + createPaymentStatusDescription(); + } + defaultPaymentStatusDescription.setName(name); + } + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Product.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Product.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/Product.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,401 @@ package jp.sf.pal.pompei.exentity; +import java.math.BigDecimal; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of PRODUCT.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class Product extends jp.sf.pal.pompei.bsentity.BsProduct { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private ProductInfo defaultProductInfo; + + private ProductPageInfo defaultProductPageInfo; + + private ProductDescription defaultProductDescription; + + private ProductContent defaultProductContent1; + + private ProductContent defaultProductContent2; + + private ProductContent defaultProductContent3; + + private void clearDefaultValues() { + defaultProductInfo = null; + defaultProductPageInfo = null; + defaultProductDescription = null; + defaultProductContent1 = null; + defaultProductContent2 = null; + defaultProductContent3 = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + // ProductInfo + private void loadProductInfo() { + if (getProductInfoList() != null && !getProductInfoList().isEmpty()) { + for (ProductInfo productInfo : getProductInfoList()) { + if (getLanguage().equals(productInfo.getLanguage())) { + defaultProductInfo = productInfo; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(productInfo.getLanguage())) { + defaultProductInfo = productInfo; + } + } + } + } + + private void createProductInfo() { + loadProductInfo(); + if (getProductInfoList() == null) { + setProductInfoList(new ArrayList()); + } + if (defaultProductInfo == null) { + defaultProductInfo = new ProductInfo(); + defaultProductInfo.setProductId(getProductId()); + defaultProductInfo.setLanguage(getLanguage()); + getProductInfoList().add(defaultProductInfo); + } + } + + public String getName() { + if (defaultProductInfo != null) { + return defaultProductInfo.getName(); + } + + loadProductInfo(); + + if (defaultProductInfo != null) { + return defaultProductInfo.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultProductInfo == null) { + createProductInfo(); + } + defaultProductInfo.setName(name); + } + + public String getUrl() { + if (defaultProductInfo != null) { + return defaultProductInfo.getUrl(); + } + + loadProductInfo(); + + if (defaultProductInfo != null) { + return defaultProductInfo.getUrl(); + } + return null; + } + + public void setUrl(String url) { + if (defaultProductInfo == null) { + createProductInfo(); + } + defaultProductInfo.setUrl(url); + } + + public String getTitle() { + if (defaultProductInfo != null) { + return defaultProductInfo.getTitle(); + } + + loadProductInfo(); + + if (defaultProductInfo != null) { + return defaultProductInfo.getTitle(); + } + return null; + } + + public void setTitle(String title) { + if (defaultProductInfo == null) { + createProductInfo(); + } + defaultProductInfo.setTitle(title); + } + + // ProductPageInfo + private void createDefaultProductPageInfo() { + if (defaultProductPageInfo == null) { + defaultProductPageInfo = new ProductPageInfo(); + defaultProductPageInfo.setProductId(getProductId()); + setProductPageInfoAsOne(defaultProductPageInfo); + } + } + + public String getPageId() { + if (getProductPageInfoAsOne() != null) { + return getProductPageInfoAsOne().getPageId(); + } + return null; + } + + public void setPageId(String pageId) { + createDefaultProductPageInfo(); + defaultProductPageInfo.setPageId(pageId); + } + + public String getTemplateName() { + if (getProductPageInfoAsOne() != null) { + return getProductPageInfoAsOne().getTemplateName(); + } + return null; + } + + public void setTemplateName(String templateName) { + createDefaultProductPageInfo(); + defaultProductPageInfo.setTemplateName(templateName); + } + + public String getKeyword() { + if (getProductPageInfoAsOne() != null) { + return getProductPageInfoAsOne().getKeyword(); + } + return null; + } + + public void setKeyword(String keyword) { + createDefaultProductPageInfo(); + defaultProductPageInfo.setKeyword(keyword); + } + + public String getDescription() { + if (getProductPageInfoAsOne() != null) { + return getProductPageInfoAsOne().getDescription(); + } + return null; + } + + public void setDescription(String description) { + createDefaultProductPageInfo(); + defaultProductPageInfo.setDescription(description); + } + + // ProductDescription + + private void loadProductDescription() { + if (getProductDescriptionList() != null + && !getProductDescriptionList().isEmpty()) { + for (ProductDescription productDescription : getProductDescriptionList()) { + if (getLanguage().equals(productDescription.getLanguage())) { + defaultProductDescription = productDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(productDescription.getLanguage())) { + defaultProductDescription = productDescription; + } + } + } + } + + private void createProductDescription() { + loadProductDescription(); + if (getProductDescriptionList() == null) { + setProductDescriptionList(new ArrayList()); + } + if (defaultProductDescription == null) { + defaultProductDescription = new ProductDescription(); + defaultProductDescription.setProductId(getProductId()); + defaultProductDescription.setLanguage(getLanguage()); + getProductDescriptionList().add(defaultProductDescription); + } + } + + public String getProductDescription() { + if (defaultProductDescription != null) { + return defaultProductDescription.getDescription(); + } + + loadProductDescription(); + + if (defaultProductDescription != null) { + return defaultProductDescription.getDescription(); + } + return null; + } + + public void setProductDescription(String description) { + if (defaultProductDescription == null) { + createProductDescription(); + } + defaultProductDescription.setDescription(description); + } + + // ProductContent + + private void loadDefaultProductContent() { + if (getProductContentList() != null + && !getProductContentList().isEmpty()) { + ProductContent productContent1 = null; + ProductContent productContent2 = null; + ProductContent productContent3 = null; + for (ProductContent productContent : getProductContentList()) { + if (getLanguage().equals(productContent.getLanguage())) { + if (BigDecimal.valueOf(1).equals( + productContent.getSortOrder())) { + defaultProductContent1 = productContent; + } else if (BigDecimal.valueOf(2).equals( + productContent.getSortOrder())) { + defaultProductContent2 = productContent; + } else if (BigDecimal.valueOf(3).equals( + productContent.getSortOrder())) { + defaultProductContent3 = productContent; + } + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(productContent.getLanguage())) { + if (BigDecimal.valueOf(1).equals( + productContent.getSortOrder())) { + productContent1 = productContent; + } else if (BigDecimal.valueOf(2).equals( + productContent.getSortOrder())) { + productContent2 = productContent; + } else if (BigDecimal.valueOf(3).equals( + productContent.getSortOrder())) { + productContent3 = productContent; + } + } + } + if (defaultProductContent1 == null) { + defaultProductContent1 = productContent1; + } + if (defaultProductContent2 == null) { + defaultProductContent2 = productContent2; + } + if (defaultProductContent3 == null) { + defaultProductContent3 = productContent3; + } + } + } + + private void createDefaultProductContent() { + if (defaultProductContent1 == null || defaultProductContent2 == null + || defaultProductContent3 == null) { + loadDefaultProductContent(); + } + if (getProductContentList() == null) { + setProductContentList(new ArrayList()); + } + if (defaultProductContent1 == null) { + defaultProductContent1 = new ProductContent(); + defaultProductContent1.setProductId(getProductId()); + defaultProductContent1.setLanguage(getLanguage()); + defaultProductContent1.setSortOrder(BigDecimal.valueOf(1)); + getProductContentList().add(defaultProductContent1); + } + if (defaultProductContent2 == null) { + defaultProductContent2 = new ProductContent(); + defaultProductContent2.setProductId(getProductId()); + defaultProductContent2.setLanguage(getLanguage()); + defaultProductContent2.setSortOrder(BigDecimal.valueOf(2)); + getProductContentList().add(defaultProductContent2); + } + if (defaultProductContent3 == null) { + defaultProductContent3 = new ProductContent(); + defaultProductContent3.setProductId(getProductId()); + defaultProductContent3.setLanguage(getLanguage()); + defaultProductContent3.setSortOrder(BigDecimal.valueOf(3)); + getProductContentList().add(defaultProductContent3); + } + } + + public String getContent1() { + if (defaultProductContent1 != null) { + return defaultProductContent1.getContent(); + } + + loadDefaultProductContent(); + + if (defaultProductContent1 != null) { + return defaultProductContent1.getContent(); + } + return null; + } + + public void setContent1(String content) { + createDefaultProductContent(); + defaultProductContent1.setContent(content); + } + + public String getContent2() { + if (defaultProductContent2 != null) { + return defaultProductContent2.getContent(); + } + + loadDefaultProductContent(); + + if (defaultProductContent2 != null) { + return defaultProductContent2.getContent(); + } + return null; + } + + public void setContent2(String content) { + createDefaultProductContent(); + defaultProductContent2.setContent(content); + } + + public String getContent3() { + if (defaultProductContent3 != null) { + return defaultProductContent3.getContent(); + } + + loadDefaultProductContent(); + + if (defaultProductContent3 != null) { + return defaultProductContent3.getContent(); + } + return null; + } + + public void setContent3(String content) { + createDefaultProductContent(); + defaultProductContent3.setContent(content); + } + + public String getManufacturerName() { + if (getManufacturer() != null) { + return getManufacturer().getName(); + } + return null; + } + + public String getManufacturerDescription() { + if (getManufacturer() != null) { + return getManufacturer().getDescription(); + } + return null; + } + + public String getManufacturerUrl() { + if (getManufacturer() != null) { + return getManufacturer().getUrl(); + } + return null; + } + // ProductStats + } Modified: pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/TaxType.java =================================================================== --- pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/TaxType.java 2008-04-07 01:45:34 UTC (rev 877) +++ pompei/libraries/pompei-db-h2/trunk/src/main/java/jp/sf/pal/pompei/exentity/TaxType.java 2008-04-08 04:39:30 UTC (rev 878) @@ -1,16 +1,104 @@ package jp.sf.pal.pompei.exentity; +import java.util.ArrayList; +import jp.sf.pal.pompei.PompeiDBConstants; + /** * The entity of TAX_TYPE.
* You can implement your original methods here.
* This class is NOT overrided when re-generating.
* * @author DBFlute(AutoGenerator) - */ + */ @SuppressWarnings("unchecked") public class TaxType extends jp.sf.pal.pompei.bsentity.BsTaxType { /** Serial version UID. (Default) */ private static final long serialVersionUID = 1L; + + private String language = PompeiDBConstants.DEFAULT_LANGUAGE; + + private TaxTypeDescription defaultTaxTypeDescription; + + private void clearDefaultValues() { + defaultTaxTypeDescription = null; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + clearDefaultValues(); + } + + private void loadTaxTypeDescription() { + if (getTaxTypeDescriptionList() != null + && !getTaxTypeDescriptionList().isEmpty()) { + for (TaxTypeDescription taxTypeDescription : getTaxTypeDescriptionList()) { + if (getLanguage().equals(taxTypeDescription.getLanguage())) { + defaultTaxTypeDescription = taxTypeDescription; + return; + } else if (PompeiDBConstants.DEFAULT_LANGUAGE + .equals(taxTypeDescription.getLanguage())) { + defaultTaxTypeDescription = taxTypeDescription; + } + } + } + } + + private void createTaxTypeDescription() { + loadTaxTypeDescription(); + if (getTaxTypeDescriptionList() == null) { + setTaxTypeDescriptionList(new ArrayList()); + } + if (defaultTaxTypeDescription == null) { + defaultTaxTypeDescription = new TaxTypeDescription(); + defaultTaxTypeDescription.setTaxTypeId(getTaxTypeId()); + defaultTaxTypeDescription.setLanguage(getLanguage()); + getTaxTypeDescriptionList().add(defaultTaxTypeDescription); + } + } + + public String getName() { + if (defaultTaxTypeDescription != null) { + return defaultTaxTypeDescription.getName(); + } + + loadTaxTypeDescription(); + + if (defaultTaxTypeDescription != null) { + return defaultTaxTypeDescription.getName(); + } + return null; + } + + public void setName(String name) { + if (defaultTaxTypeDescription == null) { + createTaxTypeDescription(); + } + defaultTaxTypeDescription.setName(name); + } + + public String getDescription() { + if (defaultTaxTypeDescription != null) { + return defaultTaxTypeDescription.getDescription(); + } + + loadTaxTypeDescription(); + + if (defaultTaxTypeDescription != null) { + return defaultTaxTypeDescription.getDescription(); + } + return null; + } + + public void setDescription(String description) { + if (defaultTaxTypeDescription == null) { + createTaxTypeDescription(); + } + defaultTaxTypeDescription.setDescription(description); + } } From svnnotify @ sourceforge.jp Tue Apr 8 13:59:55 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 08 Apr 2008 13:59:55 +0900 Subject: [pal-cvs 3143] [879] updated db schema and implemented service classes. Message-ID: <1207630795.910043.20750.nullmailer@users.sourceforge.jp> Revision: 879 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=879 Author: shinsuke Date: 2008-04-08 13:59:55 +0900 (Tue, 08 Apr 2008) Log Message: ----------- updated db schema and implemented service classes. Modified Paths: -------------- pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/PompeiDBConstants.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/SystemService.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/SystemServiceImpl.java pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/OrderServiceImplTest.java pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/ProductServiceImplTest.java pompei/libraries/pompei-db/trunk/src/test/resources/jdbc.dicon -------------- next part -------------- Modified: pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/config/pompei.clay 2008-04-08 04:59:55 UTC (rev 879) @@ -224,6 +224,19 @@ + + + + + + + + + + + + + @@ -284,6 +297,13 @@ + + + + + + + @@ -713,7 +733,7 @@ - + @@ -974,7 +994,7 @@ - + @@ -1444,7 +1464,7 @@
+
+
aaa
+
- + @@ -1459,14 +1479,27 @@ - + + + + + + + + + + + + + + - + @@ -1486,6 +1519,20 @@ + + + + + + + + + + + + + + @@ -1648,26 +1695,26 @@ - + - + - + - + - + - + @@ -2772,7 +2819,7 @@ - + @@ -3346,7 +3393,7 @@
- + @@ -3407,13 +3454,6 @@ - - - - - - - Modified: pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/config/sql/create_table.sql 2008-04-08 04:59:55 UTC (rev 879) @@ -179,6 +179,7 @@ CREATE TABLE CATEGORY ( CATEGORY_ID INTEGER NOT NULL AUTO_INCREMENT , PARENT_CATEGORY_ID INTEGER NOT NULL DEFAULT 0 + , FILE_DATA_ID BIGINT , NUM_OF_PRODUCT INTEGER , STATUS INTEGER NOT NULL , SORT_ORDER INTEGER NOT NULL @@ -228,7 +229,7 @@ , BILLING_POSTCODE VARCHAR(10) NOT NULL , BILLING_TELEPHONE VARCHAR(40) , BILLING_COUNTRY_CODE VARCHAR(40) NOT NULL - , BILLING_LOCALE_NAME VARCHAR(20) NOT NULL + , BILLING_LANGUAGE VARCHAR(20) NOT NULL , ORDER_STATUS_ID INTEGER NOT NULL , UPDATED_DATE TIMESTAMP NOT NULL , PURCHASED_DATE TIMESTAMP NOT NULL @@ -238,9 +239,11 @@ CREATE TABLE PRODUCT ( PRODUCT_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_MODE INTEGER NOT NULL + , CODE VARCHAR(40) NOT NULL , MODEL VARCHAR(80) - , CODE VARCHAR(40) NOT NULL , STOCK INTEGER + , CATALOG_PRICE DECIMAL(15, 4) , PRICE DECIMAL(15, 4) NOT NULL , WEIGHT DECIMAL(5, 2) , SIZE VARCHAR(40) @@ -427,7 +430,7 @@ CREATE TABLE MANUFACTURER_DESCRIPTION ( MANUFACTURER_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT , MANUFACTURER_ID INTEGER NOT NULL - , CONTENT TEXT + , DESCRIPTION TEXT , LANGUAGE VARCHAR(20) NOT NULL , PRIMARY KEY (MANUFACTURER_DESCRIPTION_ID) ); @@ -505,7 +508,6 @@ , PAYMENT_METHOD_CODE VARCHAR(40) NOT NULL , ORDER_CARD_INFO_ID BIGINT , PAYMENT_STATUS_ID INTEGER - , UPDATED_DATE TIMESTAMP , SUB_TOTAL_PRICE DECIMAL(14, 6) , TAX DECIMAL(14, 6) , DELIVERY_PRICE DECIMAL(14, 6) @@ -694,11 +696,17 @@ REFERENCES CATEGORY (CATEGORY_ID) ON DELETE SET DEFAULT; +ALTER TABLE CATEGORY + ADD CONSTRAINT FK_FROM_CATEGORY_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + ALTER TABLE MANUFACTURER ADD CONSTRAINT FK_FROM_MANUFACTURER_TO_FILE_DATA FOREIGN KEY (FILE_DATA_ID) REFERENCES FILE_DATA (FILE_DATA_ID) - ON DELETE CASCADE; + ON DELETE SET NULL; ALTER TABLE ORDER_FORM ADD CONSTRAINT FK_FROM_CUSTOMER_TO_ORDER_FORM @@ -719,12 +727,6 @@ ON DELETE SET NULL; ALTER TABLE PRODUCT - ADD CONSTRAINT FK_FROM_PRODUCT_TO_FILE_DATA - FOREIGN KEY (FILE_DATA_ID) - REFERENCES FILE_DATA (FILE_DATA_ID) - ON DELETE CASCADE; - -ALTER TABLE PRODUCT ADD CONSTRAINT FK_FROM_PRODUCT_TO_TAX_TYPE FOREIGN KEY (TAX_TYPE_ID) REFERENCES TAX_TYPE (TAX_TYPE_ID) @@ -736,6 +738,12 @@ REFERENCES DELIVERY_TYPE (DELIVERY_TYPE_ID) ON DELETE SET NULL; +ALTER TABLE PRODUCT + ADD CONSTRAINT FK_FROM_PRODUCT_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + ALTER TABLE BASKET ADD CONSTRAINT FK_FROM_BASKET_TO_PRODUCT FOREIGN KEY (PRODUCT_ID) Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/PompeiDBConstants.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/PompeiDBConstants.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/PompeiDBConstants.java 2008-04-08 04:59:55 UTC (rev 879) @@ -37,15 +37,22 @@ public static final String LAST_MODIFIED_DESC_ORDER = "lastModifiedDesc"; - public static final BigDecimal DEFAULT_ORDER_STATUS = new BigDecimal(1); + public static final BigDecimal DEFAULT_ORDER_STATUS = BigDecimal.valueOf(1); - public static final BigDecimal PENDING_ORDER_STATUS_TYPE = new BigDecimal(0); + public static final BigDecimal PENDING_ORDER_STATUS_TYPE = BigDecimal + .valueOf(0); - public static final BigDecimal NEW_ORDER_STATUS_TYPE = new BigDecimal(1); + public static final BigDecimal NEW_ORDER_STATUS_TYPE = BigDecimal + .valueOf(1); - public static final BigDecimal NORMAL_ORDER_STATUS_TYPE = new BigDecimal(2); + public static final BigDecimal NORMAL_ORDER_STATUS_TYPE = BigDecimal + .valueOf(2); - public static final BigDecimal FINISHED_ORDER_STATUS_TYPE = new BigDecimal( - 3); + public static final BigDecimal FINISHED_ORDER_STATUS_TYPE = BigDecimal + .valueOf(3); + public static final BigDecimal EDIT_PRODUCT_MODE = BigDecimal.valueOf(1); + + public static final BigDecimal DEPLOY_PRODUCT_MODE = BigDecimal.valueOf(2); + } Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java 2008-04-08 04:59:55 UTC (rev 879) @@ -11,6 +11,11 @@ private int currentPageNumber; + public void clear() { + pageSize = DEFAULT_PAGE_SIZE; + currentPageNumber = DEFAULT_CURRENT_PAGE_NUMBER; + } + /** * @return pageSize */ @@ -22,7 +27,7 @@ } /** - * @param pageSize 設定する pageSize + * @param pageSize Sets pageSize */ public void setPageSize(int pageSize) { this.pageSize = pageSize; @@ -39,7 +44,7 @@ } /** - * @param currentPageNumber 設定する currentPageNumber + * @param currentPageNumber Sets currentPageNumber */ public void setCurrentPageNumber(int currentPageNumber) { this.currentPageNumber = currentPageNumber; Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/pager/ProductPager.java 2008-04-08 04:59:55 UTC (rev 879) @@ -2,6 +2,8 @@ import java.math.BigDecimal; +import jp.sf.pal.pompei.PompeiDBConstants; + public class ProductPager extends DefaultPager { private static final long serialVersionUID = 5634903690975646435L; @@ -13,45 +15,45 @@ private BigDecimal categoryId; - /** - * @return categoryId - */ - public BigDecimal getCategoryId() { - return categoryId; - } + private BigDecimal productMode = PompeiDBConstants.DEPLOY_PRODUCT_MODE; - /** - * @param categoryId 設定する categoryId - */ - public void setCategoryId(BigDecimal categoryId) { - this.categoryId = categoryId; + public void clear() { + super.clear(); + displayMode = null; + orderMode = null; + categoryId = null; } - /** - * @return displayMode - */ public String getDisplayMode() { return displayMode; } - /** - * @param displayMode 設定する displayMode - */ 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; } + + public BigDecimal getCategoryId() { + return categoryId; + } + + public void setCategoryId(BigDecimal categoryId) { + this.categoryId = categoryId; + } + + public BigDecimal getProductMode() { + return productMode; + } + + public void setProductMode(BigDecimal mode) { + this.productMode = mode; + } + } Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java 2008-04-08 04:59:55 UTC (rev 879) @@ -24,7 +24,8 @@ public abstract void addBasket(Basket basket); - public abstract void addCustomer(Customer customer, AddressBook addressBook); + public abstract void addCustomer(Customer customer) + throws PompeiDBException; // ex. // Calendar yesterday = Calendar.getInstance(); @@ -48,7 +49,7 @@ boolean appendCustomer); public abstract List getAddressBookListByCustomerId( - BigDecimal customerId, String language); + BigDecimal customerId); public abstract List getAddressBookListByCustomerId( BigDecimal customerId, boolean appendCustomer); @@ -69,10 +70,18 @@ boolean appendBasketProductOption, boolean appendCustomer, boolean appendProduct) throws PompeiDBException; - public abstract List getBasketList(BigDecimal customerId, + public abstract List getBasketListByCustomerId( + BigDecimal customerId, String language) throws PompeiDBException; + + public abstract List getBasketListByCustomerId( + BigDecimal customerId, String language, + boolean appendBasketProductOption, boolean appendCustomer, + boolean appendProduct) throws PompeiDBException; + + public abstract List getBasketList(List basketIdList, String language) throws PompeiDBException; - public abstract List getBasketList(BigDecimal customerId, + public abstract List getBasketList(List basketIdList, String language, boolean appendBasketProductOption, boolean appendCustomer, boolean appendProduct) throws PompeiDBException; Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java 2008-04-08 04:59:55 UTC (rev 879) @@ -1,31 +1,18 @@ package jp.sf.pal.pompei.service; +import java.io.Serializable; import java.math.BigDecimal; import java.util.List; import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; -import jp.sf.pal.pompei.exbhv.CategoryBhv; -import jp.sf.pal.pompei.exbhv.CategoryContentBhv; -import jp.sf.pal.pompei.exbhv.CategoryInfoBhv; -import jp.sf.pal.pompei.exbhv.CategoryPageInfoBhv; -import jp.sf.pal.pompei.exbhv.ManufacturerBhv; -import jp.sf.pal.pompei.exbhv.ManufacturerDescriptionBhv; -import jp.sf.pal.pompei.exbhv.ManufacturerInfoBhv; -import jp.sf.pal.pompei.exbhv.ProductAttributeBhv; -import jp.sf.pal.pompei.exbhv.ProductBhv; -import jp.sf.pal.pompei.exbhv.ProductContentBhv; -import jp.sf.pal.pompei.exbhv.ProductDescriptionBhv; -import jp.sf.pal.pompei.exbhv.ProductInfoBhv; -import jp.sf.pal.pompei.exbhv.ProductPageInfoBhv; -import jp.sf.pal.pompei.exbhv.ProductStatsBhv; -import jp.sf.pal.pompei.exbhv.ProductToCategoryBhv; import jp.sf.pal.pompei.exentity.Category; +import jp.sf.pal.pompei.exentity.FileData; import jp.sf.pal.pompei.exentity.Manufacturer; import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.pager.ProductPager; -public interface ProductService { +public interface ProductService extends Serializable { public abstract void addCategory(Category category) throws PompeiDBException; @@ -120,73 +107,8 @@ public abstract void updateProduct(Product product) throws PompeiDBException; - public abstract ProductBhv getProductBhv(); + public abstract FileData getFileData(BigDecimal fileDataId); - public abstract void setProductBhv(ProductBhv productBhv); - - public abstract ProductDescriptionBhv getProductDescriptionBhv(); - - public abstract void setProductDescriptionBhv( - ProductDescriptionBhv productDescriptionBhv); - - public abstract ProductPageInfoBhv getProductPageInfoBhv(); - - public abstract void setProductPageInfoBhv( - ProductPageInfoBhv productPageInfoBhv); - - public abstract ProductStatsBhv getProductStatsBhv(); - - public abstract void setProductStatsBhv(ProductStatsBhv productStatsBhv); - - public abstract ProductToCategoryBhv getProductToCategoryBhv(); - - public abstract void setProductToCategoryBhv( - ProductToCategoryBhv productToCategoryBhv); - - public abstract CategoryBhv getCategoryBhv(); - - public abstract void setCategoryBhv(CategoryBhv categoryBhv); - - public abstract CategoryInfoBhv getCategoryInfoBhv(); - - public abstract void setCategoryInfoBhv(CategoryInfoBhv categoryInfoBhv); - - public abstract CategoryContentBhv getCategoryContentBhv(); - - public abstract void setCategoryContentBhv( - CategoryContentBhv categoryContentBhv); - - public abstract CategoryPageInfoBhv getCategoryPageInfoBhv(); - - public abstract void setCategoryPageInfoBhv( - CategoryPageInfoBhv categoryPageInfoBhv); - - public abstract ManufacturerBhv getManufacturerBhv(); - - public abstract void setManufacturerBhv(ManufacturerBhv manufacturerBhv); - - public abstract ManufacturerDescriptionBhv getManufacturerDescriptionBhv(); - - public abstract void setManufacturerDescriptionBhv( - ManufacturerDescriptionBhv manufacturerDescriptionBhv); - - public abstract ProductAttributeBhv getProductAttributeBhv(); - - public abstract void setProductAttributeBhv( - ProductAttributeBhv productAttributeBhv); - - public abstract ProductContentBhv getProductContentBhv(); - - public abstract void setProductContentBhv( - ProductContentBhv productContentBhv); - - public abstract ProductInfoBhv getProductInfoBhv(); - - public abstract void setProductInfoBhv(ProductInfoBhv productInfoBhv); - - public abstract ManufacturerInfoBhv getManufacturerInfoBhv(); - - public abstract void setManufacturerInfoBhv( - ManufacturerInfoBhv manufacturerInfoBhv); - + public abstract FileData getFileData(BigDecimal fileDataId, + boolean appendImageData); } \ No newline at end of file Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/SystemService.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/SystemService.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/SystemService.java 2008-04-08 04:59:55 UTC (rev 879) @@ -11,6 +11,7 @@ import jp.sf.pal.pompei.exentity.DeliveryStatus; import jp.sf.pal.pompei.exentity.DeliveryType; import jp.sf.pal.pompei.exentity.DeliveryZone; +import jp.sf.pal.pompei.exentity.OrderNotification; import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.exentity.PaymentMethod; import jp.sf.pal.pompei.exentity.PaymentStatus; @@ -207,5 +208,8 @@ public abstract void updateOrderStatus(OrderStatus orderStatus); - // TODO order notification + public List getOrderNotificationListByOrderStatusId( + BigDecimal orderStatusId); + + public OrderNotification getOrderNotification(BigDecimal orderNotificationId); } \ No newline at end of file Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2008-04-08 04:59:55 UTC (rev 879) @@ -83,7 +83,7 @@ } // inner class - private class AddressBookConditionBeanSetupper implements + private static class AddressBookConditionBeanSetupper implements ConditionBeanSetupper { private boolean defaultOnly; @@ -95,6 +95,7 @@ if (defaultOnly) { cb.query().setDefaultAddress_Equal(PompeiDBConstants.TRUE); } + cb.query().addOrderBy_DefaultAddress_Desc(); } } @@ -121,25 +122,31 @@ } /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.CustomerService#addCustomer(jp.sf.pal.pompei.exentity.Customer, jp.sf.pal.pompei.exentity.AddressBook) + * @see jp.sf.pal.pompei.service.CustomerService#addCustomer(jp.sf.pal.pompei.exentity.Customer) */ - public void addCustomer(Customer customer, AddressBook addressBook) { + public void addCustomer(Customer customer) throws PompeiDBException { // needs to set portalId for customer before calling this method. // needs to set deliveryZone for addressBook before calling this method. // needs to set country for addressBook before calling this method. - if (customer == null || addressBook == null) { - throw new IllegalArgumentException( - "customer or addressBook are null."); + if (customer == null) { + throw new IllegalArgumentException("customer is null."); } + if (customer.getAddressBookList() == null + || customer.getAddressBookList().isEmpty()) { + throw new PompeiDBException("EPD0404", + "Could not find the address book: customer=" + customer); + } + Timestamp now = new Timestamp(System.currentTimeMillis()); customer.setCreatedDate(now); customer.setUpdatedDate(now); customerBhv.insert(customer); - addressBook.setCustomerId(customer.getCustomerId()); - addressBook.setDefaultAddress(PompeiDBConstants.TRUE); - addressBookBhv.insert(addressBook); + for (AddressBook addressBook : customer.getAddressBookList()) { + addressBook.setCustomerId(customer.getCustomerId()); + addressBookBhv.insert(addressBook); + } } // ex. @@ -251,10 +258,10 @@ } /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.CustomerService#getAddressBookListByCustomerId(java.math.BigDecimal, java.lang.String) + * @see jp.sf.pal.pompei.service.CustomerService#getAddressBookListByCustomerId(java.math.BigDecimal) */ public List getAddressBookListByCustomerId( - BigDecimal customerId, String language) { + BigDecimal customerId) { return getAddressBookListByCustomerId(customerId, false); } @@ -376,19 +383,21 @@ } /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.CustomerService#getBasketList(java.math.BigDecimal, java.lang.String) + * @see jp.sf.pal.pompei.service.CustomerService#getBasketListByCustomerId(java.math.BigDecimal, java.lang.String) */ - public List getBasketList(BigDecimal customerId, String language) - throws PompeiDBException { - return getBasketList(customerId, language, true, false, true); + public List getBasketListByCustomerId(BigDecimal customerId, + String language) throws PompeiDBException { + return getBasketListByCustomerId(customerId, language, true, false, + true); } /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.CustomerService#getBasketList(java.math.BigDecimal, java.lang.String, boolean, boolean, boolean) + * @see jp.sf.pal.pompei.service.CustomerService#getBasketListByCustomerId(java.math.BigDecimal, java.lang.String, boolean, boolean, boolean) */ - public List getBasketList(BigDecimal customerId, String language, - boolean appendBasketProductOption, boolean appendCustomer, - boolean appendProduct) throws PompeiDBException { + public List getBasketListByCustomerId(BigDecimal customerId, + String language, boolean appendBasketProductOption, + boolean appendCustomer, boolean appendProduct) + throws PompeiDBException { if (customerId == null) { throw new IllegalArgumentException("customerId is null."); } @@ -427,6 +436,56 @@ return basketList; } + public List getBasketList(List basketIdList, + String language) throws PompeiDBException { + return getBasketList(basketIdList, language, true, false, true); + } + + public List getBasketList(List basketIdList, + String language, boolean appendBasketProductOption, + boolean appendCustomer, boolean appendProduct) + throws PompeiDBException { + if (basketIdList == null) { + throw new IllegalArgumentException("basketIdList is null."); + } + + List basketList = new ArrayList(); + for (BigDecimal basketId : basketIdList) { + BasketCB cb = new BasketCB(); + cb.query().setBasketId_Equal(basketId); + Basket basket = basketBhv.selectEntity(cb); + if (basket == null) { + throw new PompeiDBException("EPD0405", + "Could not find a customer basket: basketId=" + + basketId); + } + + // customer + if (appendCustomer) { + basket.setCustomer(getCustomer(basket.getCustomerId(), true, + true)); + } + + // product + if (appendProduct) { + basket.setProduct(productService.getProduct(basket + .getProductId(), language, true, true, false, false, + false, false, true, true)); + } + + // product option + if (appendBasketProductOption) { + BasketProductOptionCB cb1 = new BasketProductOptionCB(); + cb1.query().setBasketId_Equal(basket.getBasketId()); + basket.setBasketProductOptionList(basketProductOptionBhv + .selectList(cb1)); + } + basketList.add(basket); + } + + return basketList; + } + /* (non-Javadoc) * @see jp.sf.pal.pompei.service.CustomerService#getCustomer(java.math.BigDecimal) */ Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2008-04-08 04:59:55 UTC (rev 879) @@ -23,6 +23,7 @@ import jp.sf.pal.pompei.exentity.OrderComment; import jp.sf.pal.pompei.exentity.OrderDelivery; import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderNotification; import jp.sf.pal.pompei.exentity.OrderPayment; import jp.sf.pal.pompei.exentity.OrderProduct; import jp.sf.pal.pompei.exentity.OrderProductOption; @@ -443,6 +444,13 @@ // deleted by cascade + // delete order card info + OrderCardInfoCB cb = new OrderCardInfoCB(); + cb.query().setOrderFormId_Equal(orderFormId); + OrderCardInfo orderCardInfo = orderCardInfoBhv.selectEntity(cb); + if (orderCardInfo != null) { + orderCardInfoBhv.delete(orderCardInfo); + } } public OrderCardInfoBhv getOrderCardInfoBhv() { Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2008-04-08 04:59:55 UTC (rev 879) @@ -12,6 +12,7 @@ import jp.sf.pal.pompei.cbean.CategoryCB; import jp.sf.pal.pompei.cbean.CategoryContentCB; import jp.sf.pal.pompei.cbean.CategoryInfoCB; +import jp.sf.pal.pompei.cbean.FileDataCB; import jp.sf.pal.pompei.cbean.ManufacturerCB; import jp.sf.pal.pompei.cbean.ManufacturerDescriptionCB; import jp.sf.pal.pompei.cbean.ManufacturerInfoCB; @@ -25,6 +26,7 @@ import jp.sf.pal.pompei.exbhv.CategoryContentBhv; import jp.sf.pal.pompei.exbhv.CategoryInfoBhv; import jp.sf.pal.pompei.exbhv.CategoryPageInfoBhv; +import jp.sf.pal.pompei.exbhv.FileDataBhv; import jp.sf.pal.pompei.exbhv.ManufacturerBhv; import jp.sf.pal.pompei.exbhv.ManufacturerDescriptionBhv; import jp.sf.pal.pompei.exbhv.ManufacturerInfoBhv; @@ -40,6 +42,7 @@ import jp.sf.pal.pompei.exentity.CategoryContent; import jp.sf.pal.pompei.exentity.CategoryInfo; import jp.sf.pal.pompei.exentity.CategoryPageInfo; +import jp.sf.pal.pompei.exentity.FileData; import jp.sf.pal.pompei.exentity.Manufacturer; import jp.sf.pal.pompei.exentity.ManufacturerDescription; import jp.sf.pal.pompei.exentity.ManufacturerInfo; @@ -88,6 +91,8 @@ private transient ProductContentBhv productContentBhv; + private transient FileDataBhv fileDataBhv; + /* (non-Javadoc) * @see jp.sf.pal.pompei.service.ProductService#addCategory(jp.sf.pal.pompei.exentity.Category) */ @@ -407,10 +412,6 @@ throw new IllegalArgumentException("categoryId is null."); } - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } - CategoryCB cb = new CategoryCB(); cb.query().setCategoryId_Equal(categoryId); if (appendCategoryPageInfo) { @@ -424,8 +425,10 @@ // append category info if (appendCategoryInfo) { CategoryInfoCB cb1 = new CategoryInfoCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); List categoryInfoList = categoryInfoBhv .selectList(cb1); @@ -448,8 +451,10 @@ // append category content if (appendCategoryContent) { CategoryContentCB cb1 = new CategoryContentCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); cb1.query().addOrderBy_SortOrder_Asc(); List categoryContentList = categoryContentBhv @@ -483,10 +488,6 @@ throw new IllegalArgumentException("categoryId is null."); } - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } - List categoryList = new ArrayList(); while (categoryId != null) { Category category = getCategory(categoryId, language, true, true, @@ -526,10 +527,6 @@ throw new IllegalArgumentException("manufacturerId is null."); } - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } - ManufacturerCB cb = new ManufacturerCB(); cb.query().setManufacturerId_Equal(manufacturerId); if (appendFileData) { @@ -543,8 +540,10 @@ // append manufacturer info if (appendManufacturerInfo) { ManufacturerInfoCB cb1 = new ManufacturerInfoCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); List manufacturerInfoList = manufacturerInfoBhv .selectList(cb1); @@ -567,8 +566,10 @@ // append manufacturer description if (appendManufacturerDescription) { ManufacturerDescriptionCB cb1 = new ManufacturerDescriptionCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); List manufacturerDescriptionList = manufacturerDescriptionBhv .selectList(cb1); @@ -608,9 +609,6 @@ boolean appendManufacturerInfo, boolean appendManufacturerDescription, boolean appendFileData) throws PompeiDBException { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } ManufacturerCB cb = new ManufacturerCB(); if (appendFileData) { @@ -643,7 +641,7 @@ } // inner class - private class ManufacturerInfoConditionBeanSetupper implements + private static class ManufacturerInfoConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -652,16 +650,18 @@ } public void setup(ManufacturerInfoCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } // inner class - private class ManufacturerDescriptionConditionBeanSetupper implements + private static class ManufacturerDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -670,10 +670,12 @@ } public void setup(ManufacturerDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -700,10 +702,6 @@ throw new IllegalArgumentException("productId is null."); } - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } - ProductCB cb = new ProductCB(); cb.query().setProductId_Equal(productId); if (appendFileData) { @@ -723,8 +721,10 @@ // append product info if (appendProductInfo) { ProductInfoCB cb1 = new ProductInfoCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); List productInfoList = productInfoBhv.selectList(cb1); if (productInfoList.isEmpty() @@ -746,8 +746,10 @@ // append product description if (appendProductDescription) { ProductDescriptionCB cb1 = new ProductDescriptionCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); List productDescriptionList = productDescriptionBhv .selectList(cb1); @@ -770,8 +772,10 @@ // append product content if (appendProductContent) { ProductContentCB cb1 = new ProductContentCB(); - // fall back - cb1.query().setLanguage_PrefixSearch(language); + if (language != null) { + // fall back + cb1.query().setLanguage_PrefixSearch(language); + } cb1.query().addOrderBy_Language_Desc(); List productContentList = productContentBhv .selectList(cb1); @@ -803,7 +807,6 @@ // manufacturer if (appendManufacturer) { - cb.setupSelect_Manufacturer(); BigDecimal manufacturerId = product.getManufacturerId(); if (manufacturerId != null) { product.setManufacturer(getManufacturer(manufacturerId, @@ -838,10 +841,6 @@ throw new IllegalArgumentException("productPager is null."); } - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } - ProductCB cb = new ProductCB(); //pager @@ -864,6 +863,7 @@ } // query + cb.query().setProductMode_Equal(productPager.getProductMode()); // categoryId if (productPager.getCategoryId() != null) { ProductToCategoryCB subCb = new ProductToCategoryCB(); @@ -908,7 +908,7 @@ } // inner class - private class ProductInfoConditionBeanSetupper implements + private static class ProductInfoConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -917,16 +917,18 @@ } public void setup(ProductInfoCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } // inner class - private class ProductDescriptionConditionBeanSetupper implements + private static class ProductDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -935,16 +937,18 @@ } public void setup(ProductDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } // inner class - private class ProductContentConditionBeanSetupper implements + private static class ProductContentConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -953,10 +957,12 @@ } public void setup(ProductContentCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -980,10 +986,6 @@ throw new IllegalArgumentException("categoryId is null."); } - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } - CategoryCB cb = new CategoryCB(); cb.query().setParentCategoryId_Equal(categoryId); if (appendCategoryPageInfo) { @@ -1011,7 +1013,7 @@ } // inner class - private class CategoryInfoConditionBeanSetupper implements + private static class CategoryInfoConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1020,16 +1022,18 @@ } public void setup(CategoryInfoCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } // inner class - private class CategoryContentConditionBeanSetupper implements + private static class CategoryContentConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1065,12 +1069,12 @@ boolean appendProductStats, boolean appendManufacturer, boolean appendFileData) { // TODO test - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } ProductCB cb = new ProductCB(); + //TODO is it argument? + cb.query().setProductMode_Equal(PompeiDBConstants.DEPLOY_PRODUCT_MODE); + //pager cb.fetchFirst(num); @@ -1275,217 +1279,147 @@ } } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductBhv() - */ + public FileData getFileData(BigDecimal fileDataId) { + return getFileData(fileDataId, true); + } + + public FileData getFileData(BigDecimal fileDataId, boolean appendImageData) { + FileDataCB cb = new FileDataCB(); + if (appendImageData) { + cb.setupSelect_ImageDataAsOne(); + } + cb.query().setFileDataId_Equal(fileDataId); + return fileDataBhv.selectEntity(cb); + } + public ProductBhv getProductBhv() { return productBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductBhv(jp.sf.pal.pompei.exbhv.ProductBhv) - */ public void setProductBhv(ProductBhv productBhv) { this.productBhv = productBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductDescriptionBhv() - */ public ProductDescriptionBhv getProductDescriptionBhv() { return productDescriptionBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductDescriptionBhv(jp.sf.pal.pompei.exbhv.ProductDescriptionBhv) - */ public void setProductDescriptionBhv( ProductDescriptionBhv productDescriptionBhv) { this.productDescriptionBhv = productDescriptionBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductPageInfoBhv() - */ + public ProductInfoBhv getProductInfoBhv() { + return productInfoBhv; + } + + public void setProductInfoBhv(ProductInfoBhv productInfoBhv) { + this.productInfoBhv = productInfoBhv; + } + public ProductPageInfoBhv getProductPageInfoBhv() { return productPageInfoBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductPageInfoBhv(jp.sf.pal.pompei.exbhv.ProductPageInfoBhv) - */ public void setProductPageInfoBhv(ProductPageInfoBhv productPageInfoBhv) { this.productPageInfoBhv = productPageInfoBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductStatsBhv() - */ public ProductStatsBhv getProductStatsBhv() { return productStatsBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductStatsBhv(jp.sf.pal.pompei.exbhv.ProductStatsBhv) - */ public void setProductStatsBhv(ProductStatsBhv productStatsBhv) { this.productStatsBhv = productStatsBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductToCategoryBhv() - */ public ProductToCategoryBhv getProductToCategoryBhv() { return productToCategoryBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductToCategoryBhv(jp.sf.pal.pompei.exbhv.ProductToCategoryBhv) - */ public void setProductToCategoryBhv( ProductToCategoryBhv productToCategoryBhv) { this.productToCategoryBhv = productToCategoryBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getCategoryBhv() - */ public CategoryBhv getCategoryBhv() { return categoryBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setCategoryBhv(jp.sf.pal.pompei.exbhv.CategoryBhv) - */ public void setCategoryBhv(CategoryBhv categoryBhv) { this.categoryBhv = categoryBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getCategoryInfoBhv() - */ public CategoryInfoBhv getCategoryInfoBhv() { return categoryInfoBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setCategoryInfoBhv(jp.sf.pal.pompei.exbhv.CategoryInfoBhv) - */ public void setCategoryInfoBhv(CategoryInfoBhv categoryInfoBhv) { this.categoryInfoBhv = categoryInfoBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getCategoryContentBhv() - */ public CategoryContentBhv getCategoryContentBhv() { return categoryContentBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setCategoryContentBhv(jp.sf.pal.pompei.exbhv.CategoryContentBhv) - */ public void setCategoryContentBhv(CategoryContentBhv categoryContentBhv) { this.categoryContentBhv = categoryContentBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getCategoryPageInfoBhv() - */ public CategoryPageInfoBhv getCategoryPageInfoBhv() { return categoryPageInfoBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setCategoryPageInfoBhv(jp.sf.pal.pompei.exbhv.CategoryPageInfoBhv) - */ public void setCategoryPageInfoBhv(CategoryPageInfoBhv categoryPageInfoBhv) { this.categoryPageInfoBhv = categoryPageInfoBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getManufacturerBhv() - */ public ManufacturerBhv getManufacturerBhv() { return manufacturerBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setManufacturerBhv(jp.sf.pal.pompei.exbhv.ManufacturerBhv) - */ public void setManufacturerBhv(ManufacturerBhv manufacturerBhv) { this.manufacturerBhv = manufacturerBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getManufacturerDescriptionBhv() - */ + public ManufacturerInfoBhv getManufacturerInfoBhv() { + return manufacturerInfoBhv; + } + + public void setManufacturerInfoBhv(ManufacturerInfoBhv manufacturerInfoBhv) { + this.manufacturerInfoBhv = manufacturerInfoBhv; + } + public ManufacturerDescriptionBhv getManufacturerDescriptionBhv() { return manufacturerDescriptionBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setManufacturerDescriptionBhv(jp.sf.pal.pompei.exbhv.ManufacturerDescriptionBhv) - */ public void setManufacturerDescriptionBhv( ManufacturerDescriptionBhv manufacturerDescriptionBhv) { this.manufacturerDescriptionBhv = manufacturerDescriptionBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductAttributeBhv() - */ public ProductAttributeBhv getProductAttributeBhv() { return productAttributeBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductAttributeBhv(jp.sf.pal.pompei.exbhv.ProductAttributeBhv) - */ public void setProductAttributeBhv(ProductAttributeBhv productAttributeBhv) { this.productAttributeBhv = productAttributeBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductContentBhv() - */ public ProductContentBhv getProductContentBhv() { return productContentBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductContentBhv(jp.sf.pal.pompei.exbhv.ProductContentBhv) - */ public void setProductContentBhv(ProductContentBhv productContentBhv) { this.productContentBhv = productContentBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getProductInfoBhv() - */ - public ProductInfoBhv getProductInfoBhv() { - return productInfoBhv; + public FileDataBhv getFileDataBhv() { + return fileDataBhv; } - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setProductInfoBhv(jp.sf.pal.pompei.exbhv.ProductInfoBhv) - */ - public void setProductInfoBhv(ProductInfoBhv productInfoBhv) { - this.productInfoBhv = productInfoBhv; + public void setFileDataBhv(FileDataBhv fileDataBhv) { + this.fileDataBhv = fileDataBhv; } - - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#getManufacturerInfoBhv() - */ - public ManufacturerInfoBhv getManufacturerInfoBhv() { - return manufacturerInfoBhv; - } - - /* (non-Javadoc) - * @see jp.sf.pal.pompei.service.ProductService#setManufacturerInfoBhv(jp.sf.pal.pompei.exbhv.ManufacturerInfoBhv) - */ - public void setManufacturerInfoBhv(ManufacturerInfoBhv manufacturerInfoBhv) { - this.manufacturerInfoBhv = manufacturerInfoBhv; - } - } Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/SystemServiceImpl.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/SystemServiceImpl.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/SystemServiceImpl.java 2008-04-08 04:59:55 UTC (rev 879) @@ -197,6 +197,20 @@ public DeliveryMethod getDeliveryMethod(BigDecimal deliveryMethodId, String language, boolean appendDeliveryMethodDescription) { if (appendDeliveryMethodDescription) { + if (language == null) { + DeliveryMethodCB cb = new DeliveryMethodCB(); + cb.query().setDeliveryMethodId_Equal(deliveryMethodId); + DeliveryMethod deliveryMethod = deliveryMethodBhv + .selectEntity(cb); + if (deliveryMethod == null) { + return null; + } + DeliveryMethodDescriptionCB cb1 = new DeliveryMethodDescriptionCB(); + deliveryMethod + .setDeliveryMethodDescriptionList(deliveryMethodDescriptionBhv + .selectList(cb1)); + return deliveryMethod; + } DeliveryMethodDescriptionCB cb = new DeliveryMethodDescriptionCB(); cb.setupSelect_DeliveryMethod(); cb.query().setDeliveryMethodId_Equal(deliveryMethodId); @@ -238,9 +252,6 @@ */ public List getDeliveryMethodList(String language, boolean appendDeliveryMethodDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } DeliveryMethodCB cb = new DeliveryMethodCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -262,8 +273,8 @@ } // inner class - private class DeliveryMethodDescriptionConditionBeanSetupper implements - ConditionBeanSetupper { + private static class DeliveryMethodDescriptionConditionBeanSetupper + implements ConditionBeanSetupper { private String language; public DeliveryMethodDescriptionConditionBeanSetupper(String language) { @@ -271,10 +282,12 @@ } public void setup(DeliveryMethodDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -382,6 +395,21 @@ public DeliveryStatus getDeliveryStatus(BigDecimal deliveryStatusId, String language, boolean appendDeliveryStatusDescription) { if (appendDeliveryStatusDescription) { + if (language == null) { + // set all language + DeliveryStatusCB cb = new DeliveryStatusCB(); + cb.query().setDeliveryStatusId_Equal(deliveryStatusId); + DeliveryStatus deliveryStatus = deliveryStatusBhv + .selectEntity(cb); + if (deliveryStatus == null) { + return null; + } + DeliveryStatusDescriptionCB cb1 = new DeliveryStatusDescriptionCB(); + deliveryStatus + .setDeliveryStatusDescriptionList(deliveryStatusDescriptionBhv + .selectList(cb1)); + return deliveryStatus; + } DeliveryStatusDescriptionCB cb = new DeliveryStatusDescriptionCB(); cb.setupSelect_DeliveryStatus(); cb.query().setDeliveryStatusId_Equal(deliveryStatusId); @@ -423,9 +451,6 @@ */ public List getDeliveryStatusList(String language, boolean appendDeliveryStatusDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } DeliveryStatusCB cb = new DeliveryStatusCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -447,8 +472,8 @@ } // inner class - private class DeliveryStatusDescriptionConditionBeanSetupper implements - ConditionBeanSetupper { + private static class DeliveryStatusDescriptionConditionBeanSetupper + implements ConditionBeanSetupper { private String language; public DeliveryStatusDescriptionConditionBeanSetupper(String language) { @@ -456,10 +481,12 @@ } public void setup(DeliveryStatusDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -566,6 +593,20 @@ public PaymentMethod getPaymentMethod(BigDecimal paymentMethodId, String language, boolean appendPaymentMethodDescription) { if (appendPaymentMethodDescription) { + // set all language + if (language == null) { + PaymentMethodCB cb = new PaymentMethodCB(); + cb.query().setPaymentMethodId_Equal(paymentMethodId); + PaymentMethod paymentMethod = paymentMethodBhv.selectEntity(cb); + if (paymentMethod == null) { + return null; + } + PaymentMethodDescriptionCB cb1 = new PaymentMethodDescriptionCB(); + paymentMethod + .setPaymentMethodDescriptionList(paymentMethodDescriptionBhv + .selectList(cb1)); + return paymentMethod; + } PaymentMethodDescriptionCB cb = new PaymentMethodDescriptionCB(); cb.setupSelect_PaymentMethod(); cb.query().setPaymentMethodId_Equal(paymentMethodId); @@ -607,9 +648,6 @@ */ public List getPaymentMethodList(String language, boolean appendPaymentMethodDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } PaymentMethodCB cb = new PaymentMethodCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -630,8 +668,8 @@ } // inner class - private class PaymentMethodDescriptionConditionBeanSetupper implements - ConditionBeanSetupper { + private static class PaymentMethodDescriptionConditionBeanSetupper + implements ConditionBeanSetupper { private String language; public PaymentMethodDescriptionConditionBeanSetupper(String language) { @@ -639,10 +677,12 @@ } public void setup(PaymentMethodDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -748,6 +788,20 @@ public PaymentStatus getPaymentStatus(BigDecimal paymentStatusId, String language, boolean appendPaymentStatusDescription) { if (appendPaymentStatusDescription) { + // set all language + if (language == null) { + PaymentStatusCB cb = new PaymentStatusCB(); + cb.query().setPaymentStatusId_Equal(paymentStatusId); + PaymentStatus paymentStatus = paymentStatusBhv.selectEntity(cb); + if (paymentStatus == null) { + return null; + } + PaymentStatusDescriptionCB cb1 = new PaymentStatusDescriptionCB(); + paymentStatus + .setPaymentStatusDescriptionList(paymentStatusDescriptionBhv + .selectList(cb1)); + return paymentStatus; + } PaymentStatusDescriptionCB cb = new PaymentStatusDescriptionCB(); cb.setupSelect_PaymentStatus(); cb.query().setPaymentStatusId_Equal(paymentStatusId); @@ -789,9 +843,6 @@ */ public List getPaymentStatusList(String language, boolean appendPaymentStatusDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } PaymentStatusCB cb = new PaymentStatusCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -812,8 +863,8 @@ } // inner class - private class PaymentStatusDescriptionConditionBeanSetupper implements - ConditionBeanSetupper { + private static class PaymentStatusDescriptionConditionBeanSetupper + implements ConditionBeanSetupper { private String language; public PaymentStatusDescriptionConditionBeanSetupper(String language) { @@ -821,10 +872,12 @@ } public void setup(PaymentStatusDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -926,6 +979,19 @@ public CardType getCardType(BigDecimal cardTypeId, String language, boolean appendCardTypeDescription) { if (appendCardTypeDescription) { + // set all language + if (language == null) { + CardTypeCB cb = new CardTypeCB(); + cb.query().setCardTypeId_Equal(cardTypeId); + CardType cardType = cardTypeBhv.selectEntity(cb); + if (cardType == null) { + return null; + } + CardTypeDescriptionCB cb1 = new CardTypeDescriptionCB(); + cardType.setCardTypeDescriptionList(cardTypeDescriptionBhv + .selectList(cb1)); + return cardType; + } CardTypeDescriptionCB cb = new CardTypeDescriptionCB(); cb.setupSelect_CardType(); cb.query().setCardTypeId_Equal(cardTypeId); @@ -966,9 +1032,6 @@ */ public List getCardTypeList(String language, boolean appendCardTypeDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } CardTypeCB cb = new CardTypeCB(); List cardTypeList = cardTypeBhv.selectList(cb); @@ -987,7 +1050,7 @@ } // inner class - private class CardTypeDescriptionConditionBeanSetupper implements + private static class CardTypeDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -996,10 +1059,12 @@ } public void setup(CardTypeDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -1103,6 +1168,20 @@ public DeliveryZone getDeliveryZone(BigDecimal deliveryZoneId, String language, boolean appendDeliveryZoneDescription) { if (appendDeliveryZoneDescription) { + // set all language + if (language == null) { + DeliveryZoneCB cb = new DeliveryZoneCB(); + cb.query().setDeliveryZoneId_Equal(deliveryZoneId); + DeliveryZone deliveryZone = deliveryZoneBhv.selectEntity(cb); + if (deliveryZone == null) { + return null; + } + DeliveryZoneDescriptionCB cb1 = new DeliveryZoneDescriptionCB(); + deliveryZone + .setDeliveryZoneDescriptionList(deliveryZoneDescriptionBhv + .selectList(cb1)); + return deliveryZone; + } DeliveryZoneDescriptionCB cb = new DeliveryZoneDescriptionCB(); cb.setupSelect_DeliveryZone(); cb.query().setDeliveryZoneId_Equal(deliveryZoneId); @@ -1144,9 +1223,6 @@ */ public List getDeliveryZoneList(String language, boolean appendDeliveryZoneDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } DeliveryZoneCB cb = new DeliveryZoneCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -1167,7 +1243,7 @@ } // inner class - private class DeliveryZoneDescriptionConditionBeanSetupper implements + private static class DeliveryZoneDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1176,10 +1252,12 @@ } public void setup(DeliveryZoneDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -1281,6 +1359,19 @@ public Country getCountry(BigDecimal countryId, String language, boolean appendCountryDescription) { if (appendCountryDescription) { + // set all language + if (language == null) { + CountryCB cb = new CountryCB(); + cb.query().setCountryId_Equal(countryId); + Country country = countryBhv.selectEntity(cb); + if (country == null) { + return null; + } + CountryDescriptionCB cb1 = new CountryDescriptionCB(); + country.setCountryDescriptionList(countryDescriptionBhv + .selectList(cb1)); + return country; + } CountryDescriptionCB cb = new CountryDescriptionCB(); cb.setupSelect_Country(); cb.query().setCountryId_Equal(countryId); @@ -1321,9 +1412,6 @@ */ public List getCountryList(String language, boolean appendCountryDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } CountryCB cb = new CountryCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -1343,7 +1431,7 @@ } // inner class - private class CountryDescriptionConditionBeanSetupper implements + private static class CountryDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1352,10 +1440,12 @@ } public void setup(CountryDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -1454,6 +1544,19 @@ public TaxType getTaxType(BigDecimal taxTypeId, String language, boolean appendTaxTypeDescription) { if (appendTaxTypeDescription) { + // set all language + if (language == null) { + TaxTypeCB cb = new TaxTypeCB(); + cb.query().setTaxTypeId_Equal(taxTypeId); + TaxType taxType = taxTypeBhv.selectEntity(cb); + if (taxType == null) { + return null; + } + TaxTypeDescriptionCB cb1 = new TaxTypeDescriptionCB(); + taxType.setTaxTypeDescriptionList(taxTypeDescriptionBhv + .selectList(cb1)); + return taxType; + } TaxTypeDescriptionCB cb = new TaxTypeDescriptionCB(); cb.setupSelect_TaxType(); cb.query().setTaxTypeId_Equal(taxTypeId); @@ -1494,9 +1597,6 @@ */ public List getTaxTypeList(String language, boolean appendTaxTypeDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } TaxTypeCB cb = new TaxTypeCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -1516,7 +1616,7 @@ } // inner class - private class TaxTypeDescriptionConditionBeanSetupper implements + private static class TaxTypeDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1525,10 +1625,12 @@ } public void setup(TaxTypeDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -1631,6 +1733,20 @@ public DeliveryType getDeliveryType(BigDecimal deliveryTypeId, String language, boolean appendDeliveryTypeDescription) { if (appendDeliveryTypeDescription) { + // set all language + if (language == null) { + DeliveryTypeCB cb = new DeliveryTypeCB(); + cb.query().setDeliveryTypeId_Equal(deliveryTypeId); + DeliveryType deliveryType = deliveryTypeBhv.selectEntity(cb); + if (deliveryType == null) { + return null; + } + DeliveryTypeDescriptionCB cb1 = new DeliveryTypeDescriptionCB(); + deliveryType + .setDeliveryTypeDescriptionList(deliveryTypeDescriptionBhv + .selectList(cb1)); + return deliveryType; + } DeliveryTypeDescriptionCB cb = new DeliveryTypeDescriptionCB(); cb.setupSelect_DeliveryType(); cb.query().setDeliveryTypeId_Equal(deliveryTypeId); @@ -1672,9 +1788,6 @@ */ public List getDeliveryTypeList(String language, boolean appendDeliveryTypeDescription) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } DeliveryTypeCB cb = new DeliveryTypeCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -1695,7 +1808,7 @@ } // inner class - private class DeliveryTypeDescriptionConditionBeanSetupper implements + private static class DeliveryTypeDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1704,10 +1817,12 @@ } public void setup(DeliveryTypeDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -1824,27 +1939,41 @@ boolean appendOrderNotification) { OrderStatus orderStatus = null; if (appendOrderStatusDescription) { - OrderStatusDescriptionCB cb = new OrderStatusDescriptionCB(); - cb.setupSelect_OrderStatus(); - cb.query().setOrderStatusId_Equal(orderStatusId); - cb.query().setLanguage_Equal(language); - OrderStatusDescription d = orderStatusDescriptionBhv - .selectEntity(cb); - if (d == null) { - // fall back - cb.query() - .setLanguage_Equal(PompeiDBConstants.DEFAULT_LANGUAGE); - d = orderStatusDescriptionBhv.selectEntity(cb); - } + // set all language + if (language == null) { + OrderStatusCB cb = new OrderStatusCB(); + cb.query().setOrderStatusId_Equal(orderStatusId); + orderStatus = orderStatusBhv.selectEntity(cb); + if (orderStatus == null) { + return null; + } + OrderStatusDescriptionCB cb1 = new OrderStatusDescriptionCB(); + orderStatus + .setOrderStatusDescriptionList(orderStatusDescriptionBhv + .selectList(cb1)); + } else { + OrderStatusDescriptionCB cb = new OrderStatusDescriptionCB(); + cb.setupSelect_OrderStatus(); + cb.query().setOrderStatusId_Equal(orderStatusId); + cb.query().setLanguage_Equal(language); + OrderStatusDescription d = orderStatusDescriptionBhv + .selectEntity(cb); + if (d == null) { + // fall back + cb.query().setLanguage_Equal( + PompeiDBConstants.DEFAULT_LANGUAGE); + d = orderStatusDescriptionBhv.selectEntity(cb); + } - if (d == null) { - return null; + if (d == null) { + return null; + } + + List list = new ArrayList(); + list.add(d); + d.getOrderStatus().setOrderStatusDescriptionList(list); + orderStatus = d.getOrderStatus(); } - - List list = new ArrayList(); - list.add(d); - d.getOrderStatus().setOrderStatusDescriptionList(list); - orderStatus = d.getOrderStatus(); } else { OrderStatusCB cb = new OrderStatusCB(); cb.query().setOrderStatusId_Equal(orderStatusId); @@ -1874,9 +2003,6 @@ public List getOrderStatusList(String language, boolean appendOrderStatusDescription, boolean appendOrderNotification) { - if (language == null) { - language = PompeiDBConstants.DEFAULT_LANGUAGE; - } OrderStatusCB cb = new OrderStatusCB(); cb.query().addOrderBy_SortOrder_Asc(); @@ -1901,7 +2027,7 @@ } // inner class - private class OrderStatusDescriptionConditionBeanSetupper implements + private static class OrderStatusDescriptionConditionBeanSetupper implements ConditionBeanSetupper { private String language; @@ -1910,10 +2036,12 @@ } public void setup(OrderStatusDescriptionCB cb) { - List langs = new ArrayList(2); - langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); - langs.add(language); - cb.query().setLanguage_InScope(langs); + if (language != null) { + List langs = new ArrayList(2); + langs.add(PompeiDBConstants.DEFAULT_LANGUAGE); + langs.add(language); + cb.query().setLanguage_InScope(langs); + } cb.query().addOrderBy_Language_Desc(); } } @@ -1954,4 +2082,196 @@ } } + public List getOrderNotificationListByOrderStatusId( + BigDecimal orderStatusId) { + OrderNotificationCB cb = new OrderNotificationCB(); + cb.query().setOrderStatusId_Equal(orderStatusId); + return orderNotificationBhv.selectList(cb); + } + + public OrderNotification getOrderNotification(BigDecimal orderNotificationId) { + OrderNotificationCB cb = new OrderNotificationCB(); + cb.query().setOrderNotificationId_Equal(orderNotificationId); + return orderNotificationBhv.selectEntity(cb); + } + + public DeliveryMethodBhv getDeliveryMethodBhv() { + return deliveryMethodBhv; + } + + public void setDeliveryMethodBhv(DeliveryMethodBhv deliveryMethodBhv) { + this.deliveryMethodBhv = deliveryMethodBhv; + } + + public DeliveryMethodDescriptionBhv getDeliveryMethodDescriptionBhv() { + return deliveryMethodDescriptionBhv; + } + + public void setDeliveryMethodDescriptionBhv( + DeliveryMethodDescriptionBhv deliveryMethodDescriptionBhv) { + this.deliveryMethodDescriptionBhv = deliveryMethodDescriptionBhv; + } + + public DeliveryStatusBhv getDeliveryStatusBhv() { + return deliveryStatusBhv; + } + + public void setDeliveryStatusBhv(DeliveryStatusBhv deliveryStatusBhv) { + this.deliveryStatusBhv = deliveryStatusBhv; + } + + public DeliveryStatusDescriptionBhv getDeliveryStatusDescriptionBhv() { + return deliveryStatusDescriptionBhv; + } + + public void setDeliveryStatusDescriptionBhv( + DeliveryStatusDescriptionBhv deliveryStatusDescriptionBhv) { + this.deliveryStatusDescriptionBhv = deliveryStatusDescriptionBhv; + } + + public PaymentMethodBhv getPaymentMethodBhv() { + return paymentMethodBhv; + } + + public void setPaymentMethodBhv(PaymentMethodBhv paymentMethodBhv) { + this.paymentMethodBhv = paymentMethodBhv; + } + + public PaymentMethodDescriptionBhv getPaymentMethodDescriptionBhv() { + return paymentMethodDescriptionBhv; + } + + public void setPaymentMethodDescriptionBhv( + PaymentMethodDescriptionBhv paymentMethodDescriptionBhv) { + this.paymentMethodDescriptionBhv = paymentMethodDescriptionBhv; + } + + public PaymentStatusBhv getPaymentStatusBhv() { + return paymentStatusBhv; + } + + public void setPaymentStatusBhv(PaymentStatusBhv paymentStatusBhv) { + this.paymentStatusBhv = paymentStatusBhv; + } + + public PaymentStatusDescriptionBhv getPaymentStatusDescriptionBhv() { + return paymentStatusDescriptionBhv; + } + + public void setPaymentStatusDescriptionBhv( + PaymentStatusDescriptionBhv paymentStatusDescriptionBhv) { + this.paymentStatusDescriptionBhv = paymentStatusDescriptionBhv; + } + + public CardTypeBhv getCardTypeBhv() { + return cardTypeBhv; + } + + public void setCardTypeBhv(CardTypeBhv cardTypeBhv) { + this.cardTypeBhv = cardTypeBhv; + } + + public CardTypeDescriptionBhv getCardTypeDescriptionBhv() { + return cardTypeDescriptionBhv; + } + + public void setCardTypeDescriptionBhv( + CardTypeDescriptionBhv cardTypeDescriptionBhv) { + this.cardTypeDescriptionBhv = cardTypeDescriptionBhv; + } + + public DeliveryZoneBhv getDeliveryZoneBhv() { + return deliveryZoneBhv; + } + + public void setDeliveryZoneBhv(DeliveryZoneBhv deliveryZoneBhv) { + this.deliveryZoneBhv = deliveryZoneBhv; + } + + public DeliveryZoneDescriptionBhv getDeliveryZoneDescriptionBhv() { + return deliveryZoneDescriptionBhv; + } + + public void setDeliveryZoneDescriptionBhv( + DeliveryZoneDescriptionBhv deliveryZoneDescriptionBhv) { + this.deliveryZoneDescriptionBhv = deliveryZoneDescriptionBhv; + } + + public CountryBhv getCountryBhv() { + return countryBhv; + } + + public void setCountryBhv(CountryBhv countryBhv) { + this.countryBhv = countryBhv; + } + + public CountryDescriptionBhv getCountryDescriptionBhv() { + return countryDescriptionBhv; + } + + public void setCountryDescriptionBhv( + CountryDescriptionBhv countryDescriptionBhv) { + this.countryDescriptionBhv = countryDescriptionBhv; + } + + public TaxTypeBhv getTaxTypeBhv() { + return taxTypeBhv; + } + + public void setTaxTypeBhv(TaxTypeBhv taxTypeBhv) { + this.taxTypeBhv = taxTypeBhv; + } + + public TaxTypeDescriptionBhv getTaxTypeDescriptionBhv() { + return taxTypeDescriptionBhv; + } + + public void setTaxTypeDescriptionBhv( + TaxTypeDescriptionBhv taxTypeDescriptionBhv) { + this.taxTypeDescriptionBhv = taxTypeDescriptionBhv; + } + + public DeliveryTypeBhv getDeliveryTypeBhv() { + return deliveryTypeBhv; + } + + public void setDeliveryTypeBhv(DeliveryTypeBhv deliveryTypeBhv) { + this.deliveryTypeBhv = deliveryTypeBhv; + } + + public DeliveryTypeDescriptionBhv getDeliveryTypeDescriptionBhv() { + return deliveryTypeDescriptionBhv; + } + + public void setDeliveryTypeDescriptionBhv( + DeliveryTypeDescriptionBhv deliveryTypeDescriptionBhv) { + this.deliveryTypeDescriptionBhv = deliveryTypeDescriptionBhv; + } + + public OrderStatusBhv getOrderStatusBhv() { + return orderStatusBhv; + } + + public void setOrderStatusBhv(OrderStatusBhv orderStatusBhv) { + this.orderStatusBhv = orderStatusBhv; + } + + public OrderStatusDescriptionBhv getOrderStatusDescriptionBhv() { + return orderStatusDescriptionBhv; + } + + public void setOrderStatusDescriptionBhv( + OrderStatusDescriptionBhv orderStatusDescriptionBhv) { + this.orderStatusDescriptionBhv = orderStatusDescriptionBhv; + } + + public OrderNotificationBhv getOrderNotificationBhv() { + return orderNotificationBhv; + } + + public void setOrderNotificationBhv( + OrderNotificationBhv orderNotificationBhv) { + this.orderNotificationBhv = orderNotificationBhv; + } + } Modified: pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java 2008-04-08 04:59:55 UTC (rev 879) @@ -1,194 +1,194 @@ -package jp.sf.pal.pompei.service.impl; - -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; -import java.util.List; - -import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.service.CustomerService; - -import org.junit.runner.RunWith; -import org.seasar.framework.unit.Seasar2; -import org.seasar.framework.unit.TestContext; - - @ RunWith(Seasar2.class) -public class CustomerServiceImplTest { - private TestContext ctx; - - private CustomerService customerService; - - //TODO need to update - // public void getCustomerList() throws Exception { - // List customerList = customerService.getCustomerList(); - // assertEquals("1", ctx.getExpected(), customerList); - // } - - public void getCustomer() { - Customer customer = customerService.getCustomer(BigDecimal.valueOf(2)); - //TODO need to update - // assertEquals(ctx.getExpected(), customer); - } - - //TODO need to update - // public void getCustomerByPortalId() { - // Customer customer = customerService.getCustomerByPortalId("testuser2"); - // assertEquals(ctx.getExpected(), customer); - // } - - //TODO need to update - // public void getAddressBookList() throws Exception { - // List addressBookList = customerService - // .getAddressBookList(BigDecimal.ONE); - // assertEquals("1", ctx.getExpected(), addressBookList); - // } - - // public void getAddressBook1() { - // assertEquals(ctx.getExpected(), customerService.getAddressBook(BigDecimal.valueOf(1))); - // } - // - // public void getAddressBook2() { - // assertEquals(ctx.getExpected(), customerService.getAddressBook(BigDecimal.valueOf(2))); - // } - - //TODO need to update - // public void getDefaultAddressBook() { - // AddressBook addressBook = customerService - // .getDefaultAddressBook(BigDecimal.valueOf(2)); - // assertEquals(ctx.getExpected(), addressBook); - // } - - //TODO need to update - // public void getBasketList() { - // assertEquals(ctx.getExpected(), customerService - // .getBasketList(BigDecimal.valueOf(2))); - // } - - // public void getBasket1() { - // assertEquals(ctx.getExpected(), customerService.getBasketList(BigDecimal.valueOf(2))); - // } - // - // public void getBasket2() { - // assertEquals(ctx.getExpected(), customerService.getBasket(BigDecimal.valueOf(2), BigDecimal.valueOf(2))); - // } - - //TODO need to update - // public void addBasket() { - // Basket basket = new Basket(); - // basket.setCustomerId(BigDecimal.valueOf(2)); - // basket.setProductId(BigDecimal.valueOf(2)); - // basket.setQuantity(BigDecimal.valueOf(2)); - // basket.setFinalPrice(BigDecimal.valueOf(2000)); - // basket - // .setUpdatedDate(java.sql.Timestamp - // .valueOf("2006-05-04 12:34:00")); - // customerService.addBasket(basket); - // - // List basketList = customerService.getBasketList(BigDecimal - // .valueOf(2)); - // assertEquals("1", ctx.getExpected(), basketList); - // } - - //TODO need to update - // public void addAddressBook() { - // AddressBook addressBook = new AddressBook(); - // addressBook.setCustomerId(BigDecimal.valueOf(2)); - // addressBook.setCompany("company4"); - // addressBook.setDepartment("department4"); - // addressBook.setFirstname("Firstname2"); - // addressBook.setLastname("Lastname2"); - // addressBook.setFirstnameDescription("firstname2"); - // addressBook.setLastnameDescription("lastname2"); - // addressBook.setStreetAddress("Street4"); - // addressBook.setSuburb("Suburb4"); - // addressBook.setCity("City4"); - // addressBook.setState("state4"); - // addressBook.setPostcode("333-3333"); - // addressBook.setTelephone("333-333-3333"); - // addressBook.setFax("333-333-3333"); - // addressBook.setCellphone("333-3333-3333"); - // addressBook.setDefaultAddress(BigDecimal.valueOf(1)); - // addressBook.setCountryId(BigDecimal.valueOf(1)); - // addressBook.setDeliveryZoneId(BigDecimal.valueOf(1)); - // customerService.addAddressBook(addressBook); - // assertEquals(ctx.getExpected(), customerService - // .getAddressBookList(BigDecimal.valueOf(2))); - // } - - //TODO need to update - // public void addCustomer() { - // Customer customer = new Customer(); - // AddressBook addressBook = new AddressBook(); - // customer.setPortalId("portalId2"); - // customer.setGender("M"); - // customer.setFirstname(""); - // customer.setLastname(""); - // customer.setFirstnameDescription(""); - // customer.setLastnameDescription(""); - // customer.setNickname(""); - // customer.setDayOfBirth(java.sql.Timestamp - // .valueOf("1985-04-06 12:34:56")); - // customer.setEmailAddress(""); - // customer.setCreatedDate(java.sql.Timestamp - // .valueOf("2007-06-05 12:34:00")); - // customer.setUpdatedTime(java.sql.Timestamp - // .valueOf("2007-08-09 12:34:00")); - // addressBook.setCustomerId(BigDecimal.valueOf(2)); - // addressBook.setCompany("company2"); - // addressBook.setDepartment("department2"); - // addressBook.setFirstname("hoge"); - // addressBook.setLastname("hoge"); - // addressBook.setFirstnameDescription(""); - // addressBook.setLastnameDescription(""); - // addressBook.setStreetAddress(""); - // addressBook.setSuburb(""); - // addressBook.setCity(""); - // addressBook.setState(""); - // addressBook.setPostcode(""); - // addressBook.setTelephone(""); - // addressBook.setFax(""); - // addressBook.setCellphone(""); - // addressBook.setDefaultAddress(BigDecimal.valueOf(1)); - // addressBook.setCountryId(BigDecimal.valueOf(1)); - // addressBook.setDeliveryZoneId(BigDecimal.valueOf(1)); - // customerService.addCustomer(customer, addressBook); - // assertEquals("1", ctx.getExpected(), customerService.getCustomerList()); - // } - - //TODO need to update - // public void deleteCustomer() { - // customerService.deleteCustomer(BigDecimal.valueOf(1)); - // assertEquals(ctx.getExpected(), customerService.getCustomerList()); - // } - - //TODO need to update - // public void deleteAddressBook() { - // AddressBook addressBook = customerService.getAddressBook(BigDecimal - // .valueOf(2)); - // customerService.deleteAddressBook(addressBook); - // assertEquals(ctx.getExpected(), customerService - // .getAddressBookList(BigDecimal.valueOf(2))); - // } - - // public void deleteBasket1() { - // Basket basket = customerService.getBasket(BigDecimal.valueOf(2), BigDecimal.valueOf(1)); - // customerService.deleteBasket(basket); - // assertEquals(ctx.getExpected(), customerService.getBasketList(BigDecimal.valueOf(2))); - // } - - //TODO need to update - // public void deleteBasket() { - // customerService.deleteBasket(BigDecimal.valueOf(2)); - // assertEquals(ctx.getExpected(), customerService - // .getBasketList(BigDecimal.valueOf(2))); - // } - - //TODO need to update - // public void cleanupBasket() { - // customerService.cleanupBasket(BigDecimal.valueOf(2)); - // List basketList = customerService.getBasketList(BigDecimal - // .valueOf(2)); - // - // Assert.assertTrue(basketList.isEmpty()); - // } -} +//package jp.sf.pal.pompei.service.impl; +// +//import static org.junit.Assert.assertEquals; +// +//import java.math.BigDecimal; +//import java.util.List; +// +//import jp.sf.pal.pompei.exentity.Customer; +//import jp.sf.pal.pompei.service.CustomerService; +// +//import org.junit.runner.RunWith; +//import org.seasar.framework.unit.Seasar2; +//import org.seasar.framework.unit.TestContext; +// +//@RunWith(Seasar2.class) +//public class CustomerServiceImplTest { +// private TestContext ctx; +// +// private CustomerService customerService; +// +// //TODO need to update +// // public void getCustomerList() throws Exception { +// // List customerList = customerService.getCustomerList(); +// // assertEquals("1", ctx.getExpected(), customerList); +// // } +// +// public void getCustomer() { +// Customer customer = customerService.getCustomer(BigDecimal.valueOf(2)); +// //TODO need to update +// // assertEquals(ctx.getExpected(), customer); +// } +// +// //TODO need to update +// // public void getCustomerByPortalId() { +// // Customer customer = customerService.getCustomerByPortalId("testuser2"); +// // assertEquals(ctx.getExpected(), customer); +// // } +// +// //TODO need to update +// // public void getAddressBookList() throws Exception { +// // List addressBookList = customerService +// // .getAddressBookList(BigDecimal.ONE); +// // assertEquals("1", ctx.getExpected(), addressBookList); +// // } +// +// // public void getAddressBook1() { +// // assertEquals(ctx.getExpected(), customerService.getAddressBook(BigDecimal.valueOf(1))); +// // } +// // +// // public void getAddressBook2() { +// // assertEquals(ctx.getExpected(), customerService.getAddressBook(BigDecimal.valueOf(2))); +// // } +// +// //TODO need to update +// // public void getDefaultAddressBook() { +// // AddressBook addressBook = customerService +// // .getDefaultAddressBook(BigDecimal.valueOf(2)); +// // assertEquals(ctx.getExpected(), addressBook); +// // } +// +// //TODO need to update +// // public void getBasketList() { +// // assertEquals(ctx.getExpected(), customerService +// // .getBasketList(BigDecimal.valueOf(2))); +// // } +// +// // public void getBasket1() { +// // assertEquals(ctx.getExpected(), customerService.getBasketList(BigDecimal.valueOf(2))); +// // } +// // +// // public void getBasket2() { +// // assertEquals(ctx.getExpected(), customerService.getBasket(BigDecimal.valueOf(2), BigDecimal.valueOf(2))); +// // } +// +// //TODO need to update +// // public void addBasket() { +// // Basket basket = new Basket(); +// // basket.setCustomerId(BigDecimal.valueOf(2)); +// // basket.setProductId(BigDecimal.valueOf(2)); +// // basket.setQuantity(BigDecimal.valueOf(2)); +// // basket.setFinalPrice(BigDecimal.valueOf(2000)); +// // basket +// // .setUpdatedDate(java.sql.Timestamp +// // .valueOf("2006-05-04 12:34:00")); +// // customerService.addBasket(basket); +// // +// // List basketList = customerService.getBasketList(BigDecimal +// // .valueOf(2)); +// // assertEquals("1", ctx.getExpected(), basketList); +// // } +// +// //TODO need to update +// // public void addAddressBook() { +// // AddressBook addressBook = new AddressBook(); +// // addressBook.setCustomerId(BigDecimal.valueOf(2)); +// // addressBook.setCompany("company4"); +// // addressBook.setDepartment("department4"); +// // addressBook.setFirstname("Firstname2"); +// // addressBook.setLastname("Lastname2"); +// // addressBook.setFirstnameDescription("firstname2"); +// // addressBook.setLastnameDescription("lastname2"); +// // addressBook.setStreetAddress("Street4"); +// // addressBook.setSuburb("Suburb4"); +// // addressBook.setCity("City4"); +// // addressBook.setState("state4"); +// // addressBook.setPostcode("333-3333"); +// // addressBook.setTelephone("333-333-3333"); +// // addressBook.setFax("333-333-3333"); +// // addressBook.setCellphone("333-3333-3333"); +// // addressBook.setDefaultAddress(BigDecimal.valueOf(1)); +// // addressBook.setCountryId(BigDecimal.valueOf(1)); +// // addressBook.setDeliveryZoneId(BigDecimal.valueOf(1)); +// // customerService.addAddressBook(addressBook); +// // assertEquals(ctx.getExpected(), customerService +// // .getAddressBookList(BigDecimal.valueOf(2))); +// // } +// +// //TODO need to update +// // public void addCustomer() { +// // Customer customer = new Customer(); +// // AddressBook addressBook = new AddressBook(); +// // customer.setPortalId("portalId2"); +// // customer.setGender("M"); +// // customer.setFirstname(""); +// // customer.setLastname(""); +// // customer.setFirstnameDescription(""); +// // customer.setLastnameDescription(""); +// // customer.setNickname(""); +// // customer.setDayOfBirth(java.sql.Timestamp +// // .valueOf("1985-04-06 12:34:56")); +// // customer.setEmailAddress(""); +// // customer.setCreatedDate(java.sql.Timestamp +// // .valueOf("2007-06-05 12:34:00")); +// // customer.setUpdatedTime(java.sql.Timestamp +// // .valueOf("2007-08-09 12:34:00")); +// // addressBook.setCustomerId(BigDecimal.valueOf(2)); +// // addressBook.setCompany("company2"); +// // addressBook.setDepartment("department2"); +// // addressBook.setFirstname("hoge"); +// // addressBook.setLastname("hoge"); +// // addressBook.setFirstnameDescription(""); +// // addressBook.setLastnameDescription(""); +// // addressBook.setStreetAddress(""); +// // addressBook.setSuburb(""); +// // addressBook.setCity(""); +// // addressBook.setState(""); +// // addressBook.setPostcode(""); +// // addressBook.setTelephone(""); +// // addressBook.setFax(""); +// // addressBook.setCellphone(""); +// // addressBook.setDefaultAddress(BigDecimal.valueOf(1)); +// // addressBook.setCountryId(BigDecimal.valueOf(1)); +// // addressBook.setDeliveryZoneId(BigDecimal.valueOf(1)); +// // customerService.addCustomer(customer, addressBook); +// // assertEquals("1", ctx.getExpected(), customerService.getCustomerList()); +// // } +// +// //TODO need to update +// // public void deleteCustomer() { +// // customerService.deleteCustomer(BigDecimal.valueOf(1)); +// // assertEquals(ctx.getExpected(), customerService.getCustomerList()); +// // } +// +// //TODO need to update +// // public void deleteAddressBook() { +// // AddressBook addressBook = customerService.getAddressBook(BigDecimal +// // .valueOf(2)); +// // customerService.deleteAddressBook(addressBook); +// // assertEquals(ctx.getExpected(), customerService +// // .getAddressBookList(BigDecimal.valueOf(2))); +// // } +// +// // public void deleteBasket1() { +// // Basket basket = customerService.getBasket(BigDecimal.valueOf(2), BigDecimal.valueOf(1)); +// // customerService.deleteBasket(basket); +// // assertEquals(ctx.getExpected(), customerService.getBasketList(BigDecimal.valueOf(2))); +// // } +// +// //TODO need to update +// // public void deleteBasket() { +// // customerService.deleteBasket(BigDecimal.valueOf(2)); +// // assertEquals(ctx.getExpected(), customerService +// // .getBasketList(BigDecimal.valueOf(2))); +// // } +// +// //TODO need to update +// // public void cleanupBasket() { +// // customerService.cleanupBasket(BigDecimal.valueOf(2)); +// // List basketList = customerService.getBasketList(BigDecimal +// // .valueOf(2)); +// // +// // Assert.assertTrue(basketList.isEmpty()); +// // } +//} Modified: pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/OrderServiceImplTest.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/OrderServiceImplTest.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/OrderServiceImplTest.java 2008-04-08 04:59:55 UTC (rev 879) @@ -1,223 +1,223 @@ -package jp.sf.pal.pompei.service.impl; - -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; -import java.util.List; - -import jp.sf.pal.pompei.exbhv.DeliveryMethodBhv; -import jp.sf.pal.pompei.exbhv.PaymentMethodBhv; -import jp.sf.pal.pompei.exentity.OrderForm; -import jp.sf.pal.pompei.pager.OrderFormPager; -import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.OrderService; - -import org.junit.runner.RunWith; -import org.seasar.framework.unit.Seasar2; -import org.seasar.framework.unit.TestContext; - - @ RunWith(Seasar2.class) -public class OrderServiceImplTest { - private TestContext ctx; - - private OrderService orderService; - - private CustomerService customerService; - - private transient PaymentMethodBhv paymentMethodBhv; - - private transient DeliveryMethodBhv deliveryMethodBhv; - - //TODO need to update - // public void addOrderForm() { - // Customer customer = customerService.getCustomer(BigDecimal.valueOf(1)); - // List customerBasketIdList = new ArrayList(); - // customerBasketIdList.add(BigDecimal.valueOf(1)); - // customerBasketIdList.add(BigDecimal.valueOf(2)); - // AddressBook customerAddressBook = customerService - // .getAddressBook(BigDecimal.valueOf(1)); - // AddressBook deliveryAddressBook = customerService - // .getAddressBook(BigDecimal.valueOf(1)); - // AddressBook billingAddressBook = customerService - // .getAddressBook(BigDecimal.valueOf(1)); - // // set payment method - // PaymentMethodCB paymentMethodCB = new PaymentMethodCB(); - // paymentMethodCB.query().setPaymentMethodId_Equal(BigDecimal.valueOf(1)); - // PaymentMethod paymentMethod = paymentMethodBhv - // .selectEntity(paymentMethodCB); - // // set delivery method - // DeliveryMethodCB deliveryMethodCB = new DeliveryMethodCB(); - // deliveryMethodCB.query().setDeliveryMethodId_Equal( - // BigDecimal.valueOf(1)); - // DeliveryMethod deliveryMethod = deliveryMethodBhv - // .selectEntity(deliveryMethodCB); - // // set order card info - // // TODO - // OrderCardInfo orderCardInfo = new OrderCardInfo(); - // // orderCardInfo.setCardTypeId(BigDecimal.valueOf(1)); - // // orderCardInfo.setCardTypeCode() - // // set sub total price - // BigDecimal subTotalPrice = null; - // // set tax - // BigDecimal tax = null; - // // set delivery price - // BigDecimal deliveryPrice = null; - // // set payment fee - // BigDecimal paymentFee = null; - // // set total price - // BigDecimal totalPrice = null; - // - // try { - // - // orderService.addOrderForm(customer, customerBasketIdList, - // customerAddressBook, deliveryAddressBook, - // billingAddressBook, paymentMethod, deliveryMethod, - // orderCardInfo, subTotalPrice, tax, deliveryPrice, - // paymentFee, totalPrice); - // List list = orderService - // .getOrderFormListByPager(new OrderFormPager()); - // assertEquals("addOrderForm", ctx.getExpected(), list); - // } catch (Exception e) { - // // TODO: handle exception - // } - // } - - public void deleteOrderForm() { - orderService.deleteOrderForm(BigDecimal.valueOf(2)); - List list = orderService - .getOrderFormListByPager(new OrderFormPager()); - // assertEquals("deleteOrderForm", ctx.getExpected(), list); - } - - //TODO need to update - // public void getCardTypeDescriptionList() { - // List list = - // orderService.getCardTypeDescriptionList("en_US"); - // assertEquals("getCardTypeDescriptionList", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getDeliveryMethodDescription() { - // DeliveryMethodDescription d = - // orderService.getDeliveryMethodDescription(BigDecimal.valueOf(2), "ja_JP"); - // assertEquals("getDeliveryMethodDescription", ctx.getExpected(), d); - // } - - //TODO need to update - // public void getDeliveryMethodDescriptionList() { - // List list = - // orderService.getDeliveryMethodDescriptionList("en_US"); - // assertEquals("getDeliveryMethodDescriptionList", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getOrderCardInfo() { - // OrderCardInfo info = - // orderService.getOrderCardInfo(BigDecimal.valueOf(2)); - // assertEquals("getOrderCardInfo", ctx.getExpected(), info); - // } - - //TODO need to update - // public void getOrderForm() { - // OrderForm orderForm = - // orderService.getOrderForm(BigDecimal.valueOf(3)); - // assertEquals("getOrderForm", ctx.getExpected(), orderForm); - // } - - //TODO need to update - // public void getOrderFormCountByOrderStatus() { - // assertEquals("getOrderFormCountByOrderStatus", 5, - // orderService.getOrderFormCountByOrderStatus(BigDecimal.valueOf(1))); - // } - - //TODO need to update - // public void getOrderFormList() { - // List list = orderService.getOrderFormList(); - // assertEquals("getOrderFormList", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getOrderFormListByPager() { - // OrderFormPager orderFormPager = new OrderFormPager(); - // orderFormPager.setPageSize(2); - // orderFormPager.setCurrentPageNumber(2); - // orderFormPager.setOrderStatusId(BigDecimal.valueOf(1)); - // // TODO setSortOrder - //// orderFormPager.setSortOrder("sortOrder"); - // - // List list = - // orderService.getOrderFormListByPager(orderFormPager); - // assertEquals("getOrderFormListByPager", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getOrderNotification() { - // OrderNotification orderNotification = - // orderService.getOrderNotification(BigDecimal.valueOf(4)); - // assertEquals("getOrderNotification", ctx.getExpected(), orderNotification); - // } - - // // TODO - // public void getOrderNotificationListByOrderFormId() { - // List list = - // orderService.getOrderNotificationListByOrderFormId( - // BigDecimal.valueOf(3)); - // assertEquals("getOrderNotificationListByOrderFormId", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getOrderProductListByOrderFormId() { - // List list = - // orderService.getOrderProductListByOrderFormId(BigDecimal.valueOf(4)); - // assertEquals("getOrderProductListByOrderFormId", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getOrderStatus() { - // OrderStatus os = orderService.getOrderStatus( - // BigDecimal.valueOf(2)); - // assertEquals("getOrderStatus", ctx.getExpected(), os); - // } - - //TODO need to update - // public void getOrderStatusDescriptionList() { - // List list = - // orderService.getOrderStatusDescriptionList("ja_JP"); - // assertEquals("getOrderStatusDescriptionList", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getPaymentMethodDescription() { - // PaymentMethodDescription d = - // orderService.getPaymentMethodDescription( - // BigDecimal.valueOf(3), "ja_JP"); - // assertEquals("getPaymentMethodDescription", ctx.getExpected(), d); - // } - - // public void getPaymentMethodDescriptionList() { - // - // assertEquals("getPaymentMethodDescriptionList", ctx.getExpected(), actual); - // } - - // public void sendOrderNotifications() { - // - // assertEquals("sendOrderNotifications", ctx.getExpected(), actual); - // } - - //TODO need to update - // public void updateDeliveryMethodDescription() { - // DeliveryMethodDescription d = orderService.getDeliveryMethodDescription(BigDecimal.valueOf(1), "ja_JP"); - // d.setDescription("updated description"); - // d.setName("updated name"); - // orderService.updateDeliveryMethodDescription(d); - // assertEquals("updateDeliveryMethodDescription", ctx.getExpected(), - // orderService.getDeliveryMethodDescriptionList("ja_JP")); - // } - - // public void updateOrderForm() { - // orderService.getOrderForm(BigDecimal.valueOf(1)); - // - // - // assertEquals("updateOrderForm", ctx.getExpected(), actual); - // } -} +//package jp.sf.pal.pompei.service.impl; +// +//import static org.junit.Assert.assertEquals; +// +//import java.math.BigDecimal; +//import java.util.List; +// +//import jp.sf.pal.pompei.exbhv.DeliveryMethodBhv; +//import jp.sf.pal.pompei.exbhv.PaymentMethodBhv; +//import jp.sf.pal.pompei.exentity.OrderForm; +//import jp.sf.pal.pompei.pager.OrderFormPager; +//import jp.sf.pal.pompei.service.CustomerService; +//import jp.sf.pal.pompei.service.OrderService; +// +//import org.junit.runner.RunWith; +//import org.seasar.framework.unit.Seasar2; +//import org.seasar.framework.unit.TestContext; +// +//@RunWith(Seasar2.class) +//public class OrderServiceImplTest { +// private TestContext ctx; +// +// private OrderService orderService; +// +// private CustomerService customerService; +// +// private transient PaymentMethodBhv paymentMethodBhv; +// +// private transient DeliveryMethodBhv deliveryMethodBhv; +// +// //TODO need to update +// // public void addOrderForm() { +// // Customer customer = customerService.getCustomer(BigDecimal.valueOf(1)); +// // List customerBasketIdList = new ArrayList(); +// // customerBasketIdList.add(BigDecimal.valueOf(1)); +// // customerBasketIdList.add(BigDecimal.valueOf(2)); +// // AddressBook customerAddressBook = customerService +// // .getAddressBook(BigDecimal.valueOf(1)); +// // AddressBook deliveryAddressBook = customerService +// // .getAddressBook(BigDecimal.valueOf(1)); +// // AddressBook billingAddressBook = customerService +// // .getAddressBook(BigDecimal.valueOf(1)); +// // // set payment method +// // PaymentMethodCB paymentMethodCB = new PaymentMethodCB(); +// // paymentMethodCB.query().setPaymentMethodId_Equal(BigDecimal.valueOf(1)); +// // PaymentMethod paymentMethod = paymentMethodBhv +// // .selectEntity(paymentMethodCB); +// // // set delivery method +// // DeliveryMethodCB deliveryMethodCB = new DeliveryMethodCB(); +// // deliveryMethodCB.query().setDeliveryMethodId_Equal( +// // BigDecimal.valueOf(1)); +// // DeliveryMethod deliveryMethod = deliveryMethodBhv +// // .selectEntity(deliveryMethodCB); +// // // set order card info +// // // TODO +// // OrderCardInfo orderCardInfo = new OrderCardInfo(); +// // // orderCardInfo.setCardTypeId(BigDecimal.valueOf(1)); +// // // orderCardInfo.setCardTypeCode() +// // // set sub total price +// // BigDecimal subTotalPrice = null; +// // // set tax +// // BigDecimal tax = null; +// // // set delivery price +// // BigDecimal deliveryPrice = null; +// // // set payment fee +// // BigDecimal paymentFee = null; +// // // set total price +// // BigDecimal totalPrice = null; +// // +// // try { +// // +// // orderService.addOrderForm(customer, customerBasketIdList, +// // customerAddressBook, deliveryAddressBook, +// // billingAddressBook, paymentMethod, deliveryMethod, +// // orderCardInfo, subTotalPrice, tax, deliveryPrice, +// // paymentFee, totalPrice); +// // List list = orderService +// // .getOrderFormListByPager(new OrderFormPager()); +// // assertEquals("addOrderForm", ctx.getExpected(), list); +// // } catch (Exception e) { +// // // TODO: handle exception +// // } +// // } +// +// public void deleteOrderForm() { +// orderService.deleteOrderForm(BigDecimal.valueOf(2)); +// List list = orderService +// .getOrderFormListByPager(new OrderFormPager()); +// // assertEquals("deleteOrderForm", ctx.getExpected(), list); +// } +// +// //TODO need to update +// // public void getCardTypeDescriptionList() { +// // List list = +// // orderService.getCardTypeDescriptionList("en_US"); +// // assertEquals("getCardTypeDescriptionList", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getDeliveryMethodDescription() { +// // DeliveryMethodDescription d = +// // orderService.getDeliveryMethodDescription(BigDecimal.valueOf(2), "ja_JP"); +// // assertEquals("getDeliveryMethodDescription", ctx.getExpected(), d); +// // } +// +// //TODO need to update +// // public void getDeliveryMethodDescriptionList() { +// // List list = +// // orderService.getDeliveryMethodDescriptionList("en_US"); +// // assertEquals("getDeliveryMethodDescriptionList", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getOrderCardInfo() { +// // OrderCardInfo info = +// // orderService.getOrderCardInfo(BigDecimal.valueOf(2)); +// // assertEquals("getOrderCardInfo", ctx.getExpected(), info); +// // } +// +// //TODO need to update +// // public void getOrderForm() { +// // OrderForm orderForm = +// // orderService.getOrderForm(BigDecimal.valueOf(3)); +// // assertEquals("getOrderForm", ctx.getExpected(), orderForm); +// // } +// +// //TODO need to update +// // public void getOrderFormCountByOrderStatus() { +// // assertEquals("getOrderFormCountByOrderStatus", 5, +// // orderService.getOrderFormCountByOrderStatus(BigDecimal.valueOf(1))); +// // } +// +// //TODO need to update +// // public void getOrderFormList() { +// // List list = orderService.getOrderFormList(); +// // assertEquals("getOrderFormList", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getOrderFormListByPager() { +// // OrderFormPager orderFormPager = new OrderFormPager(); +// // orderFormPager.setPageSize(2); +// // orderFormPager.setCurrentPageNumber(2); +// // orderFormPager.setOrderStatusId(BigDecimal.valueOf(1)); +// // // TODO setSortOrder +// //// orderFormPager.setSortOrder("sortOrder"); +// // +// // List list = +// // orderService.getOrderFormListByPager(orderFormPager); +// // assertEquals("getOrderFormListByPager", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getOrderNotification() { +// // OrderNotification orderNotification = +// // orderService.getOrderNotification(BigDecimal.valueOf(4)); +// // assertEquals("getOrderNotification", ctx.getExpected(), orderNotification); +// // } +// +// // // TODO +// // public void getOrderNotificationListByOrderFormId() { +// // List list = +// // orderService.getOrderNotificationListByOrderFormId( +// // BigDecimal.valueOf(3)); +// // assertEquals("getOrderNotificationListByOrderFormId", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getOrderProductListByOrderFormId() { +// // List list = +// // orderService.getOrderProductListByOrderFormId(BigDecimal.valueOf(4)); +// // assertEquals("getOrderProductListByOrderFormId", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getOrderStatus() { +// // OrderStatus os = orderService.getOrderStatus( +// // BigDecimal.valueOf(2)); +// // assertEquals("getOrderStatus", ctx.getExpected(), os); +// // } +// +// //TODO need to update +// // public void getOrderStatusDescriptionList() { +// // List list = +// // orderService.getOrderStatusDescriptionList("ja_JP"); +// // assertEquals("getOrderStatusDescriptionList", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getPaymentMethodDescription() { +// // PaymentMethodDescription d = +// // orderService.getPaymentMethodDescription( +// // BigDecimal.valueOf(3), "ja_JP"); +// // assertEquals("getPaymentMethodDescription", ctx.getExpected(), d); +// // } +// +// // public void getPaymentMethodDescriptionList() { +// // +// // assertEquals("getPaymentMethodDescriptionList", ctx.getExpected(), actual); +// // } +// +// // public void sendOrderNotifications() { +// // +// // assertEquals("sendOrderNotifications", ctx.getExpected(), actual); +// // } +// +// //TODO need to update +// // public void updateDeliveryMethodDescription() { +// // DeliveryMethodDescription d = orderService.getDeliveryMethodDescription(BigDecimal.valueOf(1), "ja_JP"); +// // d.setDescription("updated description"); +// // d.setName("updated name"); +// // orderService.updateDeliveryMethodDescription(d); +// // assertEquals("updateDeliveryMethodDescription", ctx.getExpected(), +// // orderService.getDeliveryMethodDescriptionList("ja_JP")); +// // } +// +// // public void updateOrderForm() { +// // orderService.getOrderForm(BigDecimal.valueOf(1)); +// // +// // +// // assertEquals("updateOrderForm", ctx.getExpected(), actual); +// // } +//} Modified: pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/ProductServiceImplTest.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/ProductServiceImplTest.java 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/ProductServiceImplTest.java 2008-04-08 04:59:55 UTC (rev 879) @@ -1,263 +1,263 @@ -package jp.sf.pal.pompei.service.impl; - -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; - -import jp.sf.pal.pompei.service.ProductService; - -import org.junit.runner.RunWith; -import org.seasar.framework.unit.Seasar2; -import org.seasar.framework.unit.TestContext; - - @ RunWith(Seasar2.class) -public class ProductServiceImplTest { - private TestContext ctx; - - private ProductService productService; - - //TODO need to update - // public void addCategoryDescription() { - // // test passed - // Category category = new Category(); - // - // category.setParentCategoryId(BigDecimal.valueOf(1)); - // category.setNumOfProduct(BigDecimal.valueOf(10)); - // category.setStatus(BigDecimal.valueOf(1)); - // category.setSortOrder(BigDecimal.valueOf(1)); - // - // CategoryDescription categoryDescription = new CategoryDescription(); - // - // categoryDescription.setCategory(category); - // categoryDescription.setLanguage("ja_JP"); - // categoryDescription.setName("d6"); - // - // productService.addCategoryDescription(categoryDescription); - // - // assertEquals("addCategoryDescription(CategoryDescription)", ctx.getExpected() - // , productService.getCategoryDescription(BigDecimal.valueOf(6), "ja_JP")); - // } - - // public void addManufactureDescription() { - // Manufacturer manufacturer = new Manufacturer(); - // - // manufacturer.setFileDataId(BigDecimal.valueOf(4)); - // - // ManufacturerDescription manufacturerDescription = new ManufacturerDescription(); - // - // manufacturerDescription.setManufacturer(manufacturer); - // manufacturerDescription.setContent("content5"); - // manufacturerDescription.setLanguage("ja_JP"); - // manufacturerDescription.setName("test5"); - // manufacturerDescription.setUrl("http://"); - // - // productService.addManufactureDescription(manufacturerDescription); - // - // assertEquals("addManufactureDescription(ManufacturerDescription)", ctx.getExpected() - // , productService.getManufactureDescription(BigDecimal.valueOf(5), "ja_JP")); - // } - - //TODO need to update - // public void addProductDescription() throws PompeiDBException { - // Product product = new Product(); - // - // product.setModel("A"); - // product.setCode("abc8"); - // product.setStock(BigDecimal.valueOf(99)); - // product.setPrice(BigDecimal.valueOf(5000)); - // product.setWeight(BigDecimal.valueOf(500)); - // product.setSize("M"); - // product.setStatus(BigDecimal.valueOf(1)); - // product.setLimitPurchase(BigDecimal.valueOf(2)); - // product.setReleaseDate(Timestamp.valueOf("2000-01-01 00:00:00")); - // product.setStartDate(Timestamp.valueOf("2000-01-01 00:00:00")); - // product.setEndDate(Timestamp.valueOf("2010-12-31 23:59:59")); - // product.setFileDataId(BigDecimal.valueOf(4)); - // product.setManufacturerId(BigDecimal.valueOf(3)); - // product.setTaxTypeId(BigDecimal.valueOf(1)); - // product.setDeliveryTypeId(BigDecimal.valueOf(1)); - // - // ProductDescription productDescription = new ProductDescription(); - // - // productDescription.setProduct(product); - // productDescription.setName("product8"); - // productDescription.setTitle("title8"); - // productDescription.setDescription("test8"); - // productDescription.setUrl("http://"); - // productDescription.setLanguage("ja_JP"); - // - // productService.addProductDescription(productDescription, BigDecimal.valueOf(1)); - // - // assertEquals("addProductDescription(ProductDescription, BigDecimal)", ctx.getExpected() - // , productService.getProductDescription(BigDecimal.valueOf(8), "ja_JP")); - // } - - // public void deleteCategory() { - // productService.deleteCategory(BigDecimal.valueOf(4)); - // List list = productService.getSubCategoryDescriptionList(BigDecimal.valueOf(1), "ja_JP"); - // - // assertEquals("deleteCategory(BigDecimal)", ctx.getExpected(), list); - // } - // - // public void deleteManufacture() { - // productService.deleteManufacture(BigDecimal.valueOf(2)); - // List list = productService.getManufacturerList(); - // - // assertEquals("deleteManufacture", ctx.getExpected(), list); - // } - // - // public void deleteProduct() { - // productService.deleteProduct(BigDecimal.valueOf(4)); - // List list = productService.getProductList(BigDecimal.valueOf(2)); - // - // assertEquals("deleteProduct", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getCategoryDescription() { - // // test passed - // CategoryDescription categoryDescription = productService - // .getCategoryDescription(BigDecimal.valueOf(2), "en_US"); - // assertEquals("getCategoryDescription(categoryId, language)", ctx.getExpected(), - // categoryDescription); - // } - - //TODO need to update - // public void getCategoryDescriptionBreadcrumb() { - // // test passed - // List cdList = productService - // .getCategoryDescriptionBreadcrumb(BigDecimal.valueOf(5), "ja_JP"); - // assertEquals("getCategoryDescriptionBreadcrumb(categoryId)", ctx.getExpected(), - // cdList); - // } - - //TODO need to update - // public void getManufacturerDescription() { - // // test passed - // ManufacturerDescription manufacturerDescription = productService - // .getManufactureDescription(BigDecimal.valueOf(3), "en_US"); - // assertEquals("getManufacturerDescription", ctx.getExpected(), manufacturerDescription); - // } - - //TODO need to update - // public void getManufactureDescriptionList1() { - // // test passed - // List list = productService - // .getManufactureDescriptionList(); - // assertEquals("getManufactureDescriptionList1", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getManufactureDescriptionList2() { - // // test passed - // List list = productService - // .getManufactureDescriptionList("ja_JP"); - // assertEquals("getManufactureDescriptionList2", ctx.getExpected(), list); - // } - - // public void getManufacturer() { - // Manufacturer manufacturer = productService - // .getManufacturer(BigDecimal.valueOf(3)); - // assertEquals("getManufacturer", ctx.getExpected(), manufacturer); - // } - // - // public void getManufacturerList() { - // List list = productService.getManufacturerList(); - // assertEquals("getManufacturerList", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getProduct() { - // // test Passed - // Product product = productService - // .getProduct(BigDecimal.valueOf(5)); - // assertEquals("getProdcut", ctx.getExpected(), product); - // } - - //TODO need to update - // public void getProductDescription() { - // // test Passed - // ProductDescription productDescription = productService - // .getProductDescription(BigDecimal.valueOf(7), "en_US"); - // assertEquals("getProdcutDescription", ctx.getExpected(), productDescription); - // } - - //TODO need to update - // public void getProductList() { - // // test Passed - // List list = productService - // .getProductList(BigDecimal.valueOf(2)); - // assertEquals("getProductList", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getProductListByPager() { - // ProductPager productPager = new ProductPager(); - // productPager.setCategoryId(BigDecimal.valueOf(5)); - // productPager.setPageSize(3); - // productPager.setCurrentPageNumber(2); - //// productPager.setOrderMode("orderMode"); - // - // List list = productService - // .getProductListByPager(productPager); - // assertEquals("getProductListByPager", ctx.getExpected(), list); - // } - - //TODO need to update - // public void getSubCategoryDescriptionList() { - // // test passed - // List list = productService - // .getSubCategoryDescriptionList(BigDecimal.valueOf(1), "ja_JP"); - // assertEquals("getSubCategoryDescriptionList", ctx.getExpected(), list); - // } - - // public void getTopProductList() { - // List list = productService.getTopProductList(type, num); - // assertEquals("getTopProductList", ctx.getExpected(), list); - // } - - public void hasChildCategory() { - // test passed - boolean hasChildCategory = productService.hasChildCategory(BigDecimal - .valueOf(1)); - assertEquals("hasChildCategory", true, hasChildCategory); - } - - //TODO need to update - // public void updateCategoryDescription() { - // CategoryDescription d = - // productService.getCategoryDescription(BigDecimal.valueOf(3), "ja_JP"); - // d.setName("d3 updated"); - // d.setLanguage("en_US"); - // productService.updateCategoryDescription(d); - // d = productService.getCategoryDescription(BigDecimal.valueOf(3), "en_US"); - // assertEquals("updateCategoryDescription", ctx.getExpected(), d); - // } - - //TODO need to update - // public void updateManufactureDescription() { - // ManufacturerDescription d = - // productService.getManufactureDescription(BigDecimal.valueOf(3), "ja_JP"); - // d.setName("test3 updated"); - // d.setUrl("http://updated"); - // d.setContent("content3 updated"); - // d.setLanguage("en_US"); - // productService.updateManufactureDescription(d); - // d = productService.getManufactureDescription(BigDecimal.valueOf(3), "ja_JP"); - // assertEquals("updateManufactureDescription", ctx.getExpected(), d); - // } - - //TODO need to update - // public void updateProductDescription() throws PompeiDBException { - // ProductDescription d = - // productService.getProductDescription(BigDecimal.valueOf(3), "ja_JP"); - // d.setName("product3 updated"); - // d.setTitle("title3 updated"); - // d.setDescription("test3 updated"); - // d.setUrl("http://updated"); - // d.setLanguage("en_US"); - // productService.updateProductDescription(d); - // d = productService.getProductDescription(BigDecimal.valueOf(3), "en_US"); - // assertEquals("updateProductDescription", ctx.getExpected(), d); - // } -} +//package jp.sf.pal.pompei.service.impl; +// +//import static org.junit.Assert.assertEquals; +// +//import java.math.BigDecimal; +// +//import jp.sf.pal.pompei.service.ProductService; +// +//import org.junit.runner.RunWith; +//import org.seasar.framework.unit.Seasar2; +//import org.seasar.framework.unit.TestContext; +// +//@RunWith(Seasar2.class) +//public class ProductServiceImplTest { +// private TestContext ctx; +// +// private ProductService productService; +// +// //TODO need to update +// // public void addCategoryDescription() { +// // // test passed +// // Category category = new Category(); +// // +// // category.setParentCategoryId(BigDecimal.valueOf(1)); +// // category.setNumOfProduct(BigDecimal.valueOf(10)); +// // category.setStatus(BigDecimal.valueOf(1)); +// // category.setSortOrder(BigDecimal.valueOf(1)); +// // +// // CategoryDescription categoryDescription = new CategoryDescription(); +// // +// // categoryDescription.setCategory(category); +// // categoryDescription.setLanguage("ja_JP"); +// // categoryDescription.setName("d6"); +// // +// // productService.addCategoryDescription(categoryDescription); +// // +// // assertEquals("addCategoryDescription(CategoryDescription)", ctx.getExpected() +// // , productService.getCategoryDescription(BigDecimal.valueOf(6), "ja_JP")); +// // } +// +// // public void addManufactureDescription() { +// // Manufacturer manufacturer = new Manufacturer(); +// // +// // manufacturer.setFileDataId(BigDecimal.valueOf(4)); +// // +// // ManufacturerDescription manufacturerDescription = new ManufacturerDescription(); +// // +// // manufacturerDescription.setManufacturer(manufacturer); +// // manufacturerDescription.setContent("content5"); +// // manufacturerDescription.setLanguage("ja_JP"); +// // manufacturerDescription.setName("test5"); +// // manufacturerDescription.setUrl("http://"); +// // +// // productService.addManufactureDescription(manufacturerDescription); +// // +// // assertEquals("addManufactureDescription(ManufacturerDescription)", ctx.getExpected() +// // , productService.getManufactureDescription(BigDecimal.valueOf(5), "ja_JP")); +// // } +// +// //TODO need to update +// // public void addProductDescription() throws PompeiDBException { +// // Product product = new Product(); +// // +// // product.setModel("A"); +// // product.setCode("abc8"); +// // product.setStock(BigDecimal.valueOf(99)); +// // product.setPrice(BigDecimal.valueOf(5000)); +// // product.setWeight(BigDecimal.valueOf(500)); +// // product.setSize("M"); +// // product.setStatus(BigDecimal.valueOf(1)); +// // product.setLimitPurchase(BigDecimal.valueOf(2)); +// // product.setReleaseDate(Timestamp.valueOf("2000-01-01 00:00:00")); +// // product.setStartDate(Timestamp.valueOf("2000-01-01 00:00:00")); +// // product.setEndDate(Timestamp.valueOf("2010-12-31 23:59:59")); +// // product.setFileDataId(BigDecimal.valueOf(4)); +// // product.setManufacturerId(BigDecimal.valueOf(3)); +// // product.setTaxTypeId(BigDecimal.valueOf(1)); +// // product.setDeliveryTypeId(BigDecimal.valueOf(1)); +// // +// // ProductDescription productDescription = new ProductDescription(); +// // +// // productDescription.setProduct(product); +// // productDescription.setName("product8"); +// // productDescription.setTitle("title8"); +// // productDescription.setDescription("test8"); +// // productDescription.setUrl("http://"); +// // productDescription.setLanguage("ja_JP"); +// // +// // productService.addProductDescription(productDescription, BigDecimal.valueOf(1)); +// // +// // assertEquals("addProductDescription(ProductDescription, BigDecimal)", ctx.getExpected() +// // , productService.getProductDescription(BigDecimal.valueOf(8), "ja_JP")); +// // } +// +// // public void deleteCategory() { +// // productService.deleteCategory(BigDecimal.valueOf(4)); +// // List list = productService.getSubCategoryDescriptionList(BigDecimal.valueOf(1), "ja_JP"); +// // +// // assertEquals("deleteCategory(BigDecimal)", ctx.getExpected(), list); +// // } +// // +// // public void deleteManufacture() { +// // productService.deleteManufacture(BigDecimal.valueOf(2)); +// // List list = productService.getManufacturerList(); +// // +// // assertEquals("deleteManufacture", ctx.getExpected(), list); +// // } +// // +// // public void deleteProduct() { +// // productService.deleteProduct(BigDecimal.valueOf(4)); +// // List list = productService.getProductList(BigDecimal.valueOf(2)); +// // +// // assertEquals("deleteProduct", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getCategoryDescription() { +// // // test passed +// // CategoryDescription categoryDescription = productService +// // .getCategoryDescription(BigDecimal.valueOf(2), "en_US"); +// // assertEquals("getCategoryDescription(categoryId, language)", ctx.getExpected(), +// // categoryDescription); +// // } +// +// //TODO need to update +// // public void getCategoryDescriptionBreadcrumb() { +// // // test passed +// // List cdList = productService +// // .getCategoryDescriptionBreadcrumb(BigDecimal.valueOf(5), "ja_JP"); +// // assertEquals("getCategoryDescriptionBreadcrumb(categoryId)", ctx.getExpected(), +// // cdList); +// // } +// +// //TODO need to update +// // public void getManufacturerDescription() { +// // // test passed +// // ManufacturerDescription manufacturerDescription = productService +// // .getManufactureDescription(BigDecimal.valueOf(3), "en_US"); +// // assertEquals("getManufacturerDescription", ctx.getExpected(), manufacturerDescription); +// // } +// +// //TODO need to update +// // public void getManufactureDescriptionList1() { +// // // test passed +// // List list = productService +// // .getManufactureDescriptionList(); +// // assertEquals("getManufactureDescriptionList1", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getManufactureDescriptionList2() { +// // // test passed +// // List list = productService +// // .getManufactureDescriptionList("ja_JP"); +// // assertEquals("getManufactureDescriptionList2", ctx.getExpected(), list); +// // } +// +// // public void getManufacturer() { +// // Manufacturer manufacturer = productService +// // .getManufacturer(BigDecimal.valueOf(3)); +// // assertEquals("getManufacturer", ctx.getExpected(), manufacturer); +// // } +// // +// // public void getManufacturerList() { +// // List list = productService.getManufacturerList(); +// // assertEquals("getManufacturerList", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getProduct() { +// // // test Passed +// // Product product = productService +// // .getProduct(BigDecimal.valueOf(5)); +// // assertEquals("getProdcut", ctx.getExpected(), product); +// // } +// +// //TODO need to update +// // public void getProductDescription() { +// // // test Passed +// // ProductDescription productDescription = productService +// // .getProductDescription(BigDecimal.valueOf(7), "en_US"); +// // assertEquals("getProdcutDescription", ctx.getExpected(), productDescription); +// // } +// +// //TODO need to update +// // public void getProductList() { +// // // test Passed +// // List list = productService +// // .getProductList(BigDecimal.valueOf(2)); +// // assertEquals("getProductList", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getProductListByPager() { +// // ProductPager productPager = new ProductPager(); +// // productPager.setCategoryId(BigDecimal.valueOf(5)); +// // productPager.setPageSize(3); +// // productPager.setCurrentPageNumber(2); +// //// productPager.setOrderMode("orderMode"); +// // +// // List list = productService +// // .getProductListByPager(productPager); +// // assertEquals("getProductListByPager", ctx.getExpected(), list); +// // } +// +// //TODO need to update +// // public void getSubCategoryDescriptionList() { +// // // test passed +// // List list = productService +// // .getSubCategoryDescriptionList(BigDecimal.valueOf(1), "ja_JP"); +// // assertEquals("getSubCategoryDescriptionList", ctx.getExpected(), list); +// // } +// +// // public void getTopProductList() { +// // List list = productService.getTopProductList(type, num); +// // assertEquals("getTopProductList", ctx.getExpected(), list); +// // } +// +// public void hasChildCategory() { +// // test passed +// boolean hasChildCategory = productService.hasChildCategory(BigDecimal +// .valueOf(1)); +// assertEquals("hasChildCategory", true, hasChildCategory); +// } +// +// //TODO need to update +// // public void updateCategoryDescription() { +// // CategoryDescription d = +// // productService.getCategoryDescription(BigDecimal.valueOf(3), "ja_JP"); +// // d.setName("d3 updated"); +// // d.setLanguage("en_US"); +// // productService.updateCategoryDescription(d); +// // d = productService.getCategoryDescription(BigDecimal.valueOf(3), "en_US"); +// // assertEquals("updateCategoryDescription", ctx.getExpected(), d); +// // } +// +// //TODO need to update +// // public void updateManufactureDescription() { +// // ManufacturerDescription d = +// // productService.getManufactureDescription(BigDecimal.valueOf(3), "ja_JP"); +// // d.setName("test3 updated"); +// // d.setUrl("http://updated"); +// // d.setContent("content3 updated"); +// // d.setLanguage("en_US"); +// // productService.updateManufactureDescription(d); +// // d = productService.getManufactureDescription(BigDecimal.valueOf(3), "ja_JP"); +// // assertEquals("updateManufactureDescription", ctx.getExpected(), d); +// // } +// +// //TODO need to update +// // public void updateProductDescription() throws PompeiDBException { +// // ProductDescription d = +// // productService.getProductDescription(BigDecimal.valueOf(3), "ja_JP"); +// // d.setName("product3 updated"); +// // d.setTitle("title3 updated"); +// // d.setDescription("test3 updated"); +// // d.setUrl("http://updated"); +// // d.setLanguage("en_US"); +// // productService.updateProductDescription(d); +// // d = productService.getProductDescription(BigDecimal.valueOf(3), "en_US"); +// // assertEquals("updateProductDescription", ctx.getExpected(), d); +// // } +//} Modified: pompei/libraries/pompei-db/trunk/src/test/resources/jdbc.dicon =================================================================== --- pompei/libraries/pompei-db/trunk/src/test/resources/jdbc.dicon 2008-04-08 04:39:30 UTC (rev 878) +++ pompei/libraries/pompei-db/trunk/src/test/resources/jdbc.dicon 2008-04-08 04:59:55 UTC (rev 879) @@ -28,7 +28,7 @@ "jdbc:h2:file:" - + @org.seasar.framework.util.ResourceUtil @ getBuildDir(@jp.sf.pal.pompei.PompeiTestConstants @ class).getCanonicalPath() + + @org.seasar.framework.util.ResourceUtil @ getBuildDir(@jp.sf.pal.pompei.PompeiConstants @ class).getCanonicalPath() + "/db/pompei" "sa" From svnnotify @ sourceforge.jp Tue Apr 8 14:03:45 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 08 Apr 2008 14:03:45 +0900 Subject: [pal-cvs 3144] [880] replaced with pompei-db. Message-ID: <1207631025.068782.25043.nullmailer@users.sourceforge.jp> Revision: 880 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=880 Author: shinsuke Date: 2008-04-08 14:03:44 +0900 (Tue, 08 Apr 2008) Log Message: ----------- replaced with pompei-db. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/.classpath pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs pompei/portlets/pompei-core/trunk/pom.xml pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/config/sql/ pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_data.sql pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_sample_data.sql pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/ pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_over.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_down.png pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_over.png Removed Paths: ------------- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/converter/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/.classpath =================================================================== --- pompei/portlets/pompei-core/trunk/.classpath 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/.classpath 2008-04-08 05:03:44 UTC (rev 880) @@ -8,49 +8,48 @@ - - + + + + - - + + + - - - - + + - - - + + - + + + - - - + + - - Modified: pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/.settings/org.eclipse.jdt.ui.prefs 2008-04-08 05:03:44 UTC (rev 880) @@ -1,6 +1,6 @@ -#Tue Jul 24 13:39:37 JST 2007 +#Thu Oct 11 09:30:41 JST 2007 eclipse.preferences.version=1 formatter_profile=_Seasar formatter_settings_version=11 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.text.custom_code_templates= Modified: pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs =================================================================== --- pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/.settings/org.seasar.dolteng.eclipse.prefs 2008-04-08 05:03:44 UTC (rev 880) @@ -1,4 +1,4 @@ -#Sun Aug 26 07:25:31 JST 2007 +#Mon Nov 12 14:26:07 JST 2007 DaoType=S2Dao DefaultResourcePath=/pompei-core/src/main/resources DefaultRootPackage=jp.sf.pal.pompei Modified: pompei/portlets/pompei-core/trunk/pom.xml =================================================================== --- pompei/portlets/pompei-core/trunk/pom.xml 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/pom.xml 2008-04-08 05:03:44 UTC (rev 880) @@ -5,7 +5,7 @@ pompei-core war Pompei - 0.0.2-SNAPSHOT + 0.1.0-SNAPSHOT Portalet for constructing EC site http://pal.sourceforge.jp/ 2005 @@ -22,8 +22,6 @@ takeharu Takeharu Yamaguchi - TBD - TBD +9 @@ -72,9 +70,9 @@ maven-antrun-plugin - org.apache.derby - derby - 10.2.2.0 + com.h2database + h2 + 1.0.65 @@ -83,11 +81,10 @@ clean - - - - - + + + + @@ -112,6 +109,12 @@ http://maven.seasar.org/maven2 + maven.marevol.com + Maven2 Repository on marevol.com + http://maven.marevol.com/ + legacy + + maven2.marevol.com Maven2 Repository on marevol.com http://maven2.marevol.com/ @@ -130,7 +133,7 @@ 1.4 test - + xerces xercesImpl @@ -194,12 +198,12 @@ org.seasar.container s2-framework - 2.4.17 + 2.4.24 org.seasar.container s2-extension - 2.4.17 + 2.4.24 log4j @@ -210,7 +214,7 @@ org.seasar.container s2-tiger - 2.4.17 + 2.4.24 org.easymock @@ -221,9 +225,9 @@ org.seasar.teeda teeda-extension - 1.0.12-SNAPSHOT + 1.0.13-rc6 - org.seasar.dao s2-dao - 1.0.46 + 1.0.47 org.seasar.dao s2-dao-tiger - 1.0.46 + 1.0.47 - org.apache.derby - derby - 10.2.2.0 + com.h2database + h2 + 1.0.65 + provided - - - + org.apache.portals.jetspeed-2 jetspeed-api - 2.1.2_pal-1.0-beta6 - + 2.1.3_pal-1.0.3 + provided - + org.apache.portals.jetspeed-2 jetspeed-locator - 2.1.2_pal-1.0-beta6 + 2.1.3_pal-1.0.3 Deleted: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2008-04-08 05:03:44 UTC (rev 880) @@ -1,4481 +0,0 @@ - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - Copied: pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql (from rev 867, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql) =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql (rev 0) +++ pompei/portlets/pompei-core/trunk/src/main/config/sql/create_table.sql 2008-04-08 05:03:44 UTC (rev 880) @@ -0,0 +1,1117 @@ +DROP TABLE IF EXISTS ADDRESS_BOOK; +DROP TABLE IF EXISTS MANUFACTURER_INFO; +DROP TABLE IF EXISTS PRODUCT_INFO; +DROP TABLE IF EXISTS DELIVERY_ZONE_DESCRIPTION; +DROP TABLE IF EXISTS TAX_TYPE_DESCRIPTION; +DROP TABLE IF EXISTS COUNTRY_DESCRIPTION; +DROP TABLE IF EXISTS DELIVERY_TYPE_DESCRIPTION; +DROP TABLE IF EXISTS PAYMENT_STATUS_DESCRIPTION; +DROP TABLE IF EXISTS DELIVERY_STATUS_DESCRIPTION; +DROP TABLE IF EXISTS PRODUCT_ATTRIBUTE; +DROP TABLE IF EXISTS ORDER_PRODUCT_OPTION; +DROP TABLE IF EXISTS FAVORITE_PRODUCT; +DROP TABLE IF EXISTS PRODUCT_STATS; +DROP TABLE IF EXISTS BASKET_PRODUCT_OPTION; +DROP TABLE IF EXISTS PRODUCT_OPTION_VALUE_DESCRIPTION; +DROP TABLE IF EXISTS PRODUCT_OPTION_DESCRIPTION; +DROP TABLE IF EXISTS CATEGORY_INFO; +DROP TABLE IF EXISTS IMAGE_DATA; +DROP TABLE IF EXISTS FILE_TAG_TO_FILE_DATA; +DROP TABLE IF EXISTS ORDER_PAYMENT; +DROP TABLE IF EXISTS ORDER_DELIVERY; +DROP TABLE IF EXISTS PRODUCT_CONTENT; +DROP TABLE IF EXISTS PRODUCT_PAGE_INFO; +DROP TABLE IF EXISTS CATEGORY_CONTENT; +DROP TABLE IF EXISTS CATEGORY_PAGE_INFO; +DROP TABLE IF EXISTS MANUFACTURER_DESCRIPTION; +DROP TABLE IF EXISTS ORDER_NOTIFICATION; +DROP TABLE IF EXISTS ORDER_CARD_INFO; +DROP TABLE IF EXISTS CARD_TYPE_DESCRIPTION; +DROP TABLE IF EXISTS PAYMENT_METHOD_DESCRIPTION; +DROP TABLE IF EXISTS ORDER_STATUS_DESCRIPTION; +DROP TABLE IF EXISTS BARGAIN; +DROP TABLE IF EXISTS REVIEW_DESCRIPTION; +DROP TABLE IF EXISTS PRODUCT_TO_CATEGORY; +DROP TABLE IF EXISTS PRODUCT_NOTIFICATION; +DROP TABLE IF EXISTS PRODUCT_DESCRIPTION; +DROP TABLE IF EXISTS ORDER_COMMENT; +DROP TABLE IF EXISTS ORDER_STATUS_HISTORY; +DROP TABLE IF EXISTS DELIVERY_METHOD_DESCRIPTION; +DROP TABLE IF EXISTS PRODUCT_OPTION_VALUE; +DROP TABLE IF EXISTS ORDER_PRODUCT; +DROP TABLE IF EXISTS PRODUCT_OPTION; +DROP TABLE IF EXISTS REVIEW; +DROP TABLE IF EXISTS BASKET; +DROP TABLE IF EXISTS PRODUCT; +DROP TABLE IF EXISTS ORDER_FORM; +DROP TABLE IF EXISTS MANUFACTURER; +DROP TABLE IF EXISTS CATEGORY; +DROP TABLE IF EXISTS CUSTOMER; +DROP TABLE IF EXISTS DELIVERY_ZONE; +DROP TABLE IF EXISTS COUNTRY; +DROP TABLE IF EXISTS DELIVERY_TYPE; +DROP TABLE IF EXISTS FILE_TAG; +DROP TABLE IF EXISTS DELIVERY_STATUS; +DROP TABLE IF EXISTS PAYMENT_STATUS; +DROP TABLE IF EXISTS FILE_DATA; +DROP TABLE IF EXISTS CARD_TYPE; +DROP TABLE IF EXISTS PAYMENT_METHOD; +DROP TABLE IF EXISTS TAX_TYPE; +DROP TABLE IF EXISTS ORDER_STATUS; +DROP TABLE IF EXISTS DELIVERY_METHOD; + +CREATE TABLE DELIVERY_METHOD ( + DELIVERY_METHOD_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , OBJECT_NAME VARCHAR(128) NOT NULL + , STATUS INTEGER NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (DELIVERY_METHOD_ID) +); + +CREATE TABLE ORDER_STATUS ( + ORDER_STATUS_ID INTEGER NOT NULL AUTO_INCREMENT + , TYPE INTEGER NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (ORDER_STATUS_ID) +); + +CREATE TABLE TAX_TYPE ( + TAX_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , RATE DECIMAL(7, 4) NOT NULL + , SORT_ORDER INTEGER + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (TAX_TYPE_ID) +); + +CREATE TABLE PAYMENT_METHOD ( + PAYMENT_METHOD_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , OBJECT_NAME VARCHAR(128) NOT NULL + , STATUS INTEGER NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (PAYMENT_METHOD_ID) +); + +CREATE TABLE CARD_TYPE ( + CARD_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (CARD_TYPE_ID) +); + +CREATE TABLE FILE_DATA ( + FILE_DATA_ID BIGINT NOT NULL AUTO_INCREMENT + , NAME VARCHAR(100) NOT NULL + , FILE_TYPE VARCHAR(10) NOT NULL + , STATUS INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (FILE_DATA_ID) +); + +CREATE TABLE PAYMENT_STATUS ( + PAYMENT_STATUS_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , SORT_ORDER INTEGER + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (PAYMENT_STATUS_ID) +); + +CREATE TABLE DELIVERY_STATUS ( + DELIVERY_STATUS_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , SORT_ORDER INTEGER + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (DELIVERY_STATUS_ID) +); + +CREATE TABLE FILE_TAG ( + FILE_TAG_ID BIGINT NOT NULL AUTO_INCREMENT + , NAME VARCHAR(100) NOT NULL + , PRIMARY KEY (FILE_TAG_ID) +); + +CREATE TABLE DELIVERY_TYPE ( + DELIVERY_TYPE_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (DELIVERY_TYPE_ID) +); + +CREATE TABLE COUNTRY ( + COUNTRY_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (COUNTRY_ID) +); + +CREATE TABLE DELIVERY_ZONE ( + DELIVERY_ZONE_ID INTEGER NOT NULL AUTO_INCREMENT + , CODE VARCHAR(40) NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (DELIVERY_ZONE_ID) +); + +CREATE TABLE CUSTOMER ( + CUSTOMER_ID BIGINT NOT NULL AUTO_INCREMENT + , PORTAL_ID VARCHAR(255) NOT NULL + , GENDER CHAR(1) NOT NULL + , FIRSTNAME VARCHAR(40) NOT NULL + , LASTNAME VARCHAR(40) NOT NULL + , FIRSTNAME_DESCRIPTION VARCHAR(40) + , LASTNAME_DESCRIPTION VARCHAR(40) + , NICKNAME VARCHAR(64) + , DAY_OF_BIRTH DATE NOT NULL DEFAULT '0000-00-00 00:00:00' + , EMAIL_ADDRESS VARCHAR(128) NOT NULL + , CREATED_DATE TIMESTAMP NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (CUSTOMER_ID) +); + +CREATE TABLE CATEGORY ( + CATEGORY_ID INTEGER NOT NULL AUTO_INCREMENT + , PARENT_CATEGORY_ID INTEGER NOT NULL DEFAULT 0 + , FILE_DATA_ID BIGINT + , NUM_OF_PRODUCT INTEGER + , STATUS INTEGER NOT NULL + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (CATEGORY_ID) +); + +CREATE TABLE MANUFACTURER ( + MANUFACTURER_ID INTEGER NOT NULL AUTO_INCREMENT + , FILE_DATA_ID BIGINT + , SORT_ORDER INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (MANUFACTURER_ID) +); + +CREATE TABLE ORDER_FORM ( + ORDER_FORM_ID BIGINT NOT NULL AUTO_INCREMENT + , ORDER_FORM_NUMBER VARCHAR(40) NOT NULL + , CUSTOMER_ID BIGINT + , CUSTOMER_GENDER CHAR(1) NOT NULL + , CUSTOMER_FIRSTNAME VARCHAR(40) NOT NULL + , CUSTOMER_LASTNAME VARCHAR(40) NOT NULL + , CUSTOMER_FIRSTNAME_DESCRIPTION VARCHAR(40) + , CUSTOMER_LASTNAME_DESCRIPTION VARCHAR(40) + , CUSTOMER_DAY_OF_BIRTH DATE NOT NULL + , CUSTOMER_EMAIL_ADDRESS VARCHAR(200) NOT NULL + , CUSTOMER_COMPANY VARCHAR(120) + , CUSTOMER_DEPARTMENT VARCHAR(100) + , CUSTOMER_STREET_ADDRESS VARCHAR(240) NOT NULL + , CUSTOMER_SUBURB VARCHAR(40) + , CUSTOMER_CITY VARCHAR(80) NOT NULL + , CUSTOMER_STATE VARCHAR(40) + , CUSTOMER_POSTCODE VARCHAR(10) NOT NULL + , CUSTOMER_TELEPHONE VARCHAR(40) + , CUSTOMER_COUNTRY_CODE VARCHAR(40) NOT NULL + , CUSTOMER_LANGUAGE VARCHAR(20) NOT NULL + , BILLING_COMPANY VARCHAR(120) + , BILLING_DEPARTMENT VARCHAR(100) + , BILLING_FIRSTNAME VARCHAR(40) NOT NULL + , BILLING_LASTNAME VARCHAR(40) NOT NULL + , BILLING_FIRSTNAME_DESCRIPTION VARCHAR(40) + , BILLING_LASTNAME_DESCRIPTION VARCHAR(40) + , BILLING_STREET_ADDRESS VARCHAR(240) NOT NULL + , BILLING_SUBURB VARCHAR(40) + , BILLING_CITY VARCHAR(80) NOT NULL + , BILLING_STATE VARCHAR(40) + , BILLING_POSTCODE VARCHAR(10) NOT NULL + , BILLING_TELEPHONE VARCHAR(40) + , BILLING_COUNTRY_CODE VARCHAR(40) NOT NULL + , BILLING_LANGUAGE VARCHAR(20) NOT NULL + , ORDER_STATUS_ID INTEGER NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PURCHASED_DATE TIMESTAMP NOT NULL + , FINISHED_DATE TIMESTAMP + , PRIMARY KEY (ORDER_FORM_ID) +); + +CREATE TABLE PRODUCT ( + PRODUCT_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_MODE INTEGER NOT NULL + , CODE VARCHAR(40) NOT NULL + , MODEL VARCHAR(80) + , STOCK INTEGER + , CATALOG_PRICE DECIMAL(15, 4) + , PRICE DECIMAL(15, 4) NOT NULL + , WEIGHT DECIMAL(5, 2) + , SIZE VARCHAR(40) + , STATUS INTEGER NOT NULL + , LIMIT_PURCHASE INTEGER + , RELEASE_DATE TIMESTAMP + , START_DATE TIMESTAMP + , END_DATE TIMESTAMP + , FILE_DATA_ID BIGINT + , MANUFACTURER_ID INTEGER + , TAX_TYPE_ID INTEGER NOT NULL + , DELIVERY_TYPE_ID INTEGER NOT NULL + , CREATED_DATE TIMESTAMP NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (PRODUCT_ID) +); + +CREATE TABLE BASKET ( + BASKET_ID BIGINT NOT NULL AUTO_INCREMENT + , CUSTOMER_ID BIGINT NOT NULL + , PRODUCT_ID BIGINT NOT NULL + , QUANTITY INTEGER NOT NULL + , FINAL_PRICE DECIMAL(15, 4) + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (BASKET_ID) +); + +CREATE TABLE REVIEW ( + REVIEW_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , CUSTOMER_ID BIGINT + , CUSTOMER_NICKNAME VARCHAR(80) NOT NULL + , RATING INTEGER + , CREATED_DATE TIMESTAMP NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (REVIEW_ID) +); + +CREATE TABLE PRODUCT_OPTION ( + PRODUCT_OPTION_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , CODE VARCHAR(40) NOT NULL + , PRIMARY KEY (PRODUCT_OPTION_ID) +); + +CREATE TABLE ORDER_PRODUCT ( + ORDER_PRODUCT_ID BIGINT NOT NULL AUTO_INCREMENT + , ORDER_FORM_ID BIGINT NOT NULL + , PRODUCT_ID BIGINT NOT NULL + , MODEL VARCHAR(80) + , CODE VARCHAR(40) NOT NULL + , PRICE DECIMAL(15, 4) NOT NULL + , FINAL_PRICE DECIMAL(15, 4) NOT NULL + , TAX DECIMAL(7, 4) NOT NULL + , QUANTITY INTEGER NOT NULL + , PRODUCT_NAME VARCHAR(150) + , DISPLAY_PRODUCT_NAME VARCHAR(150) + , MANUFACTURER_NAME VARCHAR(80) + , DISPLAY_MANUFACTURER_NAME VARCHAR(80) + , PRIMARY KEY (ORDER_PRODUCT_ID) +); + +CREATE TABLE PRODUCT_OPTION_VALUE ( + PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_OPTION_ID BIGINT NOT NULL + , CODE VARCHAR(40) NOT NULL + , STOCK INTEGER + , PRIMARY KEY (PRODUCT_OPTION_VALUE_ID) +); + +CREATE TABLE DELIVERY_METHOD_DESCRIPTION ( + DELIVERY_METHOD_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , DELIVERY_METHOD_ID INTEGER NOT NULL DEFAULT 0 + , NAME VARCHAR(80) NOT NULL + , DESCRIPTION TEXT + , LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1' + , PRIMARY KEY (DELIVERY_METHOD_DESCRIPTION_ID) +); + +CREATE TABLE ORDER_STATUS_HISTORY ( + ORDER_STATUS_HISTORY_ID INTEGER NOT NULL AUTO_INCREMENT + , ORDER_FORM_ID BIGINT NOT NULL + , ORDER_STATUS_ID INTEGER NOT NULL + , CUSTOMER_NOTIFIED INTEGER DEFAULT 0 + , REMARK VARCHAR(200) + , CREATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (ORDER_STATUS_HISTORY_ID) +); + +CREATE TABLE ORDER_COMMENT ( + ORDER_COMMENT_ID BIGINT NOT NULL AUTO_INCREMENT + , ORDER_FORM_ID BIGINT NOT NULL + , TYPE INTEGER NOT NULL + , COMMENT TEXT + , PRIMARY KEY (ORDER_COMMENT_ID) +); + +CREATE TABLE PRODUCT_DESCRIPTION ( + PRODUCT_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , DESCRIPTION TEXT + , LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1' + , PRIMARY KEY (PRODUCT_DESCRIPTION_ID) +); + +CREATE TABLE PRODUCT_NOTIFICATION ( + PRODUCT_ID BIGINT NOT NULL + , CUSTOMER_ID BIGINT NOT NULL + , CREATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (CUSTOMER_ID, PRODUCT_ID) +); + +CREATE TABLE PRODUCT_TO_CATEGORY ( + PRODUCT_ID BIGINT NOT NULL + , CATEGORY_ID INTEGER NOT NULL + , PRIMARY KEY (CATEGORY_ID, PRODUCT_ID) +); + +CREATE TABLE REVIEW_DESCRIPTION ( + REVIEW_ID BIGINT NOT NULL + , COMMENT TEXT NOT NULL + , PRIMARY KEY (REVIEW_ID) +); + +CREATE TABLE BARGAIN ( + BARGAIN_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , BARGAIN_PRICE DECIMAL(15, 4) NOT NULL + , BARGAIN_CODE VARCHAR(40) + , START_DATE TIMESTAMP + , END_DATE TIMESTAMP + , STATUS INTEGER NOT NULL DEFAULT 1 + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (BARGAIN_ID) +); + +CREATE TABLE ORDER_STATUS_DESCRIPTION ( + ORDER_STATUS_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , ORDER_STATUS_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , DESCRIPTION VARCHAR(255) + , LANGUAGE VARCHAR(20) + , PRIMARY KEY (ORDER_STATUS_DESCRIPTION_ID) +); + +CREATE TABLE PAYMENT_METHOD_DESCRIPTION ( + PAYMENT_METHOD_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , PAYMENT_METHOD_ID INTEGER NOT NULL + , NAME VARCHAR(80) NOT NULL + , DESCRIPTION TEXT + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (PAYMENT_METHOD_DESCRIPTION_ID) +); + +CREATE TABLE CARD_TYPE_DESCRIPTION ( + CARD_TYPE_DESCRIPTION_ID INTEGER NOT NULL + , CARD_TYPE_ID INTEGER NOT NULL + , NAME VARCHAR(80) NOT NULL + , DESCRIPTION TEXT + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (CARD_TYPE_DESCRIPTION_ID) +); + +CREATE TABLE ORDER_CARD_INFO ( + ORDER_FORM_ID BIGINT NOT NULL AUTO_INCREMENT + , CARD_TYPE_ID INTEGER + , CARD_TYPE_CODE VARCHAR(40) NOT NULL + , CARD_OWNER VARCHAR(255) NOT NULL + , CARD_NUMBER VARCHAR(255) NOT NULL + , CARD_EXPIRES VARCHAR(255) NOT NULL + , CARD_PAYMENT_TYPE VARCHAR(80) + , PRIMARY KEY (ORDER_FORM_ID) +); + +CREATE TABLE ORDER_NOTIFICATION ( + ORDER_NOTIFICATION_ID INTEGER NOT NULL AUTO_INCREMENT + , ORDER_STATUS_ID INTEGER NOT NULL + , EMAIL_ADDRESS VARCHAR(200) + , TEMPLATE_NAME VARCHAR(40) NOT NULL + , STATUS INTEGER NOT NULL + , PRIMARY KEY (ORDER_NOTIFICATION_ID) +); + +CREATE TABLE MANUFACTURER_DESCRIPTION ( + MANUFACTURER_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , MANUFACTURER_ID INTEGER NOT NULL + , DESCRIPTION TEXT + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (MANUFACTURER_DESCRIPTION_ID) +); + +CREATE TABLE CATEGORY_PAGE_INFO ( + CATEGORY_ID INTEGER NOT NULL + , PAGE_ID VARCHAR(80) NOT NULL + , TEMPLATE_NAME VARCHAR(80) NOT NULL + , KEYWORD VARCHAR(160) + , DESCRIPTION VARCHAR(160) + , PRIMARY KEY (CATEGORY_ID) +); + +CREATE TABLE CATEGORY_CONTENT ( + CATEGORY_CONTENT_ID INTEGER NOT NULL AUTO_INCREMENT + , CATEGORY_ID INTEGER NOT NULL + , CONTENT TEXT + , SORT_ORDER INTEGER NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (CATEGORY_CONTENT_ID) +); + +CREATE TABLE PRODUCT_PAGE_INFO ( + PRODUCT_ID BIGINT NOT NULL + , PAGE_ID VARCHAR(80) NOT NULL + , TEMPLATE_NAME VARCHAR(80) NOT NULL + , KEYWORD VARCHAR(160) + , DESCRIPTION VARCHAR(160) + , PRIMARY KEY (PRODUCT_ID) +); + +CREATE TABLE PRODUCT_CONTENT ( + PRODUCT_CONTENT_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , CONTENT TEXT + , SORT_ORDER INTEGER NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (PRODUCT_CONTENT_ID) +); + +CREATE TABLE ORDER_DELIVERY ( + ORDER_FORM_ID BIGINT NOT NULL + , DELIVERY_COMPANY VARCHAR(120) + , DELIVERY_DEPARTMENT VARCHAR(100) + , DELIVERY_FIRSTNAME VARCHAR(40) NOT NULL + , DELIVERY_LASTNAME VARCHAR(40) NOT NULL + , DELIVERY_FIRSTNAME_DESCRIPTION VARCHAR(40) + , DELIVERY_LASTNAME_DESCRIPTION VARCHAR(40) + , DELIVERY_STREET_ADDRESS VARCHAR(240) NOT NULL + , DELIVERY_SUBURB VARCHAR(40) + , DELIVERY_CITY VARCHAR(80) NOT NULL + , DELIVERY_STATE VARCHAR(40) + , DELIVERY_POSTCODE VARCHAR(10) NOT NULL + , DELIVERY_TELEPHONE VARCHAR(40) + , DELIVERY_STATUS_ID INTEGER + , DELIVERY_METHOD_ID INTEGER + , DELIVERY_METHOD_CODE VARCHAR(40) NOT NULL + , DELIVERY_COUNTRY_CODE VARCHAR(40) NOT NULL + , DELIVERY_LANGUAGE VARCHAR(20) NOT NULL + , DELIVERY_COUNTRY_ID INTEGER NOT NULL + , DELIVERY_ZONE_ID INTEGER NOT NULL + , REQUESTED_DATE TIMESTAMP + , SENT_DATE TIMESTAMP + , RECEIVED_DATE TIMESTAMP + , SLIP_NUMBER VARCHAR(40) + , GIFT_WRAP INTEGER + , GIFT_MESSAGE VARCHAR(200) + , ENVELOPE_LABEL VARCHAR(100) + , PRIMARY KEY (ORDER_FORM_ID) +); + +CREATE TABLE ORDER_PAYMENT ( + ORDER_FORM_ID BIGINT NOT NULL + , PAYMENT_METHOD_ID INTEGER + , PAYMENT_METHOD_CODE VARCHAR(40) NOT NULL + , ORDER_CARD_INFO_ID BIGINT + , PAYMENT_STATUS_ID INTEGER + , SUB_TOTAL_PRICE DECIMAL(14, 6) + , TAX DECIMAL(14, 6) + , DELIVERY_PRICE DECIMAL(14, 6) + , PAYMENT_FEE DECIMAL(14, 6) + , TOTAL_PRICE DECIMAL(14, 6) NOT NULL + , PRIMARY KEY (ORDER_FORM_ID) +); + +CREATE TABLE FILE_TAG_TO_FILE_DATA ( + FILE_TAG_ID BIGINT NOT NULL + , FILE_DATA_ID BIGINT NOT NULL + , PRIMARY KEY (FILE_DATA_ID, FILE_TAG_ID) +); + +CREATE TABLE IMAGE_DATA ( + FILE_DATA_ID BIGINT NOT NULL AUTO_INCREMENT + , SIZE INTEGER + , HEIGHT INTEGER + , WIDTH INTEGER + , PRIMARY KEY (FILE_DATA_ID) +); + +CREATE TABLE CATEGORY_INFO ( + CATEGORY_INFO_ID INTEGER NOT NULL AUTO_INCREMENT + , CATEGORY_ID INTEGER NOT NULL + , NAME VARCHAR(80) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (CATEGORY_INFO_ID) +); + +CREATE TABLE PRODUCT_OPTION_DESCRIPTION ( + PRODUCT_OPTION_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_OPTION_ID BIGINT NOT NULL + , NAME VARCHAR(80) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (PRODUCT_OPTION_DESCRIPTION_ID) +); + +CREATE TABLE PRODUCT_OPTION_VALUE_DESCRIPTION ( + PRODUCT_OPTION_VALUE_DESCRIPTION_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL + , NAME VARCHAR(80) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (PRODUCT_OPTION_VALUE_DESCRIPTION_ID) +); + +CREATE TABLE BASKET_PRODUCT_OPTION ( + BASKET_PRODUCT_OPTION_ID BIGINT NOT NULL AUTO_INCREMENT + , BASKET_ID BIGINT NOT NULL + , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL + , PRIMARY KEY (BASKET_PRODUCT_OPTION_ID) +); + +CREATE TABLE PRODUCT_STATS ( + PRODUCT_ID BIGINT NOT NULL + , ORDERED INTEGER + , REVIEWED INTEGER + , RATING INTEGER + , FAVORITE INTEGER + , NOTIFICATION INTEGER + , PRIMARY KEY (PRODUCT_ID) +); + +CREATE TABLE FAVORITE_PRODUCT ( + PRODUCT_ID BIGINT NOT NULL + , CUSTOMER_ID BIGINT NOT NULL + , UPDATED_DATE TIMESTAMP NOT NULL + , PRIMARY KEY (CUSTOMER_ID, PRODUCT_ID) +); + +CREATE TABLE ORDER_PRODUCT_OPTION ( + ORDER_PRODUCT_OPTION_ID BIGINT NOT NULL AUTO_INCREMENT + , ORDER_PRODUCT_ID BIGINT NOT NULL + , PRODUCT_OPTION_VALUE_ID BIGINT NOT NULL + , PRODUCT_OPTION_CODE VARCHAR(40) NOT NULL + , PRODUCT_OPTION_VALUE_CODE VARCHAR(40) NOT NULL + , PRODUCT_OPTION_NAME VARCHAR(80) + , DISPLAY_PRODUCT_OPTION_NAME VARCHAR(80) + , PRODUCT_OPTION_VALUE_NAME VARCHAR(80) + , DISPLAY_PRODUCT_OPTION_VALUE_NAME VARCHAR(80) + , PRIMARY KEY (ORDER_PRODUCT_OPTION_ID) +); + +CREATE TABLE PRODUCT_ATTRIBUTE ( + PRODUCT_ATTRIBUTE_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , NAME VARCHAR(100) NOT NULL + , VALUE VARCHAR(100) + , PRIMARY KEY (PRODUCT_ATTRIBUTE_ID) +); + +CREATE TABLE DELIVERY_STATUS_DESCRIPTION ( + DELIVERY_STATUS_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , DELIVERY_STATUS_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (DELIVERY_STATUS_DESCRIPTION_ID) +); + +CREATE TABLE PAYMENT_STATUS_DESCRIPTION ( + PAYMENT_STATUS_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , PAYMENT_STATUS_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (PAYMENT_STATUS_DESCRIPTION_ID) +); + +CREATE TABLE DELIVERY_TYPE_DESCRIPTION ( + DELIVERY_TYPE_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , DELIVERY_TYPE_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (DELIVERY_TYPE_DESCRIPTION_ID) +); + +CREATE TABLE COUNTRY_DESCRIPTION ( + COUNTRY_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , COUNTRY_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (COUNTRY_DESCRIPTION_ID) +); + +CREATE TABLE TAX_TYPE_DESCRIPTION ( + TAX_TYPE_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , TAX_TYPE_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , DESCRIPTION VARCHAR(200) + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (TAX_TYPE_DESCRIPTION_ID) +); + +CREATE TABLE DELIVERY_ZONE_DESCRIPTION ( + DELIVERY_ZONE_DESCRIPTION_ID INTEGER NOT NULL AUTO_INCREMENT + , DELIVERY_ZONE_ID INTEGER NOT NULL + , NAME VARCHAR(40) NOT NULL + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (DELIVERY_ZONE_DESCRIPTION_ID) +); + +CREATE TABLE PRODUCT_INFO ( + PRODUCT_INFO_ID BIGINT NOT NULL AUTO_INCREMENT + , PRODUCT_ID BIGINT NOT NULL + , NAME VARCHAR(150) NOT NULL DEFAULT '' + , TITLE VARCHAR(80) + , URL VARCHAR(255) + , LANGUAGE VARCHAR(20) NOT NULL DEFAULT '1' + , PRIMARY KEY (PRODUCT_INFO_ID) +); + +CREATE TABLE MANUFACTURER_INFO ( + MANUFACTURER_INFO_ID INTEGER NOT NULL AUTO_INCREMENT + , MANUFACTURER_ID INTEGER NOT NULL + , NAME VARCHAR(80) NOT NULL + , URL VARCHAR(255) + , LANGUAGE VARCHAR(20) NOT NULL + , PRIMARY KEY (MANUFACTURER_INFO_ID) +); + +CREATE TABLE ADDRESS_BOOK ( + ADDRESS_BOOK_ID BIGINT NOT NULL AUTO_INCREMENT + , CUSTOMER_ID BIGINT NOT NULL + , COMPANY VARCHAR(128) + , DEPARTMENT VARCHAR(64) + , FIRSTNAME VARCHAR(40) NOT NULL + , LASTNAME VARCHAR(40) NOT NULL + , FIRSTNAME_DESCRIPTION VARCHAR(40) + , LASTNAME_DESCRIPTION VARCHAR(40) + , STREET_ADDRESS VARCHAR(255) NOT NULL + , SUBURB VARCHAR(32) + , CITY VARCHAR(64) NOT NULL + , STATE VARCHAR(32) + , POSTCODE VARCHAR(10) NOT NULL + , TELEPHONE VARCHAR(32) + , FAX VARCHAR(32) + , CELLPHONE VARCHAR(32) + , DEFAULT_ADDRESS INTEGER NOT NULL + , COUNTRY_ID INTEGER NOT NULL DEFAULT 0 + , DELIVERY_ZONE_ID INTEGER NOT NULL + , PRIMARY KEY (ADDRESS_BOOK_ID) +); + +ALTER TABLE CATEGORY + ADD CONSTRAINT FK_FROM_CATEGORY_TO_CATEGORY + FOREIGN KEY (PARENT_CATEGORY_ID) + REFERENCES CATEGORY (CATEGORY_ID) + ON DELETE SET DEFAULT; + +ALTER TABLE CATEGORY + ADD CONSTRAINT FK_FROM_CATEGORY_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + +ALTER TABLE MANUFACTURER + ADD CONSTRAINT FK_FROM_MANUFACTURER_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_FORM + ADD CONSTRAINT FK_FROM_CUSTOMER_TO_ORDER_FORM + FOREIGN KEY (CUSTOMER_ID) + REFERENCES CUSTOMER (CUSTOMER_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_FORM + ADD CONSTRAINT FK_FROM_ORDER_FORM_TO_ORDER_STATUS + FOREIGN KEY (ORDER_STATUS_ID) + REFERENCES ORDER_STATUS (ORDER_STATUS_ID) + ON DELETE SET NULL; + +ALTER TABLE PRODUCT + ADD CONSTRAINT FK_FROM_PRODUCT_TO_MANUFACTURER + FOREIGN KEY (MANUFACTURER_ID) + REFERENCES MANUFACTURER (MANUFACTURER_ID) + ON DELETE SET NULL; + +ALTER TABLE PRODUCT + ADD CONSTRAINT FK_FROM_PRODUCT_TO_TAX_TYPE + FOREIGN KEY (TAX_TYPE_ID) + REFERENCES TAX_TYPE (TAX_TYPE_ID) + ON DELETE SET NULL; + +ALTER TABLE PRODUCT + ADD CONSTRAINT FK_FROM_PRODUCT_TO_DELIVERY_TYPE + FOREIGN KEY (DELIVERY_TYPE_ID) + REFERENCES DELIVERY_TYPE (DELIVERY_TYPE_ID) + ON DELETE SET NULL; + +ALTER TABLE PRODUCT + ADD CONSTRAINT FK_FROM_PRODUCT_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE SET NULL; + +ALTER TABLE BASKET + ADD CONSTRAINT FK_FROM_BASKET_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE BASKET + ADD CONSTRAINT FK_FROM_BASKET_TO_CUSTOMER + FOREIGN KEY (CUSTOMER_ID) + REFERENCES CUSTOMER (CUSTOMER_ID) + ON DELETE CASCADE; + +ALTER TABLE REVIEW + ADD CONSTRAINT FK_FROM_REVIEW_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE SET NULL; + +ALTER TABLE REVIEW + ADD CONSTRAINT FK_FROM_REVIEW_TO_CUSTOMER + FOREIGN KEY (CUSTOMER_ID) + REFERENCES CUSTOMER (CUSTOMER_ID) + ON DELETE SET NULL; + +ALTER TABLE PRODUCT_OPTION + ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_PRODUCT + ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_PRODUCT + ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_TO_ORDER_FORM + FOREIGN KEY (ORDER_FORM_ID) + REFERENCES ORDER_FORM (ORDER_FORM_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_OPTION_VALUE + ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_VALUE_TO_PRODUCT_OPTION + FOREIGN KEY (PRODUCT_OPTION_ID) + REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID) + ON DELETE CASCADE; + +ALTER TABLE DELIVERY_METHOD_DESCRIPTION + ADD CONSTRAINT FK_FROM_DELIVERY_METHOD_DESCRIPTION_TO_DELIVERY_METHOD + FOREIGN KEY (DELIVERY_METHOD_ID) + REFERENCES DELIVERY_METHOD (DELIVERY_METHOD_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_STATUS_HISTORY + ADD CONSTRAINT FK_FROM_ORDERS_STATUS_HISTORY_TO_ORDER_FORM + FOREIGN KEY (ORDER_FORM_ID) + REFERENCES ORDER_FORM (ORDER_FORM_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_STATUS_HISTORY + ADD CONSTRAINT FK_FROM_ORDER_STATUS_HISTORY_TO_ORDER_FORM + FOREIGN KEY (ORDER_STATUS_ID) + REFERENCES ORDER_STATUS (ORDER_STATUS_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_COMMENT + ADD CONSTRAINT FK_FROM_ORDER_COMMENT_TO_ORDER_FORM + FOREIGN KEY (ORDER_FORM_ID) + REFERENCES ORDER_FORM (ORDER_FORM_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_DESCRIPTION + ADD CONSTRAINT FK_FROM_PRODUCT_DESCRIPTION_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_NOTIFICATION + ADD CONSTRAINT FK_FROM_PRODUCT_NOTIFICATION_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_NOTIFICATION + ADD CONSTRAINT FK_FROM_PRODUCT_NOTIFICATION_TO_CUSTOMER + FOREIGN KEY (CUSTOMER_ID) + REFERENCES CUSTOMER (CUSTOMER_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_TO_CATEGORY + ADD CONSTRAINT FK_FROM_PRODUCT_TO_CATEGORY_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_TO_CATEGORY + ADD CONSTRAINT FK_FROM_PRODUCT_TO_CATEGORY_TO_CATEGORY + FOREIGN KEY (CATEGORY_ID) + REFERENCES CATEGORY (CATEGORY_ID) + ON DELETE CASCADE; + +ALTER TABLE REVIEW_DESCRIPTION + ADD CONSTRAINT FK_FROM_REVIEW_DESCRIPTION_TO_REVIEW + FOREIGN KEY (REVIEW_ID) + REFERENCES REVIEW (REVIEW_ID) + ON DELETE CASCADE; + +ALTER TABLE BARGAIN + ADD CONSTRAINT FK_FROM_BARGAIN_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_STATUS_DESCRIPTION + ADD CONSTRAINT FK_FROM_ORDER_STATUS_DESCRIPTION_TO_ORDER_STATUS + FOREIGN KEY (ORDER_STATUS_ID) + REFERENCES ORDER_STATUS (ORDER_STATUS_ID) + ON DELETE CASCADE; + +ALTER TABLE PAYMENT_METHOD_DESCRIPTION + ADD CONSTRAINT FK_FROM_PAYMENT_METHOD_DESCRIPTION_TO_PAYMENT_METHOD + FOREIGN KEY (PAYMENT_METHOD_ID) + REFERENCES PAYMENT_METHOD (PAYMENT_METHOD_ID) + ON DELETE CASCADE; + +ALTER TABLE CARD_TYPE_DESCRIPTION + ADD CONSTRAINT FK_FROM_CARD_TYPES_DESCRIPTION_TO_CARD_TYPE + FOREIGN KEY (CARD_TYPE_ID) + REFERENCES CARD_TYPE (CARD_TYPE_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_CARD_INFO + ADD CONSTRAINT FK_FROM_ORDER_CARD_INFO_TO_CARD_TYPE + FOREIGN KEY (CARD_TYPE_ID) + REFERENCES CARD_TYPE (CARD_TYPE_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_NOTIFICATION + ADD CONSTRAINT FK_FROM_ORDER_NOTIFICATION_TO_ORDER_STATUS + FOREIGN KEY (ORDER_STATUS_ID) + REFERENCES ORDER_STATUS (ORDER_STATUS_ID) + ON DELETE CASCADE; + +ALTER TABLE MANUFACTURER_DESCRIPTION + ADD CONSTRAINT FK_FROM_MANUFACTURER_DESCRIPTION_TO_MANUFACTURER + FOREIGN KEY (MANUFACTURER_ID) + REFERENCES MANUFACTURER (MANUFACTURER_ID) + ON DELETE CASCADE; + +ALTER TABLE CATEGORY_PAGE_INFO + ADD CONSTRAINT FK_FROM_CATEGORY_PAGE_INFO_TO_CATEGORY + FOREIGN KEY (CATEGORY_ID) + REFERENCES CATEGORY (CATEGORY_ID) + ON DELETE CASCADE; + +ALTER TABLE CATEGORY_CONTENT + ADD CONSTRAINT FK_FROM_CATEGORY_CONTENT_TO_CATEGORY + FOREIGN KEY (CATEGORY_ID) + REFERENCES CATEGORY (CATEGORY_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_PAGE_INFO + ADD CONSTRAINT FK_FROM_PRODUCT_PAGE_INFO_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_CONTENT + ADD CONSTRAINT FK_FROM_PRODUCT_CONTENT_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_DELIVERY + ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_DELIVERY_ZONE + FOREIGN KEY (DELIVERY_ZONE_ID) + REFERENCES DELIVERY_ZONE (DELIVERY_ZONE_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_DELIVERY + ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_COUNTRY + FOREIGN KEY (DELIVERY_COUNTRY_ID) + REFERENCES COUNTRY (COUNTRY_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_DELIVERY + ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_DELIVERY_METHOD + FOREIGN KEY (DELIVERY_METHOD_ID) + REFERENCES DELIVERY_METHOD (DELIVERY_METHOD_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_DELIVERY + ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_DELIVERY_STATUS + FOREIGN KEY (DELIVERY_STATUS_ID) + REFERENCES DELIVERY_STATUS (DELIVERY_STATUS_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_DELIVERY + ADD CONSTRAINT FK_FROM_ORDER_DELIVERY_TO_ORDER_FORM + FOREIGN KEY (ORDER_FORM_ID) + REFERENCES ORDER_FORM (ORDER_FORM_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_PAYMENT + ADD CONSTRAINT FK_FROM_ORDER_PAYMENT_TO_ORDER_FORM + FOREIGN KEY (ORDER_FORM_ID) + REFERENCES ORDER_FORM (ORDER_FORM_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_PAYMENT + ADD CONSTRAINT FK_FROM_ORDER_PAYMENT_TO_PAYMENT_STATUS + FOREIGN KEY (PAYMENT_STATUS_ID) + REFERENCES PAYMENT_STATUS (PAYMENT_STATUS_ID) + ON DELETE SET NULL; + +ALTER TABLE ORDER_PAYMENT + ADD CONSTRAINT FK_FROM_ORDER_PAYMENT_TO_PAYMENT_METHOD + FOREIGN KEY (PAYMENT_METHOD_ID) + REFERENCES PAYMENT_METHOD (PAYMENT_METHOD_ID) + ON DELETE SET NULL; + +ALTER TABLE FILE_TAG_TO_FILE_DATA + ADD CONSTRAINT FK_FROM_FILE_TAG_TO_FILE_DATA_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE CASCADE; + +ALTER TABLE FILE_TAG_TO_FILE_DATA + ADD CONSTRAINT FK_FROM_FILE_TAG_TO_FILE_DATA_TO_FILE_TAG + FOREIGN KEY (FILE_TAG_ID) + REFERENCES FILE_TAG (FILE_TAG_ID) + ON DELETE CASCADE; + +ALTER TABLE IMAGE_DATA + ADD CONSTRAINT FK_FROM_IMAGE_DATA_TO_FILE_DATA + FOREIGN KEY (FILE_DATA_ID) + REFERENCES FILE_DATA (FILE_DATA_ID) + ON DELETE CASCADE; + +ALTER TABLE CATEGORY_INFO + ADD CONSTRAINT FK_FROM_CATEGORY_INFO_TO_CATEGORY + FOREIGN KEY (CATEGORY_ID) + REFERENCES CATEGORY (CATEGORY_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_OPTION_DESCRIPTION + ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_DESCRIPTION_TO_PRODUCT_OPTION + FOREIGN KEY (PRODUCT_OPTION_ID) + REFERENCES PRODUCT_OPTION (PRODUCT_OPTION_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_OPTION_VALUE_DESCRIPTION + ADD CONSTRAINT FK_FROM_PRODUCT_OPTION_VALUE_DESCRIPTION_TO_PRODUCT_OPTION_VALUE + FOREIGN KEY (PRODUCT_OPTION_VALUE_ID) + REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID) + ON DELETE CASCADE; + +ALTER TABLE BASKET_PRODUCT_OPTION + ADD CONSTRAINT FK_FROM_BASKET_PRODUCT_OPTION_TO_BASKET + FOREIGN KEY (BASKET_ID) + REFERENCES BASKET (BASKET_ID) + ON DELETE CASCADE; + +ALTER TABLE BASKET_PRODUCT_OPTION + ADD CONSTRAINT FK_FROM_BASKET_PRODUCT_OPTION_TO_PRODUCT_OPTION_VALUE + FOREIGN KEY (PRODUCT_OPTION_VALUE_ID) + REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_STATS + ADD CONSTRAINT FK_FROM_PRODUCT_STATS_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE FAVORITE_PRODUCT + ADD CONSTRAINT FK_FROM_FAVORITE_PRODUCT_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE FAVORITE_PRODUCT + ADD CONSTRAINT FK_FROM_FAVORITE_PRODUCT_TO_CUSTOMER + FOREIGN KEY (CUSTOMER_ID) + REFERENCES CUSTOMER (CUSTOMER_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_PRODUCT_OPTION + ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_OPTION_TO_ORDER_PRODUCT + FOREIGN KEY (ORDER_PRODUCT_ID) + REFERENCES ORDER_PRODUCT (ORDER_PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE ORDER_PRODUCT_OPTION + ADD CONSTRAINT FK_FROM_ORDER_PRODUCT_OPTION_TO_PRODUCT_OPTION_VALUE + FOREIGN KEY (PRODUCT_OPTION_VALUE_ID) + REFERENCES PRODUCT_OPTION_VALUE (PRODUCT_OPTION_VALUE_ID) + ON DELETE SET NULL; + +ALTER TABLE PRODUCT_ATTRIBUTE + ADD CONSTRAINT FK_FROM_PRODUCT_ATTRIBUTE_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE DELIVERY_STATUS_DESCRIPTION + ADD CONSTRAINT FK_FROM_DELIVERY_STATUS_DESCRIPTION_TO_DELIVERY_STATUS + FOREIGN KEY (DELIVERY_STATUS_ID) + REFERENCES DELIVERY_STATUS (DELIVERY_STATUS_ID) + ON DELETE CASCADE; + +ALTER TABLE PAYMENT_STATUS_DESCRIPTION + ADD CONSTRAINT FK_FROM_PAYMENT_STATUS_DESCRIPTION_PAYMENT_STATUS + FOREIGN KEY (PAYMENT_STATUS_ID) + REFERENCES PAYMENT_STATUS (PAYMENT_STATUS_ID) + ON DELETE CASCADE; + +ALTER TABLE DELIVERY_TYPE_DESCRIPTION + ADD CONSTRAINT FK_FROM_DELIVERY_TYPE_DESCRIPTION_TO_DELIVERY_TYPE + FOREIGN KEY (DELIVERY_TYPE_ID) + REFERENCES DELIVERY_TYPE (DELIVERY_TYPE_ID); + +ALTER TABLE COUNTRY_DESCRIPTION + ADD CONSTRAINT FK_FROM_COUNTRY_DESCRIPTION_TO_COUNTRY + FOREIGN KEY (COUNTRY_ID) + REFERENCES COUNTRY (COUNTRY_ID) + ON DELETE CASCADE; + +ALTER TABLE TAX_TYPE_DESCRIPTION + ADD CONSTRAINT FK_FROM_TAX_TYPE_DESCRIPTION_TO_TAX_TYPE + FOREIGN KEY (TAX_TYPE_ID) + REFERENCES TAX_TYPE (TAX_TYPE_ID) + ON DELETE CASCADE; + +ALTER TABLE DELIVERY_ZONE_DESCRIPTION + ADD CONSTRAINT FK_FROM_DELIVERY_ZONE_DESCRIPTION_TO_DELIVERY_ZONE + FOREIGN KEY (DELIVERY_ZONE_ID) + REFERENCES DELIVERY_ZONE (DELIVERY_ZONE_ID) + ON DELETE CASCADE; + +ALTER TABLE PRODUCT_INFO + ADD CONSTRAINT FK_FROM_PRODUCT_INFO_TO_PRODUCT + FOREIGN KEY (PRODUCT_ID) + REFERENCES PRODUCT (PRODUCT_ID) + ON DELETE CASCADE; + +ALTER TABLE MANUFACTURER_INFO + ADD CONSTRAINT FK_FROM_MANUFACTURER_INFO_TO_MANUFACTURER + FOREIGN KEY (MANUFACTURER_ID) + REFERENCES MANUFACTURER (MANUFACTURER_ID) + ON DELETE CASCADE; + +ALTER TABLE ADDRESS_BOOK + ADD CONSTRAINT FK_FROM_ADDRESS_BOOK_TO_CUSTOMER + FOREIGN KEY (CUSTOMER_ID) + REFERENCES CUSTOMER (CUSTOMER_ID) + ON DELETE CASCADE; + +ALTER TABLE ADDRESS_BOOK + ADD CONSTRAINT FK_FROM_ADDRESS_BOOK_TO_COUNTRY + FOREIGN KEY (COUNTRY_ID) + REFERENCES COUNTRY (COUNTRY_ID) + ON DELETE SET NULL; + +ALTER TABLE ADDRESS_BOOK + ADD CONSTRAINT FK_FROM_ADDRESS_BOOK_TO_DELIVERY_ZONE + FOREIGN KEY (DELIVERY_ZONE_ID) + REFERENCES DELIVERY_ZONE (DELIVERY_ZONE_ID) + ON DELETE SET NULL; + Copied: pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_data.sql (from rev 867, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql) =================================================================== Copied: pompei/portlets/pompei-core/trunk/src/main/config/sql/insert_sample_data.sql (from rev 867, pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_sample_data.sql) =================================================================== Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java (rev 0) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java 2008-04-08 05:03:44 UTC (rev 880) @@ -0,0 +1,93 @@ +package jp.sf.pal.pompei; + +/** + * @author shinsuke + * + */ +public class PompeiException extends Exception { + + /** + * Serial Version UID + */ + private static final long serialVersionUID = -2222811573245110791L; + + private String messageId; + + private Object[] args; + + /** + * @return Returns the messageId. + */ + public String getMessageId() { + return messageId; + } + + /** + * @param messageId + * The messageId to set. + */ + public void setMessageId(String messageId) { + this.messageId = messageId; + } + + /** + * @return Returns the args. + */ + public Object[] getArgs() { + return args; + } + + /** + * @param args + * The args to set. + */ + public void setArgs(Object[] args) { + this.args = args; + } + + public PompeiException(String messageId) { + super(messageId); + this.messageId = messageId; + } + + public PompeiException(String messageId, Object[] args) { + super(messageId); + this.messageId = messageId; + this.args = args; + } + + public PompeiException(String messageId, String message, Throwable cause) { + super(message, cause); + this.messageId = messageId; + } + + public PompeiException(String messageId, Object[] args, String message, + Throwable cause) { + super(message, cause); + this.messageId = messageId; + this.args = args; + } + + public PompeiException(String messageId, String message) { + super(message); + this.messageId = messageId; + } + + public PompeiException(String messageId, Object[] args, String message) { + super(message); + this.messageId = messageId; + this.args = args; + } + + public PompeiException(String messageId, Throwable cause) { + super(cause); + this.messageId = messageId; + } + + public PompeiException(String messageId, Object[] args, Throwable cause) { + super(cause); + this.messageId = messageId; + this.args = args; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiException.java ___________________________________________________________________ Name: svn:eol-style + native Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CardTypeDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,15 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.pompei.exentity.CardTypeDescription; - -import org.seasar.extension.dxo.annotation.ConversionRule; - -public interface CardTypeDxo extends Serializable { - - @ConversionRule("label : name" + ", value : cardType.code") - public List> convert(List ctd); -} Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CategoryDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,34 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.pompei.exentity.Category; -import jp.sf.pal.pompei.exentity.CategoryDescription; -import jp.sf.pal.pompei.web.admin.product.CategoryEditPage; - -import org.seasar.extension.dxo.annotation.ConversionRule; - -public interface CategoryDxo extends Serializable { - - @ConversionRule("sortOrder : category.sortOrder" + ",name : name" - + ",description : description" + ",categoryId : categoryId" - + ",parentId : category.parentId" + ",image : category.image") - public void convert(List category, - List> list); - - @ConversionRule("sortOrder : category.sortOrder" + ",name : name" - + ",description : description" + ",categoryId : categoryId" - + ",parentId : category.parentId" + ",image : category.image") - public List> convert(List category); - - CategoryDescription convert(CategoryEditPage page); - - public void convert(CategoryEditPage page, CategoryDescription entity); - - public void convert(CategoryDescription entity, CategoryEditPage page); - - public void convert(Category entity, CategoryEditPage page); - -} Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -7,36 +7,47 @@ import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.web.admin.customer.AbstractCustomerEditPage; +import jp.sf.pal.pompei.web.admin.customer.CustomerConfirmPage; import jp.sf.pal.pompei.web.user.checkout.CheckoutConfirmPage; import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage; import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage; -import jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage; +import jp.sf.pal.pompei.web.user.signup.SignupConfirmPage; public interface CustomerDxo extends Serializable { + public void convertFromCustomerToMap(List customerList, + List> list); - public void convert(AbstractCustomerEditPage page, AddressBook book); + public void convertFromCustomerToPage(Customer customer, + AbstractCustomerEditPage page); - public void convert(AbstractCustomerEditPage page, Customer customer); + public void convertFromAddressBookToMap(List addressBookList, + List> list); - public void convert(AbstractUsersignupPage page, AddressBook book); + public void convertFromPageToCustomer(SignupConfirmPage page, + Customer customer); - public void convert(AbstractUsersignupPage page, Customer customer); + public void convertFromPageToAddressBook(SignupConfirmPage page, + AddressBook addressBook); - public void convert(Customer customer, AbstractCustomerEditPage page); + public void convertFromCustomerToPage(Customer customer, + UserInfoEditPage page); - public void convert(AddressBook addressBook, AbstractCustomerEditPage page); + public void convertFromAddressBookToPage(AddressBook addressBook, + UserInfoEditPage page); - public List> convert(List list); + public void convertFromPageToCustomer(UserInfoEditPage page, + Customer customer); - public void convert(Customer customer, UserInfoEditPage page); + public void convertFromPageToAddressBook(UserInfoEditPage page, + AddressBook addressBook); - public void convert(AddressBook addressBook, UserInfoEditPage page); + public void convertFromPageToAddressBook(UserAddressSelectPage page, + AddressBook addressBook); - public void convert(UserInfoEditPage page, Customer customer); + public void convertFromAddressBookToPage(AddressBook addressBook, + CheckoutConfirmPage page); - public void convert(UserInfoEditPage page, AddressBook addressBook); + public void convertFromPageToCustomer(CustomerConfirmPage page, + Customer customer); - public void convert(UserAddressSelectPage page, AddressBook addressBook); - - public void convert(AddressBook addressBook, CheckoutConfirmPage page); } Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/DeliveryMethodDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,33 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.pompei.exentity.DeliveryMethod; -import jp.sf.pal.pompei.exentity.DeliveryMethodDescription; -import jp.sf.pal.pompei.web.admin.order.DeliveryMethodEditPage; - -import org.seasar.extension.dxo.annotation.ConversionRule; - -public interface DeliveryMethodDxo extends Serializable { - @ConversionRule("sortOrder : deliveryMethod.sortOrder" + ",name : name" - + ",deliveryMethodId : deliveryMethodId" - + ",code : deliveryMethod.code" + ",status : deliveryMethod.status") - public void convert( - List deliveryMethodDescriptionList, - List> list); - - // @ConversionRule("label : name" + ", value : deliveryMethodId") - public List> convert(List dmd); - - public void convert(DeliveryMethodDescription dmd, - DeliveryMethodEditPage page); - - public void convert(DeliveryMethod dm, DeliveryMethodEditPage page); - - public void convert(DeliveryMethodEditPage page, DeliveryMethod dm); - - public void convert(DeliveryMethodEditPage page, - DeliveryMethodDescription dmd); -} Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ManufacturerDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,36 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.pompei.exentity.Manufacturer; -import jp.sf.pal.pompei.exentity.ManufacturerDescription; -import jp.sf.pal.pompei.web.admin.product.ManufacturerEditPage; - -import org.seasar.extension.dxo.annotation.ConversionRule; - -public interface ManufacturerDxo extends Serializable { - - @ConversionRule("manufacturerId : manufacturerId" - + ",name : manufacturer.name" - + ",shortDescription : shortDescription") - void convert(List manufacturerDescriptionList, - List> list); - - @ConversionRule("manufacturerId : manufacturerId" - + ",name : manufacturer.name" + ",image : manufacturer.image" - + ",url : url" + ",shortDescription : shortDescription" - + ",longDescription : longDescription") - void convert(ManufacturerDescription info, ManufacturerEditPage page); - - void convert(ManufacturerEditPage manufacturerEditPage, - ManufacturerDescription entity); - - void convert(ManufacturerEditPage manufacturerEditPage, Manufacturer entity); - - @ConversionRule("value : manufacturerId" + ",label : name") - void convertCombo(List manufacturer, - List> list); - -} Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java (rev 0) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -0,0 +1,107 @@ +package jp.sf.pal.pompei.dxo; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.entity.notification.order.Order; +import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.Customer; +import jp.sf.pal.pompei.exentity.OrderCardInfo; +import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.OrderStatus; +import jp.sf.pal.pompei.exentity.Product; +import jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage; + +import org.seasar.extension.dxo.annotation.ConversionRule; + +public interface OrderDxo extends Serializable { + public void convertFromOrderFormToMap(List orderFormList, + List> list); + + public void convertFromOrderFormToPage(OrderForm orderForm, + AbstractOrderEditPage page); + + public void convertFromOrderCardInfoToPage(OrderCardInfo orderCardInfo, + AbstractOrderEditPage page); + + public void convertFromOrderProductToMap( + List orderProductList, List> list); + + @ConversionRule("label : name" + ",value : orderStatusId") + public void convertFromOrderStatusToLabel( + List orderStatusList, List> list); + + public void convertFromPageToOrderForm(AbstractOrderEditPage page, + OrderForm orderForm); + + public void convertFromPageToOrderCardInfo(AbstractOrderEditPage page, + OrderCardInfo orderCardInfo); + + public void convertFromOrderFormToOrder(OrderForm orderForm, Order order); + + public void convertFromProductToNotification(Product product, + jp.sf.pal.pompei.entity.notification.order.Product notification); + + public void convertFromOrderProductToNotification( + OrderProduct orderProduct, + jp.sf.pal.pompei.entity.notification.order.Product notification); + + @ConversionRule("customerId : customerId" + ",customerGender : gender" + + ",customerFirstname : firstname" + ",customerLastname : lastname" + + ",customerFirstnameDescription : firstnameDescription" + + ",customerLastnameDescription : lastnameDescription" + + ",customerDayOfBirth : dayOfBirth" + + ",customerEmailAddress : emailAddress") + public void convertFromCustomerToOrderForm(Customer customer, + OrderForm orderForm); + + @ConversionRule("customerCompany : company" + + ",customerDepartment : department" + + ",customerStreetAddress : streetAddress" + + ",customerSuburb : suburb" + ",customerCity : city" + + ",customerState : state" + ",customerPostcode : postcode" + + ",customerCompany : company" + + ",customerCountryName : country.name" + + ",customerTelephone : telephone") + public void convertFromCustomerAddressBookToOrderForm( + AddressBook addressBook, OrderForm orderForm); + + @ConversionRule("deliveryFirstname : firstname" + + ",deliveryLastname : lastname" + + ",deliveryFirstnameDescription : firstnameDescription" + + ",deliveryLastnameDescription : lastnameDescription" + + ",deliveryCompany : company" + ",deliveryDepartment : department" + + ",deliveryStreetAddress : streetAddress" + + ",deliverySuburb : suburb" + ",deliveryCity : city" + + ",deliveryState : state" + ",deliveryPostcode : postcode" + + ",deliveryCompany : company" + + ",deliveryCountryName : country.name" + + ",deliveryTelephone : telephone") + public void convertFromDeliveryAddressBookToOrderForm( + AddressBook addressBook, OrderForm orderForm); + + @ConversionRule("billingFirstname : firstname" + + ",billingLastname : lastname" + + ",billingFirstnameDescription : firstnameDescription" + + ",billingLastnameDescription : lastnameDescription" + + ",billingCompany : company" + ",billingDepartment : department" + + ",billingStreetAddress : streetAddress" + + ",billingSuburb : suburb" + ",billingCity : city" + + ",billingState : state" + ",billingPostcode : postcode" + + ",billingCompany : company" + + ",billingCountryName : country.name" + + ",billingTelephone : telephone") + public void convertFromBillingAddressBookToOrderForm( + AddressBook addressBook, OrderForm orderForm); + + @ConversionRule("productId : productId" + ",model : model" + ",code : code" + + ",price : price" + ",productName : name" + + ",manufacturerName : manufacturerName") + public void convertFromProductToOrderProduct(Product product, + OrderProduct orderProduct); + + public void convertFromOrderFormToNotification(OrderForm orderForm, + Order order); +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderDxo.java ___________________________________________________________________ Name: svn:eol-style + native Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,108 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import org.seasar.extension.dxo.annotation.ConversionRule; -import org.seasar.extension.dxo.annotation.ExcludeNull; - -import jp.sf.pal.pompei.entity.notification.order.Order; -import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.OrderCardInfo; -import jp.sf.pal.pompei.exentity.OrderForm; -import jp.sf.pal.pompei.exentity.OrderProduct; -import jp.sf.pal.pompei.exentity.OrderStatusDescription; -import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage; -import jp.sf.pal.pompei.web.admin.order.OrderConfirmPage; - -public interface OrderFormDxo extends Serializable { - - OrderForm convert(OrderConfirmPage orderConfirmPage); - - void convert(AbstractOrderEditPage orderEditPage, OrderForm orders); - - // TODO above method is really needed? - - public void convertToOrderCardInfo(OrderConfirmPage orderConfirmPage, - OrderCardInfo orderCardInfo); - - @ExcludeNull - public void convert(OrderConfirmPage orderConfirmPage, OrderForm orderForm); - - public void convert(OrderForm orderForm, AbstractOrderEditPage orderEditPage); - - @ConversionRule("label : name" + ",value : orderStatusId") - public List> convertToOrderStatusItems( - List list); - - @ConversionRule("orderProductId : orderProductId" - + ",orderFormId : orderFormId" + ",productId : productId" - + ",code : code" + ",model : model" + ",price : price" - + ",tax : tax" + ",finalPrice : finalPrice" - + ",quantity : quantity") - public List> convertToOrderProductItems( - List list); - - public List> convert(List list); - - @ConversionRule("customerId : customerId" + ",customerGender : gender" - + ",customerFirstname : firstname" + ",customerLastname : lastname" - + ",customerFirstnameDescription : firstnameDescription" - + ",customerLastnameDescription : lastnameDescription" - + ",customerDayOfBirth : dayOfBirth" - + ",customerEmailAddress : emailAddress") - public void convertToCustomer(Customer customer, OrderForm orderForm); - - @ConversionRule("customerCompany : company" - + ",customerDepartment : department" - + ",customerStreetAddress : streetAddress" - + ",customerSuburb : suburb" + ",customerCity : city" - + ",customerState : state" + ",customerPostcode : postcode" - + ",customerCompany : company" - + ",customerCountryName : country.name" - + ",customerTelephone : telephone" - + ",customerLocaleName : language.localeName") - public void convertToCustomerAddressBook(AddressBook addressBook, - OrderForm orderForm); - - @ConversionRule("deliveryFirstname : firstname" - + ",deliveryLastname : lastname" - + ",deliveryFirstnameDescription : firstnameDescription" - + ",deliveryLastnameDescription : lastnameDescription" - + ",deliveryCompany : company" + ",deliveryDepartment : department" - + ",deliveryStreetAddress : streetAddress" - + ",deliverySuburb : suburb" + ",deliveryCity : city" - + ",deliveryState : state" + ",deliveryPostcode : postcode" - + ",deliveryCompany : company" - + ",deliveryCountryName : country.name" - + ",deliveryTelephone : telephone" - + ",deliveryLocaleName : language.localeName") - public void convertToDeliveryAddressBook(AddressBook addressBook, - OrderForm orderForm); - - @ConversionRule("billingFirstname : firstname" - + ",billingLastname : lastname" - + ",billingFirstnameDescription : firstnameDescription" - + ",billingLastnameDescription : lastnameDescription" - + ",billingCompany : company" + ",billingDepartment : department" - + ",billingStreetAddress : streetAddress" - + ",billingSuburb : suburb" + ",billingCity : city" - + ",billingState : state" + ",billingPostcode : postcode" - + ",billingCompany : company" - + ",billingCountryName : country.name" - + ",billingTelephone : telephone" - + ",billingLocaleName : language.localeName") - public void convertToBillingAddressBook(AddressBook addressBook, - OrderForm orderForm); - - public void convert(Product product, OrderProduct orderProduct); - - public void convert(OrderCardInfo orderCardInfo, - AbstractOrderEditPage orderEditPage); - - public Order convert(OrderForm orderForm); - -} Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/PaymentMethodDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,14 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.pompei.exentity.PaymentMethodDescription; - -public interface PaymentMethodDxo extends Serializable { - - // @ConversionRule("name : displayMessage" - // + ", value : paymentMethodId") - public List> convert(List pmd); -} Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -4,63 +4,74 @@ import java.util.List; import java.util.Map; -import org.seasar.extension.dxo.annotation.ConversionRule; -import org.seasar.extension.dxo.annotation.ExcludeNull; - -import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.Category; +import jp.sf.pal.pompei.exentity.DeliveryType; +import jp.sf.pal.pompei.exentity.Manufacturer; import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.exentity.ProductDescription; +import jp.sf.pal.pompei.exentity.TaxType; +import jp.sf.pal.pompei.web.admin.product.CategoryEditPage; +import jp.sf.pal.pompei.web.admin.product.ManufacturerEditPage; import jp.sf.pal.pompei.web.admin.product.ProductEditPage; import jp.sf.pal.pompei.web.user.product.ProductDetailsPage; +import org.seasar.extension.dxo.annotation.ConversionRule; + public interface ProductDxo extends Serializable { - ProductDescription convert(ProductEditPage productEditPage); + @ConversionRule("sortOrder : sortOrder" + ",name : name" + + ",categoryId : categoryId" + ",parentId : parentId" + + ",pageId : categoryPageInfoAsOne.pageId"/* + ",image : category.image"*/) + public void convertFromCategoryToMap(List categoryList, + List> list); - Product convertProduct(ProductEditPage productEditPage); + public void convertFromCategoryToPage(Category entity, CategoryEditPage page); + public void convertFromPageToCategory(CategoryEditPage page, Category entity); + + @ConversionRule("manufacturerId : manufacturerId" + ",name : name" + + ",url : url") + public void convertFromManufacturerToMap( + List manufacturerList, List> list); + + public void convertFromManufacturerToPage(Manufacturer manufacturer, + ManufacturerEditPage page); + + public void convertFromPageToManufacturer(ManufacturerEditPage page, + Manufacturer manufacturer); + @ConversionRule("productId : productId" + ",code : code" + ",model : model" - + ",price : price" + ",status : status" - + ",productDescriptionList : productDescriptionList" - + ",manufacturerName : manufacturer.name" - + ",dateAdded : dateAdded") - void convert(List list, List> list2); + + ",price : price" + ",status : status" + ",pageId : pageId" + + ",fileDataId : fileDataId" + ",name : name" + + ",updatedDate : updatedDate") + public void convertFromProductToMap(List productList, + List> list); - // @ConversionRule("productsId : productsId" - // + ",productsModel : products.productsModel" - // + ",productsImage : products.productsImage" - // + ",productsPrice : products.productsPrice" - // + ",productsStatus : products.productsStatus" - // + ",manufacturersId : products.manufacturersId" - // + ",productsName : productsName") - void convert(ProductDescription description, ProductEditPage productEditPage); + @ConversionRule("value : manufacturerId" + ",label : name") + public void convertFromManufacturerToLabel( + List manufacturerList, List> list); - void convertPageToDescription(ProductEditPage productEditPage, - ProductDescription description); + @ConversionRule("value : taxTypeId" + ",label : name") + public void convertFromTaxTypeToLabel(List taxTypeList, + List> list); - void convertPageToProduct(ProductEditPage productEditPage, Product products); + @ConversionRule("value : deliveryTypeId" + ",label : name") + public void convertFromDeliveryTypeToLabel( + List deliveryTypeList, List> list); - void convert(ProductDescription description, - ProductDetailsPage productDetailsPage); + public void convertFromProductToPage(Product product, ProductEditPage page); - @ConversionRule("productsId : productsId" - + ",productsModel : products.productsModel" - + ",productsImage : products.productsImage" - + ",productsPrice : products.productsPrice" - + ",productsStatus : products.productsStatus" - + ",manufacturersId : products.manufacturersId" - + ",productsName : productsName") - void convert(ProductDescription description, Map map); + public void covertFromPageToProduct(ProductEditPage page, Product product); - @ExcludeNull - public void convert(ProductDescription productDescription, - jp.sf.pal.pompei.entity.notification.order.Product product); + public void convertFromProductToPage(Product product, + ProductDetailsPage page); - @ExcludeNull - public void convert(Product product, - jp.sf.pal.pompei.entity.notification.order.Product p); + @ConversionRule("sortOrder : sortOrder" + ",name : name" + + ",categoryId : categoryId" + ",parentId : parentId" + + ",pageId : categoryPageInfoAsOne.pageId"/* + ",image : category.image"*/) + public void convertFromCategoryToBreadcrumb(List category, + List> list); - @ExcludeNull - public void convert(OrderProduct orderProduct, - jp.sf.pal.pompei.entity.notification.order.Product product); + public void convertFromProductToNotification(Product product, + jp.sf.pal.pompei.entity.notification.order.Product notification); + } Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java (rev 0) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -0,0 +1,23 @@ +package jp.sf.pal.pompei.dxo; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.exentity.CardType; +import jp.sf.pal.pompei.exentity.DeliveryMethod; +import jp.sf.pal.pompei.exentity.PaymentMethod; + +public interface SystemDxo extends Serializable { + + public void convertFromDeliveryMethodToMap( + List deliveryMethodList, + List> list); + + public void convertFromPaymentMethodToMap( + List paymentMethodList, + List> list); + + public void convertFromCardTypeToMap(List cardTypeList, + List> list); +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/SystemDxo.java ___________________________________________________________________ Name: svn:eol-style + native Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/TaxDxo.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,15 +0,0 @@ -package jp.sf.pal.pompei.dxo; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -import org.seasar.extension.dxo.annotation.ConversionRule; - -import jp.sf.pal.pompei.exentity.TaxClass; - -public interface TaxDxo extends Serializable { - @ConversionRule("value : taxClassId" + ",label : name") - public void convert(List taxClassList, - List> list); -} Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,6 +1,8 @@ package jp.sf.pal.pompei.entity.notification.order; import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; public class Product implements Serializable { @@ -9,420 +11,855 @@ */ private static final long serialVersionUID = 1955114932729040595L; - protected java.math.BigDecimal languageId; + // OrderForm + private BigDecimal orderFormId; - protected String name; + private String orderFormNumber; - protected String title; + private BigDecimal customerId; - protected String description; + private String customerGender; - protected String url; + private String customerFirstname; - protected java.math.BigDecimal viewed; + private String customerLastname; - protected java.math.BigDecimal weight; + private String customerFirstnameDescription; - protected String size; + private String customerLastnameDescription; - protected java.math.BigDecimal ordered; + private java.util.Date customerDayOfBirth; - protected java.math.BigDecimal reviewed; + private String customerEmailAddress; - protected java.math.BigDecimal rating; + private String customerCompany; - protected java.math.BigDecimal status; + private String customerDepartment; - protected java.sql.Timestamp dateAdded; + private String customerStreetAddress; - protected java.sql.Timestamp lastModified; + private String customerSuburb; - protected java.sql.Timestamp dateAvailable; + private String customerCity; - protected java.math.BigDecimal taxClassId; + private String customerState; - protected java.math.BigDecimal manufacturerId; + private String customerPostcode; - protected java.math.BigDecimal orderProductId; + private String customerTelephone; - protected java.math.BigDecimal orderFormId; + private String customerCountryCode; - protected java.math.BigDecimal productId; + private String customerLanguage; - protected String code; + private String billingCompany; - protected String model; + private String billingDepartment; - protected java.math.BigDecimal price; + private String billingFirstname; - protected java.math.BigDecimal finalPrice; + private String billingLastname; - protected java.math.BigDecimal tax; + private String billingFirstnameDescription; - protected java.math.BigDecimal quantity; + private String billingLastnameDescription; - /** - * @return the languageId - */ - public java.math.BigDecimal getLanguageId() { - return languageId; + private String billingStreetAddress; + + private String billingSuburb; + + private String billingCity; + + private String billingState; + + private String billingPostcode; + + private String billingTelephone; + + private String billingCountryCode; + + private String billingLanguage; + + private BigDecimal orderStatusId; + + private Date updatedDate; + + private Date purchasedDate; + + private Date finishedDate; + + // OrderPayment + private BigDecimal paymentMethodId; + + private String paymentMethodCode; + + private BigDecimal orderCardInfoId; + + private BigDecimal paymentStatusId; + + private BigDecimal subTotalPrice; + + private BigDecimal tax; + + private BigDecimal deliveryPrice; + + private BigDecimal paymentFee; + + private BigDecimal totalPrice; + + // OrderDelivery + private String deliveryCompany; + + private String deliveryDepartment; + + private String deliveryFirstname; + + private String deliveryLastname; + + private String deliveryFirstnameDescription; + + private String deliveryLastnameDescription; + + private String deliveryStreetAddress; + + private String deliverySuburb; + + private String deliveryCity; + + private String deliveryState; + + private String deliveryPostcode; + + private String deliveryTelephone; + + private BigDecimal deliveryStatusId; + + private BigDecimal deliveryMethodId; + + private String deliveryMethodCode; + + private String deliveryCountryCode; + + private String deliveryLanguage; + + private BigDecimal deliveryCountryId; + + private BigDecimal deliveryZoneId; + + private Date requestedDate; + + private Date sentDate; + + private Date receivedDate; + + private String slipNumber; + + private BigDecimal giftWrap; + + private String giftMessage; + + private String envelopeLabel; + + // OrderProduct + private BigDecimal orderProductId; + + private BigDecimal productId; + + private String model; + + private String code; + + private BigDecimal price; + + private BigDecimal finalPrice; + + // private BigDecimal tax; + + private BigDecimal quantity; + + private String productName; + + private String displayProductName; + + private String manufacturerName; + + private String displayManufacturerName; + + public BigDecimal getOrderFormId() { + return orderFormId; } - /** - * @param languageId the languageId to set - */ - public void setLanguageId(java.math.BigDecimal languageId) { - this.languageId = languageId; + public void setOrderFormId(BigDecimal orderFormId) { + this.orderFormId = orderFormId; } - /** - * @return the name - */ - public String getName() { - return name; + public String getOrderFormNumber() { + return orderFormNumber; } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; + public void setOrderFormNumber(String orderFormNumber) { + this.orderFormNumber = orderFormNumber; } - /** - * @return the title - */ - public String getTitle() { - return title; + public BigDecimal getCustomerId() { + return customerId; } - /** - * @param title the title to set - */ - public void setTitle(String title) { - this.title = title; + public void setCustomerId(BigDecimal customerId) { + this.customerId = customerId; } - /** - * @return the description - */ - public String getDescription() { - return description; + public String getCustomerGender() { + return customerGender; } - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; + public void setCustomerGender(String customerGender) { + this.customerGender = customerGender; } - /** - * @return the url - */ - public String getUrl() { - return url; + public String getCustomerFirstname() { + return customerFirstname; } - /** - * @param url the url to set - */ - public void setUrl(String url) { - this.url = url; + public void setCustomerFirstname(String customerFirstname) { + this.customerFirstname = customerFirstname; } - /** - * @return the viewed - */ - public java.math.BigDecimal getViewed() { - return viewed; + public String getCustomerLastname() { + return customerLastname; } - /** - * @param viewed the viewed to set - */ - public void setViewed(java.math.BigDecimal viewed) { - this.viewed = viewed; + public void setCustomerLastname(String customerLastname) { + this.customerLastname = customerLastname; } - /** - * @return the weight - */ - public java.math.BigDecimal getWeight() { - return weight; + public String getCustomerFirstnameDescription() { + return customerFirstnameDescription; } - /** - * @param weight the weight to set - */ - public void setWeight(java.math.BigDecimal weight) { - this.weight = weight; + public void setCustomerFirstnameDescription( + String customerFirstnameDescription) { + this.customerFirstnameDescription = customerFirstnameDescription; } - /** - * @return the size - */ - public String getSize() { - return size; + public String getCustomerLastnameDescription() { + return customerLastnameDescription; } - /** - * @param size the size to set - */ - public void setSize(String size) { - this.size = size; + public void setCustomerLastnameDescription( + String customerLastnameDescription) { + this.customerLastnameDescription = customerLastnameDescription; } - /** - * @return the ordered - */ - public java.math.BigDecimal getOrdered() { - return ordered; + public java.util.Date getCustomerDayOfBirth() { + return customerDayOfBirth; } - /** - * @param ordered the ordered to set - */ - public void setOrdered(java.math.BigDecimal ordered) { - this.ordered = ordered; + public void setCustomerDayOfBirth(java.util.Date customerDayOfBirth) { + this.customerDayOfBirth = customerDayOfBirth; } - /** - * @return the reviewed - */ - public java.math.BigDecimal getReviewed() { - return reviewed; + public String getCustomerEmailAddress() { + return customerEmailAddress; } - /** - * @param reviewed the reviewed to set - */ - public void setReviewed(java.math.BigDecimal reviewed) { - this.reviewed = reviewed; + public void setCustomerEmailAddress(String customerEmailAddress) { + this.customerEmailAddress = customerEmailAddress; } - /** - * @return the rating - */ - public java.math.BigDecimal getRating() { - return rating; + public String getCustomerCompany() { + return customerCompany; } - /** - * @param rating the rating to set - */ - public void setRating(java.math.BigDecimal rating) { - this.rating = rating; + public void setCustomerCompany(String customerCompany) { + this.customerCompany = customerCompany; } - /** - * @return the status - */ - public java.math.BigDecimal getStatus() { - return status; + public String getCustomerDepartment() { + return customerDepartment; } - /** - * @param status the status to set - */ - public void setStatus(java.math.BigDecimal status) { - this.status = status; + public void setCustomerDepartment(String customerDepartment) { + this.customerDepartment = customerDepartment; } - /** - * @return the dateAdded - */ - public java.sql.Timestamp getDateAdded() { - return dateAdded; + public String getCustomerStreetAddress() { + return customerStreetAddress; } - /** - * @param dateAdded the dateAdded to set - */ - public void setDateAdded(java.sql.Timestamp dateAdded) { - this.dateAdded = dateAdded; + public void setCustomerStreetAddress(String customerStreetAddress) { + this.customerStreetAddress = customerStreetAddress; } - /** - * @return the lastModified - */ - public java.sql.Timestamp getLastModified() { - return lastModified; + public String getCustomerSuburb() { + return customerSuburb; } - /** - * @param lastModified the lastModified to set - */ - public void setLastModified(java.sql.Timestamp lastModified) { - this.lastModified = lastModified; + public void setCustomerSuburb(String customerSuburb) { + this.customerSuburb = customerSuburb; } - /** - * @return the dateAvailable - */ - public java.sql.Timestamp getDateAvailable() { - return dateAvailable; + public String getCustomerCity() { + return customerCity; } - /** - * @param dateAvailable the dateAvailable to set - */ - public void setDateAvailable(java.sql.Timestamp dateAvailable) { - this.dateAvailable = dateAvailable; + public void setCustomerCity(String customerCity) { + this.customerCity = customerCity; } - /** - * @return the taxClassId - */ - public java.math.BigDecimal getTaxClassId() { - return taxClassId; + public String getCustomerState() { + return customerState; } - /** - * @param taxClassId the taxClassId to set - */ - public void setTaxClassId(java.math.BigDecimal taxClassId) { - this.taxClassId = taxClassId; + public void setCustomerState(String customerState) { + this.customerState = customerState; } - /** - * @return the manufacturerId - */ - public java.math.BigDecimal getManufacturerId() { - return manufacturerId; + public String getCustomerPostcode() { + return customerPostcode; } - /** - * @param manufacturerId the manufacturerId to set - */ - public void setManufacturerId(java.math.BigDecimal manufacturerId) { - this.manufacturerId = manufacturerId; + public void setCustomerPostcode(String customerPostcode) { + this.customerPostcode = customerPostcode; } - /** - * @return the orderProductId - */ - public java.math.BigDecimal getOrderProductId() { - return orderProductId; + public String getCustomerTelephone() { + return customerTelephone; } - /** - * @param orderProductId the orderProductId to set - */ - public void setOrderProductId(java.math.BigDecimal orderProductId) { - this.orderProductId = orderProductId; + public void setCustomerTelephone(String customerTelephone) { + this.customerTelephone = customerTelephone; } - /** - * @return the orderFormId - */ - public java.math.BigDecimal getOrderFormId() { - return orderFormId; + public String getCustomerCountryCode() { + return customerCountryCode; } - /** - * @param orderFormId the orderFormId to set - */ - public void setOrderFormId(java.math.BigDecimal orderFormId) { - this.orderFormId = orderFormId; + public void setCustomerCountryCode(String customerCountryCode) { + this.customerCountryCode = customerCountryCode; } - /** - * @return the productId - */ - public java.math.BigDecimal getProductId() { - return productId; + public String getCustomerLanguage() { + return customerLanguage; } - /** - * @param productId the productId to set - */ - public void setProductId(java.math.BigDecimal productId) { - this.productId = productId; + public void setCustomerLanguage(String customerLanguage) { + this.customerLanguage = customerLanguage; } - /** - * @return the code - */ - public String getCode() { - return code; + public String getBillingCompany() { + return billingCompany; } - /** - * @param code the code to set - */ - public void setCode(String code) { - this.code = code; + public void setBillingCompany(String billingCompany) { + this.billingCompany = billingCompany; } - /** - * @return the model - */ + public String getBillingDepartment() { + return billingDepartment; + } + + public void setBillingDepartment(String billingDepartment) { + this.billingDepartment = billingDepartment; + } + + public String getBillingFirstname() { + return billingFirstname; + } + + public void setBillingFirstname(String billingFirstname) { + this.billingFirstname = billingFirstname; + } + + public String getBillingLastname() { + return billingLastname; + } + + public void setBillingLastname(String billingLastname) { + this.billingLastname = billingLastname; + } + + public String getBillingFirstnameDescription() { + return billingFirstnameDescription; + } + + public void setBillingFirstnameDescription( + String billingFirstnameDescription) { + this.billingFirstnameDescription = billingFirstnameDescription; + } + + public String getBillingLastnameDescription() { + return billingLastnameDescription; + } + + public void setBillingLastnameDescription(String billingLastnameDescription) { + this.billingLastnameDescription = billingLastnameDescription; + } + + public String getBillingStreetAddress() { + return billingStreetAddress; + } + + public void setBillingStreetAddress(String billingStreetAddress) { + this.billingStreetAddress = billingStreetAddress; + } + + public String getBillingSuburb() { + return billingSuburb; + } + + public void setBillingSuburb(String billingSuburb) { + this.billingSuburb = billingSuburb; + } + + public String getBillingCity() { + return billingCity; + } + + public void setBillingCity(String billingCity) { + this.billingCity = billingCity; + } + + public String getBillingState() { + return billingState; + } + + public void setBillingState(String billingState) { + this.billingState = billingState; + } + + public String getBillingPostcode() { + return billingPostcode; + } + + public void setBillingPostcode(String billingPostcode) { + this.billingPostcode = billingPostcode; + } + + public String getBillingTelephone() { + return billingTelephone; + } + + public void setBillingTelephone(String billingTelephone) { + this.billingTelephone = billingTelephone; + } + + public String getBillingCountryCode() { + return billingCountryCode; + } + + public void setBillingCountryCode(String billingCountryCode) { + this.billingCountryCode = billingCountryCode; + } + + public String getBillingLanguage() { + return billingLanguage; + } + + public void setBillingLanguage(String billingLanguage) { + this.billingLanguage = billingLanguage; + } + + public BigDecimal getOrderStatusId() { + return orderStatusId; + } + + public void setOrderStatusId(BigDecimal orderStatusId) { + this.orderStatusId = orderStatusId; + } + + public Date getUpdatedDate() { + return updatedDate; + } + + public void setUpdatedDate(Date updatedDate) { + this.updatedDate = updatedDate; + } + + public Date getPurchasedDate() { + return purchasedDate; + } + + public void setPurchasedDate(Date purchasedDate) { + this.purchasedDate = purchasedDate; + } + + public Date getFinishedDate() { + return finishedDate; + } + + public void setFinishedDate(Date finishedDate) { + this.finishedDate = finishedDate; + } + + public BigDecimal getPaymentMethodId() { + return paymentMethodId; + } + + public void setPaymentMethodId(BigDecimal paymentMethodId) { + this.paymentMethodId = paymentMethodId; + } + + public String getPaymentMethodCode() { + return paymentMethodCode; + } + + public void setPaymentMethodCode(String paymentMethodCode) { + this.paymentMethodCode = paymentMethodCode; + } + + public BigDecimal getOrderCardInfoId() { + return orderCardInfoId; + } + + public void setOrderCardInfoId(BigDecimal orderCardInfoId) { + this.orderCardInfoId = orderCardInfoId; + } + + public BigDecimal getPaymentStatusId() { + return paymentStatusId; + } + + public void setPaymentStatusId(BigDecimal paymentStatusId) { + this.paymentStatusId = paymentStatusId; + } + + public BigDecimal getSubTotalPrice() { + return subTotalPrice; + } + + public void setSubTotalPrice(BigDecimal subTotalPrice) { + this.subTotalPrice = subTotalPrice; + } + + public BigDecimal getTax() { + return tax; + } + + public void setTax(BigDecimal tax) { + this.tax = tax; + } + + public BigDecimal getDeliveryPrice() { + return deliveryPrice; + } + + public void setDeliveryPrice(BigDecimal deliveryPrice) { + this.deliveryPrice = deliveryPrice; + } + + public BigDecimal getPaymentFee() { + return paymentFee; + } + + public void setPaymentFee(BigDecimal paymentFee) { + this.paymentFee = paymentFee; + } + + public BigDecimal getTotalPrice() { + return totalPrice; + } + + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; + } + + public String getDeliveryCompany() { + return deliveryCompany; + } + + public void setDeliveryCompany(String deliveryCompany) { + this.deliveryCompany = deliveryCompany; + } + + public String getDeliveryDepartment() { + return deliveryDepartment; + } + + public void setDeliveryDepartment(String deliveryDepartment) { + this.deliveryDepartment = deliveryDepartment; + } + + public String getDeliveryFirstname() { + return deliveryFirstname; + } + + public void setDeliveryFirstname(String deliveryFirstname) { + this.deliveryFirstname = deliveryFirstname; + } + + public String getDeliveryLastname() { + return deliveryLastname; + } + + public void setDeliveryLastname(String deliveryLastname) { + this.deliveryLastname = deliveryLastname; + } + + public String getDeliveryFirstnameDescription() { + return deliveryFirstnameDescription; + } + + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + this.deliveryFirstnameDescription = deliveryFirstnameDescription; + } + + public String getDeliveryLastnameDescription() { + return deliveryLastnameDescription; + } + + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + this.deliveryLastnameDescription = deliveryLastnameDescription; + } + + public String getDeliveryStreetAddress() { + return deliveryStreetAddress; + } + + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + this.deliveryStreetAddress = deliveryStreetAddress; + } + + public String getDeliverySuburb() { + return deliverySuburb; + } + + public void setDeliverySuburb(String deliverySuburb) { + this.deliverySuburb = deliverySuburb; + } + + public String getDeliveryCity() { + return deliveryCity; + } + + public void setDeliveryCity(String deliveryCity) { + this.deliveryCity = deliveryCity; + } + + public String getDeliveryState() { + return deliveryState; + } + + public void setDeliveryState(String deliveryState) { + this.deliveryState = deliveryState; + } + + public String getDeliveryPostcode() { + return deliveryPostcode; + } + + public void setDeliveryPostcode(String deliveryPostcode) { + this.deliveryPostcode = deliveryPostcode; + } + + public String getDeliveryTelephone() { + return deliveryTelephone; + } + + public void setDeliveryTelephone(String deliveryTelephone) { + this.deliveryTelephone = deliveryTelephone; + } + + public BigDecimal getDeliveryStatusId() { + return deliveryStatusId; + } + + public void setDeliveryStatusId(BigDecimal deliveryStatusId) { + this.deliveryStatusId = deliveryStatusId; + } + + public BigDecimal getDeliveryMethodId() { + return deliveryMethodId; + } + + public void setDeliveryMethodId(BigDecimal deliveryMethodId) { + this.deliveryMethodId = deliveryMethodId; + } + + public String getDeliveryMethodCode() { + return deliveryMethodCode; + } + + public void setDeliveryMethodCode(String deliveryMethodCode) { + this.deliveryMethodCode = deliveryMethodCode; + } + + public String getDeliveryCountryCode() { + return deliveryCountryCode; + } + + public void setDeliveryCountryCode(String deliveryCountryCode) { + this.deliveryCountryCode = deliveryCountryCode; + } + + public String getDeliveryLanguage() { + return deliveryLanguage; + } + + public void setDeliveryLanguage(String deliveryLanguage) { + this.deliveryLanguage = deliveryLanguage; + } + + public BigDecimal getDeliveryCountryId() { + return deliveryCountryId; + } + + public void setDeliveryCountryId(BigDecimal deliveryCountryId) { + this.deliveryCountryId = deliveryCountryId; + } + + public BigDecimal getDeliveryZoneId() { + return deliveryZoneId; + } + + public void setDeliveryZoneId(BigDecimal deliveryZoneId) { + this.deliveryZoneId = deliveryZoneId; + } + + public Date getRequestedDate() { + return requestedDate; + } + + public void setRequestedDate(Date requestedDate) { + this.requestedDate = requestedDate; + } + + public Date getSentDate() { + return sentDate; + } + + public void setSentDate(Date sentDate) { + this.sentDate = sentDate; + } + + public Date getReceivedDate() { + return receivedDate; + } + + public void setReceivedDate(Date receivedDate) { + this.receivedDate = receivedDate; + } + + public String getSlipNumber() { + return slipNumber; + } + + public void setSlipNumber(String slipNumber) { + this.slipNumber = slipNumber; + } + + public BigDecimal getGiftWrap() { + return giftWrap; + } + + public void setGiftWrap(BigDecimal giftWrap) { + this.giftWrap = giftWrap; + } + + public String getGiftMessage() { + return giftMessage; + } + + public void setGiftMessage(String giftMessage) { + this.giftMessage = giftMessage; + } + + public String getEnvelopeLabel() { + return envelopeLabel; + } + + public void setEnvelopeLabel(String envelopeLabel) { + this.envelopeLabel = envelopeLabel; + } + + public BigDecimal getOrderProductId() { + return orderProductId; + } + + public void setOrderProductId(BigDecimal orderProductId) { + this.orderProductId = orderProductId; + } + + public BigDecimal getProductId() { + return productId; + } + + public void setProductId(BigDecimal productId) { + this.productId = productId; + } + public String getModel() { return model; } - /** - * @param model the model to set - */ public void setModel(String model) { this.model = model; } - /** - * @return the price - */ - public java.math.BigDecimal getPrice() { + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public BigDecimal getPrice() { return price; } - /** - * @param price the price to set - */ - public void setPrice(java.math.BigDecimal price) { + public void setPrice(BigDecimal price) { this.price = price; } - /** - * @return the finalPrice - */ - public java.math.BigDecimal getFinalPrice() { + public BigDecimal getFinalPrice() { return finalPrice; } - /** - * @param finalPrice the finalPrice to set - */ - public void setFinalPrice(java.math.BigDecimal finalPrice) { + public void setFinalPrice(BigDecimal finalPrice) { this.finalPrice = finalPrice; } - /** - * @return the tax - */ - public java.math.BigDecimal getTax() { - return tax; + public BigDecimal getQuantity() { + return quantity; } - /** - * @param tax the tax to set - */ - public void setTax(java.math.BigDecimal tax) { - this.tax = tax; + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; } - /** - * @return the quantity - */ - public java.math.BigDecimal getQuantity() { - return quantity; + public String getProductName() { + return productName; } - /** - * @param quantity the quantity to set - */ - public void setQuantity(java.math.BigDecimal quantity) { - this.quantity = quantity; + public void setProductName(String productName) { + this.productName = productName; } + public String getDisplayProductName() { + return displayProductName; + } + + public void setDisplayProductName(String displayProductName) { + this.displayProductName = displayProductName; + } + + public String getManufacturerName() { + return manufacturerName; + } + + public void setManufacturerName(String manufacturerName) { + this.manufacturerName = manufacturerName; + } + + public String getDisplayManufacturerName() { + return displayManufacturerName; + } + + public void setDisplayManufacturerName(String displayManufacturerName) { + this.displayManufacturerName = displayManufacturerName; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/FeeCalculator.java 2008-04-08 05:03:44 UTC (rev 880) @@ -6,9 +6,9 @@ import java.util.Map; import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.exentity.Basket; public interface FeeCalculator extends Serializable { - public BigDecimal calculate(List list, + public BigDecimal calculate(List list, AddressBook deliveryAddressBook, Map informationMap); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/BankPaymentCalculator.java 2008-04-08 05:03:44 UTC (rev 880) @@ -5,7 +5,7 @@ import java.util.Map; import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.fee.FeeCalculator; public class BankPaymentCalculator implements FeeCalculator { @@ -15,7 +15,7 @@ */ private static final long serialVersionUID = 2210867873710022790L; - public BigDecimal calculate(List list, + public BigDecimal calculate(List list, AddressBook deliveryAddressBook, Map informationMap) { return new BigDecimal(0); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/CashOnDeliveryPaymentCalculator.java 2008-04-08 05:03:44 UTC (rev 880) @@ -5,7 +5,7 @@ import java.util.Map; import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.fee.FeeCalculator; public class CashOnDeliveryPaymentCalculator implements FeeCalculator { @@ -15,7 +15,7 @@ */ private static final long serialVersionUID = 2769660903440943706L; - public BigDecimal calculate(List list, + public BigDecimal calculate(List list, AddressBook deliveryAddressBook, Map informationMap) { return new BigDecimal(300); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java 2008-04-08 05:03:44 UTC (rev 880) @@ -7,7 +7,7 @@ import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.fee.FeeCalculator; public class DefaultDeliveryMethodCalculator implements FeeCalculator { @@ -54,7 +54,7 @@ this.focPrice = BigDecimal.valueOf(Double.parseDouble(focPrice)); } - public BigDecimal calculate(List list, + public BigDecimal calculate(List list, AddressBook deliveryAddressBook, Map informationMap) { BigDecimal fee = defaultFee; if (zoneMap.get(deliveryAddressBook.getState()) != null) { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java 2008-04-08 05:03:44 UTC (rev 880) @@ -6,7 +6,7 @@ import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.fee.FeeCalculator; public class ECollectPaymentCalculator implements FeeCalculator { @@ -22,7 +22,7 @@ private String type; - public BigDecimal calculate(List list, + public BigDecimal calculate(List list, AddressBook deliveryAddressBook, Map informationMap) { if (CASH.equals(getType())) { @@ -35,18 +35,18 @@ return new BigDecimal(0); } - protected BigDecimal calculateForCash(List list, + protected BigDecimal calculateForCash(List list, AddressBook deliveryAddressBook, Map informationMap) { return calculateCharge(list, deliveryAddressBook, informationMap).add( calculateFiscal(list, deliveryAddressBook, informationMap)); } - protected BigDecimal calculateForCreditcard(List list, + protected BigDecimal calculateForCreditcard(List list, AddressBook deliveryAddressBook, Map informationMap) { return calculateCharge(list, deliveryAddressBook, informationMap); } - protected BigDecimal calculateCharge(List list, + protected BigDecimal calculateCharge(List list, AddressBook deliveryAddressBook, Map informationMap) { BigDecimal subTotalPrice = (BigDecimal) informationMap .get(PompeiConstants.SUB_TOTAL_PRICE); @@ -74,7 +74,7 @@ return BigDecimal.valueOf(4200); } - protected BigDecimal calculateFiscal(List list, + protected BigDecimal calculateFiscal(List list, AddressBook deliveryAddressBook, Map informationMap) { BigDecimal subTotalPrice = (BigDecimal) informationMap .get(PompeiConstants.SUB_TOTAL_PRICE); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2008-04-08 05:03:44 UTC (rev 880) @@ -3,13 +3,15 @@ import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.Locale; import javax.faces.context.FacesContext; import javax.portlet.PortletConfig; import javax.portlet.RenderResponse; -import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiDBConstants; +import jp.sf.pal.pompei.PompeiException; import org.apache.jetspeed.administration.PortalAdministration; import org.apache.jetspeed.page.PageManager; @@ -73,7 +75,7 @@ return path + templateName; } - public static String getMessageDigest(String str) throws CommonException { + public static String getMessageDigest(String str) throws PompeiException { if (str == null) { str = ""; } @@ -102,10 +104,10 @@ } return buf.toString(); } catch (NoSuchAlgorithmException e) { - throw new CommonException("could.not.encode.secret.password", + throw new PompeiException("could.not.encode.secret.password", "Could not encode secret password", e); } catch (UnsupportedEncodingException e) { - throw new CommonException("could.not.encode.secret.password", + throw new PompeiException("could.not.encode.secret.password", "Could not encode secret password", e); } } @@ -189,4 +191,20 @@ } return new String(sb); } + + public static String getDefaultLanguage() { + Locale locale = getFacesContext().getViewRoot().getLocale(); + if (locale != null) { + locale.toString(); + } + return PompeiDBConstants.DEFAULT_LANGUAGE; + } + + public static String getCurrentLanguage() { + Locale locale = getFacesContext().getViewRoot().getLocale(); + if (locale != null) { + locale.toString(); + } + return PompeiDBConstants.DEFAULT_LANGUAGE; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/UploadedFileUtil.java 2008-04-08 05:03:44 UTC (rev 880) @@ -12,9 +12,10 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.StreamUtil; -import jp.sf.pal.jsf.custom.fileupload.UploadedFile; import jp.sf.pal.pompei.PompeiConstants; +import org.seasar.teeda.extension.util.UploadedFile; + public class UploadedFileUtil { private static String getExtension(String name) { if (name == null) { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/AbstractCustomerEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -3,107 +3,164 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; +import java.util.Map; import org.seasar.teeda.extension.util.LabelHelper; public abstract class AbstractCustomerEditPage implements Serializable { + private String mode; - private BigDecimal addressBookId; + private LabelHelper labelHelper; - private String cellphone; + private List> addressBookItems; - private String city; + // Customer + public BigDecimal customerId; - private String company; + public String portalId; - private BigDecimal customerId; + public String gender; - private Date dayOfBirth; + public String firstname; - private String department; + public String lastname; - private String emailAddress; + public String firstnameDescription; - private String fax; + public String lastnameDescription; - private String firstname; + public String nickname; - private String gender; + public java.util.Date dayOfBirth; - private String lastname; + public String emailAddress; - private String mode; + public Date createdDate; - private String postcode; + public Date updatedDate; - private String state; + // AddressBook + public BigDecimal addressBookId; - private String streetAddress; + public String company; - private String telephone; + public String department; - private LabelHelper labelHelper; + public String streetAddress; + public String suburb; + + public String city; + + public String state; + + public String postcode; + + public String telephone; + + public String fax; + + public String cellphone; + + public BigDecimal defaultAddress; + + public BigDecimal countryId; + + public BigDecimal deliveryZoneId; + public AbstractCustomerEditPage() { super(); } - public BigDecimal getAddressBookId() { - return addressBookId; + public String getMode() { + return mode; } - public void setAddressBookId(BigDecimal addressBookId) { - this.addressBookId = addressBookId; + public void setMode(String mode) { + this.mode = mode; } - public String getCellphone() { - return cellphone; + public LabelHelper getLabelHelper() { + return labelHelper; } - public void setCellphone(String cellphone) { - this.cellphone = cellphone; + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; } - public String getCity() { - return city; + public BigDecimal getCustomerId() { + return customerId; } - public void setCity(String city) { - this.city = city; + public void setCustomerId(BigDecimal customerId) { + this.customerId = customerId; } - public String getCompany() { - return company; + public String getPortalId() { + return portalId; } - public void setCompany(String company) { - this.company = company; + public void setPortalId(String portalId) { + this.portalId = portalId; } - public BigDecimal getCustomerId() { - return customerId; + public String getGender() { + return gender; } - public void setCustomerId(BigDecimal customerId) { - this.customerId = customerId; + public void setGender(String gender) { + this.gender = gender; } - public Date getDayOfBirth() { - return dayOfBirth; + public String getFirstname() { + return firstname; } - public void setDayOfBirth(Date dayOfBirth) { - this.dayOfBirth = dayOfBirth; + public void setFirstname(String firstname) { + this.firstname = firstname; } - public String getDepartment() { - return department; + public String getLastname() { + return lastname; } - public void setDepartment(String department) { - this.department = department; + public void setLastname(String lastname) { + this.lastname = lastname; } + public String getFirstnameDescription() { + return firstnameDescription; + } + + public void setFirstnameDescription(String firstnameDescription) { + this.firstnameDescription = firstnameDescription; + } + + public String getLastnameDescription() { + return lastnameDescription; + } + + public void setLastnameDescription(String lastnameDescription) { + this.lastnameDescription = lastnameDescription; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public java.util.Date getDayOfBirth() { + return dayOfBirth; + } + + public void setDayOfBirth(java.util.Date dayOfBirth) { + this.dayOfBirth = dayOfBirth; + } + public String getEmailAddress() { return emailAddress; } @@ -112,54 +169,70 @@ this.emailAddress = emailAddress; } - public String getFax() { - return fax; + public Date getCreatedDate() { + return createdDate; } - public void setFax(String fax) { - this.fax = fax; + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; } - public String getFirstname() { - return firstname; + public Date getUpdatedDate() { + return updatedDate; } - public void setFirstname(String firstname) { - this.firstname = firstname; + public void setUpdatedDate(Date updatedDate) { + this.updatedDate = updatedDate; } - public String getGender() { - return gender; + public BigDecimal getAddressBookId() { + return addressBookId; } - public void setGender(String gender) { - this.gender = gender; + public void setAddressBookId(BigDecimal addressBookId) { + this.addressBookId = addressBookId; } - public String getLastname() { - return lastname; + public String getCompany() { + return company; } - public void setLastname(String lastname) { - this.lastname = lastname; + public void setCompany(String company) { + this.company = company; } - public String getMode() { - return mode; + public String getDepartment() { + return department; } - public void setMode(String mode) { - this.mode = mode; + public void setDepartment(String department) { + this.department = department; } - public String getPostcode() { - return postcode; + public String getStreetAddress() { + return streetAddress; } - public void setPostcode(String postcode) { - this.postcode = postcode; + public void setStreetAddress(String streetAddress) { + this.streetAddress = streetAddress; } + public String getSuburb() { + return suburb; + } + + public void setSuburb(String suburb) { + this.suburb = suburb; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + public String getState() { return state; } @@ -168,12 +241,12 @@ this.state = state; } - public String getStreetAddress() { - return streetAddress; + public String getPostcode() { + return postcode; } - public void setStreetAddress(String streetAddress) { - this.streetAddress = streetAddress; + public void setPostcode(String postcode) { + this.postcode = postcode; } public String getTelephone() { @@ -184,18 +257,52 @@ this.telephone = telephone; } - /** - * @return labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; + public String getFax() { + return fax; } - /** - * @param labelHelper 設定する labelHelper - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; + public void setFax(String fax) { + this.fax = fax; } + public String getCellphone() { + return cellphone; + } + + public void setCellphone(String cellphone) { + this.cellphone = cellphone; + } + + public BigDecimal getDefaultAddress() { + return defaultAddress; + } + + public void setDefaultAddress(BigDecimal defaultAddress) { + this.defaultAddress = defaultAddress; + } + + public BigDecimal getCountryId() { + return countryId; + } + + public void setCountryId(BigDecimal countryId) { + this.countryId = countryId; + } + + public BigDecimal getDeliveryZoneId() { + return deliveryZoneId; + } + + public void setDeliveryZoneId(BigDecimal deliveryZoneId) { + this.deliveryZoneId = deliveryZoneId; + } + + public List> getAddressBookItems() { + return addressBookItems; + } + + public void setAddressBookItems(List> addressBookItems) { + this.addressBookItems = addressBookItems; + } + } \ No newline at end of file Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,24 +1,30 @@ package jp.sf.pal.pompei.web.admin.customer; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.dxo.CustomerDxo; -import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.service.CustomerService; +import jp.sf.pal.pompei.web.admin.order.OrderListAction; +import org.seasar.framework.log.Logger; + public class CustomerConfirmAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -2150284828406095184L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderListAction.class); // LOG CODE: ?PC013? + private CustomerConfirmPage customerConfirmPage; private CustomerService customerService; @@ -30,22 +36,30 @@ } public Class prerender() { - if (getCustomerConfirmPage().getCustomerId() != null + if (customerConfirmPage.getCustomerId() != null && (isUpdate() || isDelete())) { if (isDelete()) { - // address book - AddressBook addressBook = getCustomerService() - .getDefaultAddressBook( - getCustomerConfirmPage().getCustomerId()); - if (addressBook != null) { - getCustomerDxo().convert(addressBook, - getCustomerConfirmPage()); + try { + // customer + Customer customer = customerService + .getCustomer(customerConfirmPage.getCustomerId()); + customerDxo.convertFromCustomerToPage(customer, + customerConfirmPage); + + // address book + List> addressBookItems = new ArrayList>(); + customerDxo.convertFromAddressBookToMap(customer + .getAddressBookList(), addressBookItems); + customerConfirmPage.setAddressBookItems(addressBookItems); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage( + "could.not.find.customer.in.customerconfirm", + new Object[] { customerConfirmPage + .getCustomerId() }); + logger.log("EPC0131", new Object[] { this.toString() }, e); + return CustomerListPage.class; } - - // customer - Customer customer = getCustomerService().getCustomer( - getCustomerConfirmPage().getCustomerId()); - getCustomerDxo().convert(customer, getCustomerConfirmPage()); } } else { FacesMessageUtil @@ -60,104 +74,96 @@ public Class doFinish() { if (isUpdate()) { - if (getCustomerConfirmPage().getCustomerId() == null) { + if (customerConfirmPage.getCustomerId() == null) { FacesMessageUtil .addErrorMessage("customer.is.not.specified.in.customerconfirm"); return CustomerListPage.class; } - Customer customer = getCustomerService().getCustomer( - getCustomerConfirmPage().getCustomerId()); + Customer customer = customerService.getCustomer(customerConfirmPage + .getCustomerId()); if (customer == null) { - FacesMessageUtil - .addErrorMessage( - "could.not.find.customer.info.in.customerconfirm", - new Object[] { getCustomerConfirmPage() - .getCustomerId() }); + FacesMessageUtil.addErrorMessage( + "could.not.find.customer.info.in.customerconfirm", + new Object[] { customerConfirmPage.getCustomerId() }); return CustomerListPage.class; } - getCustomerDxo().convert(getCustomerConfirmPage(), customer); + customerDxo.convertFromPageToCustomer(customerConfirmPage, customer); - AddressBook addressBook = null; - if (getCustomerConfirmPage().getAddressBookId() != null) { - addressBook = getCustomerService().getAddressBook( - getCustomerConfirmPage().getAddressBookId()); - getCustomerDxo().convert(getCustomerConfirmPage(), addressBook); + try { + customerService.updateCustomer(customer); + + FacesMessageUtil + .addInfoMessage("updated.customer.in.customerconfirm"); + return CustomerListPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "failed.to.update.customer.in.customerconfirm", + new Object[] { customerConfirmPage.toString() }); + logger.log("EPC0132", new Object[] { this.toString() }, e); } - - getCustomerService().updateCustomer(customer, addressBook); - - FacesMessageUtil - .addInfoMessage("updated.customer.in.customerconfirm"); - return CustomerListPage.class; } else if (isDelete()) { - if (getCustomerConfirmPage().getCustomerId() == null) { + if (customerConfirmPage.getCustomerId() == null) { FacesMessageUtil .addErrorMessage("customer.is.not.specified.in.customerconfirm.for.delete"); return CustomerListPage.class; } - getCustomerService().deleteCustomer( - getCustomerConfirmPage().getCustomerId()); + try { + customerService.deleteCustomer(customerConfirmPage + .getCustomerId()); - FacesMessageUtil - .addInfoMessage("deleted.customer.in.customerconfirm"); - return CustomerListPage.class; + FacesMessageUtil + .addInfoMessage("deleted.customer.in.customerconfirm"); + return CustomerListPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage( + "failed.to.delete.customer.in.customerconfirm", + new Object[] { customerConfirmPage.toString() }); + logger.log("EPC0133", new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "failed.to.delete.customer.in.customerconfirm", + new Object[] { customerConfirmPage.toString() }); + logger.log("EPC0134", new Object[] { this.toString() }, e); + } } else { FacesMessageUtil .addErrorMessage("unexpected.action.in.customerconfirm"); - return null; } + return null; } private boolean isUpdate() { - return PompeiConstants.UPDATE_MODE.equals(getCustomerConfirmPage() - .getMode()); + return PompeiConstants.UPDATE_MODE + .equals(customerConfirmPage.getMode()); } private boolean isDelete() { - return PompeiConstants.DELETE_MODE.equals(getCustomerConfirmPage() - .getMode()); + return PompeiConstants.DELETE_MODE + .equals(customerConfirmPage.getMode()); } - /** - * @return customerConfirmPage - */ public CustomerConfirmPage getCustomerConfirmPage() { return customerConfirmPage; } - /** - * @param customerConfirmPage 設定する customerConfirmPage - */ public void setCustomerConfirmPage(CustomerConfirmPage customerConfirmPage) { this.customerConfirmPage = customerConfirmPage; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return customerDxo - */ public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo 設定する customerDxo - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerConfirmPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,8 +1,9 @@ package jp.sf.pal.pompei.web.admin.customer; - public class CustomerConfirmPage extends AbstractCustomerEditPage { + private static final long serialVersionUID = -5986707363868218117L; + public String getGenderStr() { if (getLabelHelper() != null && getGender() != null) { return getLabelHelper().getLabelValue(getGender()); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,24 +1,29 @@ package jp.sf.pal.pompei.web.admin.customer; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.dxo.CustomerDxo; -import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.service.CustomerService; +import jp.sf.pal.pompei.web.admin.order.OrderListAction; +import org.seasar.framework.log.Logger; + public class CustomerEditAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 1427442393860756060L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderListAction.class); // LOG CODE: ?PC012? + private CustomerEditPage customerEditPage; private CustomerService customerService; @@ -30,22 +35,23 @@ } public Class prerender() { - if (getCustomerEditPage().getCustomerId() == null || !isUpdate()) { + if (customerEditPage.getCustomerId() == null || !isUpdate()) { FacesMessageUtil .addErrorMessage("invalid.parameter.in.customeredit"); return CustomerListPage.class; } - // address book - AddressBook addressBook = getCustomerService().getDefaultAddressBook( - getCustomerEditPage().getCustomerId()); - getCustomerDxo().convert(addressBook, getCustomerEditPage()); - // customer - Customer customer = getCustomerService().getCustomer( - getCustomerEditPage().getCustomerId()); - getCustomerDxo().convert(customer, getCustomerEditPage()); + Customer customer = customerService.getCustomer(customerEditPage + .getCustomerId()); + customerDxo.convertFromCustomerToPage(customer, customerEditPage); + // address book + List> addressBookItems = new ArrayList>(); + customerDxo.convertFromAddressBookToMap(customer.getAddressBookList(), + addressBookItems); + customerEditPage.setAddressBookItems(addressBookItems); + //render faces message FacesMessageUtil.renderMessages(); return null; @@ -56,50 +62,31 @@ } private boolean isUpdate() { - return PompeiConstants.UPDATE_MODE.equals(getCustomerEditPage() - .getMode()); + return PompeiConstants.UPDATE_MODE.equals(customerEditPage.getMode()); } - /** - * @return customerService - */ + public CustomerEditPage getCustomerEditPage() { + return customerEditPage; + } + + public void setCustomerEditPage(CustomerEditPage customerEditPage) { + this.customerEditPage = customerEditPage; + } + public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return customerDxo - */ public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo 設定する customerDxo - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } - /** - * @return customerEditPage - */ - public CustomerEditPage getCustomerEditPage() { - return customerEditPage; - } - - /** - * @param customerEditPage 設定する customerEditPage - */ - public void setCustomerEditPage(CustomerEditPage customerEditPage) { - this.customerEditPage = customerEditPage; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,10 +1,22 @@ package jp.sf.pal.pompei.web.admin.customer; +import java.util.List; +import java.util.Map; + public class CustomerEditPage extends AbstractCustomerEditPage { - /** - * - */ + + private static final long serialVersionUID = 5782672253630576575L; + private List> addressBookItems; + + public List> getAddressBookItems() { + return addressBookItems; + } + + public void setAddressBookItems(List> addressBookItems) { + this.addressBookItems = addressBookItems; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,84 +1,87 @@ package jp.sf.pal.pompei.web.admin.customer; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.dxo.CustomerDxo; import jp.sf.pal.pompei.exentity.Customer; +import jp.sf.pal.pompei.pager.CustomerPager; import jp.sf.pal.pompei.service.CustomerService; +import jp.sf.pal.pompei.web.admin.order.OrderListAction; +import org.seasar.framework.log.Logger; + public class CustomerListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 8532394606295152264L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderListAction.class); // LOG CODE: ?PC011? + private CustomerListPage customerListPage; private CustomerService customerService; private CustomerDxo customerDxo; + private CustomerPager customerPager; + public Class initialize() { return null; } public Class prerender() { + //TODO pager + //TODO catch an exception + // customer list - List customerList = getCustomerService().getCustomerList(); - getCustomerListPage().setCustomerItems( - getCustomerDxo().convert(customerList)); + List customerList = customerService + .getCustomerListByPager(customerPager); + List> customerItems = new ArrayList>(); + customerDxo.convertFromCustomerToMap(customerList, customerItems); + customerListPage.setCustomerItems(customerItems); // render faces message FacesMessageUtil.renderMessages(); return null; } - /** - * @return customerListPage - */ public CustomerListPage getCustomerListPage() { return customerListPage; } - /** - * @param customerListPage 設定する customerListPage - */ public void setCustomerListPage(CustomerListPage customerListPage) { this.customerListPage = customerListPage; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return customerDxo - */ public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo 設定する customerDxo - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } + public CustomerPager getCustomerPager() { + return customerPager; + } + + public void setCustomerPager(CustomerPager customerPager) { + this.customerPager = customerPager; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -8,35 +8,66 @@ public class CustomerListPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -7603304026216388367L; - private BigDecimal customerId; - private int customerIndex; private List> customerItems; - private String emailAddress; + // Customer + public BigDecimal customerId; - private String firstName; + public String portalId; - private String lastName; + public String gender; - private String portalId; + public String firstname; - private Date dateAdded; + public String lastname; - public BigDecimal getCustomerId() { - return customerId; - } + public String firstnameDescription; - public void setCustomerId(BigDecimal customerId) { - this.customerId = customerId; - } + public String lastnameDescription; + public String nickname; + + public java.util.Date dayOfBirth; + + public String emailAddress; + + public Date createdDate; + + public Date updatedDate; + + // AddressBook + public BigDecimal addressBookId; + + public String company; + + public String department; + + public String streetAddress; + + public String suburb; + + public String city; + + public String state; + + public String postcode; + + public String telephone; + + public String fax; + + public String cellphone; + + public BigDecimal defaultAddress; + + public BigDecimal countryId; + + public BigDecimal deliveryZoneId; + public int getCustomerIndex() { return customerIndex; } @@ -53,6 +84,78 @@ this.customerItems = customerItems; } + public BigDecimal getCustomerId() { + return customerId; + } + + public void setCustomerId(BigDecimal customerId) { + this.customerId = customerId; + } + + public String getPortalId() { + return portalId; + } + + public void setPortalId(String portalId) { + this.portalId = portalId; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public String getFirstnameDescription() { + return firstnameDescription; + } + + public void setFirstnameDescription(String firstnameDescription) { + this.firstnameDescription = firstnameDescription; + } + + public String getLastnameDescription() { + return lastnameDescription; + } + + public void setLastnameDescription(String lastnameDescription) { + this.lastnameDescription = lastnameDescription; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public java.util.Date getDayOfBirth() { + return dayOfBirth; + } + + public void setDayOfBirth(java.util.Date dayOfBirth) { + this.dayOfBirth = dayOfBirth; + } + public String getEmailAddress() { return emailAddress; } @@ -61,42 +164,132 @@ this.emailAddress = emailAddress; } - public String getFirstName() { - return firstName; + public Date getCreatedDate() { + return createdDate; } - public void setFirstName(String firstName) { - this.firstName = firstName; + public void setCreatedDate(Date createdDate) { + this.createdDate = createdDate; } - public String getLastName() { - return lastName; + public Date getUpdatedDate() { + return updatedDate; } - public void setLastName(String lastName) { - this.lastName = lastName; + public void setUpdatedDate(Date updatedDate) { + this.updatedDate = updatedDate; } - public String getPortalId() { - return portalId; + public BigDecimal getAddressBookId() { + return addressBookId; } - public void setPortalId(String portalId) { - this.portalId = portalId; + public void setAddressBookId(BigDecimal addressBookId) { + this.addressBookId = addressBookId; } - /** - * @return dateAdded - */ - public Date getDateAdded() { - return dateAdded; + public String getCompany() { + return company; } - /** - * @param dateAdded 設定する dateAdded - */ - public void setDateAdded(Date dateAdded) { - this.dateAdded = dateAdded; + public void setCompany(String company) { + this.company = company; } + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getStreetAddress() { + return streetAddress; + } + + public void setStreetAddress(String streetAddress) { + this.streetAddress = streetAddress; + } + + public String getSuburb() { + return suburb; + } + + public void setSuburb(String suburb) { + this.suburb = suburb; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getPostcode() { + return postcode; + } + + public void setPostcode(String postcode) { + this.postcode = postcode; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getCellphone() { + return cellphone; + } + + public void setCellphone(String cellphone) { + this.cellphone = cellphone; + } + + public BigDecimal getDefaultAddress() { + return defaultAddress; + } + + public void setDefaultAddress(BigDecimal defaultAddress) { + this.defaultAddress = defaultAddress; + } + + public BigDecimal getCountryId() { + return countryId; + } + + public void setCountryId(BigDecimal countryId) { + this.countryId = countryId; + } + + public BigDecimal getDeliveryZoneId() { + return deliveryZoneId; + } + + public void setDeliveryZoneId(BigDecimal deliveryZoneId) { + this.deliveryZoneId = deliveryZoneId; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -6,29 +6,59 @@ import java.util.List; import java.util.Map; -import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; import org.seasar.teeda.extension.util.LabelHelper; public abstract class AbstractOrderEditPage implements Serializable { private List> orderProductItems; - private String model; + private String mode; - private String code; + private LabelHelper labelHelper; - private BigDecimal price; + // OrderForm + private BigDecimal orderFormId; - private BigDecimal finalPrice; + private String orderFormNumber; - private BigDecimal quantity; + private BigDecimal customerId; - private String billingCity; + private String customerGender; + private String customerFirstname; + + private String customerLastname; + + private String customerFirstnameDescription; + + private String customerLastnameDescription; + + private java.util.Date customerDayOfBirth; + + private String customerEmailAddress; + + private String customerCompany; + + private String customerDepartment; + + private String customerStreetAddress; + + private String customerSuburb; + + private String customerCity; + + private String customerState; + + private String customerPostcode; + + private String customerTelephone; + + private String customerCountryCode; + + private String customerLanguage; + private String billingCompany; - private String billingCountryName; - private String billingDepartment; private String billingFirstname; @@ -39,61 +69,52 @@ private String billingLastnameDescription; - private String billingLocaleName; + private String billingStreetAddress; - private String billingPostcode; + private String billingSuburb; + private String billingCity; + private String billingState; - private String billingStreetAddress; + private String billingPostcode; private String billingTelephone; - private BigDecimal currencyId; + private String billingCountryCode; - private String currencyCode; + private String billingLanguage; - private String customerCity; + private BigDecimal orderStatusId; - private String customerCompany; + private Date updatedDate; - private String customerCountryName; + private Date purchasedDate; - @DateTimeConverter(pattern = "yyyy/MM/dd") - private Date customerDayOfBirth; + private Date finishedDate; - private String customerDepartment; + // OrderPayment + private BigDecimal paymentMethodId; - private String customerEmailAddress; + private String paymentMethodCode; - private String customerFirstname; + private BigDecimal orderCardInfoId; - private String customerFirstnameDescription; + private BigDecimal paymentStatusId; - private String customerGender; + private BigDecimal subTotalPrice; - private BigDecimal customerId; + private BigDecimal tax; - private String customerLastname; + private BigDecimal deliveryPrice; - private String customerLastnameDescription; + private BigDecimal paymentFee; - private String customerLocaleName; + private BigDecimal totalPrice; - private String customerPostcode; - - private String customerState; - - private String customerStreetAddress; - - private String customerTelephone; - - private String deliveryCity; - + // OrderDelivery private String deliveryCompany; - private String deliveryCountryName; - private String deliveryDepartment; private String deliveryFirstname; @@ -104,77 +125,275 @@ private String deliveryLastnameDescription; - private String deliveryLocaleName; + private String deliveryStreetAddress; - private String deliveryMethodCode; + private String deliverySuburb; - private BigDecimal deliveryMethodId; + private String deliveryCity; + private String deliveryState; + private String deliveryPostcode; - private BigDecimal deliveryPrice; + private String deliveryTelephone; - private String deliveryState; + private BigDecimal deliveryStatusId; - private String deliveryStreetAddress; + private BigDecimal deliveryMethodId; - private String deliveryTelephone; + private String deliveryMethodCode; - private String deliveryNumber; + private String deliveryCountryCode; - @DateTimeConverter(pattern = "yyyy/MM/dd") - private Date finishedDate; + private String deliveryLanguage; - @DateTimeConverter(pattern = "yyyy/MM/dd") - private Date lastModified; + private BigDecimal deliveryCountryId; - private String mode; + private BigDecimal deliveryZoneId; - private BigDecimal orderFormId; + private Date requestedDate; - private String orderFormNumber; + private Date sentDate; - private BigDecimal orderStatusId; + private Date receivedDate; - private String paymentMethodCode; + private String slipNumber; - private BigDecimal paymentMethodId; + private BigDecimal giftWrap; - private BigDecimal paymentFee; + private String giftMessage; - @DateTimeConverter(pattern = "yyyy/MM/dd") - private Date purchasedDate; + private String envelopeLabel; - private BigDecimal subTotalPrice; + // OrderProduct + private BigDecimal orderProductId; - private BigDecimal tax; + private BigDecimal productId; - private BigDecimal totalPrice; + private String model; - private String cardCode; + private String code; + private BigDecimal price; + + private BigDecimal finalPrice; + + // private BigDecimal tax; + + private BigDecimal quantity; + + private String productName; + + private String displayProductName; + + private String manufacturerName; + + private String displayManufacturerName; + + //OrderCardInfo + + private BigDecimal cardTypeId; + + private String cardTypeCode; + private String cardOwner; private String cardNumber; private String cardExpires; - private BigDecimal orderCardInfoId; + private String cardPaymentType; - private LabelHelper labelHelper; - public AbstractOrderEditPage() { super(); } - public String getBillingCity() { - return billingCity; + public List> getOrderProductItems() { + return orderProductItems; } - public void setBillingCity(String billingCity) { - this.billingCity = billingCity; + public void setOrderProductItems(List> orderProductItems) { + this.orderProductItems = orderProductItems; } + public String getMode() { + return mode; + } + + public void setMode(String mode) { + this.mode = mode; + } + + public LabelHelper getLabelHelper() { + return labelHelper; + } + + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public BigDecimal getOrderFormId() { + return orderFormId; + } + + public void setOrderFormId(BigDecimal orderFormId) { + this.orderFormId = orderFormId; + } + + public String getOrderFormNumber() { + return orderFormNumber; + } + + public void setOrderFormNumber(String orderFormNumber) { + this.orderFormNumber = orderFormNumber; + } + + public BigDecimal getCustomerId() { + return customerId; + } + + public void setCustomerId(BigDecimal customerId) { + this.customerId = customerId; + } + + public String getCustomerGender() { + return customerGender; + } + + public void setCustomerGender(String customerGender) { + this.customerGender = customerGender; + } + + public String getCustomerFirstname() { + return customerFirstname; + } + + public void setCustomerFirstname(String customerFirstname) { + this.customerFirstname = customerFirstname; + } + + public String getCustomerLastname() { + return customerLastname; + } + + public void setCustomerLastname(String customerLastname) { + this.customerLastname = customerLastname; + } + + public String getCustomerFirstnameDescription() { + return customerFirstnameDescription; + } + + public void setCustomerFirstnameDescription( + String customerFirstnameDescription) { + this.customerFirstnameDescription = customerFirstnameDescription; + } + + public String getCustomerLastnameDescription() { + return customerLastnameDescription; + } + + public void setCustomerLastnameDescription( + String customerLastnameDescription) { + this.customerLastnameDescription = customerLastnameDescription; + } + + public java.util.Date getCustomerDayOfBirth() { + return customerDayOfBirth; + } + + public void setCustomerDayOfBirth(java.util.Date customerDayOfBirth) { + this.customerDayOfBirth = customerDayOfBirth; + } + + public String getCustomerEmailAddress() { + return customerEmailAddress; + } + + public void setCustomerEmailAddress(String customerEmailAddress) { + this.customerEmailAddress = customerEmailAddress; + } + + public String getCustomerCompany() { + return customerCompany; + } + + public void setCustomerCompany(String customerCompany) { + this.customerCompany = customerCompany; + } + + public String getCustomerDepartment() { + return customerDepartment; + } + + public void setCustomerDepartment(String customerDepartment) { + this.customerDepartment = customerDepartment; + } + + public String getCustomerStreetAddress() { + return customerStreetAddress; + } + + public void setCustomerStreetAddress(String customerStreetAddress) { + this.customerStreetAddress = customerStreetAddress; + } + + public String getCustomerSuburb() { + return customerSuburb; + } + + public void setCustomerSuburb(String customerSuburb) { + this.customerSuburb = customerSuburb; + } + + public String getCustomerCity() { + return customerCity; + } + + public void setCustomerCity(String customerCity) { + this.customerCity = customerCity; + } + + public String getCustomerState() { + return customerState; + } + + public void setCustomerState(String customerState) { + this.customerState = customerState; + } + + public String getCustomerPostcode() { + return customerPostcode; + } + + public void setCustomerPostcode(String customerPostcode) { + this.customerPostcode = customerPostcode; + } + + public String getCustomerTelephone() { + return customerTelephone; + } + + public void setCustomerTelephone(String customerTelephone) { + this.customerTelephone = customerTelephone; + } + + public String getCustomerCountryCode() { + return customerCountryCode; + } + + public void setCustomerCountryCode(String customerCountryCode) { + this.customerCountryCode = customerCountryCode; + } + + public String getCustomerLanguage() { + return customerLanguage; + } + + public void setCustomerLanguage(String customerLanguage) { + this.customerLanguage = customerLanguage; + } + public String getBillingCompany() { return billingCompany; } @@ -183,14 +402,6 @@ this.billingCompany = billingCompany; } - public String getBillingCountryName() { - return billingCountryName; - } - - public void setBillingCountryName(String billingCountryName) { - this.billingCountryName = billingCountryName; - } - public String getBillingDepartment() { return billingDepartment; } @@ -215,22 +426,47 @@ this.billingLastname = billingLastname; } - public String getBillingLocaleName() { - return billingLocaleName; + public String getBillingFirstnameDescription() { + return billingFirstnameDescription; } - public void setBillingLocaleName(String billingLocaleName) { - this.billingLocaleName = billingLocaleName; + public void setBillingFirstnameDescription( + String billingFirstnameDescription) { + this.billingFirstnameDescription = billingFirstnameDescription; } - public String getBillingPostcode() { - return billingPostcode; + public String getBillingLastnameDescription() { + return billingLastnameDescription; } - public void setBillingPostcode(String billingPostcode) { - this.billingPostcode = billingPostcode; + public void setBillingLastnameDescription(String billingLastnameDescription) { + this.billingLastnameDescription = billingLastnameDescription; } + public String getBillingStreetAddress() { + return billingStreetAddress; + } + + public void setBillingStreetAddress(String billingStreetAddress) { + this.billingStreetAddress = billingStreetAddress; + } + + public String getBillingSuburb() { + return billingSuburb; + } + + public void setBillingSuburb(String billingSuburb) { + this.billingSuburb = billingSuburb; + } + + public String getBillingCity() { + return billingCity; + } + + public void setBillingCity(String billingCity) { + this.billingCity = billingCity; + } + public String getBillingState() { return billingState; } @@ -239,12 +475,12 @@ this.billingState = billingState; } - public String getBillingStreetAddress() { - return billingStreetAddress; + public String getBillingPostcode() { + return billingPostcode; } - public void setBillingStreetAddress(String billingStreetAddress) { - this.billingStreetAddress = billingStreetAddress; + public void setBillingPostcode(String billingPostcode) { + this.billingPostcode = billingPostcode; } public String getBillingTelephone() { @@ -255,142 +491,126 @@ this.billingTelephone = billingTelephone; } - public BigDecimal getCurrencyId() { - return currencyId; + public String getBillingCountryCode() { + return billingCountryCode; } - public void setCurrencyId(BigDecimal currencyId) { - this.currencyId = currencyId; + public void setBillingCountryCode(String billingCountryCode) { + this.billingCountryCode = billingCountryCode; } - public String getCustomerCity() { - return customerCity; + public String getBillingLanguage() { + return billingLanguage; } - public void setCustomerCity(String customerCity) { - this.customerCity = customerCity; + public void setBillingLanguage(String billingLocaleName) { + this.billingLanguage = billingLocaleName; } - public String getCustomerCompany() { - return customerCompany; + public BigDecimal getOrderStatusId() { + return orderStatusId; } - public void setCustomerCompany(String customerCompany) { - this.customerCompany = customerCompany; + public void setOrderStatusId(BigDecimal orderStatusId) { + this.orderStatusId = orderStatusId; } - public String getCustomerCountryName() { - return customerCountryName; + public Date getUpdatedDate() { + return updatedDate; } - public void setCustomerCountryName(String customerCountryName) { - this.customerCountryName = customerCountryName; + public void setUpdatedDate(Date updatedDate) { + this.updatedDate = updatedDate; } - public Date getCustomerDayOfBirth() { - return customerDayOfBirth; + public Date getPurchasedDate() { + return purchasedDate; } - public void setCustomerDayOfBirth(Date customerDayOfBirth) { - this.customerDayOfBirth = customerDayOfBirth; + public void setPurchasedDate(Date purchasedDate) { + this.purchasedDate = purchasedDate; } - public String getCustomerDepartment() { - return customerDepartment; + public Date getFinishedDate() { + return finishedDate; } - public void setCustomerDepartment(String customerDepartment) { - this.customerDepartment = customerDepartment; + public void setFinishedDate(Date finishedDate) { + this.finishedDate = finishedDate; } - public String getCustomerEmailAddress() { - return customerEmailAddress; + public BigDecimal getPaymentMethodId() { + return paymentMethodId; } - public void setCustomerEmailAddress(String customerEmailAddress) { - this.customerEmailAddress = customerEmailAddress; + public void setPaymentMethodId(BigDecimal paymentMethodId) { + this.paymentMethodId = paymentMethodId; } - public String getCustomerFirstname() { - return customerFirstname; + public String getPaymentMethodCode() { + return paymentMethodCode; } - public void setCustomerFirstname(String customerFirstname) { - this.customerFirstname = customerFirstname; + public void setPaymentMethodCode(String paymentMethodCode) { + this.paymentMethodCode = paymentMethodCode; } - public String getCustomerGender() { - return customerGender; + public BigDecimal getOrderCardInfoId() { + return orderCardInfoId; } - public void setCustomerGender(String customerGender) { - this.customerGender = customerGender; + public void setOrderCardInfoId(BigDecimal orderCardInfoId) { + this.orderCardInfoId = orderCardInfoId; } - public BigDecimal getCustomerId() { - return customerId; + public BigDecimal getPaymentStatusId() { + return paymentStatusId; } - public void setCustomerId(BigDecimal customerId) { - this.customerId = customerId; + public void setPaymentStatusId(BigDecimal paymentStatusId) { + this.paymentStatusId = paymentStatusId; } - public String getCustomerLastname() { - return customerLastname; + public BigDecimal getSubTotalPrice() { + return subTotalPrice; } - public void setCustomerLastname(String customerLastname) { - this.customerLastname = customerLastname; + public void setSubTotalPrice(BigDecimal subTotalPrice) { + this.subTotalPrice = subTotalPrice; } - public String getCustomerLocaleName() { - return customerLocaleName; + public BigDecimal getTax() { + return tax; } - public void setCustomerLocaleName(String customerLocaleName) { - this.customerLocaleName = customerLocaleName; + public void setTax(BigDecimal tax) { + this.tax = tax; } - public String getCustomerPostcode() { - return customerPostcode; + public BigDecimal getDeliveryPrice() { + return deliveryPrice; } - public void setCustomerPostcode(String customerPostcode) { - this.customerPostcode = customerPostcode; + public void setDeliveryPrice(BigDecimal deliveryPrice) { + this.deliveryPrice = deliveryPrice; } - public String getCustomerState() { - return customerState; + public BigDecimal getPaymentFee() { + return paymentFee; } - public void setCustomerState(String customerState) { - this.customerState = customerState; + public void setPaymentFee(BigDecimal paymentFee) { + this.paymentFee = paymentFee; } - public String getCustomerStreetAddress() { - return customerStreetAddress; + public BigDecimal getTotalPrice() { + return totalPrice; } - public void setCustomerStreetAddress(String customerStreetAddress) { - this.customerStreetAddress = customerStreetAddress; + public void setTotalPrice(BigDecimal totalPrice) { + this.totalPrice = totalPrice; } - public String getCustomerTelephone() { - return customerTelephone; - } - - public void setCustomerTelephone(String customerTelephone) { - this.customerTelephone = customerTelephone; - } - - public String getDeliveryCity() { - return deliveryCity; - } - - public void setDeliveryCity(String deliveryCity) { - this.deliveryCity = deliveryCity; - } - public String getDeliveryCompany() { return deliveryCompany; } @@ -399,14 +619,6 @@ this.deliveryCompany = deliveryCompany; } - public String getDeliveryCountryName() { - return deliveryCountryName; - } - - public void setDeliveryCountryName(String deliveryCountryName) { - this.deliveryCountryName = deliveryCountryName; - } - public String getDeliveryDepartment() { return deliveryDepartment; } @@ -431,44 +643,46 @@ this.deliveryLastname = deliveryLastname; } - public String getDeliveryLocaleName() { - return deliveryLocaleName; + public String getDeliveryFirstnameDescription() { + return deliveryFirstnameDescription; } - public void setDeliveryLocaleName(String deliveryLocaleName) { - this.deliveryLocaleName = deliveryLocaleName; + public void setDeliveryFirstnameDescription( + String deliveryFirstnameDescription) { + this.deliveryFirstnameDescription = deliveryFirstnameDescription; } - public String getDeliveryMethodCode() { - return deliveryMethodCode; + public String getDeliveryLastnameDescription() { + return deliveryLastnameDescription; } - public void setDeliveryMethodCode(String deliveryMethodCode) { - this.deliveryMethodCode = deliveryMethodCode; + public void setDeliveryLastnameDescription( + String deliveryLastnameDescription) { + this.deliveryLastnameDescription = deliveryLastnameDescription; } - public BigDecimal getDeliveryMethodId() { - return deliveryMethodId; + public String getDeliveryStreetAddress() { + return deliveryStreetAddress; } - public void setDeliveryMethodId(BigDecimal deliveryMethodId) { - this.deliveryMethodId = deliveryMethodId; + public void setDeliveryStreetAddress(String deliveryStreetAddress) { + this.deliveryStreetAddress = deliveryStreetAddress; } - public String getDeliveryPostcode() { - return deliveryPostcode; + public String getDeliverySuburb() { + return deliverySuburb; } - public void setDeliveryPostcode(String deliveryPostcode) { - this.deliveryPostcode = deliveryPostcode; + public void setDeliverySuburb(String deliverySuburb) { + this.deliverySuburb = deliverySuburb; } - public BigDecimal getDeliveryPrice() { - return deliveryPrice; + public String getDeliveryCity() { + return deliveryCity; } - public void setDeliveryPrice(BigDecimal deliveryPrice) { - this.deliveryPrice = deliveryPrice; + public void setDeliveryCity(String deliveryCity) { + this.deliveryCity = deliveryCity; } public String getDeliveryState() { @@ -479,12 +693,12 @@ this.deliveryState = deliveryState; } - public String getDeliveryStreetAddress() { - return deliveryStreetAddress; + public String getDeliveryPostcode() { + return deliveryPostcode; } - public void setDeliveryStreetAddress(String deliveryStreetAddress) { - this.deliveryStreetAddress = deliveryStreetAddress; + public void setDeliveryPostcode(String deliveryPostcode) { + this.deliveryPostcode = deliveryPostcode; } public String getDeliveryTelephone() { @@ -495,403 +709,252 @@ this.deliveryTelephone = deliveryTelephone; } - public Date getFinishedDate() { - return finishedDate; + public BigDecimal getDeliveryStatusId() { + return deliveryStatusId; } - public void setFinishedDate(Date finishedDate) { - this.finishedDate = finishedDate; + public void setDeliveryStatusId(BigDecimal deliveryStatusId) { + this.deliveryStatusId = deliveryStatusId; } - public Date getLastModified() { - return lastModified; + public BigDecimal getDeliveryMethodId() { + return deliveryMethodId; } - public void setLastModified(Date lastModified) { - this.lastModified = lastModified; + public void setDeliveryMethodId(BigDecimal deliveryMethodId) { + this.deliveryMethodId = deliveryMethodId; } - public String getMode() { - return mode; + public String getDeliveryMethodCode() { + return deliveryMethodCode; } - public void setMode(String mode) { - this.mode = mode; + public void setDeliveryMethodCode(String deliveryMethodCode) { + this.deliveryMethodCode = deliveryMethodCode; } - public BigDecimal getOrderFormId() { - return orderFormId; + public String getDeliveryCountryCode() { + return deliveryCountryCode; } - public void setOrderFormId(BigDecimal orderFormId) { - this.orderFormId = orderFormId; + public void setDeliveryCountryCode(String deliveryCountryCode) { + this.deliveryCountryCode = deliveryCountryCode; } - public String getOrderFormNumber() { - return orderFormNumber; + public String getDeliveryLanguage() { + return deliveryLanguage; } - public void setOrderFormNumber(String orderFormNumber) { - this.orderFormNumber = orderFormNumber; + public void setDeliveryLanguage(String deliveryLanguage) { + this.deliveryLanguage = deliveryLanguage; } - public BigDecimal getOrderStatusId() { - return orderStatusId; + public BigDecimal getDeliveryCountryId() { + return deliveryCountryId; } - public void setOrderStatusId(BigDecimal orderStatusId) { - this.orderStatusId = orderStatusId; + public void setDeliveryCountryId(BigDecimal deliveryCountryId) { + this.deliveryCountryId = deliveryCountryId; } - public String getPaymentMethodCode() { - return paymentMethodCode; + public BigDecimal getDeliveryZoneId() { + return deliveryZoneId; } - public void setPaymentMethodCode(String paymentMethodCode) { - this.paymentMethodCode = paymentMethodCode; + public void setDeliveryZoneId(BigDecimal deliveryZoneId) { + this.deliveryZoneId = deliveryZoneId; } - public BigDecimal getPaymentMethodId() { - return paymentMethodId; + public Date getRequestedDate() { + return requestedDate; } - public void setPaymentMethodId(BigDecimal paymentMethodId) { - this.paymentMethodId = paymentMethodId; + public void setRequestedDate(Date requestedDate) { + this.requestedDate = requestedDate; } - public Date getPurchasedDate() { - return purchasedDate; + public Date getSentDate() { + return sentDate; } - public void setPurchasedDate(Date purchasedDate) { - this.purchasedDate = purchasedDate; + public void setSentDate(Date sentDate) { + this.sentDate = sentDate; } - public BigDecimal getSubTotalPrice() { - return subTotalPrice; + public Date getReceivedDate() { + return receivedDate; } - public void setSubTotalPrice(BigDecimal subTotalPrice) { - this.subTotalPrice = subTotalPrice; + public void setReceivedDate(Date receivedDate) { + this.receivedDate = receivedDate; } - public BigDecimal getTax() { - return tax; + public String getSlipNumber() { + return slipNumber; } - public void setTax(BigDecimal tax) { - this.tax = tax; + public void setSlipNumber(String slipNumber) { + this.slipNumber = slipNumber; } - public BigDecimal getTotalPrice() { - return totalPrice; + public BigDecimal getGiftWrap() { + return giftWrap; } - public void setTotalPrice(BigDecimal totalPrice) { - this.totalPrice = totalPrice; + public void setGiftWrap(BigDecimal giftWrap) { + this.giftWrap = giftWrap; } - public boolean isOrderCardInfo() { - return orderCardInfoId != null; + public String getGiftMessage() { + return giftMessage; } - /** - * @return cardCode - */ - public String getCardCode() { - return cardCode; + public void setGiftMessage(String giftMessage) { + this.giftMessage = giftMessage; } - /** - * @param cardCode 設定する cardCode - */ - public void setCardCode(String cardCode) { - this.cardCode = cardCode; + public String getEnvelopeLabel() { + return envelopeLabel; } - /** - * @return cardOwner - */ - public String getCardOwner() { - return cardOwner; + public void setEnvelopeLabel(String envelopeLabel) { + this.envelopeLabel = envelopeLabel; } - /** - * @param cardOwner 設定する cardOwner - */ - public void setCardOwner(String cardOwner) { - this.cardOwner = cardOwner; + public BigDecimal getOrderProductId() { + return orderProductId; } - /** - * @return cardNumber - */ - public String getCardNumber() { - return cardNumber; + public void setOrderProductId(BigDecimal orderProductId) { + this.orderProductId = orderProductId; } - /** - * @param cardNumber 設定する cardNumber - */ - public void setCardNumber(String cardNumber) { - this.cardNumber = cardNumber; + public BigDecimal getProductId() { + return productId; } - /** - * @return cardExpires - */ - public String getCardExpires() { - return cardExpires; + public void setProductId(BigDecimal productId) { + this.productId = productId; } - /** - * @param cardExpires 設定する cardExpires - */ - public void setCardExpires(String cardExpires) { - this.cardExpires = cardExpires; + public String getModel() { + return model; } - /** - * @return orderCardInfoId - */ - public BigDecimal getOrderCardInfoId() { - return orderCardInfoId; + public void setModel(String model) { + this.model = model; } - /** - * @param orderCardInfoId 設定する orderCardInfoId - */ - public void setOrderCardInfoId(BigDecimal orderCardInfoId) { - this.orderCardInfoId = orderCardInfoId; + public String getCode() { + return code; } - /** - * @return currencyCode - */ - public String getCurrencyCode() { - return currencyCode; + public void setCode(String code) { + this.code = code; } - /** - * @param currencyCode 設定する currencyCode - */ - public void setCurrencyCode(String currencyCode) { - this.currencyCode = currencyCode; - } - - /** - * @return labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; - } - - /** - * @param labelHelper 設定する labelHelper - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; - } - - /** - * @return orderProductItems - */ - public List> getOrderProductItems() { - return orderProductItems; - } - - /** - * @param orderProductItems 設定する orderProductItems - */ - public void setOrderProductItems(List> orderProductItems) { - this.orderProductItems = orderProductItems; - } - - /** - * @return model - */ - public String getModel() { - return model; - } - - /** - * @param model 設定する model - */ - public void setModel(String model) { - this.model = model; - } - - /** - * @return price - */ public BigDecimal getPrice() { return price; } - /** - * @param price 設定する price - */ public void setPrice(BigDecimal price) { this.price = price; } - /** - * @return finalPrice - */ public BigDecimal getFinalPrice() { return finalPrice; } - /** - * @param finalPrice 設定する finalPrice - */ public void setFinalPrice(BigDecimal finalPrice) { this.finalPrice = finalPrice; } - /** - * @return quantity - */ public BigDecimal getQuantity() { return quantity; } - /** - * @param quantity 設定する quantity - */ public void setQuantity(BigDecimal quantity) { this.quantity = quantity; } - /** - * @return code - */ - public String getCode() { - return code; + public String getProductName() { + return productName; } - /** - * @param code 設定する code - */ - public void setCode(String code) { - this.code = code; + public void setProductName(String productName) { + this.productName = productName; } - /** - * @return billingFirstnameDescription - */ - public String getBillingFirstnameDescription() { - return billingFirstnameDescription; + public String getDisplayProductName() { + return displayProductName; } - /** - * @param billingFirstnameDescription 設定する billingFirstnameDescription - */ - public void setBillingFirstnameDescription( - String billingFirstnameDescription) { - this.billingFirstnameDescription = billingFirstnameDescription; + public void setDisplayProductName(String displayProductName) { + this.displayProductName = displayProductName; } - /** - * @return billingLastnameDescription - */ - public String getBillingLastnameDescription() { - return billingLastnameDescription; + public String getManufacturerName() { + return manufacturerName; } - /** - * @param billingLastnameDescription 設定する billingLastnameDescription - */ - public void setBillingLastnameDescription(String billingLastnameDescription) { - this.billingLastnameDescription = billingLastnameDescription; + public void setManufacturerName(String manufacturerName) { + this.manufacturerName = manufacturerName; } - /** - * @return customerFirstnameDescription - */ - public String getCustomerFirstnameDescription() { - return customerFirstnameDescription; + public String getDisplayManufacturerName() { + return displayManufacturerName; } - /** - * @param customerFirstnameDescription 設定する customerFirstnameDescription - */ - public void setCustomerFirstnameDescription( - String customerFirstnameDescription) { - this.customerFirstnameDescription = customerFirstnameDescription; + public void setDisplayManufacturerName(String displayManufacturerName) { + this.displayManufacturerName = displayManufacturerName; } - /** - * @return customerLastnameDescription - */ - public String getCustomerLastnameDescription() { - return customerLastnameDescription; + public BigDecimal getCardTypeId() { + return cardTypeId; } - /** - * @param customerLastnameDescription 設定する customerLastnameDescription - */ - public void setCustomerLastnameDescription( - String customerLastnameDescription) { - this.customerLastnameDescription = customerLastnameDescription; + public void setCardTypeId(BigDecimal cardTypeId) { + this.cardTypeId = cardTypeId; } - /** - * @return deliveryFirstnameDescription - */ - public String getDeliveryFirstnameDescription() { - return deliveryFirstnameDescription; + public String getCardTypeCode() { + return cardTypeCode; } - /** - * @param deliveryFirstnameDescription 設定する deliveryFirstnameDescription - */ - public void setDeliveryFirstnameDescription( - String deliveryFirstnameDescription) { - this.deliveryFirstnameDescription = deliveryFirstnameDescription; + public void setCardTypeCode(String cardTypeCode) { + this.cardTypeCode = cardTypeCode; } - /** - * @return deliveryLastnameDescription - */ - public String getDeliveryLastnameDescription() { - return deliveryLastnameDescription; + public String getCardOwner() { + return cardOwner; } - /** - * @param deliveryLastnameDescription 設定する deliveryLastnameDescription - */ - public void setDeliveryLastnameDescription( - String deliveryLastnameDescription) { - this.deliveryLastnameDescription = deliveryLastnameDescription; + public void setCardOwner(String cardOwner) { + this.cardOwner = cardOwner; } - /** - * @return the deliveryNumber - */ - public String getDeliveryNumber() { - return deliveryNumber; + public String getCardNumber() { + return cardNumber; } - /** - * @param deliveryNumber the deliveryNumber to set - */ - public void setDeliveryNumber(String deliveryNumber) { - this.deliveryNumber = deliveryNumber; + public void setCardNumber(String cardNumber) { + this.cardNumber = cardNumber; } - /** - * @return the paymentFee - */ - public BigDecimal getPaymentFee() { - return paymentFee; + public String getCardExpires() { + return cardExpires; } - /** - * @param paymentFee the paymentFee to set - */ - public void setPaymentFee(BigDecimal paymentFee) { - this.paymentFee = paymentFee; + public void setCardExpires(String cardExpires) { + this.cardExpires = cardExpires; } + public String getCardPaymentType() { + return cardPaymentType; + } + + public void setCardPaymentType(String cardPaymentType) { + this.cardPaymentType = cardPaymentType; + } + } \ No newline at end of file Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,154 +0,0 @@ -package jp.sf.pal.pompei.web.admin.order; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Date; - -import jp.sf.pal.common.util.FacesMessageUtil; -import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.DeliveryMethodDxo; -import jp.sf.pal.pompei.exentity.DeliveryMethod; -import jp.sf.pal.pompei.exentity.DeliveryMethodDescription; -import jp.sf.pal.pompei.service.DeliveryMethodSerivce; - -import org.seasar.teeda.extension.annotation.takeover.TakeOver; -import org.seasar.teeda.extension.annotation.takeover.TakeOverType; - -public class DeliveryMethodEditAction implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -8204806329170528584L; - - /** - * - */ - private DeliveryMethodEditPage deliveryMethodEditPage; - - private DeliveryMethodSerivce deliveryMethodSerivce; - - private DeliveryMethodDxo deliveryMethodDxo; - - public Class initialize() { - return null; - } - - public Class prerender() { - if (PompeiConstants.INSERT_MODE.equals(getDeliveryMethodEditPage() - .getMode())) { - // insert - } else if (PompeiConstants.UPDATE_MODE - .equals(getDeliveryMethodEditPage().getMode())) { - // update - if (getDeliveryMethodEditPage().getTargetId() == null) { - return DeliveryMethodListPage.class; - } - DeliveryMethodDescription dmd = getDeliveryMethodSerivce() - .getDeliveryMethodDescription( - getDeliveryMethodEditPage().getTargetId()); - if (dmd == null) { - FacesMessageUtil.addWarnMessage("could.not.find.target.item"); - return DeliveryMethodListPage.class; - } - getDeliveryMethodDxo().convert(dmd, getDeliveryMethodEditPage()); - getDeliveryMethodDxo().convert(dmd.getDeliveryMethod(), - getDeliveryMethodEditPage()); - } else { - return DeliveryMethodListPage.class; - } - - // render FacesMessages - FacesMessageUtil.renderMessages(); - return null; - } - - @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,targetId") - public Class doUpdate() { - if (PompeiConstants.INSERT_MODE.equals(getDeliveryMethodEditPage() - .getMode())) { - // insert - DeliveryMethodDescription dmd = new DeliveryMethodDescription(); - dmd.setDeliveryMethod(new DeliveryMethod()); - dmd.getDeliveryMethod().setDateAdded( - new Timestamp(new Date().getTime())); - dmd.getDeliveryMethod().setLastModified( - new Timestamp(new Date().getTime())); - getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(), - dmd.getDeliveryMethod()); - getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(), dmd); - //TODO LANGUAGE_ID - dmd.setLanguageId(new BigDecimal(1)); - getDeliveryMethodSerivce().addDeliveryMethodDescription(dmd); - FacesMessageUtil.addInfoMessage("added.delivery.method"); - return DeliveryMethodListPage.class; - } else if (PompeiConstants.UPDATE_MODE - .equals(getDeliveryMethodEditPage().getMode())) { - // update - DeliveryMethodDescription dmd = getDeliveryMethodSerivce() - .getDeliveryMethodDescription( - getDeliveryMethodEditPage().getTargetId()); - if (dmd == null) { - FacesMessageUtil.addWarnMessage("could.not.find.target.item"); - return null; - } - dmd.getDeliveryMethod().setLastModified( - new Timestamp(new Date().getTime())); - getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(), - dmd.getDeliveryMethod()); - getDeliveryMethodDxo().convert(getDeliveryMethodEditPage(), dmd); - getDeliveryMethodSerivce().updateDeliveryMethodDescription(dmd); - FacesMessageUtil.addInfoMessage("updated.delivery.method"); - return DeliveryMethodEditPage.class; - } else { - FacesMessageUtil.addWarnMessage("unknown.action"); - } - return null; - } - - /** - * @return deliveryMethodEditPage - */ - public DeliveryMethodEditPage getDeliveryMethodEditPage() { - return deliveryMethodEditPage; - } - - /** - * @param deliveryMethodEditPage 設定する deliveryMethodEditPage - */ - public void setDeliveryMethodEditPage( - DeliveryMethodEditPage deliveryMethodEditPage) { - this.deliveryMethodEditPage = deliveryMethodEditPage; - } - - /** - * @return deliveryMethodSerivce - */ - public DeliveryMethodSerivce getDeliveryMethodSerivce() { - return deliveryMethodSerivce; - } - - /** - * @param deliveryMethodSerivce 設定する deliveryMethodSerivce - */ - public void setDeliveryMethodSerivce( - DeliveryMethodSerivce deliveryMethodSerivce) { - this.deliveryMethodSerivce = deliveryMethodSerivce; - } - - /** - * @return deliveryMethodDxo - */ - public DeliveryMethodDxo getDeliveryMethodDxo() { - return deliveryMethodDxo; - } - - /** - * @param deliveryMethodDxo 設定する deliveryMethodDxo - */ - public void setDeliveryMethodDxo(DeliveryMethodDxo deliveryMethodDxo) { - this.deliveryMethodDxo = deliveryMethodDxo; - } - -} Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,158 +0,0 @@ -package jp.sf.pal.pompei.web.admin.order; - -import java.io.Serializable; -import java.math.BigDecimal; - -import org.seasar.teeda.extension.annotation.validator.Required; -import org.seasar.teeda.extension.util.LabelHelper; - -public class DeliveryMethodEditPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -4656929386006745305L; - - @Required - private String objectName; - - @Required - private Integer status; - - @Required - private String code; - - private String mode; - - @Required - private Integer sortOrder; - - private BigDecimal targetId; - - private String name; - - private String description; - - private LabelHelper labelHelper; - - public String getObjectName() { - return objectName; - } - - public void setObjectName(String deliveryClass) { - this.objectName = deliveryClass; - } - - /** - * @return deliveryStatus - */ - public Integer getStatus() { - return status; - } - - /** - * @param deliveryStatus 設定する deliveryStatus - */ - public void setStatus(Integer deliveryStatus) { - this.status = deliveryStatus; - } - - public String getCode() { - return code; - } - - public void setCode(String deliveryMethodName) { - this.code = deliveryMethodName; - } - - public String getMode() { - return mode; - } - - public void setMode(String mode) { - this.mode = mode; - } - - public BigDecimal getTargetId() { - return targetId; - } - - public void setTargetId(BigDecimal targetId) { - this.targetId = targetId; - } - - /** - * @return deliveryMethodId - */ - public BigDecimal getDeliveryMethodId() { - return targetId; - } - - /** - * @param deliveryMethodId 設定する deliveryMethodId - */ - public void setDeliveryMethodId(BigDecimal deliveryMethodId) { - this.targetId = deliveryMethodId; - } - - /** - * @return labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; - } - - /** - * @param labelHelper 設定する labelHelper - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; - } - - public String getDoUpdateValue() { - return getLabelHelper().getLabelValue(getMode()); - } - - /** - * @return name - */ - public String getName() { - return name; - } - - /** - * @param name 設定する name - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return description - */ - public String getDescription() { - return description; - } - - /** - * @param description 設定する description - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * @return sortOrder - */ - public Integer getSortOrder() { - return sortOrder; - } - - /** - * @param sortOrder 設定する sortOrder - */ - public void setSortOrder(Integer sortOrder) { - this.sortOrder = sortOrder; - } - -} Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,123 +0,0 @@ -package jp.sf.pal.pompei.web.admin.order; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.common.util.FacesMessageUtil; -import jp.sf.pal.pompei.dxo.DeliveryMethodDxo; -import jp.sf.pal.pompei.exentity.DeliveryMethodDescription; -import jp.sf.pal.pompei.service.DeliveryMethodSerivce; - -public class DeliveryMethodListAction implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -3423909536402310913L; - - /** - * - */ - private DeliveryMethodListPage deliveryMethodListPage; - - private DeliveryMethodSerivce deliveryMethodSerivce; - - private DeliveryMethodDxo deliveryMethodDxo; - - public Class initialize() { - return null; - } - - public Class prerender() { - List> list = new ArrayList>(); - getDeliveryMethodDxo().convert( - getDeliveryMethodSerivce().getDeliveryMethodDescriptionList(), - list); - getDeliveryMethodListPage().setDeliveryMethodItems(list); - - // render FacesMessages - FacesMessageUtil.renderMessages(); - return null; - } - - public Class doDelete() { - if (getDeliveryMethodListPage().getTargetId() == null) { - FacesMessageUtil.addWarnMessage("could.not.find.target.item"); - return null; - } - - try { - getDeliveryMethodSerivce().deleteDeliveryMethod( - getDeliveryMethodListPage().getTargetId()); - } catch (Exception e) { - FacesMessageUtil.addWarnMessage("could.not.delete.target.item"); - } - return null; - } - - public Class doUpdate() { - if (getDeliveryMethodListPage().getTargetId() == null) { - FacesMessageUtil.addWarnMessage("could.not.find.target.item"); - return null; - } - DeliveryMethodDescription dmd = getDeliveryMethodSerivce() - .getDeliveryMethodDescription( - getDeliveryMethodListPage().getTargetId()); - if (dmd == null) { - FacesMessageUtil.addWarnMessage("target.item.does.not.exist"); - return null; - } - return DeliveryMethodEditPage.class; - } - - public Class doAdd() { - return DeliveryMethodEditPage.class; - } - - /** - * @return deliveryMethodListPage - */ - public DeliveryMethodListPage getDeliveryMethodListPage() { - return deliveryMethodListPage; - } - - /** - * @param deliveryMethodListPage 設定する deliveryMethodListPage - */ - public void setDeliveryMethodListPage( - DeliveryMethodListPage deliveryMethodListPage) { - this.deliveryMethodListPage = deliveryMethodListPage; - } - - /** - * @return deliveryMethodSerivce - */ - public DeliveryMethodSerivce getDeliveryMethodSerivce() { - return deliveryMethodSerivce; - } - - /** - * @param deliveryMethodSerivce 設定する deliveryMethodSerivce - */ - public void setDeliveryMethodSerivce( - DeliveryMethodSerivce deliveryMethodSerivce) { - this.deliveryMethodSerivce = deliveryMethodSerivce; - } - - /** - * @return deliveryMethodDxo - */ - public DeliveryMethodDxo getDeliveryMethodDxo() { - return deliveryMethodDxo; - } - - /** - * @param deliveryMethodDxo 設定する deliveryMethodDxo - */ - public void setDeliveryMethodDxo(DeliveryMethodDxo deliveryMethodDxo) { - this.deliveryMethodDxo = deliveryMethodDxo; - } - -} Deleted: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/DeliveryMethodListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,96 +0,0 @@ -package jp.sf.pal.pompei.web.admin.order; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -public class DeliveryMethodListPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -2437233534751079761L; - - private String code; - - private BigDecimal deliveryMethodId; - - private int deliveryMethodIndex; - - private List> deliveryMethodItems; - - private String name; - - private String mode; - - private BigDecimal sortOrder; - - private BigDecimal targetId; - - public String getCode() { - return code; - } - - public void setCode(String deliveryClass) { - this.code = deliveryClass; - } - - public BigDecimal getDeliveryMethodId() { - return deliveryMethodId; - } - - public void setDeliveryMethodId(BigDecimal deliveryMethodId) { - this.deliveryMethodId = deliveryMethodId; - } - - public int getDeliveryMethodIndex() { - return deliveryMethodIndex; - } - - public void setDeliveryMethodIndex(int deliveryMethodIndex) { - this.deliveryMethodIndex = deliveryMethodIndex; - } - - public List> getDeliveryMethodItems() { - return deliveryMethodItems; - } - - public void setDeliveryMethodItems( - List> deliveryMethodItems) { - this.deliveryMethodItems = deliveryMethodItems; - } - - public String getName() { - return name; - } - - public void setName(String deliveryMethodName) { - this.name = deliveryMethodName; - } - - public String getMode() { - return mode; - } - - public void setMode(String mode) { - this.mode = mode; - } - - public BigDecimal getSortOrder() { - return sortOrder; - } - - public void setSortOrder(BigDecimal sortOrder) { - this.sortOrder = sortOrder; - } - - public BigDecimal getTargetId() { - return targetId; - } - - public void setTargetId(BigDecimal targetId) { - this.targetId = targetId; - } - -} Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,84 +1,103 @@ package jp.sf.pal.pompei.web.admin.order; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.OrderFormDxo; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.dxo.OrderDxo; import jp.sf.pal.pompei.exentity.OrderCardInfo; import jp.sf.pal.pompei.exentity.OrderForm; import jp.sf.pal.pompei.exentity.OrderNotification; -import jp.sf.pal.pompei.exentity.OrderStatusDescription; -import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.service.OrderService; +import jp.sf.pal.pompei.service.SystemService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class OrderConfirmAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 3702608842511957150L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderListAction.class); // LOG CODE: ?PC009? + private OrderConfirmPage orderConfirmPage; private OrderService orderService; - private LanguageService languageService; + private SystemService systemService; - private OrderFormDxo orderFormDxo; + private OrderDxo orderDxo; public Class initialize() { return null; } public Class prerender() { - if (getOrderConfirmPage().getOrderFormId() != null + if (orderConfirmPage.getOrderFormId() != null && (isUpdate() || isDelete())) { - if (isDelete()) { - // order form - OrderForm orderForm = getOrderService().getOrderForm( - getOrderConfirmPage().getOrderFormId()); - getOrderFormDxo().convert(orderForm, getOrderConfirmPage()); + try { + if (isDelete()) { + // order form + OrderForm orderForm = orderService + .getOrderForm(orderConfirmPage.getOrderFormId()); + orderDxo.convertFromOrderFormToPage(orderForm, + orderConfirmPage); - // card info - if (orderForm.getOrderCardInfoId() != null) { - OrderCardInfo oci = getOrderService().getOrderCardInfo( - orderForm.getOrderCardInfoId()); - if (oci != null) { - getOrderFormDxo().convert(oci, getOrderConfirmPage()); + // card info + if (orderForm.getOrderCardInfoId() != null) { + OrderCardInfo oci = orderService + .getOrderCardInfo(orderForm + .getOrderCardInfoId()); + if (oci != null) { + orderDxo.convertFromOrderCardInfoToPage(oci, + orderConfirmPage); + } } + + // order product + List orderProductList = orderService + .getOrderProductListByOrderFormId(orderForm + .getOrderFormId()); + List> orderProductItems = new ArrayList>(); + orderDxo.convertFromOrderProductToMap(orderProductList, + orderProductItems); + orderConfirmPage.setOrderProductItems(orderProductItems); + } - // order product - getOrderConfirmPage().setOrderProductItems( - getOrderFormDxo().convertToOrderProductItems( - getOrderService() - .getOrderProductListByOrderFormId( - orderForm.getOrderFormId()))); - } + // order status + List orderStatusList = systemService + .getOrderStatusList(SystemUtil.getCurrentLanguage()); + for (OrderStatus orderStatus : orderStatusList) { + if (orderStatus.getOrderStatusId().equals( + orderConfirmPage.getOrderStatusId())) { + orderConfirmPage.setOrderStatusName(orderStatus + .getName()); + } + } - // order status - List orderStatusDescriptionList = getOrderService() - .getOrderStatusDescriptionList( - getLanguageService().getDefaultLanguage() - .getLanguageId()); - for (OrderStatusDescription osd : orderStatusDescriptionList) { - if (osd.getOrderStatusId().equals( - getOrderConfirmPage().getOrderStatusId())) { - getOrderConfirmPage().setOrderStatusName(osd.getName()); - } + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "could.not.find.customer.info.in.customerconfirm", + new Object[] { orderConfirmPage.getOrderFormId() }); + logger.log("EPC0091", new Object[] { this.toString() }, e); + return OrderListPage.class; } - - // render faces messages - FacesMessageUtil.renderMessages(); - return null; } else { FacesMessageUtil.addErrorMessage("unexpected.mode.in.orderconfirm"); return OrderListPage.class; @@ -88,62 +107,76 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "orderFormId") public Class doUpdate() { if (isUpdate()) { - // order form - OrderForm orderForm = getOrderService().getOrderForm( - getOrderConfirmPage().getOrderFormId()); - if (orderForm == null) { - FacesMessageUtil.addErrorMessage( - "could.not.find.order.in.orderconfirm", - new Object[] { getOrderConfirmPage() - .getOrderCardInfoId() }); - return null; - } - getOrderFormDxo().convert(getOrderConfirmPage(), orderForm); + try { + // order form + OrderForm orderForm = orderService + .getOrderForm(orderConfirmPage.getOrderFormId()); + if (orderForm == null) { + FacesMessageUtil.addErrorMessage( + "could.not.find.order.in.orderconfirm", + new Object[] { orderConfirmPage + .getOrderCardInfoId() }); + return null; + } + orderDxo + .convertFromPageToOrderForm(orderConfirmPage, orderForm); - // order card info - OrderCardInfo orderCardInfo = null; - if (getOrderConfirmPage().getOrderCardInfoId() != null) { - orderCardInfo = getOrderService().getOrderCardInfo( - getOrderConfirmPage().getOrderCardInfoId()); - if (orderCardInfo != null) { - getOrderFormDxo().convertToOrderCardInfo( - getOrderConfirmPage(), orderCardInfo); + // order card info + OrderCardInfo orderCardInfo = null; + if (orderConfirmPage.getOrderCardInfoId() != null) { + orderCardInfo = orderService + .getOrderCardInfo(orderConfirmPage + .getOrderCardInfoId()); + if (orderCardInfo != null) { + orderDxo.convertFromPageToOrderCardInfo( + orderConfirmPage, orderCardInfo); + } } - } - // update - getOrderService().updateOrderForm(orderForm, orderCardInfo); + // update + orderService.updateOrderForm(orderForm, orderCardInfo); - FacesMessageUtil - .addInfoMessage("updated.order.info.in.orderconfirm"); + FacesMessageUtil + .addInfoMessage("updated.order.info.in.orderconfirm"); - List orderNotificationList = getOrderService() - .getOrderNotificationListByOrderFormId( - getOrderConfirmPage().getOrderFormId()); - if (orderNotificationList != null - && !orderNotificationList.isEmpty()) { - return OrderNotificationSelectPage.class; - } else { - return OrderListPage.class; + List orderNotificationList = systemService + .getOrderNotificationListByOrderStatusId(orderForm + .getOrderStatusId()); + if (orderNotificationList != null + && !orderNotificationList.isEmpty()) { + return OrderNotificationSelectPage.class; + } else { + return OrderListPage.class; + } + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage( + "failed.to.update.order.in.orderconfirm", + new Object[] { this.toString() }); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + return null; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "failed.to.update.order.in.orderconfirm", + new Object[] { this.toString() }); + logger.log("EPC0092", new Object[] { this.toString() }, e); + return null; } } else if (isDelete()) { - // order form - OrderForm orderForm = getOrderService().getOrderForm( - getOrderConfirmPage().getOrderFormId()); - if (orderForm == null) { + try { + // delete + orderService.deleteOrderForm(orderConfirmPage.getOrderFormId()); + + FacesMessageUtil + .addInfoMessage("deleted.order.info.in.orderconfirm"); + return OrderListPage.class; + } catch (Exception e) { FacesMessageUtil.addErrorMessage( - "could.not.find.order.in.orderconfirm.for.delete", - new Object[] { getOrderConfirmPage() - .getOrderCardInfoId() }); + "failed.to.delete.order.in.orderconfirm", + new Object[] { this.toString() }); + logger.log("EPC0093", new Object[] { this.toString() }, e); return null; } - - // delete - getOrderService().deleteOrderForm(orderForm); - - FacesMessageUtil - .addInfoMessage("deleted.order.info.in.orderconfirm"); - return OrderListPage.class; } else { FacesMessageUtil .addErrorMessage("unexpected.action.in.orderconfirm"); @@ -152,69 +185,43 @@ } private boolean isUpdate() { - return PompeiConstants.UPDATE_MODE.equals(getOrderConfirmPage() - .getMode()); + return PompeiConstants.UPDATE_MODE.equals(orderConfirmPage.getMode()); } private boolean isDelete() { - return PompeiConstants.DELETE_MODE.equals(getOrderConfirmPage() - .getMode()); + return PompeiConstants.DELETE_MODE.equals(orderConfirmPage.getMode()); } - /** - * @return orderConfirmPage - */ public OrderConfirmPage getOrderConfirmPage() { return orderConfirmPage; } - /** - * @param orderConfirmPage 設定する orderConfirmPage - */ public void setOrderConfirmPage(OrderConfirmPage orderConfirmPage) { this.orderConfirmPage = orderConfirmPage; } - /** - * @return orderService - */ public OrderService getOrderService() { return orderService; } - /** - * @param orderService 設定する orderService - */ public void setOrderService(OrderService orderService) { this.orderService = orderService; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; + public SystemService getSystemService() { + return systemService; } - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; + public void setSystemService(SystemService systemService) { + this.systemService = systemService; } - /** - * @return orderFormDxo - */ - public OrderFormDxo getOrderFormDxo() { - return orderFormDxo; + public OrderDxo getOrderDxo() { + return orderDxo; } - /** - * @param orderFormDxo 設定する orderFormDxo - */ - public void setOrderFormDxo(OrderFormDxo orderFormDxo) { - this.orderFormDxo = orderFormDxo; + public void setOrderDxo(OrderDxo orderDxo) { + this.orderDxo = orderDxo; } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -62,8 +62,8 @@ */ @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") @Override - public void setLastModified(Date lastModified) { - super.setLastModified(lastModified); + public void setUpdatedDate(Date updatedDate) { + super.setUpdatedDate(updatedDate); } /* (non-Javadoc) Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,73 +1,81 @@ package jp.sf.pal.pompei.web.admin.order; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.OrderFormDxo; +import jp.sf.pal.pompei.dxo.OrderDxo; import jp.sf.pal.pompei.exentity.OrderCardInfo; import jp.sf.pal.pompei.exentity.OrderForm; -import jp.sf.pal.pompei.exentity.OrderStatusDescription; -import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.service.OrderService; +import jp.sf.pal.pompei.service.SystemService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + public class OrderEditAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 9139379556735565068L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderEditAction.class); // LOG CODE: ?PC008? + private OrderEditPage orderEditPage; private OrderService orderService; - private LanguageService languageService; + private SystemService systemService; - private OrderFormDxo orderFormDxo; + private OrderDxo orderDxo; public Class initialize() { return null; } public Class prerender() { - if (!isUpdate() || getOrderEditPage().getOrderFormId() == null) { + //TODO catch exception from db + if (!isUpdate() || orderEditPage.getOrderFormId() == null) { FacesMessageUtil.addErrorMessage("invalid.mode.in.orderedit"); return OrderListPage.class; } // order form - OrderForm orderForm = getOrderService().getOrderForm( - getOrderEditPage().getOrderFormId()); - getOrderFormDxo().convert(orderForm, getOrderEditPage()); + OrderForm orderForm = orderService.getOrderForm(orderEditPage + .getOrderFormId()); + orderDxo.convertFromOrderFormToPage(orderForm, orderEditPage); // card info if (orderForm.getOrderCardInfoId() != null) { - OrderCardInfo oci = getOrderService().getOrderCardInfo( - orderForm.getOrderCardInfoId()); + OrderCardInfo oci = orderService.getOrderCardInfo(orderForm + .getOrderCardInfoId()); if (oci != null) { - getOrderFormDxo().convert(oci, getOrderEditPage()); + orderDxo.convertFromOrderCardInfoToPage(oci, orderEditPage); } } // order product - getOrderEditPage().setOrderProductItems( - getOrderFormDxo().convertToOrderProductItems( - getOrderService().getOrderProductListByOrderFormId( - orderForm.getOrderFormId()))); + List orderProductList = orderService + .getOrderProductListByOrderFormId(orderForm.getOrderFormId()); + List> orderProductItems = new ArrayList>(); + orderDxo.convertFromOrderProductToMap(orderProductList, + orderProductItems); + orderEditPage.setOrderProductItems(orderProductItems); // order status - List orderStatusDescriptionList = getOrderService() - .getOrderStatusDescriptionList( - getLanguageService().getDefaultLanguage() - .getLanguageId()); - getOrderEditPage().setOrderStatusIdItems( - getOrderFormDxo().convertToOrderStatusItems( - orderStatusDescriptionList)); + List orderStatusList = systemService + .getOrderStatusList(SystemUtil.getCurrentLanguage()); + List> orderStatusItems = new ArrayList>(); + orderDxo.convertFromOrderStatusToLabel(orderStatusList, + orderStatusItems); + orderEditPage.setOrderStatusIdItems(orderStatusItems); // render faces messages FacesMessageUtil.renderMessages(); @@ -75,67 +83,43 @@ } private boolean isUpdate() { - return PompeiConstants.UPDATE_MODE.equals(getOrderEditPage().getMode()); + return PompeiConstants.UPDATE_MODE.equals(orderEditPage.getMode()); } public Class doConfirm() { return OrderConfirmPage.class; } - /** - * @return orderEditPage - */ public OrderEditPage getOrderEditPage() { return orderEditPage; } - /** - * @param orderEditPage 設定する orderEditPage - */ public void setOrderEditPage(OrderEditPage orderEditPage) { this.orderEditPage = orderEditPage; } - /** - * @return orderService - */ public OrderService getOrderService() { return orderService; } - /** - * @param orderService 設定する orderService - */ public void setOrderService(OrderService orderService) { this.orderService = orderService; } - /** - * @return orderFormDxo - */ - public OrderFormDxo getOrderFormDxo() { - return orderFormDxo; + public SystemService getSystemService() { + return systemService; } - /** - * @param orderFormDxo 設定する orderFormDxo - */ - public void setOrderFormDxo(OrderFormDxo orderFormDxo) { - this.orderFormDxo = orderFormDxo; + public void setSystemService(SystemService systemService) { + this.systemService = systemService; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; + public OrderDxo getOrderDxo() { + return orderDxo; } - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; + public void setOrderDxo(OrderDxo orderDxo) { + this.orderDxo = orderDxo; } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -11,9 +11,6 @@ public class OrderEditPage extends AbstractOrderEditPage { - /** - * - */ private static final long serialVersionUID = 1961839532521710788L; private List> orderStatusIdItems; @@ -52,8 +49,9 @@ */ @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm:ss") @Override - public void setLastModified(Date lastModified) { - super.setLastModified(lastModified); + public void setUpdatedDate(Date updatedDate) { + // TODO Auto-generated method stub + super.setUpdatedDate(updatedDate); } /* (non-Javadoc) Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -10,36 +10,39 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; -import jp.sf.pal.pompei.dxo.OrderFormDxo; +import jp.sf.pal.pompei.dxo.OrderDxo; import jp.sf.pal.pompei.dxo.PagerDxo; import jp.sf.pal.pompei.exentity.OrderForm; -import jp.sf.pal.pompei.exentity.OrderStatusDescription; +import jp.sf.pal.pompei.exentity.OrderStatus; import jp.sf.pal.pompei.pager.OrderFormPager; -import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.service.OrderService; +import jp.sf.pal.pompei.service.SystemService; import jp.sf.pal.pompei.util.PagingResultBeanWrapper; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + public class OrderListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 1252504959359597358L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderListAction.class); // LOG CODE: ?PC007? + private OrderListPage orderListPage; private OrderService orderService; - private LanguageService languageService; + private SystemService systemService; - private OrderFormDxo orderFormDxo; + private OrderFormPager orderFormPager; private PagerDxo pagerDxo; - private OrderFormPager orderFormPager; + private OrderDxo orderDxo; public Class initialize() { return null; @@ -57,31 +60,31 @@ } // set page number and size - if (getOrderListPage().getPageNumber() != 0 - && getOrderListPage().getPageSize() != 0) { - getPagerDxo().convert(getOrderListPage(), getOrderFormPager()); + if (orderListPage.getPageNumber() != 0 + && orderListPage.getPageSize() != 0) { + pagerDxo.convert(orderListPage, orderFormPager); } // sort order - if (getOrderListPage().getSortOrder() != null) { - getOrderFormPager().setSortOrder(getOrderListPage().getSortOrder()); + if (orderListPage.getSortOrder() != null) { + orderFormPager.setSortOrder(orderListPage.getSortOrder()); } else { - String sortOrder = getOrderFormPager().getSortOrder(); + String sortOrder = orderFormPager.getSortOrder(); if (sortOrder == null) { sortOrder = PompeiConstants.ORDER_STATUS_ASC_ORDER; - getOrderFormPager().setSortOrder(sortOrder); + orderFormPager.setSortOrder(sortOrder); } - getOrderListPage().setSortOrder(sortOrder); + orderListPage.setSortOrder(sortOrder); } // order from - PagingResultBean orderFormList = getOrderService() - .getOrderFormListByPager(getOrderFormPager()); - List> items = getOrderFormDxo().convert( - orderFormList); - getOrderListPage().setOrderFormItems(items); - getPagerDxo().convert(new PagingResultBeanWrapper(orderFormList), - getOrderListPage()); + PagingResultBean orderFormList = orderService + .getOrderFormListByPager(orderFormPager); + List> items = new ArrayList>(); + orderDxo.convertFromOrderFormToMap(orderFormList, items); + orderListPage.setOrderFormItems(items); + pagerDxo.convert(new PagingResultBeanWrapper(orderFormList), + orderListPage); // page range orderFormList.setPageRangeSize(PompeiConstants.DEFAULT_PAGE_RANGE_SIZE); @@ -93,34 +96,34 @@ map.put("pageNumber", new Integer(i)); pageNumberItems.add(map); } - getOrderListPage().setPageNumberItems(pageNumberItems); + orderListPage.setPageNumberItems(pageNumberItems); // order status - List orderStatusDescriptionList = getOrderService() - .getOrderStatusDescriptionList( - getLanguageService().getDefaultLanguage() - .getLanguageId()); + List orderStatusList = systemService + .getOrderStatusList(SystemUtil.getCurrentLanguage()); List> orderStatusCountItems = new ArrayList>(); Map orderStatusNameMap = new HashMap(); List> orderStatusIdItems = new ArrayList>(); - for (OrderStatusDescription osd : orderStatusDescriptionList) { - orderStatusNameMap.put(osd.getOrderStatusId(), osd.getName()); + for (OrderStatus orderStatus : orderStatusList) { + orderStatusNameMap.put(orderStatus.getOrderStatusId(), orderStatus + .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()))); + map.put("orderStatusId", orderStatus.getOrderStatusId()); + map.put("name", orderStatus.getName()); + map.put("count", new BigDecimal(orderService + .getOrderFormCountByOrderStatus(orderStatus + .getOrderStatusId()))); orderStatusCountItems.add(map); // orderStatusIdItems Map map2 = new HashMap(); - map2.put("label", osd.getName()); - map2.put("value", osd.getOrderStatusId().toString()); + map2.put("label", orderStatus.getName()); + map2.put("value", orderStatus.getOrderStatusId().toString()); orderStatusIdItems.add(map2); } - getOrderListPage().setOrderStatusNameMap(orderStatusNameMap); - getOrderListPage().setOrderStatusCountItems(orderStatusCountItems); - getOrderListPage().setOrderStatusIdItems(orderStatusIdItems); + orderListPage.setOrderStatusNameMap(orderStatusNameMap); + orderListPage.setOrderStatusCountItems(orderStatusCountItems); + orderListPage.setOrderStatusIdItems(orderStatusIdItems); // render FacesMessage FacesMessageUtil.renderMessages(); @@ -128,7 +131,7 @@ } private boolean isDelete() { - if (PompeiConstants.DELETE_MODE.equals(getOrderListPage().getMode())) { + if (PompeiConstants.DELETE_MODE.equals(orderListPage.getMode())) { return true; } return false; @@ -139,21 +142,14 @@ * @return */ public Class doSearch() { - getOrderFormPager().setOrderStatusId( - getOrderListPage().getOrderStatusId()); + orderFormPager.setOrderStatusId(orderListPage.getOrderStatusId()); return null; } - /** - * @return orderListPage - */ public OrderListPage getOrderListPage() { return orderListPage; } - /** - * @param orderListPage 設定する orderListPage - */ public void setOrderListPage(OrderListPage orderListPage) { this.orderListPage = orderListPage; } @@ -166,54 +162,36 @@ this.orderService = orderService; } - public OrderFormDxo getOrderFormDxo() { - return orderFormDxo; + public SystemService getSystemService() { + return systemService; } - public void setOrderFormDxo(OrderFormDxo ordersDxo) { - this.orderFormDxo = ordersDxo; + public void setSystemService(SystemService systemService) { + this.systemService = systemService; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - /** - * @return orderFormPager - */ public OrderFormPager getOrderFormPager() { return orderFormPager; } - /** - * @param orderFormPager 設定する orderFormPager - */ public void setOrderFormPager(OrderFormPager orderFormPager) { this.orderFormPager = orderFormPager; } - /** - * @return pagerDxo - */ public PagerDxo getPagerDxo() { return pagerDxo; } - /** - * @param pagerDxo 設定する pagerDxo - */ public void setPagerDxo(PagerDxo pagerDxo) { this.pagerDxo = pagerDxo; } + public OrderDxo getOrderDxo() { + return orderDxo; + } + + public void setOrderDxo(OrderDxo orderDxo) { + this.orderDxo = orderDxo; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,71 +1,107 @@ package jp.sf.pal.pompei.web.admin.order; import java.io.Serializable; +import java.io.StringWriter; +import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; -import jp.sf.pal.common.CommonException; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; + import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiException; +import jp.sf.pal.pompei.dxo.OrderDxo; +import jp.sf.pal.pompei.entity.notification.order.Order; import jp.sf.pal.pompei.exentity.OrderForm; import jp.sf.pal.pompei.exentity.OrderNotification; +import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.service.OrderService; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.service.SystemService; +import jp.sf.pal.pompei.util.SystemUtil; +import jp.sf.pal.pompei.util.VelocityUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.seasar.framework.log.Logger; + public class OrderNotificationSelectAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -8099143241154630299L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(OrderListAction.class); // LOG CODE: ?PC010? + private OrderNotificationSelectPage orderNotificationSelectPage; + private ProductService productService; + private OrderService orderService; + private SystemService systemService; + + private OrderDxo orderDxo; + public Class initialize() { return null; } public Class prerender() { - if (getOrderNotificationSelectPage().getOrderFormId() == null) { + if (orderNotificationSelectPage.getOrderFormId() == null) { FacesMessageUtil.addErrorMessage("orderformid.is.null"); return OrderListPage.class; } - OrderForm orderForm = getOrderService().getOrderForm( - getOrderNotificationSelectPage().getOrderFormId()); + OrderForm orderForm = orderService + .getOrderForm(orderNotificationSelectPage.getOrderFormId()); if (orderForm == null) { FacesMessageUtil.addErrorMessage("could.not.find.orderformid"); return OrderListPage.class; } - List 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")); + try { + List orderNotificationList = systemService + .getOrderNotificationListByOrderStatusId(orderForm + .getOrderStatusId()); + 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(orderNotificationSelectPage.getLabelHelper() + .getLabelValue("to_customer")); + } + sb.append(")"); + map.put(PompeiConstants.LABEL, sb.toString()); + map.put(PompeiConstants.VALUE, orderNotification + .getOrderNotificationId().toString()); + orderNotificationIdsItems.add(map); } - sb.append(")"); - map.put(PompeiConstants.LABEL, sb.toString()); - map.put(PompeiConstants.VALUE, orderNotification - .getOrderNotificationId().toString()); - orderNotificationIdsItems.add(map); + orderNotificationSelectPage + .setOrderNotificationIdsItems(orderNotificationIdsItems); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "could.not.find.order.notification", new Object[] { this + .toString() }); + logger.log("EPC0101", new Object[] { this.toString() }, e); } - getOrderNotificationSelectPage().setOrderNotificationIdsItems( - orderNotificationIdsItems); // render faces messages FacesMessageUtil.renderMessages(); @@ -74,13 +110,13 @@ public Class doSend() { try { - getOrderService().sendOrderNotifications( - getOrderNotificationSelectPage().getOrderFormId(), - getOrderNotificationSelectPage().getOrderNotificationIds()); + sendOrderNotifications( + orderNotificationSelectPage.getOrderFormId(), + orderNotificationSelectPage.getOrderNotificationIds()); FacesMessageUtil.addInfoMessage("sent.order.notifications"); //TODO test // return OrderListPage.class; - } catch (CommonException e) { + } catch (PompeiException e) { if (e.getArgs() != null) { FacesMessageUtil.addErrorMessage(e.getMessageId(), e.getArgs()); } else { @@ -90,33 +126,150 @@ return null; } - /** - * @return the orderNotificationSelectPage - */ + private void sendOrderNotifications(BigDecimal orderFormId, + BigDecimal[] orderNotificationIds) throws PompeiException { + if (orderFormId == null) { + throw new PompeiException("orderFormId.is.null.in.notification"); + } + OrderForm orderForm = orderService.getOrderForm(orderFormId); + if (orderForm == null) { + throw new PompeiException( + "could.not.find.orderformid.in.notification"); + } + List errors = new ArrayList(); + for (BigDecimal orderNotificationId : orderNotificationIds) { + OrderNotification orderNotification = systemService + .getOrderNotification(orderNotificationId); + if (orderNotification != null) { + String to = orderNotification.getEmailAddress(); + if (to == null || "".equals(to)) { + to = orderForm.getCustomerEmailAddress(); + } + try { + sendOrderNotification(orderForm, to, SystemUtil + .getAdministratorEmail(), orderNotification + .getTemplateName()); + } catch (Exception e) { + logger.log("EPC0102", new Object[] {}, e); + errors.add(orderNotification.getTemplateName() + "(" + to + + ")"); + } + } + } + if (!errors.isEmpty()) { + String templates = StringUtils.join(errors.toArray(), ", "); + throw new PompeiException("failed.to.send.some.order.notification", + new String[] { templates }); + } + } + + private void sendOrderNotification(OrderForm orderForm, String to, + String from, String templateName) throws PompeiException { + try { + Order order = new Order(); + orderDxo.convertFromOrderFormToOrder(orderForm, order); + List orderProductList = orderService + .getOrderProductListByOrderFormId(orderForm + .getOrderFormId()); + for (OrderProduct orderProduct : orderProductList) { + //TODO i18n: pass language for user + Product productData = productService.getProduct(orderProduct + .getProductId(), orderForm.getCustomerLanguage()); + jp.sf.pal.pompei.entity.notification.order.Product product = new jp.sf.pal.pompei.entity.notification.order.Product(); + orderDxo.convertFromProductToNotification(productData, product); + orderDxo.convertFromOrderProductToNotification(orderProduct, product); + order.addProduct(product); + } + + // set velocity context + VelocityContext context = new VelocityContext(); + context.put("order", order); + + VelocityUtil.init(); + StringWriter sw = new StringWriter(); + String templatePath = SystemUtil + .getOrderNotificationTemplatePath(templateName); + // TODO i18n: encoding + Template template = VelocityUtil.getTemplate(templatePath, "UTF-8"); + + template.merge(context, sw); + + String content = sw.toString(); + if (content == null) { + throw new PompeiException("notification.content.is.null"); + } + int index = content.indexOf("\n"); + String subject = null; + String body = null; + if (index != -1) { + subject = content.substring(0, index); + body = content.substring(index); + } else { + // TODO should throw exception? + subject = content; + body = content; + } + + Properties props = System.getProperties(); + // set smtp server + props.put("mail.smtp.host", SystemUtil.getSmtpHost()); + Session session = Session.getDefaultInstance(props, null); + MimeMessage mimeMessage = new MimeMessage(session); + mimeMessage.setFrom(new InternetAddress(from)); + mimeMessage.setRecipients(Message.RecipientType.TO, to); + //TODO i18n: encoding + mimeMessage.setSubject(subject, "iso-2022-jp"); + //TODO i18n: encoding + mimeMessage.setText(body, "iso-2022-jp"); + mimeMessage.setHeader("Content-Type", "text/plain"); + mimeMessage.setSentDate(new Date()); + + Transport.send(mimeMessage); + } catch (Exception e) { + throw new PompeiException("faild.to.send.order.notification", e); + } + + } + public OrderNotificationSelectPage getOrderNotificationSelectPage() { return orderNotificationSelectPage; } - /** - * @param orderNotificationSelectPage the orderNotificationSelectPage to set - */ public void setOrderNotificationSelectPage( OrderNotificationSelectPage orderNotificationSelectPage) { this.orderNotificationSelectPage = orderNotificationSelectPage; } - /** - * @return the orderService - */ + public ProductService getProductService() { + return productService; + } + + public void setProductService(ProductService productService) { + this.productService = productService; + } + public OrderService getOrderService() { return orderService; } - /** - * @param orderService the orderService to set - */ public void setOrderService(OrderService orderService) { this.orderService = orderService; } + public SystemService getSystemService() { + return systemService; + } + + public void setSystemService(SystemService systemService) { + this.systemService = systemService; + } + + public OrderDxo getOrderDxo() { + return orderDxo; + } + + public void setOrderDxo(OrderDxo orderDxo) { + this.orderDxo = orderDxo; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -2,83 +2,62 @@ import java.io.Serializable; import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Date; import java.util.List; import java.util.Map; -import org.seasar.teeda.extension.annotation.takeover.TakeOver; -import org.seasar.teeda.extension.annotation.takeover.TakeOverType; - import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.CategoryDxo; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.dxo.ProductDxo; import jp.sf.pal.pompei.exentity.Category; -import jp.sf.pal.pompei.exentity.CategoryDescription; -import jp.sf.pal.pompei.service.CategoryService; -import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; + public class CategoryEditAction implements Serializable { - /** - * - */ + private static final long serialVersionUID = 286938960714084338L; - private CategoryService categoryService; - /** - * dxo + * Logger for this class */ - private CategoryDxo categoryDxo; + private static final Logger logger = Logger + .getLogger(CategoryEditAction.class); // LOG CODE: ?PC002? + private ProductService productService; + + private ProductDxo productDxo; + /** * カテゴリ編集ページ */ private CategoryEditPage categoryEditPage; - private LanguageService languageService; - - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - /** - * @return categoryEditPage - */ - public CategoryEditPage getCategoryEditPage() { - return categoryEditPage; - } - - /** - * @param categoryEditPage 設定する categoryEditPage - */ - public void setCategoryEditPage(CategoryEditPage categoryEditPage) { - this.categoryEditPage = categoryEditPage; - } - public Class initialize() { return null; } public Class prerender() { if (categoryEditPage.getMode().equals(PompeiConstants.UPDATE_MODE)) { - // update - CategoryDescription cd = categoryService.getCategoryDescription( - categoryEditPage.getTargetId(), getLanguageService() - .getDefaultLanguage().getLanguageId()); + try { + // update + Category cd = productService.getCategory(categoryEditPage + .getTargetId(), SystemUtil.getDefaultLanguage()); - getCategoryDxo().convert(cd, getCategoryEditPage()); - getCategoryDxo().convert(cd.getCategory(), getCategoryEditPage()); + productDxo.convertFromCategoryToPage(cd, categoryEditPage); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("could.not.load.category"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + return CategoryListPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.load.category"); + logger.log("EPC0021", new Object[] { this.toString() }, e); + return CategoryListPage.class; + } } else { // insert @@ -100,63 +79,75 @@ Map m = list.get(index); BigDecimal parentId = (BigDecimal) m.get(PompeiConstants.CATEGORY_ID); + categoryEditPage.setParentId(parentId); if (categoryEditPage.getMode().equals(PompeiConstants.INSERT_MODE)) { // insert - CategoryDescription d = new CategoryDescription(); - categoryDxo.convert(getCategoryEditPage(), d); - Category c = new Category(); - // TODO dxo - c.setCategoryId(categoryEditPage.getTargetId()); - c.setImage(categoryEditPage.getImage()); - c.setSortOrder(categoryEditPage.getSortOrder()); - d.setCategory(c); - c.setParentId(parentId); - categoryService.addCategoryDescription(d); + Category category = new Category(); + productDxo.convertFromPageToCategory(categoryEditPage, category); - categoryEditPage.setTargetId(d.getCategoryId()); + try { + productService.addCategory(category); - FacesMessageUtil.addInfoMessage("added.category.in.categoryedit"); + categoryEditPage.setTargetId(category.getCategoryId()); + + FacesMessageUtil + .addInfoMessage("added.category.in.categoryedit"); + return CategoryListPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil + .addErrorMessage("failed.to.add.category.in.categoryedit"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("failed.to.add.category.in.categoryedit"); + logger.log("EPC0022", new Object[] { this.toString() }, e); + } } else { - // update - CategoryDescription d = getCategoryService() - .getCategoryDescription( - categoryEditPage.getTargetId(), - getLanguageService().getDefaultLanguage() - .getLanguageId()); - categoryDxo.convert(getCategoryEditPage(), d); - Category c = d.getCategory(); - // TODO dxo - c.setCategoryId(categoryEditPage.getTargetId()); - c.setImage(categoryEditPage.getImage()); - c.setSortOrder(categoryEditPage.getSortOrder()); - c.setLastModified(new Timestamp(new Date().getTime())); - c.setParentId(parentId); - categoryService.updateCategoryDescription(d); + try { // update + Category category = productService.getCategory(categoryEditPage + .getTargetId(), SystemUtil.getDefaultLanguage()); + productDxo + .convertFromPageToCategory(categoryEditPage, category); - FacesMessageUtil.addInfoMessage("updated.category.in.categoryedit"); + productService.updateCategory(category); + + FacesMessageUtil + .addInfoMessage("updated.category.in.categoryedit"); + return CategoryListPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil + .addErrorMessage("failed.to.update.category.in.categoryedit"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("failed.to.update.category.in.categoryedit"); + logger.log("EPC0023", new Object[] { this.toString() }, e); + } } //needed? // categoryEditPage.setTargetId(parentId); - return CategoryListPage.class; + return null; } - public CategoryService getCategoryService() { - return categoryService; + public ProductService getProductService() { + return productService; } - public void setCategoryService(CategoryService categoryListService) { - this.categoryService = categoryListService; + public void setProductService(ProductService productService) { + this.productService = productService; } - public CategoryDxo getCategoryDxo() { - return categoryDxo; + public CategoryEditPage getCategoryEditPage() { + return categoryEditPage; } - public void setCategoryDxo(CategoryDxo dxo) { - this.categoryDxo = dxo; + public void setCategoryEditPage(CategoryEditPage categoryEditPage) { + this.categoryEditPage = categoryEditPage; } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -11,9 +11,6 @@ public class CategoryEditPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -1500068209788825609L; public static final String categoriesName_TRequiredValidator = null; @@ -35,17 +32,27 @@ @SubapplicationScope private List> breadcrumbItems; - private String image; - @Required private String name; - private String description; - private BigDecimal parentId; private BigDecimal sortOrder; + private String pageId; + + private String templateName; + + private String keyword; + + private String description; + + private String content1; + + private String content2; + + private String content3; + /** * 処理モード */ @@ -55,14 +62,6 @@ private LabelHelper labelHelper; - public String getImage() { - return image; - } - - public void setImage(String categoriesImage) { - this.image = categoriesImage; - } - public String getName() { return name; } @@ -150,4 +149,52 @@ public void setDescription(String description) { this.description = description; } + + public String getPageId() { + return pageId; + } + + public void setPageId(String pageId) { + this.pageId = pageId; + } + + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public String getContent1() { + return content1; + } + + public void setContent1(String content1) { + this.content1 = content1; + } + + public String getContent2() { + return content2; + } + + public void setContent2(String content2) { + this.content2 = content2; + } + + public String getContent3() { + return content3; + } + + public void setContent3(String content3) { + this.content3 = content3; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -7,51 +7,32 @@ import java.util.List; import java.util.Map; +import org.seasar.framework.log.Logger; + import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.CategoryDxo; -import jp.sf.pal.pompei.exentity.CategoryDescription; -import jp.sf.pal.pompei.service.CategoryService; -import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.exentity.Category; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; public class CategoryListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -8616177799734159313L; /** - * + * Logger for this class */ - private CategoryDxo dxo; + private static final Logger logger = Logger + .getLogger(CategoryListAction.class); // LOG CODE: ?PC001? - /** - * - */ private CategoryListPage categoryListPage; - /** - * - */ - private CategoryService categoryService; + private ProductService productService; - private LanguageService languageService; + private ProductDxo productDxo; - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - public Class initialize() { return null; } @@ -71,8 +52,8 @@ m .put(PompeiConstants.CATEGORY_ID, PompeiConstants.ROOT_CATEGORY_ID); - m.put(PompeiConstants.BREADCRUMB, getCategoryListPage() - .getLabelHelper().getLabelValue("top")); + m.put(PompeiConstants.BREADCRUMB, categoryListPage.getLabelHelper() + .getLabelValue("top")); list.add(m); categoryListPage.setBreadcrumbItems(list); @@ -88,12 +69,11 @@ } //カテゴリ一覧の取得 - List list = categoryService - .getSubCategoryDescriptionList(categoryListPage.getParentId(), - getLanguageService().getDefaultLanguage() - .getLanguageId()); + List list = productService + .getSubCategoryList(categoryListPage.getParentId(), SystemUtil + .getDefaultLanguage()); List> cList = new ArrayList>(); - dxo.convert(list, cList); + productDxo.convertFromCategoryToMap(list, cList); categoryListPage.setCategoryItems(cList); // render FacesMessages @@ -108,44 +88,30 @@ public Class doDelete() { //選択行を取得 - BigDecimal id = getCategoryListPage().getTargetId(); + BigDecimal id = categoryListPage.getTargetId(); // TODO check if id is null - if (categoryService.hasChildCategory(id)) { + if (productService.hasChildCategory(id)) { FacesMessageUtil.addWarnMessage("has.child.categories"); return null; } - // TODO check related tables - categoryService.deleteCategory(id); + try { + // TODO check related tables + productService.deleteCategory(id); - // TODO redirect wrong page?? + // TODO redirect wrong page?? - FacesMessageUtil.addInfoMessage("deleted.category"); - return CategoryListPage.class; + FacesMessageUtil.addInfoMessage("deleted.category"); + return CategoryListPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.category"); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.category"); + } + return null; } - /** - * @return categoryListPage - */ - public CategoryListPage getCategoryListPage() { - return categoryListPage; - } - - /** - * @param categoryListPage 設定する categoryListPage - */ - public void setCategoryListPage(CategoryListPage categoryListPage) { - this.categoryListPage = categoryListPage; - } - - /** - * @return categoryListService - */ - public CategoryService getCategoryService() { - return categoryService; - } - private List> setBreadcrumb( List> breadcrumbItems, BigDecimal id) { List> list = new ArrayList>(); @@ -156,38 +122,52 @@ } } - CategoryDescription cd = categoryService.getCategoryDescription( - categoryListPage.getCategoryId(), getLanguageService() - .getDefaultLanguage().getLanguageId()); + Category category = null; + try { + category = productService.getCategory(categoryListPage + .getCategoryId(), SystemUtil.getDefaultLanguage()); + } catch (PompeiDBException e) { + FacesMessageUtil + .addWarnMessage("could.not.load.category.for.breadcrumb"); + } - if (cd == null) { + if (category == null) { return list; } Map m = new HashMap(); m.put(PompeiConstants.CATEGORY_ID, id); - m.put(PompeiConstants.BREADCRUMB, cd.getName()); + m.put(PompeiConstants.BREADCRUMB, category.getName()); list.add(m); return list; } - /** - * @param categoryListService 設定する categoryListService - */ - public void setCategoryService(CategoryService categoryListService) { - this.categoryService = categoryListService; + public Class doUpdate() { + return CategoryEditPage.class; } - public CategoryDxo getDxo() { - return dxo; + public CategoryListPage getCategoryListPage() { + return categoryListPage; } - public void setDxo(CategoryDxo dxo) { - this.dxo = dxo; + public void setCategoryListPage(CategoryListPage categoryListPage) { + this.categoryListPage = categoryListPage; } - public Class doUpdate() { - return CategoryEditPage.class; + public ProductService getProductService() { + return productService; } + public void setProductService(ProductService productService) { + this.productService = productService; + } + + public ProductDxo getProductDxo() { + return productDxo; + } + + public void setProductDxo(ProductDxo productDxo) { + this.productDxo = productDxo; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/CategoryListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -28,7 +28,7 @@ private BigDecimal categoryId; - private String image; + private String pageId; private String name; @@ -54,14 +54,6 @@ private LabelHelper labelHelper; - public String getImage() { - return image; - } - - public void setImage(String categoriesImage) { - this.image = categoriesImage; - } - public String getName() { return name; } @@ -171,4 +163,12 @@ public void setLabelHelper(LabelHelper labelHelper) { this.labelHelper = labelHelper; } + + public String getPageId() { + return pageId; + } + + public void setPageId(String pageId) { + this.pageId = pageId; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -3,35 +3,34 @@ import java.io.Serializable; import java.math.BigDecimal; -import org.seasar.teeda.extension.annotation.takeover.TakeOver; -import org.seasar.teeda.extension.annotation.takeover.TakeOverType; - import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.ManufacturerDxo; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.dxo.ProductDxo; import jp.sf.pal.pompei.exentity.Manufacturer; -import jp.sf.pal.pompei.exentity.ManufacturerDescription; -import jp.sf.pal.pompei.service.LanguageService; -import jp.sf.pal.pompei.service.ManufacturerService; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.annotation.takeover.TakeOverType; + public class ManufacturerEditAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -5265247570402988033L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(ManufacturerEditAction.class); // LOG CODE: ?PC004? + private ManufacturerEditPage manufacturerEditPage; - private LanguageService languageService; + private ProductService productService; - private ManufacturerService manufacturerService; + private ProductDxo productDxo; - private ManufacturerDxo manufacturersDxo; - public Class initialize() { return null; @@ -45,14 +44,28 @@ public Class prerender() { if (isUpdate()) { - BigDecimal id = manufacturerEditPage.getManufacturerId(); - ManufacturerDescription info = manufacturerService - .getManufactureDescription(id, getLanguageService() - .getDefaultLanguage().getLanguageId()); - if (info != null) { - manufacturersDxo.convert(info, manufacturerEditPage); + Manufacturer manufacturer=null; + try { + manufacturer = productService.getManufacturer( + manufacturerEditPage.getManufacturerId(), SystemUtil + .getDefaultLanguage()); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("could.not.find.manufacturer"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + return ManufacturerListPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.find.manufacturer"); + logger.log("EPC0041", new Object[] { this.toString() }, e); + return ManufacturerListPage.class; + } + + if (manufacturer != null) { + productDxo.convertFromManufacturerToPage(manufacturer, + manufacturerEditPage); } else { - //TODO exception and then move to a list page + FacesMessageUtil.addErrorMessage("could.not.find.manufacturer"); + return ManufacturerListPage.class; } } else { manufacturerEditPage.setMode(PompeiConstants.INSERT_MODE); @@ -63,83 +76,51 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "mode,manufacturerId") public Class doUpdate() { if (isUpdate()) { - // update - BigDecimal id = getManufacturerEditPage().getManufacturerId(); - ManufacturerDescription info = getManufacturerService() - .getManufactureDescription( - id, - getLanguageService().getDefaultLanguage() - .getLanguageId()); - getManufacturersDxo().convert(getManufacturerEditPage(), info); - Manufacturer manufacturers = info.getManufacturer(); - getManufacturersDxo().convert(getManufacturerEditPage(), - manufacturers); - manufacturers.setName(manufacturerEditPage.getName()); - manufacturers.setImage(manufacturerEditPage.getImage()); - manufacturerService.updateManufactureDescription(info); + try { + // update + BigDecimal manufacturerId = manufacturerEditPage + .getManufacturerId(); + Manufacturer manufacturer = productService.getManufacturer( + manufacturerId, SystemUtil.getDefaultLanguage()); - FacesMessageUtil.addInfoMessage("updated.manufacturer"); - return ManufacturerEditPage.class; + productDxo.convertFromPageToManufacturer(manufacturerEditPage, + manufacturer); + + productService.updateManufacture(manufacturer); + + FacesMessageUtil.addInfoMessage("updated.manufacturer"); + return ManufacturerEditPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil + .addErrorMessage("faild.to.update.manufacturer"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("faild.to.update.manufacturer"); + logger.log("EPC0042", new Object[] { this.toString() }, e); + } } else { // insert - ManufacturerDescription info = new ManufacturerDescription(); - getManufacturersDxo().convert(getManufacturerEditPage(), info); - info.setLanguageId(getLanguageService().getDefaultLanguage() - .getLanguageId()); - Manufacturer manufacturers = new Manufacturer(); - getManufacturersDxo().convert(getManufacturerEditPage(), - manufacturers); - info.setManufacturer(manufacturers); - getManufacturerService().addManufactureDescription(info); + Manufacturer manufacturer = new Manufacturer(); + productDxo.convertFromPageToManufacturer(manufacturerEditPage, + manufacturer); - FacesMessageUtil.addInfoMessage("added.manufacturer"); - return ManufacturerListPage.class; + try { + productService.addManufacture(manufacturer); + + FacesMessageUtil.addInfoMessage("added.manufacturer"); + return ManufacturerListPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("faild.to.add.manufacturer"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("faild.to.add.manufacturer"); + logger.log("EPC0043", new Object[] { this.toString() }, e); + } } + return null; } - /** - * @return manufacturerEditPage - */ - public ManufacturerEditPage getManufacturerEditPage() { - return manufacturerEditPage; - } - - /** - * @param manufacturerEditPage 設定する manufacturerEditPage - */ - public void setManufacturerEditPage( - ManufacturerEditPage manufacturerEditPage) { - this.manufacturerEditPage = manufacturerEditPage; - } - - public ManufacturerDxo getManufacturersDxo() { - return manufacturersDxo; - } - - public void setManufacturersDxo(ManufacturerDxo dxo) { - this.manufacturersDxo = dxo; - } - - public ManufacturerService getManufacturerService() { - return manufacturerService; - } - - public void setManufacturerService(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; - } - - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -7,9 +7,6 @@ public class ManufacturerEditPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 8556055996092048443L; public static final String manufacturersName_TRequiredValidator = null; @@ -18,13 +15,9 @@ private BigDecimal manufacturerId; - private String image; - - private String longDescription; - private String name; - private String shortDescription; + private String description; private String url; @@ -51,22 +44,6 @@ this.targetId = targetId; } - public String getImage() { - return image; - } - - public void setImage(String manufacturersImage) { - this.image = manufacturersImage; - } - - public String getLongDescription() { - return longDescription; - } - - public void setLongDescription(String manufacturersLongDesc) { - this.longDescription = manufacturersLongDesc; - } - public String getName() { return name; } @@ -75,14 +52,6 @@ this.name = manufacturersName; } - public String getShortDescription() { - return shortDescription; - } - - public void setShortDescription(String manufacturersShortDesc) { - this.shortDescription = manufacturersShortDesc; - } - public String getUrl() { return url; } @@ -124,4 +93,12 @@ public String getDoUpdateValue() { return getLabelHelper().getLabelValue(getMode()); } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ManufacturerListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -6,32 +6,30 @@ import java.util.Map; import jp.sf.pal.common.util.FacesMessageUtil; -import jp.sf.pal.pompei.dxo.ManufacturerDxo; -import jp.sf.pal.pompei.exentity.ManufacturerDescription; -import jp.sf.pal.pompei.service.LanguageService; -import jp.sf.pal.pompei.service.ManufacturerService; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.exentity.Manufacturer; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + public class ManufacturerListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 841279946405958157L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(ManufacturerListAction.class); // LOG CODE: ?PC003? + private ManufacturerListPage manufacturerListPage; - /** - * - */ - private ManufacturerService manufacturerService; + private ProductService productService; - private LanguageService languageService; + private ProductDxo productDxo; - private ManufacturerDxo manufacturersDxo; - public Class initialize() { return null; } @@ -39,23 +37,39 @@ public Class prerender() { // List list = getMockList(); // makerListPage.setManufacturerItems(list); - List list = manufacturerService - .getManufactureDescriptionList(getLanguageService() - .getDefaultLanguage().getLanguageId()); - List> mapList = new ArrayList>(); - manufacturersDxo.convert(list, mapList); - getManufacturerListPage().setManufacturerItems(mapList); + try { + List list = productService + .getManufacturerList(SystemUtil.getDefaultLanguage()); + List> mapList = new ArrayList>(); + productDxo.convertFromManufacturerToMap(list, mapList); + getManufacturerListPage().setManufacturerItems(mapList); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.load.manufacturers"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.load.manufacturers"); + logger.log("EPC0031", new Object[] { this.toString() }, e); + } - // redner FacesMessage + // render FacesMessage FacesMessageUtil.renderMessages(); return null; } public Class doDelete() { - manufacturerService.deleteManufacture(getManufacturerListPage() - .getTargetId()); + try { + productService.deleteManufacturer(getManufacturerListPage() + .getTargetId()); - FacesMessageUtil.addInfoMessage("deleted.manufacturer"); + FacesMessageUtil.addInfoMessage("deleted.manufacturer"); + return ManufacturerListPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.manufacturer"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.manufacturer"); + logger.log("EPC0032", new Object[] { this.toString() }, e); + } return null; } @@ -70,42 +84,6 @@ } /** - * @return manufacturerService - */ - public ManufacturerService getManufacturerService() { - return manufacturerService; - } - - /** - * @param manufacturerService 設定する manufacturerService - */ - public void setManufacturerService(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; - } - - public ManufacturerDxo getManufacturersDxo() { - return manufacturersDxo; - } - - public void setManufacturersDxo(ManufacturerDxo dxo) { - this.manufacturersDxo = dxo; - } - - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - /** * @return manufacuturerListPage */ public ManufacturerListPage getManufacturerListPage() { @@ -121,4 +99,20 @@ this.manufacturerListPage = manufacuturerListPage; } + public ProductService getProductService() { + return productService; + } + + public void setProductService(ProductService productService) { + this.productService = productService; + } + + public ProductDxo getProductDxo() { + return productDxo; + } + + public void setProductDxo(ProductDxo productDxo) { + this.productDxo = productDxo; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -6,87 +6,106 @@ import java.util.List; import java.util.Map; -import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.ManufacturerDxo; +import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.dxo.ProductDxo; -import jp.sf.pal.pompei.dxo.TaxDxo; +import jp.sf.pal.pompei.exentity.DeliveryType; import jp.sf.pal.pompei.exentity.Manufacturer; import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.exentity.ProductImage; -import jp.sf.pal.pompei.exentity.TaxClass; -import jp.sf.pal.pompei.service.LanguageService; -import jp.sf.pal.pompei.service.ManufacturerService; -import jp.sf.pal.pompei.service.TaxService; -import jp.sf.pal.pompei.service.impl.ProductServiceImpl; +import jp.sf.pal.pompei.exentity.TaxType; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.service.SystemService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class ProductEditAction implements Serializable { + private static final long serialVersionUID = -9187256555144964188L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -9187256555144964188L; + private static final Logger logger = Logger + .getLogger(ProductEditAction.class); // LOG CODE: ?PC006? - /** */ private ProductEditPage productEditPage; - /** */ - private ProductServiceImpl productService; + private ProductService productService; - private LanguageService languageService; + //TODO cache + private SystemService systemService; - /** */ private ProductDxo productDxo; - private TaxDxo taxDxo; - - /** */ - private ManufacturerService manufacturerService; - - private TaxService taxService; - - /** */ - private ManufacturerDxo manufacturerDxo; - public Class initialize() { // manufacturer - getProductEditPage().setManufacturerIdItems(getManufacturerIdList()); + productEditPage.setManufacturerIdItems(getManufacturerIdList()); // tax - getProductEditPage().setTaxClassIdItems(getTaxClassIdList()); + productEditPage.setTaxTypeIdItems(getTaxTypeIdList()); + // delivery + productEditPage.setDeliveryTypeIdItems(getDeliveryTypeIdList()); // status - getProductEditPage().setStatusItems(getStatusList()); + productEditPage.setStatusItems(getStatusList()); return null; } private List> getManufacturerIdList() { - List mList = manufacturerService.getManufacturerList(); List> list = new ArrayList>(); - manufacturerDxo.convertCombo(mList, list); + try { + List manufacturerList = productService + .getManufacturerList(SystemUtil.getDefaultLanguage(), true, + false, false); + productDxo.convertFromManufacturerToLabel(manufacturerList, list); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("could.not.load.manufacturers"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.load.manufacturers"); + logger.log("EPC0061", new Object[] { this.toString() }, e); + } return list; } - private List> getTaxClassIdList() { - List mList = getTaxService().getTaxClassList(); + private List> getTaxTypeIdList() { List> list = new ArrayList>(); - getTaxDxo().convert(mList, list); + try { + List taxTypeList = systemService.getTaxTypeList(SystemUtil + .getDefaultLanguage()); + productDxo.convertFromTaxTypeToLabel(taxTypeList, list); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.load.taxtypes"); + logger.log("EPC0062", new Object[] { this.toString() }, e); + } return list; } + private List> getDeliveryTypeIdList() { + List> list = new ArrayList>(); + try { + List deliveryTypeList = systemService + .getDeliveryTypeList(SystemUtil.getDefaultLanguage()); + productDxo.convertFromDeliveryTypeToLabel(deliveryTypeList, list); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.load.deliverytypes"); + logger.log("EPC0063", new Object[] { this.toString() }, e); + } + return list; + } + private List> getStatusList() { List> list = new ArrayList>(); Map map1 = new HashMap(); - map1.put("label", getProductEditPage().getLabelHelper().getLabelValue( + map1.put("label", productEditPage.getLabelHelper().getLabelValue( "enabled")); map1.put("value", PompeiConstants.TRUE_BIGDECIMAL.toString()); list.add(map1); Map map2 = new HashMap(); - map2.put("label", getProductEditPage().getLabelHelper().getLabelValue( + map2.put("label", productEditPage.getLabelHelper().getLabelValue( "disabled")); map2.put("value", PompeiConstants.FALSE_BIGDECIMAL.toString()); list.add(map2); @@ -97,11 +116,18 @@ if (isUpdate()) { // update - ProductDescription description = productService - .getProdcutDescription(productEditPage.getProductId(), - getLanguageService().getDefaultLanguage() - .getLanguageId()); - productDxo.convert(description, productEditPage); + try { + Product product = productService.getProduct(productEditPage + .getProductId(), SystemUtil.getDefaultLanguage()); + productDxo.convertFromProductToPage(product, productEditPage); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("could.not.load.product"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.load.product"); + logger.log("EPC0064", new Object[] { this.toString() }, e); + } } // render faces messages @@ -114,65 +140,40 @@ if (isInsert()) { // insert - ProductDescription pd = productDxo.convert(productEditPage); - Product product = productDxo.convertProduct(productEditPage); + Product product = new Product(); - pd.setProduct(product); - pd.setLanguageId(getLanguageService().getDefaultLanguage() - .getLanguageId()); + productDxo.covertFromPageToProduct(productEditPage, product); - List productImageList = new ArrayList(); - if (getProductEditPage().getImageFile() != null) { - ProductImage productImage = new ProductImage(); - productImage.setImageFile(getProductEditPage().getImageFile()); - productImage.setType(PompeiConstants.DETAILS_IMAGE_TYPE); - productImageList.add(productImage); - } - if (getProductEditPage().getThumbnailFile() != null) { - ProductImage productImage = new ProductImage(); - productImage.setImageFile(getProductEditPage().getThumbnailFile()); - productImage.setType(PompeiConstants.THUMBNAIL_IMAGE_TYPE); - productImageList.add(productImage); - } - product.setProductImageList(productImageList); - try { - productService.addProductDescription(pd, productEditPage + productService.addProduct(product, productEditPage .getParentId()); FacesMessageUtil.addInfoMessage("added.product"); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.add.product"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.add.product"); + logger.log("EPC0065", new Object[] { this.toString() }, e); } } else if (isUpdate()) { - ProductDescription pd = getProductService().getProdcutDescription( - getProductEditPage().getProductId(), - getLanguageService().getDefaultLanguage().getLanguageId()); - getProductDxo().convertPageToDescription(getProductEditPage(), pd); + try { + Product product = productService.getProduct(productEditPage + .getProductId(), SystemUtil.getDefaultLanguage(), true, + true, true, true, false, true, false, false); - Product product = pd.getProduct(); - getProductDxo().convertPageToProduct(getProductEditPage(), product); + productDxo.covertFromPageToProduct(productEditPage, product); - List productImageList = new ArrayList(); - if (getProductEditPage().getImageFile() != null) { - ProductImage productImage = new ProductImage(); - productImage.setImageFile(getProductEditPage().getImageFile()); - productImage.setType(PompeiConstants.DETAILS_IMAGE_TYPE); - productImageList.add(productImage); - } - if (getProductEditPage().getThumbnailFile() != null) { - ProductImage productImage = new ProductImage(); - productImage.setImageFile(getProductEditPage().getThumbnailFile()); - productImage.setType(PompeiConstants.THUMBNAIL_IMAGE_TYPE); - productImageList.add(productImage); - } - product.setProductImageList(productImageList); - - try { - productService.updateProductDescription(pd); + productService.updateProduct(product); FacesMessageUtil.addInfoMessage("updated.product"); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.update.product"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.update.product"); + logger.log("EPC0066", new Object[] { this.toString() }, e); } } else { @@ -185,100 +186,11 @@ } private boolean isUpdate() { - return PompeiConstants.UPDATE_MODE.equals(getProductEditPage() - .getMode()); + return PompeiConstants.UPDATE_MODE.equals(productEditPage.getMode()); } private boolean isInsert() { - return PompeiConstants.INSERT_MODE.equals(getProductEditPage() - .getMode()); + return PompeiConstants.INSERT_MODE.equals(productEditPage.getMode()); } - /** - * @return productEditPage - */ - public ProductEditPage getProductEditPage() { - return productEditPage; - } - - /** - * @param productEditPage 設定する productEditPage - */ - public void setProductEditPage(ProductEditPage productEditPage) { - this.productEditPage = productEditPage; - } - - public ProductServiceImpl getProductService() { - return productService; - } - - public void setProductService(ProductServiceImpl productService) { - this.productService = productService; - } - - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - public ManufacturerDxo getManufacturerDxo() { - return manufacturerDxo; - } - - public void setManufacturerDxo(ManufacturerDxo manufacturersDxo) { - this.manufacturerDxo = manufacturersDxo; - } - - public ManufacturerService getManufacturerService() { - return manufacturerService; - } - - public void setManufacturerService(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; - } - - /** - * @return taxService - */ - public TaxService getTaxService() { - return taxService; - } - - /** - * @param taxService 設定する taxService - */ - public void setTaxService(TaxService taxService) { - this.taxService = taxService; - } - - /** - * @return taxDxo - */ - public TaxDxo getTaxDxo() { - return taxDxo; - } - - /** - * @param taxDxo 設定する taxDxo - */ - public void setTaxDxo(TaxDxo taxDxo) { - this.taxDxo = taxDxo; - } - - public ProductDxo getProductDxo() { - return productDxo; - } - - public void setProductDxo(ProductDxo productDxo) { - this.productDxo = productDxo; - } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductEditPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -2,11 +2,10 @@ import java.io.Serializable; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Map; -import jp.sf.pal.jsf.custom.fileupload.UploadedFile; - import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; import org.seasar.teeda.extension.annotation.scope.SubapplicationScope; import org.seasar.teeda.extension.annotation.validator.Required; @@ -14,9 +13,6 @@ public class ProductEditPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 2187705411622892857L; private String breadcrumb; @@ -26,70 +22,91 @@ @SubapplicationScope private List> breadcrumbItems; - private List> manufacturerIdItems; - - private List> statusItems; - - @Required - private BigDecimal manufacturerId; - private String mode; private BigDecimal parentId; + private BigDecimal targetId; + + /* product */ private BigDecimal productId; - private String imageName; + private String code; - private UploadedFile imageFile; - - private String thumbnailName; - - private UploadedFile thumbnailFile; - private String model; - @Required - private String name; + private BigDecimal stock; //TODO i18n @BigDecimalConverter(pattern = "###,###") + private BigDecimal catalogPrice; + + //TODO i18n + @BigDecimalConverter(pattern = "###,###") @Required private BigDecimal price; - @Required - private BigDecimal quantity; + private BigDecimal weight; - @Required - private BigDecimal status; + private String size; - private List> taxClassIdItems; + private BigDecimal limitPurchase; + private Date releaseDate; + + private Date startDate; + + private Date endDate; + + private List> manufacturerIdItems; + @Required - private BigDecimal taxClassId; + private BigDecimal manufacturerId; - private BigDecimal weight; + private List> statusItems; - private BigDecimal targetId; + @Required + public BigDecimal status; - private String code; + private List> taxTypeIdItems; - private String size; + @Required + private BigDecimal taxTypeId; - private BigDecimal ordered; + private List> deliveryTypeIdItems; - private BigDecimal reviewed; + @Required + private BigDecimal deliveryTypeId; - private BigDecimal rating; + /* product info */ + @Required + private String name; private String title; private String url; - private BigDecimal viewed; + /* product page info*/; + @Required + private String pageId; + + private String templateName; + + private String keyword; + private String description; + /* product description */ + private String productDescription; + + /* product content */ + private String content1; + + private String content2; + + private String content3; + private LabelHelper labelHelper; public String getBreadcrumb() { @@ -116,15 +133,6 @@ this.breadcrumbItems = breadcrumbItems; } - public List> getManufacturerIdItems() { - return manufacturerIdItems; - } - - public void setManufacturerIdItems( - List> manufacturerItems) { - this.manufacturerIdItems = manufacturerItems; - } - public String getMode() { return mode; } @@ -141,300 +149,268 @@ this.parentId = parentId; } - public String getImageName() { - return imageName; + public BigDecimal getTargetId() { + return targetId; } - public void setImageName(String productsImage) { - this.imageName = productsImage; + public void setTargetId(BigDecimal targetId) { + this.targetId = targetId; } - /** - * @return productsImageFile - */ - public UploadedFile getImageFile() { - return imageFile; + public BigDecimal getProductId() { + return productId; } - /** - * @param productsImageFile 設定する productsImageFile - */ - public void setImageFile(UploadedFile productsImageFile) { - this.imageFile = productsImageFile; + public void setProductId(BigDecimal productId) { + this.productId = productId; } - public String getModel() { - return model; + public String getCode() { + return code; } - public void setModel(String productsModel) { - this.model = productsModel; + public void setCode(String code) { + this.code = code; } - public String getName() { - return name; + public String getModel() { + return model; } - public void setName(String productsName) { - this.name = productsName; + public void setModel(String model) { + this.model = model; } - public BigDecimal getPrice() { - return price; + public BigDecimal getStock() { + return stock; } - public void setPrice(BigDecimal productsPrice) { - this.price = productsPrice; + public void setStock(BigDecimal stock) { + this.stock = stock; } - public BigDecimal getQuantity() { - return quantity; + public BigDecimal getCatalogPrice() { + return catalogPrice; } - public void setQuantity(BigDecimal productsQuantity) { - this.quantity = productsQuantity; + public void setCatalogPrice(BigDecimal catalogPrice) { + this.catalogPrice = catalogPrice; } - public BigDecimal getStatus() { - return status; + public BigDecimal getPrice() { + return price; } - public void setStatus(BigDecimal productsStatus) { - this.status = productsStatus; + public void setPrice(BigDecimal price) { + this.price = price; } - public BigDecimal getTaxClassId() { - return taxClassId; + public BigDecimal getWeight() { + return weight; } - public void setTaxClassId(BigDecimal productsTaxClassId) { - this.taxClassId = productsTaxClassId; + public void setWeight(BigDecimal weight) { + this.weight = weight; } - public BigDecimal getWeight() { - return weight; + public String getSize() { + return size; } - public void setWeight(BigDecimal productsWeight) { - this.weight = productsWeight; + public void setSize(String size) { + this.size = size; } - public BigDecimal getTargetId() { - return targetId; + public BigDecimal getLimitPurchase() { + return limitPurchase; } - public void setTargetId(BigDecimal targetId) { - this.targetId = targetId; + public void setLimitPurchase(BigDecimal limitPurchase) { + this.limitPurchase = limitPurchase; } - public BigDecimal getManufacturerId() { - return manufacturerId; + public Date getReleaseDate() { + return releaseDate; } - public void setManufacturerId(BigDecimal manufacturersId) { - this.manufacturerId = manufacturersId; + public void setReleaseDate(Date releaseDate) { + this.releaseDate = releaseDate; } - public BigDecimal getProductId() { - return productId; + public Date getStartDate() { + return startDate; } - public void setProductId(BigDecimal productsId) { - this.productId = productsId; + public void setStartDate(Date startDate) { + this.startDate = startDate; } - /** - * @return thumbnail - */ - public String getThumbnailName() { - return thumbnailName; + public Date getEndDate() { + return endDate; } - /** - * @param thumbnail 設定する thumbnail - */ - public void setThumbnailName(String thumbnail) { - this.thumbnailName = thumbnail; + public void setEndDate(Date endDate) { + this.endDate = endDate; } - /** - * @return thumbnailFile - */ - public UploadedFile getThumbnailFile() { - return thumbnailFile; + public List> getManufacturerIdItems() { + return manufacturerIdItems; } - /** - * @param thumbnailFile 設定する thumbnailFile - */ - public void setThumbnailFile(UploadedFile thumbnailFile) { - this.thumbnailFile = thumbnailFile; + public void setManufacturerIdItems( + List> manufacturerIdItems) { + this.manufacturerIdItems = manufacturerIdItems; } - /** - * @return taxClassIdItems - */ - public List> getTaxClassIdItems() { - return taxClassIdItems; + public BigDecimal getManufacturerId() { + return manufacturerId; } - /** - * @param taxClassIdItems 設定する taxClassIdItems - */ - public void setTaxClassIdItems(List> taxClassIdItems) { - this.taxClassIdItems = taxClassIdItems; + public void setManufacturerId(BigDecimal manufacturerId) { + this.manufacturerId = manufacturerId; } - /** - * @return statusItems - */ public List> getStatusItems() { return statusItems; } - /** - * @param statusItems 設定する statusItems - */ public void setStatusItems(List> statusItems) { this.statusItems = statusItems; } - /** - * @return code - */ - public String getCode() { - return code; + public BigDecimal getStatus() { + return status; } - /** - * @param code 設定する code - */ - public void setCode(String code) { - this.code = code; + public void setStatus(BigDecimal status) { + this.status = status; } - /** - * @return size - */ - public String getSize() { - return size; + public List> getTaxTypeIdItems() { + return taxTypeIdItems; } - /** - * @param size 設定する size - */ - public void setSize(String size) { - this.size = size; + public void setTaxTypeIdItems(List> taxTypeIdItems) { + this.taxTypeIdItems = taxTypeIdItems; } - /** - * @return ordered - */ - public BigDecimal getOrdered() { - return ordered; + public BigDecimal getTaxTypeId() { + return taxTypeId; } - /** - * @param ordered 設定する ordered - */ - public void setOrdered(BigDecimal ordered) { - this.ordered = ordered; + public void setTaxTypeId(BigDecimal taxTypeId) { + this.taxTypeId = taxTypeId; } - /** - * @return reviewed - */ - public BigDecimal getReviewed() { - return reviewed; + public List> getDeliveryTypeIdItems() { + return deliveryTypeIdItems; } - /** - * @param reviewed 設定する reviewed - */ - public void setReviewed(BigDecimal reviewed) { - this.reviewed = reviewed; + public void setDeliveryTypeIdItems( + List> deliveryTypeIdItems) { + this.deliveryTypeIdItems = deliveryTypeIdItems; } - /** - * @return rating - */ - public BigDecimal getRating() { - return rating; + public BigDecimal getDeliveryTypeId() { + return deliveryTypeId; } - /** - * @param rating 設定する rating - */ - public void setRating(BigDecimal rating) { - this.rating = rating; + public void setDeliveryTypeId(BigDecimal deliveryTypeId) { + this.deliveryTypeId = deliveryTypeId; } - /** - * @return title - */ + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getTitle() { return title; } - /** - * @param title 設定する title - */ public void setTitle(String title) { this.title = title; } - /** - * @return url - */ public String getUrl() { return url; } - /** - * @param url 設定する url - */ public void setUrl(String url) { this.url = url; } - /** - * @return viewed - */ - public BigDecimal getViewed() { - return viewed; + public String getPageId() { + return pageId; } - /** - * @param viewed 設定する viewed - */ - public void setViewed(BigDecimal viewed) { - this.viewed = viewed; + public void setPageId(String pageId) { + this.pageId = pageId; } - /** - * @return description - */ + public String getTemplateName() { + return templateName; + } + + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + public String getDescription() { return description; } - /** - * @param description 設定する description - */ public void setDescription(String description) { this.description = description; } - /** - * @return labelHelper - */ + public String getProductDescription() { + return productDescription; + } + + public void setProductDescription(String productDescription) { + this.productDescription = productDescription; + } + + public String getContent1() { + return content1; + } + + public void setContent1(String content1) { + this.content1 = content1; + } + + public String getContent2() { + return content2; + } + + public void setContent2(String content2) { + this.content2 = content2; + } + + public String getContent3() { + return content3; + } + + public void setContent3(String content3) { + this.content3 = content3; + } + public LabelHelper getLabelHelper() { return labelHelper; } - /** - * @param labelHelper 設定する labelHelper - */ public void setLabelHelper(LabelHelper labelHelper) { this.labelHelper = labelHelper; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -9,51 +9,42 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.CategoryDxo; +import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.dxo.ProductDxo; -import jp.sf.pal.pompei.exentity.CategoryDescription; +import jp.sf.pal.pompei.exentity.Category; import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.service.CategoryService; -import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.pager.ProductPager; import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + public class ProductListAction implements Serializable { + + private static final long serialVersionUID = 3259525565087243422L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = 3259525565087243422L; + private static final Logger logger = Logger + .getLogger(ProductListAction.class); // LOG CODE: ?PC005? - /** */ private ProductListPage productListPage; - /** */ private ProductService productService; - /** */ private ProductDxo productDxo; - /** */ - private CategoryService categoryService; + private ProductPager productPager; - private LanguageService languageService; - - /** */ - private CategoryDxo categoriesDxo; - public Class initialize() { return null; } - public Class doDelete() { - productService.deleteProduct(productListPage.getProductId()); - FacesMessageUtil.addInfoMessage("deleted.product"); - return null; - } - private boolean isDelete() { - return getProductListPage().getMode() != null - && getProductListPage().getMode().equals( - PompeiConstants.DELETE_MODE); + return productListPage.getMode() != null + && productListPage.getMode() + .equals(PompeiConstants.DELETE_MODE); } public Class prerender() { @@ -75,9 +66,8 @@ m .put(PompeiConstants.CATEGORY_ID, PompeiConstants.ROOT_CATEGORY_ID); - m.put(PompeiConstants.BREADCRUMB, getProductListPage() - .getLabelHelper().getLabelValue( - PompeiConstants.TOP_CATEGORY)); + m.put(PompeiConstants.BREADCRUMB, productListPage.getLabelHelper() + .getLabelValue(PompeiConstants.TOP_CATEGORY)); list.add(m); productListPage.setBreadcrumbItems(list); @@ -97,86 +87,42 @@ productListPage.setCategoryItems(cList); //商品一覧の取得 - List list = productService.getProductList(productListPage - .getParentId()); - List> sList = new ArrayList>(); - productDxo.convert(list, sList); - productListPage.setProductItems(sList); + if (productPager != null) { + if (productPager.getCategoryId() != null + && !productPager.getCategoryId().equals( + productListPage.getParentId())) { + productPager.clear(); + productPager.setCategoryId(productListPage.getParentId()); + } + } else { + productPager = new ProductPager(); + } + try { + List list = productService.getProductListByPager( + productPager, SystemUtil.getDefaultLanguage()); + List> sList = new ArrayList>(); + productDxo.convertFromProductToMap(list, sList); + productListPage.setProductItems(sList); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.find.products"); + logger.log("EPC0051", new Object[] { this.toString() }, e); + } + // render faces messages FacesMessageUtil.renderMessages(); return null; } private List> getCategoryList() { - List list = categoryService - .getSubCategoryDescriptionList(productListPage.getParentId(), - getLanguageService().getDefaultLanguage() - .getLanguageId()); - List> cList = new ArrayList>(); - categoriesDxo.convert(list, cList); - return cList; + List categoryList = productService.getSubCategoryList( + productListPage.getParentId(), SystemUtil.getDefaultLanguage()); + List> list = new ArrayList>(); + productDxo.convertFromCategoryToMap(categoryList, list); + return list; } /** - * @return productListPage - */ - public ProductListPage getProductListPage() { - return productListPage; - } - - /** - * @param productListPage 設定する productListPage - */ - public void setProductListPage(ProductListPage productListPage) { - this.productListPage = productListPage; - } - - /** - * @return productService - */ - public ProductService getProductService() { - return productService; - } - - /** - * @param productService 設定する productService - */ - public void setProductService(ProductService productService) { - this.productService = productService; - } - - public CategoryService getCategoryService() { - return categoryService; - } - - public void setCategoryService(CategoryService categoryListService) { - this.categoryService = categoryListService; - } - - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - public CategoryDxo getCategoriesDxo() { - return categoriesDxo; - } - - public void setCategoriesDxo(CategoryDxo categoriesDxo) { - this.categoriesDxo = categoriesDxo; - } - - /** * パンくずリストを返します。 * @param breadcrumbItems * @param id @@ -191,21 +137,61 @@ return list; } } - CategoryDescription d = categoryService.getCategoryDescription( - productListPage.getCategoryId(), getLanguageService() - .getDefaultLanguage().getLanguageId()); + Category category = null; + try { + category = productService.getCategory(productListPage + .getCategoryId(), SystemUtil.getDefaultLanguage()); + } catch (PompeiDBException e) { + FacesMessageUtil + .addErrorMessage("could.not.load.category.for.breadcrumb"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("could.not.load.category.for.breadcrumb"); + logger.log("EPC0052", new Object[] { this.toString() }, e); + } - if (d == null) { + if (category == null) { return list; } Map m = new HashMap(); m.put(PompeiConstants.CATEGORY_ID, id); - m.put(PompeiConstants.BREADCRUMB, d.getName()); + m.put(PompeiConstants.BREADCRUMB, category.getName()); list.add(m); return list; } + public Class doDelete() { + try { + productService.deleteProduct(productListPage.getProductId()); + FacesMessageUtil.addInfoMessage("deleted.product"); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.product"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.product"); + logger.log("EPC0053", new Object[] { this.toString() }, e); + } + return null; + } + + public ProductListPage getProductListPage() { + return productListPage; + } + + public void setProductListPage(ProductListPage productListPage) { + this.productListPage = productListPage; + } + + public ProductService getProductService() { + return productService; + } + + public void setProductService(ProductService productService) { + this.productService = productService; + } + public ProductDxo getProductDxo() { return productDxo; } @@ -214,4 +200,11 @@ this.productDxo = productDxo; } + public ProductPager getProductPager() { + return productPager; + } + + public void setProductPager(ProductPager productPager) { + this.productPager = productPager; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/product/ProductListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -7,8 +7,6 @@ import java.util.Map; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.service.LanguageService; import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; @@ -71,8 +69,6 @@ private LabelHelper labelHelper; - private LanguageService languageService; - /** * @return mode */ @@ -231,18 +227,6 @@ this.name = categoriesName; } - // public List getDescriptionList() { - // return new ArrayList(); - // } - // - // public void setDescriptionList(List list) { - // if (list != null && list.size() > 0) { - // this.productsName = ((ProductDescription) list.get(0)) - // .getProductsName(); - // } else { - // this.productsName = ""; - // } - // } public BigDecimal getProductId() { return productId; @@ -266,39 +250,6 @@ this.labelHelper = labelHelper; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - public String getDefaultName() { - //TODO remove? - if (productItems != null && productIndex < productItems.size()) { - List list = (List) productItems - .get(productIndex).get( - PompeiConstants.PRODUCT_DESCRIPTION_LIST); - if (list != null) { - for (ProductDescription pd : list) { - BigDecimal languagesId = getLanguageService() - .getDefaultLanguage().getLanguageId(); - if (pd.getLanguageId().equals(languagesId)) { - return pd.getName(); - } - } - } - } - return "-"; - } - public String getStatusStr() { if (PompeiConstants.TRUE_BIGDECIMAL.equals(getStatus())) { return getLabelHelper().getLabelValue("enabled"); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -11,15 +11,16 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.CustomerBasket; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.service.CartService; +import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.ManufacturerService; import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + /** * カート画面でのアクション処理を記述します。 * TODO セッション内のカート情報を表示 @@ -29,28 +30,20 @@ */ public class ProductListAction implements Serializable { + private static final long serialVersionUID = -7622016737871221829L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -7622016737871221829L; + private static final Logger logger = Logger + .getLogger(ProductListAction.class); // LOG CODE: ?PC018? - private ManufacturerService manufacturerService; + private ProductListPage productListPage; private ProductService productService; - private CartService cartService; - private CustomerService customerService; - private ProductDxo productDxo; - - public Class doDelete() { - getCartService().deleteCustomerBasket( - getProductListPage().getCustomerBasketId()); - FacesMessageUtil.addInfoMessage("deleted.product.from.cart"); - return null; - } - public Class initialize() { return null; } @@ -61,18 +54,18 @@ .getExternalContext().getRemoteUser(); Customer customer = null; if (remoteUser == null) { - getProductListPage().setLogin(false); - getProductListPage().setUser(false); + productListPage.setLogin(false); + productListPage.setUser(false); return null; } else { - getProductListPage().setLogin(true); + productListPage.setLogin(true); // check user - customer = getCustomerService().getCustomerByPortalId(remoteUser); + customer = customerService.getCustomerByPortalId(remoteUser); if (customer == null) { - getProductListPage().setUser(false); + productListPage.setUser(false); return null; } else { - getProductListPage().setUser(true); + productListPage.setUser(true); } } @@ -81,35 +74,48 @@ doDelete(); } - getCartService().cleanupCustomerBasket(customer.getCustomerId()); + try { + //TODO expiredTime needs to be moved to portlet.xml + customerService.cleanupBasket(customer.getCustomerId(), System + .currentTimeMillis() + - 24 * 60 * 60 * 1000); - List baskets = getCartService().getCustomerBasketList( - customer.getCustomerId()); + List baskets = customerService.getBasketListByCustomerId( + customer.getCustomerId(), SystemUtil.getCurrentLanguage()); - BigDecimal totalPrice = new BigDecimal(0); - List> products = new ArrayList>(); - // TODO Dxo... it may be difficult.. - for (CustomerBasket basket : baskets) { - totalPrice = totalPrice.add(basket.getFinalPrice()); - ProductDescription pd = getProductService().getProdcutDescription( - basket.getProductId()); - // ManufacturerDescription mi = getManufacturerService() - // .getManufactureDescription( - // basket.getProduct().getManufacturerId()); - Map map = new HashMap(); - map.put("customerBasketId", basket.getCustomerBasketId()); - map.put("productName", pd.getName()); - map.put("productUrl", pd.getUrl()); - map.put("productModel", basket.getProduct().getModel()); - map.put("productCode", basket.getProduct().getCode()); - map.put("productPrice", basket.getProduct().getPrice()); - // map.put("manufacturerName", mi.getManufacturer().getName()); - map.put("quantity", basket.getQuantity()); - map.put("finalPrice", basket.getFinalPrice()); - products.add(map); + BigDecimal totalPrice = new BigDecimal(0); + List> products = new ArrayList>(); + // TODO Dxo... it may be difficult.. + for (Basket basket : baskets) { + totalPrice = totalPrice.add(basket.getFinalPrice()); + Product pd = productService.getProduct(basket.getProductId(), + SystemUtil.getCurrentLanguage()); + // ManufacturerDescription mi = getManufacturerService() + // .getManufactureDescription( + // basket.getProduct().getManufacturerId()); + Map map = new HashMap(); + map.put("customerBasketId", basket.getBasketId()); + map.put("productName", pd.getName()); + map.put("productUrl", pd.getUrl()); + map.put("productModel", basket.getProduct().getModel()); + map.put("productCode", basket.getProduct().getCode()); + map.put("productPrice", basket.getProduct().getPrice()); + // map.put("manufacturerName", mi.getManufacturer().getName()); + map.put("quantity", basket.getQuantity()); + map.put("finalPrice", basket.getFinalPrice()); + products.add(map); + } + productListPage.setTotalPrice(totalPrice); + productListPage.setProductItems(products); + } catch (PompeiDBException e) { + FacesMessageUtil + .addErrorMessage("failed.to.load.product.in.basket"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("failed.to.load.product.in.basket"); + logger.log("EPC0181", new Object[] { this.toString() }, e); } - getProductListPage().setTotalPrice(totalPrice); - getProductListPage().setProductItems(products); // render FacesMessages FacesMessageUtil.renderMessages(); @@ -117,110 +123,61 @@ } private boolean isDelete() { - return getProductListPage().getMode() != null - && getProductListPage().getMode().equals( - PompeiConstants.DELETE_MODE); + return productListPage.getMode() != null + && productListPage.getMode() + .equals(PompeiConstants.DELETE_MODE); } - /** - * - */ - private ProductListPage productListPage; + public Class doDelete() { + try { + customerService.deleteBasket(productListPage.getBasketId()); + FacesMessageUtil.addInfoMessage("deleted.product.from.cart"); + } catch (PompeiDBException e) { + FacesMessageUtil + .addErrorMessage("failed.to.delete.product.in.basket"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil + .addErrorMessage("failed.to.delete.product.in.basket"); + logger.log("EPC0182", new Object[] { this.toString() }, e); + } + return null; + } public Class doUpdate() { return null; } - /** - * @return productListPage - */ + public String doJumpProductList() { + return "../product/productList"; + } + + public String doJumpCheckoutEdit() { + return "../checkout/checkoutEdit"; + } + public ProductListPage getProductListPage() { return productListPage; } - /** - * @param productListPage 設定する productListPage - */ public void setProductListPage(ProductListPage productListPage) { this.productListPage = productListPage; } - /** - * @return manufacturerService - */ - public ManufacturerService getManufacturerService() { - return manufacturerService; - } - - /** - * @param manufacturerService 設定する manufacturerService - */ - public void setManufacturerService(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; - } - - /** - * @return productService - */ public ProductService getProductService() { return productService; } - /** - * @param productService 設定する productService - */ public void setProductService(ProductService productService) { this.productService = productService; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return cartService - */ - public CartService getCartService() { - return cartService; - } - - /** - * @param cartService 設定する cartService - */ - public void setCartService(CartService cartService) { - this.cartService = cartService; - } - - /** - * @return productDxo - */ - public ProductDxo getProductDxo() { - return productDxo; - } - - /** - * @param productDxo 設定する productDxo - */ - public void setProductDxo(ProductDxo productDxo) { - this.productDxo = productDxo; - } - - public String doJumpProductList() { - return "../product/productList"; - } - - public String doJumpCheckoutEdit() { - return "../checkout/checkoutEdit"; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -20,7 +20,7 @@ private BigDecimal quantity; - private BigDecimal customerBasketId; + private BigDecimal basketId; private String manufacturerName; @@ -53,15 +53,15 @@ /** * @return customersBasketId */ - public BigDecimal getCustomerBasketId() { - return customerBasketId; + public BigDecimal getBasketId() { + return basketId; } /** * @param customersBasketId 設定する customersBasketId */ - public void setCustomerBasketId(BigDecimal customersBasketId) { - this.customerBasketId = customersBasketId; + public void setBasketId(BigDecimal customersBasketId) { + this.basketId = customersBasketId; } public BigDecimal getQuantity() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -4,6 +4,8 @@ import javax.faces.context.FacesContext; +import org.seasar.framework.log.Logger; + import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.service.CustomerService; @@ -11,14 +13,14 @@ public class CheckoutCompleteAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 4915206497601066893L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(CheckoutConfirmAction.class); // LOG CODE: ?PC027? + private CheckoutCompletePage checkoutCompletePage; private CustomerService customerService; @@ -36,13 +38,12 @@ } // check user info - Customer customers = getCustomerService().getCustomerByPortalId( - remoteUser); + Customer customers = customerService.getCustomerByPortalId(remoteUser); if (customers == null) { return UserInfoEditPage.class; } - if (getCheckoutCompletePage().getOrderFormNumber() == null) { + if (checkoutCompletePage.getOrderFormNumber() == null) { return UserInfoEditPage.class; } @@ -58,33 +59,4 @@ return null; } - /** - * @return checkoutCompletePage - */ - public CheckoutCompletePage getCheckoutCompletePage() { - return checkoutCompletePage; - } - - /** - * @param checkoutCompletePage 設定する checkoutCompletePage - */ - public void setCheckoutCompletePage( - CheckoutCompletePage checkoutCompletePage) { - this.checkoutCompletePage = checkoutCompletePage; - } - - /** - * @return customerService - */ - public CustomerService getCustomerService() { - return customerService; - } - - /** - * @param customerService 設定する customerService - */ - public void setCustomerService(CustomerService customerService) { - this.customerService = customerService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,79 +1,88 @@ package jp.sf.pal.pompei.web.user.checkout; import java.io.Serializable; +import java.io.StringWriter; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import javax.faces.context.FacesContext; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.PompeiException; import jp.sf.pal.pompei.dxo.CustomerDxo; -import jp.sf.pal.pompei.dxo.OrderFormDxo; +import jp.sf.pal.pompei.dxo.OrderDxo; +import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.entity.notification.order.Order; import jp.sf.pal.pompei.exentity.AddressBook; -import jp.sf.pal.pompei.exentity.Currency; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.CustomerBasket; -import jp.sf.pal.pompei.exentity.DeliveryMethodDescription; -import jp.sf.pal.pompei.exentity.ManufacturerDescription; +import jp.sf.pal.pompei.exentity.DeliveryMethod; import jp.sf.pal.pompei.exentity.OrderCardInfo; -import jp.sf.pal.pompei.exentity.PaymentMethodDescription; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.exentity.TaxRate; +import jp.sf.pal.pompei.exentity.OrderForm; +import jp.sf.pal.pompei.exentity.OrderNotification; +import jp.sf.pal.pompei.exentity.OrderProduct; +import jp.sf.pal.pompei.exentity.OrderStatus; +import jp.sf.pal.pompei.exentity.PaymentMethod; +import jp.sf.pal.pompei.exentity.Product; import jp.sf.pal.pompei.fee.FeeCalculator; -import jp.sf.pal.pompei.service.CartService; import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.DeliveryMethodSerivce; -import jp.sf.pal.pompei.service.ManufacturerService; import jp.sf.pal.pompei.service.OrderService; -import jp.sf.pal.pompei.service.PaymentMethodService; import jp.sf.pal.pompei.service.ProductService; -import jp.sf.pal.pompei.service.TaxService; +import jp.sf.pal.pompei.service.SystemService; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; +import jp.sf.pal.pompei.util.VelocityUtil; +import org.apache.commons.lang.StringUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; import org.seasar.framework.container.ComponentNotFoundRuntimeException; import org.seasar.framework.container.CyclicReferenceRuntimeException; import org.seasar.framework.container.S2Container; import org.seasar.framework.container.TooManyRegistrationRuntimeException; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class CheckoutConfirmAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 1684922335841191730L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(CheckoutConfirmAction.class); // LOG CODE: ?PC025?, ?PC026? + private CheckoutConfirmPage checkoutConfirmPage; private CustomerService customerService; - private CartService cartService; - private ProductService productService; - private ManufacturerService manufacturerService; + private SystemService systemService; - private DeliveryMethodSerivce deliveryMethodSerivce; - - private PaymentMethodService paymentMethodService; - - private TaxService taxService; - private OrderService orderService; private CustomerDxo customerDxo; - private OrderFormDxo orderFormDxo; + private OrderDxo orderDxo; + private ProductDxo productDxo; + private transient S2Container container; public Class initialize() { @@ -88,191 +97,201 @@ return UserInfoEditPage.class; } - // check user info - Customer customers = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customers == null) { - return UserInfoEditPage.class; - } + try { + // check user info + Customer customers = customerService + .getCustomerByPortalId(remoteUser); + if (customers == null) { + return UserInfoEditPage.class; + } - Map orderProcessMap = getOrderProcessMap(); - if (orderProcessMap == null) { - // expires session - FacesMessageUtil - .addErrorMessage("expire.order.process.in.checkoutconfirm"); - return UserInfoEditPage.class; - } + Map orderProcessMap = getOrderProcessMap(); + if (orderProcessMap == null) { + // expires session + FacesMessageUtil + .addErrorMessage("expire.order.process.in.checkoutconfirm"); + return UserInfoEditPage.class; + } - List baskets = getCartService().getCustomerBasketList( - customers.getCustomerId()); - if (baskets.isEmpty()) { - // clean up in the cart - FacesMessageUtil - .addErrorMessage("cart.is.empty.in.checkoutconfirm"); - return UserInfoEditPage.class; - } + List baskets = customerService.getBasketListByCustomerId( + customers.getCustomerId(), SystemUtil.getCurrentLanguage()); + if (baskets.isEmpty()) { + // clean up in the cart + FacesMessageUtil + .addErrorMessage("cart.is.empty.in.checkoutconfirm"); + return UserInfoEditPage.class; + } - List customersBasketIdList = new ArrayList(); + List customersBasketIdList = new ArrayList(); - BigDecimal subTotalPrice = new BigDecimal(0); - List> products = new ArrayList>(); - // TODO Dxo... it may be difficult.. - for (CustomerBasket basket : baskets) { - customersBasketIdList.add(basket.getCustomerBasketId()); - subTotalPrice = subTotalPrice.add(basket.getFinalPrice()); - ProductDescription pd = getProductService().getProdcutDescription( - basket.getProductId()); - ManufacturerDescription mi = getManufacturerService() - .getManufactureDescription( - basket.getProduct().getManufacturerId()); - Map map = new HashMap(); - map.put("customerBasketId", basket.getCustomerBasketId()); - map.put("name", pd.getName()); - map.put("url", pd.getUrl()); - map.put("model", basket.getProduct().getModel()); - map.put("manufacturerName", mi.getManufacturer().getName()); - map.put("quantity", basket.getQuantity()); - map.put("price", basket.getProduct().getPrice()); - map.put("finalPrice", basket.getFinalPrice()); - products.add(map); - } - getCheckoutConfirmPage().setSubTotalPrice(subTotalPrice); - getCheckoutConfirmPage().setCustomerBasketItems(products); + BigDecimal subTotalPrice = new BigDecimal(0); + List> products = new ArrayList>(); + // TODO Dxo... it may be difficult.. + for (Basket basket : baskets) { + customersBasketIdList.add(basket.getBasketId()); + subTotalPrice = subTotalPrice.add(basket.getFinalPrice()); + Product product = productService.getProduct(basket + .getProductId(), SystemUtil.getCurrentLanguage()); + Map map = new HashMap(); + map.put("basketId", basket.getBasketId()); + map.put("name", product.getName()); + map.put("url", product.getUrl()); + map.put("model", product.getModel()); + map.put("manufacturerName", product.getManufacturerName()); + map.put("quantity", basket.getQuantity()); + map.put("price", basket.getProduct().getPrice()); + map.put("finalPrice", basket.getFinalPrice()); + products.add(map); + } + checkoutConfirmPage.setSubTotalPrice(subTotalPrice); + checkoutConfirmPage.setBasketItems(products); - orderProcessMap.put(PompeiConstants.CUSTOMER_BASKET_ID_LIST, - customersBasketIdList); + orderProcessMap.put(PompeiConstants.CUSTOMER_BASKET_ID_LIST, + customersBasketIdList); - // address - String deliveryAddressBookId = (String) orderProcessMap - .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID); - if (deliveryAddressBookId == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.delivery.addressbook.id.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - AddressBook deliveryAddressBook; - try { - deliveryAddressBook = getCustomerService().getAddressBook( - new BigDecimal(deliveryAddressBookId)); - } catch (NumberFormatException e) { - FacesMessageUtil - .addErrorMessage("invalid.delivery.addressbook.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - if (deliveryAddressBook == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.delivery.addressbook.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - getCustomerDxo().convert(deliveryAddressBook, getCheckoutConfirmPage()); + // address + String deliveryAddressBookId = (String) orderProcessMap + .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID); + if (deliveryAddressBookId == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.delivery.addressbook.id.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + AddressBook deliveryAddressBook = null; + try { + deliveryAddressBook = customerService + .getAddressBook(new BigDecimal(deliveryAddressBookId)); + } catch (NumberFormatException e) { + FacesMessageUtil + .addErrorMessage("invalid.delivery.addressbook.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + if (deliveryAddressBook == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.delivery.addressbook.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + customerDxo.convertFromAddressBookToPage(deliveryAddressBook, + checkoutConfirmPage); - // tax - TaxRate taxRates = getTaxService().getTaxRateByZoneId( - deliveryAddressBook.getZone().getZoneId()); - if (taxRates == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.tax.rate.incheckoutconfirm"); - return UserInfoEditPage.class; - } - BigDecimal tax = subTotalPrice.multiply(taxRates.getRate()).divide( - new BigDecimal(100)); - getCheckoutConfirmPage().setTax(tax); + // TODO tax + // TaxRate taxRates = getTaxService().getTaxRateByZoneId( + // deliveryAddressBook.getZone().getZoneId()); + // if (taxRates == null) { + // FacesMessageUtil + // .addErrorMessage("could.not.find.tax.rate.incheckoutconfirm"); + // return UserInfoEditPage.class; + // } + // BigDecimal tax = subTotalPrice.multiply(taxRates.getRate()).divide( + // new BigDecimal(100)); + BigDecimal tax = new BigDecimal(0); + checkoutConfirmPage.setTax(tax); - Map informationMap = new HashMap(); - informationMap.put(PompeiConstants.SUB_TOTAL_PRICE, subTotalPrice); - informationMap.put(PompeiConstants.TAX, 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); - if (paymentMethodId == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.payment.method.id.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - PaymentMethodDescription pmd = getPaymentMethodService() - .getPaymentMethodDescription(paymentMethodId); - if (pmd == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.payment.method.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - getCheckoutConfirmPage().setPaymentMethodName(pmd.getName()); + // payment + BigDecimal paymentMethodId = (BigDecimal) orderProcessMap + .get(PompeiConstants.PAYMENT_METHOD_ID); + if (paymentMethodId == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.payment.method.id.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + PaymentMethod paymentMethod = systemService.getPaymentMethod( + paymentMethodId, SystemUtil.getCurrentLanguage()); + if (paymentMethod == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.payment.method.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + checkoutConfirmPage.setPaymentMethodName(paymentMethod.getName()); - // payment fee - String paymentMethodObjectName = pmd.getPaymentMethod().getObjectName(); - BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE; - try { - FeeCalculator pmc = (FeeCalculator) getContainer().getComponent( - paymentMethodObjectName); - paymentFee = pmc.calculate(baskets, deliveryAddressBook, - informationMap); - getCheckoutConfirmPage().setPaymentFee(paymentFee); - } catch (ComponentNotFoundRuntimeException e) { - FacesMessageUtil - .addErrorMessage("could.not.calculate.payment.fee.1"); - //TODO logger - return UserInfoEditPage.class; - } catch (TooManyRegistrationRuntimeException e) { - FacesMessageUtil - .addErrorMessage("could.not.calculate.payment.fee.2"); - //TODO logger - return UserInfoEditPage.class; - } catch (CyclicReferenceRuntimeException e) { - FacesMessageUtil - .addErrorMessage("could.not.calculate.payment.fee.3"); - //TODO logger - return UserInfoEditPage.class; - } + // payment fee + String paymentMethodObjectName = paymentMethod.getObjectName(); + BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE; + try { + FeeCalculator pmc = (FeeCalculator) container + .getComponent(paymentMethodObjectName); + paymentFee = pmc.calculate(baskets, deliveryAddressBook, + informationMap); + checkoutConfirmPage.setPaymentFee(paymentFee); + } catch (ComponentNotFoundRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.payment.fee.1"); + logger.log("EPC0251", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; + } catch (TooManyRegistrationRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.payment.fee.2"); + logger.log("EPC0252", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; + } catch (CyclicReferenceRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.payment.fee.3"); + logger.log("EPC0253", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; + } - // deliveryMethod - BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap - .get(PompeiConstants.DELIVERY_METHOD_ID); - if (deliveryMethodId == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.delivery.method.id.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - DeliveryMethodDescription dmd = getDeliveryMethodSerivce() - .getDeliveryMethodDescription(deliveryMethodId); - if (dmd == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.delivery.method.in.checkoutconfirm"); - return UserInfoEditPage.class; - } - getCheckoutConfirmPage().setDeliveryMethodName(dmd.getName()); + // deliveryMethod + BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap + .get(PompeiConstants.DELIVERY_METHOD_ID); + if (deliveryMethodId == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.delivery.method.id.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + DeliveryMethod deliveryMethod = systemService.getDeliveryMethod( + deliveryMethodId, SystemUtil.getCurrentLanguage()); + if (deliveryMethod == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.delivery.method.in.checkoutconfirm"); + return UserInfoEditPage.class; + } + checkoutConfirmPage.setDeliveryMethodName(deliveryMethod.getName()); - // delivery fee - String deliveryMethodObjectName = dmd.getDeliveryMethod() - .getObjectName(); - BigDecimal deliveryPrice = PompeiConstants.DEFAULT_DELIVERY_PRICE; - try { - FeeCalculator dmc = (FeeCalculator) getContainer().getComponent( - deliveryMethodObjectName); - deliveryPrice = dmc.calculate(baskets, deliveryAddressBook, - informationMap); - getCheckoutConfirmPage().setDeliveryPrice(deliveryPrice); - } catch (ComponentNotFoundRuntimeException e) { + // delivery fee + String deliveryMethodObjectName = deliveryMethod.getObjectName(); + BigDecimal deliveryPrice = PompeiConstants.DEFAULT_DELIVERY_PRICE; + try { + FeeCalculator dmc = (FeeCalculator) container + .getComponent(deliveryMethodObjectName); + deliveryPrice = dmc.calculate(baskets, deliveryAddressBook, + informationMap); + checkoutConfirmPage.setDeliveryPrice(deliveryPrice); + } catch (ComponentNotFoundRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.delivery.price.1"); + logger.log("EPC0254", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; + } catch (TooManyRegistrationRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.delivery.price.2"); + logger.log("EPC0255", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; + } catch (CyclicReferenceRuntimeException e) { + FacesMessageUtil + .addErrorMessage("could.not.calculate.delivery.price.3"); + logger.log("EPC0256", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; + } + + // total + checkoutConfirmPage.setTotalPrice(subTotalPrice.add(tax).add( + deliveryPrice).add(paymentFee)); + } catch (PompeiDBException e) { FacesMessageUtil - .addErrorMessage("could.not.calculate.delivery.price.1"); - //TODO logger + .addErrorMessage("failed.to.load.order.in.checkout.process"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); return UserInfoEditPage.class; - } catch (TooManyRegistrationRuntimeException e) { + } catch (Exception e) { FacesMessageUtil - .addErrorMessage("could.not.calculate.delivery.price.2"); - //TODO logger + .addErrorMessage("failed.to.load.order.in.checkout.process"); + logger.log("EPC0257", new Object[] { this.toString() }, e); return UserInfoEditPage.class; - } catch (CyclicReferenceRuntimeException e) { - FacesMessageUtil - .addErrorMessage("could.not.calculate.delivery.price.3"); - //TODO logger - return UserInfoEditPage.class; } - // total - getCheckoutConfirmPage().setTotalPrice( - subTotalPrice.add(tax).add(deliveryPrice).add(paymentFee)); - // render FacesMessages FacesMessageUtil.renderMessages(); return null; @@ -287,100 +306,288 @@ return UserInfoEditPage.class; } - // check user info - Customer customer = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customer == null) { - return UserInfoEditPage.class; - } + try { + // check user info + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + return UserInfoEditPage.class; + } - Map map = (Map) SessionUtil - .getFromLocalScope(getCheckoutConfirmPage().getOrderProcessId()); - if (map == null) { - // expires session - // TODO clear session info for card + Map map = (Map) SessionUtil + .getFromLocalScope(checkoutConfirmPage.getOrderProcessId()); + if (map == null) { + // expires session + // TODO clear session info for card + FacesMessageUtil + .addErrorMessage("expire.order.process.in.checkoutconfirm.for.confirm"); + return UserInfoEditPage.class; + } + + BigDecimal paymentMethodId = (BigDecimal) map + .get(PompeiConstants.PAYMENT_METHOD_ID); + String cardCode = (String) map.get(PompeiConstants.CARD_TYPE); + String cardNumber = (String) map.get(PompeiConstants.CARD_NUMBER); + String cardOwner = (String) map.get(PompeiConstants.CARD_OWNER); + String cardExpires = (String) map.get(PompeiConstants.CARD_EXPIRES); + BigDecimal deliveryMethodId = (BigDecimal) map + .get(PompeiConstants.DELIVERY_METHOD_ID); + String deliveryAddressBookIdStr = (String) map + .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID); + List basketIdList = (List) map + .get(PompeiConstants.CUSTOMER_BASKET_ID_LIST); + + if (basketIdList.isEmpty()) { + FacesMessageUtil.addErrorMessage("cart.is.empty"); + return null; + } + + if (paymentMethodId == null || deliveryMethodId == null + || deliveryAddressBookIdStr == null || basketIdList == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.cart.info.in.checkoutconfirm"); + return null; + } + + OrderCardInfo orderCardInfo = null; + if (cardCode != null) { + orderCardInfo = new OrderCardInfo(); + orderCardInfo.setCardTypeCode(cardCode); + orderCardInfo.setCardNumber(cardNumber); + orderCardInfo.setCardOwner(cardOwner); + orderCardInfo.setCardExpires(cardExpires); + } + + BigDecimal deliveryAddressBookId = new BigDecimal( + deliveryAddressBookIdStr); + + PaymentMethod paymentMethod = systemService.getPaymentMethod( + paymentMethodId, SystemUtil.getCurrentLanguage()); + DeliveryMethod deliveryMethod = systemService.getDeliveryMethod( + deliveryMethodId, SystemUtil.getCurrentLanguage()); + AddressBook defaultAddressBook = customerService + .getDefaultAddressBook(customer.getCustomerId()); + AddressBook deliveryAddressBook = customerService + .getAddressBook(deliveryAddressBookId); + + OrderForm orderForm = new OrderForm(); + orderDxo.convertFromCustomerAddressBookToOrderForm( + defaultAddressBook, orderForm); + // TODO select billing address book + orderDxo.convertFromBillingAddressBookToOrderForm( + defaultAddressBook, orderForm); + orderDxo.convertFromDeliveryAddressBookToOrderForm( + defaultAddressBook, orderForm); + orderDxo.convertFromCustomerToOrderForm(customer, orderForm); + + orderForm.setPaymentMethodId(paymentMethod.getPaymentMethodId()); + orderForm.setDeliveryMethodId(deliveryMethod.getDeliveryMethodId()); + //TODO others + orderForm.setSubTotalPrice(checkoutConfirmPage.getSubTotalPrice()); + orderForm.setTax(checkoutConfirmPage.getTax()); + orderForm.setDeliveryPrice(checkoutConfirmPage.getDeliveryPrice()); + orderForm.setPaymentFee(checkoutConfirmPage.getPaymentFee()); + orderForm.setTotalPrice(checkoutConfirmPage.getTotalPrice()); + + // basketIdList + List basketList; + try { + basketList = customerService.getBasketList(basketIdList, + SystemUtil.getCurrentLanguage()); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("could.not.find.cart.info"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + return null; + } + + // customer basket + List orderProductList = new ArrayList(); + for (Basket basket : basketList) { + + OrderProduct orderProduct = new OrderProduct(); + orderDxo.convertFromProductToOrderProduct(basket.getProduct(), + orderProduct); + orderProduct.setOrderFormId(orderForm.getOrderFormId()); + // TODO bargain price + orderProduct.setFinalPrice(basket.getFinalPrice()); + //TODO tax + orderProduct.setTax(new BigDecimal(0)); + orderProduct.setQuantity(basket.getQuantity()); + + //TODO sync? stock info + // Product product = basket.getProduct(); + // if (product.getStock() != null) { + // BigDecimal quantity = product.getStock().subtract( + // basket.getQuantity()); + // if (quantity.intValue() < 0) { + // FacesMessageUtil.addErrorMessage("prodocut.is.shortage"); + // logger.log("EPC0258", new Object[] { this.toString() }); + // return null; + // } + // product.setStock(quantity); + // } + orderProductList.add(orderProduct); + } + orderForm.setOrderProductList(orderProductList); + + String orderFormNumber = orderService.addOrderForm(orderForm, + orderCardInfo); + checkoutConfirmPage.setOrderFormNumber(orderFormNumber); + + // send mail + OrderStatus orderStatus = systemService.getOrderStatus(orderForm + .getOrderStatusId(), SystemUtil.getCurrentLanguage()); + if (orderStatus != null + && PompeiConstants.NEW_ORDER_STATUS_TYPE.equals(orderStatus + .getType())) { + List orderNotificationList = orderStatus + .getOrderNotificationList(); + if (orderNotificationList != null + && !orderNotificationList.isEmpty()) { + BigDecimal[] orderNotificationIds = new BigDecimal[orderNotificationList + .size()]; + int count = 0; + for (OrderNotification orderNotification : orderNotificationList) { + orderNotificationIds[count] = orderNotification + .getOrderNotificationId(); + count++; + } + try { + sendOrderNotifications(orderForm, orderNotificationIds); + } catch (PompeiException e) { + //TODO cancel order? + FacesMessageUtil.addErrorMessage(e.getMessageId(), e + .getArgs()); + logger.log("EPC0259", new Object[] { this.toString() }, + e); + } catch (Exception e) { + //TODO cancel order? + logger.log("EPC0260", new Object[] { this.toString() }, + e); + } + } + } + + // remove order process id + SessionUtil.removeFromLocalScope(checkoutConfirmPage + .getOrderProcessId()); + + return CheckoutCompletePage.class; + } catch (PompeiDBException e) { FacesMessageUtil - .addErrorMessage("expire.order.process.in.checkoutconfirm.for.confirm"); - return UserInfoEditPage.class; + .addErrorMessage("system.error.occurs.in.order.process"); + logger.log("EPC0262", new Object[] { this.toString() }, e); } + return null; + } - BigDecimal paymentMethodId = (BigDecimal) map - .get(PompeiConstants.PAYMENT_METHOD_ID); - String cardCode = (String) map.get(PompeiConstants.CARD_TYPE); - String cardNumber = (String) map.get(PompeiConstants.CARD_NUMBER); - String cardOwner = (String) map.get(PompeiConstants.CARD_OWNER); - String cardExpires = (String) map.get(PompeiConstants.CARD_EXPIRES); - BigDecimal deliveryMethodId = (BigDecimal) map - .get(PompeiConstants.DELIVERY_METHOD_ID); - String deliveryAddressBookIdStr = (String) map - .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID); - List customerBasketIdList = (List) map - .get(PompeiConstants.CUSTOMER_BASKET_ID_LIST); - if (paymentMethodId == null || deliveryMethodId == null - || deliveryAddressBookIdStr == null - || customerBasketIdList == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.cart.info.in.checkoutconfirm"); - return null; + protected void sendOrderNotifications(OrderForm orderForm, + BigDecimal[] orderNotificationIds) throws PompeiException { + if (orderForm == null) { + throw new PompeiException( + "could.not.find.orderformid.in.notification"); } - OrderCardInfo orderCardInfo = null; - if (cardCode != null) { - orderCardInfo = new OrderCardInfo(); - orderCardInfo.setCardCode(cardCode); - orderCardInfo.setCardNumber(cardNumber); - orderCardInfo.setCardOwner(cardOwner); - orderCardInfo.setCardExpires(cardExpires); + List errors = new ArrayList(); + for (BigDecimal orderNotificationId : orderNotificationIds) { + OrderNotification orderNotification = systemService + .getOrderNotification(orderNotificationId); + if (orderNotification != null) { + String to = orderNotification.getEmailAddress(); + if (to == null || "".equals(to)) { + to = orderForm.getCustomerEmailAddress(); + } + try { + sendOrderNotification(orderForm, to, SystemUtil + .getAdministratorEmail(), orderNotification + .getTemplateName()); + } catch (Exception e) { + logger.log("EPC0261", new Object[] { this.toString() }, e); + errors.add(orderNotification.getTemplateName() + "(" + to + + ")"); + } + } } + if (!errors.isEmpty()) { + String templates = StringUtils.join(errors.toArray(), ", "); + throw new PompeiException("failed.to.send.some.order.notification", + new String[] { templates }); + } + } - BigDecimal deliveryAddressBookId = new BigDecimal( - deliveryAddressBookIdStr); + private void sendOrderNotification(OrderForm orderForm, String to, + String from, String templateName) throws PompeiException { + try { + Order order = new Order(); + orderDxo.convertFromOrderFormToNotification(orderForm, order); + List orderProductList = orderService + .getOrderProductListByOrderFormId(orderForm + .getOrderFormId()); + for (OrderProduct orderProduct : orderProductList) { + //TODO i18n: pass language id + Product product = productService.getProduct(orderProduct + .getProductId(), SystemUtil.getCurrentLanguage()); + jp.sf.pal.pompei.entity.notification.order.Product productNotification = new jp.sf.pal.pompei.entity.notification.order.Product(); + productDxo.convertFromProductToNotification(product, + productNotification); + orderDxo.convertFromOrderProductToNotification(orderProduct, + productNotification); + order.addProduct(productNotification); + } - PaymentMethodDescription pmd = getPaymentMethodService() - .getPaymentMethodDescription(paymentMethodId); - DeliveryMethodDescription dmd = getDeliveryMethodSerivce() - .getDeliveryMethodDescription(deliveryMethodId); - AddressBook defaultAddressBook = getCustomerService() - .getDefaultAddressBook(customer.getCustomerId()); - AddressBook deliveryAddressBook = getCustomerService().getAddressBook( - deliveryAddressBookId); - Currency currency = getOrderService().getCurrency( - PompeiConstants.DEFAULT_CURRENCY_ID); + // set velocity context + VelocityContext context = new VelocityContext(); + context.put("order", order); - // TODO select billing address book - // TODO currency - try { - String orderFormNumber = getOrderService().addOrderForm(customer, - customerBasketIdList, defaultAddressBook, - deliveryAddressBook, defaultAddressBook, - pmd.getPaymentMethod(), dmd.getDeliveryMethod(), - orderCardInfo, currency, - getCheckoutConfirmPage().getSubTotalPrice(), - getCheckoutConfirmPage().getTax(), - getCheckoutConfirmPage().getDeliveryPrice(), - getCheckoutConfirmPage().getPaymentFee(), - getCheckoutConfirmPage().getTotalPrice()); - getCheckoutConfirmPage().setOrderFormNumber(orderFormNumber); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - //TODO logger - return null; + VelocityUtil.init(); + StringWriter sw = new StringWriter(); + String templatePath = SystemUtil + .getOrderNotificationTemplatePath(templateName); + // TODO i18n: encoding + Template template = VelocityUtil.getTemplate(templatePath, "UTF-8"); + + template.merge(context, sw); + + String content = sw.toString(); + if (content == null) { + throw new CommonException("notification.content.is.null"); + } + int index = content.indexOf("\n"); + String subject = null; + String body = null; + if (index != -1) { + subject = content.substring(0, index); + body = content.substring(index); + } else { + // TODO should throw exception? + subject = content; + body = content; + } + Properties props = System.getProperties(); + // set smtp server + props.put("mail.smtp.host", SystemUtil.getSmtpHost()); + Session session = Session.getDefaultInstance(props, null); + MimeMessage mimeMessage = new MimeMessage(session); + mimeMessage.setFrom(new InternetAddress(from)); + mimeMessage.setRecipients(Message.RecipientType.TO, to); + //TODO i18n: encoding + mimeMessage.setSubject(subject, "iso-2022-jp"); + //TODO i18n: encoding + mimeMessage.setText(body, "iso-2022-jp"); + mimeMessage.setHeader("Content-Type", "text/plain"); + mimeMessage.setSentDate(new Date()); + + Transport.send(mimeMessage); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.store.order"); - //TODO logger - return null; + throw new PompeiException("faild.to.send.order.notification", e); } - // remove order process id - SessionUtil.removeFromLocalScope(getCheckoutConfirmPage() - .getOrderProcessId()); - - return CheckoutCompletePage.class; } @TakeOver(type = TakeOverType.NEVER) public Class doCancel() { - SessionUtil.removeFromLocalScope(getCheckoutConfirmPage() + SessionUtil.removeFromLocalScope(checkoutConfirmPage .getOrderProcessId()); FacesMessageUtil.addInfoMessage("canceled.order"); return UserInfoEditPage.class; @@ -388,177 +595,79 @@ private Map getOrderProcessMap() { return (Map) SessionUtil - .getFromLocalScope(getCheckoutConfirmPage().getOrderProcessId()); + .getFromLocalScope(checkoutConfirmPage.getOrderProcessId()); } - /** - * @return checkoutConfirmPage - */ public CheckoutConfirmPage getCheckoutConfirmPage() { return checkoutConfirmPage; } - /** - * @param checkoutConfirmPage 設定する checkoutConfirmPage - */ public void setCheckoutConfirmPage(CheckoutConfirmPage checkoutConfirmPage) { this.checkoutConfirmPage = checkoutConfirmPage; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return cartService - */ - public CartService getCartService() { - return cartService; - } - - /** - * @param cartService 設定する cartService - */ - public void setCartService(CartService cartService) { - this.cartService = cartService; - } - - /** - * @return productService - */ public ProductService getProductService() { return productService; } - /** - * @param productService 設定する productService - */ public void setProductService(ProductService productService) { this.productService = productService; } - /** - * @return manufacturerService - */ - public ManufacturerService getManufacturerService() { - return manufacturerService; + public SystemService getSystemService() { + return systemService; } - /** - * @param manufacturerService 設定する manufacturerService - */ - public void setManufacturerService(ManufacturerService manufacturerService) { - this.manufacturerService = manufacturerService; + public void setSystemService(SystemService systemService) { + this.systemService = systemService; } - /** - * @return customerDxo - */ + public OrderService getOrderService() { + return orderService; + } + + public void setOrderService(OrderService orderService) { + this.orderService = orderService; + } + public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo 設定する customerDxo - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } - /** - * @return deliveryMethodSerivce - */ - public DeliveryMethodSerivce getDeliveryMethodSerivce() { - return deliveryMethodSerivce; + public OrderDxo getOrderDxo() { + return orderDxo; } - /** - * @param deliveryMethodSerivce 設定する deliveryMethodSerivce - */ - public void setDeliveryMethodSerivce( - DeliveryMethodSerivce deliveryMethodSerivce) { - this.deliveryMethodSerivce = deliveryMethodSerivce; + public void setOrderDxo(OrderDxo orderDxo) { + this.orderDxo = orderDxo; } - /** - * @return taxService - */ - public TaxService getTaxService() { - return taxService; + public ProductDxo getProductDxo() { + return productDxo; } - /** - * @param taxService 設定する taxService - */ - public void setTaxService(TaxService taxService) { - this.taxService = taxService; + public void setProductDxo(ProductDxo productDxo) { + this.productDxo = productDxo; } - /** - * @return container - */ public S2Container getContainer() { return container; } - /** - * @param container 設定する container - */ public void setContainer(S2Container container) { this.container = container; } - /** - * @return paymentMethodService - */ - public PaymentMethodService getPaymentMethodService() { - return paymentMethodService; - } - - /** - * @param paymentMethodService 設定する paymentMethodService - */ - public void setPaymentMethodService( - PaymentMethodService paymentMethodService) { - this.paymentMethodService = paymentMethodService; - } - - /** - * @return orderFormDxo - */ - public OrderFormDxo getOrderFormDxo() { - return orderFormDxo; - } - - /** - * @param orderFormDxo 設定する orderFormDxo - */ - public void setOrderFormDxo(OrderFormDxo orderFormDxo) { - this.orderFormDxo = orderFormDxo; - } - - /** - * @return orderService - */ - public OrderService getOrderService() { - return orderService; - } - - /** - * @param orderService 設定する orderService - */ - public void setOrderService(OrderService orderService) { - this.orderService = orderService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -21,7 +21,7 @@ private LabelHelper labelHelper; - private List> customerBasketItems; + private List> basketItems; private String deliveryMethodName; @@ -104,16 +104,16 @@ /** * @return customersBasketItems */ - public List> getCustomerBasketItems() { - return customerBasketItems; + public List> getBasketItems() { + return basketItems; } /** * @param customersBasketItems 設定する customersBasketItems */ - public void setCustomerBasketItems( + public void setBasketItems( List> customersBasketItems) { - this.customerBasketItems = customersBasketItems; + this.basketItems = customersBasketItems; } public String getDeliveryMethodName() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -13,49 +13,39 @@ import jp.sf.pal.common.util.DateUtil; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.CardTypeDxo; -import jp.sf.pal.pompei.dxo.DeliveryMethodDxo; -import jp.sf.pal.pompei.dxo.PaymentMethodDxo; -import jp.sf.pal.pompei.exentity.CardTypeDescription; +import jp.sf.pal.pompei.dxo.SystemDxo; +import jp.sf.pal.pompei.exentity.CardType; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.DeliveryMethodDescription; -import jp.sf.pal.pompei.exentity.PaymentMethodDescription; -import jp.sf.pal.pompei.service.CardTypeService; +import jp.sf.pal.pompei.exentity.DeliveryMethod; +import jp.sf.pal.pompei.exentity.PaymentMethod; import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.DeliveryMethodSerivce; -import jp.sf.pal.pompei.service.PaymentMethodService; +import jp.sf.pal.pompei.service.SystemService; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; import org.seasar.framework.util.StringUtil; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class PaymentSelectAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 5613498829230308147L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(PaymentSelectAction.class); // LOG CODE: ?PC024? + private PaymentSelectPage paymentSelectPage; private CustomerService customerService; - private DeliveryMethodSerivce deliveryMethodSerivce; + private SystemService systemService; - private PaymentMethodService paymentMethodService; + private SystemDxo systemDxo; - private CardTypeService cardTypeService; - - private DeliveryMethodDxo deliveryMethodDxo; - - private PaymentMethodDxo paymentMethodDxo; - - private CardTypeDxo cardTypeDxo; - public Class initialize() { // ccExpiresYear Date now = new Date(); @@ -67,8 +57,8 @@ map.put("value", Integer.toString(year + i)); ccExpiresYearItems.add(map); } - getPaymentSelectPage().setCcExpiresYearItems(ccExpiresYearItems); - // getPaymentSelectPage().setCcExpiresYear(Integer.toString(year)); + paymentSelectPage.setCcExpiresYearItems(ccExpiresYearItems); + // paymentSelectPage.setCcExpiresYear(Integer.toString(year)); // ccExpiresMonth List> ccExpiresMonthItems = new ArrayList>(); @@ -78,8 +68,8 @@ map.put("value", Integer.toString(i)); ccExpiresMonthItems.add(map); } - getPaymentSelectPage().setCcExpiresMonthItems(ccExpiresMonthItems); - // getPaymentSelectPage().setCcExpiresMonth( + paymentSelectPage.setCcExpiresMonthItems(ccExpiresMonthItems); + // paymentSelectPage.setCcExpiresMonth( // Integer.toString(DateUtil.getMonth(now) + 1)); return null; @@ -93,54 +83,72 @@ return UserInfoEditPage.class; } - // check user info - Customer customers = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customers == null) { + try { + // check user info + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + return UserInfoEditPage.class; + } + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.load.customer"); + logger.log("EPC0241", new Object[] { this.toString() }, e); return UserInfoEditPage.class; } - // set delivery method - List dmd = getDeliveryMethodSerivce() - .getDeliveryMethodDescriptionList(); - getPaymentSelectPage().setDeliveryMethodItems( - getDeliveryMethodDxo().convert(dmd)); + try { + // set delivery method + List deliveryMethodList = systemService + .getDeliveryMethodList(SystemUtil.getCurrentLanguage()); + List> deliveryMethodItems = new ArrayList>(); + systemDxo.convertFromDeliveryMethodToMap(deliveryMethodList, + deliveryMethodItems); + paymentSelectPage.setDeliveryMethodItems(deliveryMethodItems); - // set payment method - List pmd = getPaymentMethodService() - .getPaymentMethodDescriptionList(); - getPaymentSelectPage().setPaymentMethodItems( - getPaymentMethodDxo().convert(pmd)); + // set payment method + List paymentMethodList = systemService + .getPaymentMethodList(SystemUtil.getCurrentLanguage()); + List> paymentMethodItems = new ArrayList>(); + systemDxo.convertFromPaymentMethodToMap(paymentMethodList, + paymentMethodItems); + paymentSelectPage.setPaymentMethodItems(paymentMethodItems); - // check credit card - getPaymentSelectPage().setCreditcard(false); - for (PaymentMethodDescription paymentMethodDescription : pmd) { - if (PompeiConstants.CREDITCARD_PAYMENT_METHOD - .equals(paymentMethodDescription.getPaymentMethod() - .getCode())) { - getPaymentSelectPage().setCreditcard(true); + // check credit card + paymentSelectPage.setCreditcard(false); + for (PaymentMethod paymentMethod : paymentMethodList) { + if (PompeiConstants.CREDITCARD_PAYMENT_METHOD + .equals(paymentMethod.getCode())) { + paymentSelectPage.setCreditcard(true); + } } - } - // set card type - List ctd = getCardTypeService() - .getCardTypeDescriptionList(); - getPaymentSelectPage().setCardCodeItems(getCardTypeDxo().convert(ctd)); + // set card type + List cardTypeList = systemService + .getCardTypeList(SystemUtil.getCurrentLanguage()); + List> cardTypeItems = new ArrayList>(); + systemDxo.convertFromCardTypeToMap(cardTypeList, cardTypeItems); + paymentSelectPage.setCardCodeItems(cardTypeItems); - // set default value - if (getPaymentSelectPage().getPaymentMethodItems() != null - && getPaymentSelectPage().getPaymentMethodItems().size() == 1) { - getPaymentSelectPage().setPaymentMethodId( - (BigDecimal) getPaymentSelectPage().getPaymentMethodItems() - .get(0).get("paymentMethodId")); + // set default value + if (paymentSelectPage.getPaymentMethodItems() != null + && paymentSelectPage.getPaymentMethodItems().size() == 1) { + paymentSelectPage + .setPaymentMethodId((BigDecimal) paymentSelectPage + .getPaymentMethodItems().get(0).get( + "paymentMethodId")); + } + if (paymentSelectPage.getDeliveryMethodItems() != null + && paymentSelectPage.getDeliveryMethodItems().size() == 1) { + paymentSelectPage + .setDeliveryMethodId((BigDecimal) paymentSelectPage + .getDeliveryMethodItems().get(0).get( + "deliveryMethodId")); + } + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.load.system.info"); + logger.log("EPC0242", new Object[] { this.toString() }, e); + return UserInfoEditPage.class; } - if (getPaymentSelectPage().getDeliveryMethodItems() != null - && getPaymentSelectPage().getDeliveryMethodItems().size() == 1) { - getPaymentSelectPage().setDeliveryMethodId( - (BigDecimal) getPaymentSelectPage() - .getDeliveryMethodItems().get(0).get( - "deliveryMethodId")); - } // render FacesMessage FacesMessageUtil.renderMessages(); @@ -156,228 +164,153 @@ return UserInfoEditPage.class; } - // check user info - Customer customer = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customer == null) { - return UserInfoEditPage.class; - } + try { + // check user info + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + return UserInfoEditPage.class; + } - Map map = (Map) SessionUtil - .getFromLocalScope(getPaymentSelectPage().getOrderProcessId()); - if (map == null) { - // expires session - // TODO clear session info for card - FacesMessageUtil - .addErrorMessage("expire.order.process.in.paymentselect"); - return UserInfoEditPage.class; - } - - BigDecimal paymentMethodId = getPaymentSelectPage() - .getTargetPaymentMethodId(); - if (paymentMethodId == null) { - // TODO clear session info for card - FacesMessageUtil - .addErrorMessage("could.not.find.payment.method.id.in.paymentselect"); - return null; - } - PaymentMethodDescription pmd = getPaymentMethodService() - .getPaymentMethodDescription(paymentMethodId); - if (pmd == null) { - // invalid payment string - // TODO clear session info for card - FacesMessageUtil - .addErrorMessage("could.not.find.payment.method.in.paymentselect"); - return null; - } - map.put(PompeiConstants.PAYMENT_METHOD_ID, pmd.getPaymentMethodId()); - - // card - if (PompeiConstants.CREDITCARD_PAYMENT_METHOD.equals(pmd - .getPaymentMethod().getCode())) { - // card type - if (!StringUtil.isEmpty(getPaymentSelectPage().getCcOwner())) { - map.put(PompeiConstants.CARD_TYPE, getPaymentSelectPage() - .getCardCode()); - } else { - // invalid card owner + Map map = (Map) SessionUtil + .getFromLocalScope(paymentSelectPage.getOrderProcessId()); + if (map == null) { + // expires session + // TODO clear session info for card FacesMessageUtil - .addErrorMessage("could.not.find.card.type.in.paymentselect"); - return null; + .addErrorMessage("expire.order.process.in.paymentselect"); + return UserInfoEditPage.class; } - // card number - if (!StringUtil.isEmpty(getPaymentSelectPage().getCcNumber1()) - && !StringUtil.isEmpty(getPaymentSelectPage() - .getCcNumber2()) - && !StringUtil.isEmpty(getPaymentSelectPage() - .getCcNumber3()) - && !StringUtil.isEmpty(getPaymentSelectPage() - .getCcNumber4())) { - map.put(PompeiConstants.CARD_NUMBER, getPaymentSelectPage() - .getCcNumber1() - + getPaymentSelectPage().getCcNumber2() - + getPaymentSelectPage().getCcNumber3() - + getPaymentSelectPage().getCcNumber4()); - } else { - // invalid card number + + BigDecimal paymentMethodId = paymentSelectPage + .getTargetPaymentMethodId(); + if (paymentMethodId == null) { // TODO clear session info for card FacesMessageUtil - .addErrorMessage("could.not.find.card.number.in.paymentselect"); + .addErrorMessage("could.not.find.payment.method.id.in.paymentselect"); return null; } - // owner - if (!StringUtil.isEmpty(getPaymentSelectPage().getCcOwner())) { - map.put(PompeiConstants.CARD_OWNER, getPaymentSelectPage() - .getCcOwner()); - } else { - // invalid card number + PaymentMethod pmd = systemService.getPaymentMethod(paymentMethodId, + SystemUtil.getCurrentLanguage()); + if (pmd == null) { + // invalid payment string // TODO clear session info for card FacesMessageUtil - .addErrorMessage("could.not.find.card.owner.in.paymentselect"); + .addErrorMessage("could.not.find.payment.method.in.paymentselect"); return null; } - // expire - if (!StringUtil.isEmpty(getPaymentSelectPage().getCcExpiresMonth()) - && !StringUtil.isEmpty(getPaymentSelectPage() - .getCcExpiresYear())) { - map.put(PompeiConstants.CARD_EXPIRES, getPaymentSelectPage() - .getCcExpiresMonth() - + getPaymentSelectPage().getCcExpiresYear()); + map + .put(PompeiConstants.PAYMENT_METHOD_ID, pmd + .getPaymentMethodId()); + + // card + if (PompeiConstants.CREDITCARD_PAYMENT_METHOD.equals(pmd.getCode())) { + // card type + if (!StringUtil.isEmpty(paymentSelectPage.getCcOwner())) { + map.put(PompeiConstants.CARD_TYPE, paymentSelectPage + .getCardCode()); + } else { + // invalid card owner + FacesMessageUtil + .addErrorMessage("could.not.find.card.type.in.paymentselect"); + return null; + } + // card number + if (!StringUtil.isEmpty(paymentSelectPage.getCcNumber1()) + && !StringUtil + .isEmpty(paymentSelectPage.getCcNumber2()) + && !StringUtil + .isEmpty(paymentSelectPage.getCcNumber3()) + && !StringUtil + .isEmpty(paymentSelectPage.getCcNumber4())) { + map.put(PompeiConstants.CARD_NUMBER, paymentSelectPage + .getCcNumber1() + + paymentSelectPage.getCcNumber2() + + paymentSelectPage.getCcNumber3() + + paymentSelectPage.getCcNumber4()); + } else { + // invalid card number + // TODO clear session info for card + FacesMessageUtil + .addErrorMessage("could.not.find.card.number.in.paymentselect"); + return null; + } + // owner + if (!StringUtil.isEmpty(paymentSelectPage.getCcOwner())) { + map.put(PompeiConstants.CARD_OWNER, paymentSelectPage + .getCcOwner()); + } else { + // invalid card number + // TODO clear session info for card + FacesMessageUtil + .addErrorMessage("could.not.find.card.owner.in.paymentselect"); + return null; + } + // expire + if (!StringUtil.isEmpty(paymentSelectPage.getCcExpiresMonth()) + && !StringUtil.isEmpty(paymentSelectPage + .getCcExpiresYear())) { + map.put(PompeiConstants.CARD_EXPIRES, paymentSelectPage + .getCcExpiresMonth() + + paymentSelectPage.getCcExpiresYear()); + } else { + // invalid card number + // TODO clear session info for card + FacesMessageUtil + .addErrorMessage("could.not.find.card.expire.in.paymentselect"); + return null; + } + } + + // delivery method + BigDecimal deliveryMethodId = paymentSelectPage + .getTargetDeliveryMethodId(); + if (deliveryMethodId != null) { + map.put(PompeiConstants.DELIVERY_METHOD_ID, deliveryMethodId); } else { - // invalid card number - // TODO clear session info for card FacesMessageUtil - .addErrorMessage("could.not.find.card.expire.in.paymentselect"); + .addErrorMessage("could.not.find.delivery.method.id.in.paymentselect"); return null; } - } - - // delivery method - BigDecimal deliveryMethodId = getPaymentSelectPage() - .getTargetDeliveryMethodId(); - if (deliveryMethodId != null) { - map.put(PompeiConstants.DELIVERY_METHOD_ID, deliveryMethodId); - } else { - FacesMessageUtil - .addErrorMessage("could.not.find.delivery.method.id.in.paymentselect"); + return CheckoutConfirmPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("system.error.occur.in.payment"); + logger.log("EPC0243", new Object[] { this.toString() }, e); return null; } - return CheckoutConfirmPage.class; } - /** - * @return paymentSelectPage - */ public PaymentSelectPage getPaymentSelectPage() { return paymentSelectPage; } - /** - * @param paymentSelectPage 設定する paymentSelectPage - */ public void setPaymentSelectPage(PaymentSelectPage paymentSelectPage) { this.paymentSelectPage = paymentSelectPage; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return deliveryMethodSerivce - */ - public DeliveryMethodSerivce getDeliveryMethodSerivce() { - return deliveryMethodSerivce; + public SystemService getSystemService() { + return systemService; } - /** - * @param deliveryMethodSerivce 設定する deliveryMethodSerivce - */ - public void setDeliveryMethodSerivce( - DeliveryMethodSerivce deliveryMethodSerivce) { - this.deliveryMethodSerivce = deliveryMethodSerivce; + public void setSystemService(SystemService systemService) { + this.systemService = systemService; } - /** - * @return deliveryMethodDxo - */ - public DeliveryMethodDxo getDeliveryMethodDxo() { - return deliveryMethodDxo; + public SystemDxo getSystemDxo() { + return systemDxo; } - /** - * @param deliveryMethodDxo 設定する deliveryMethodDxo - */ - public void setDeliveryMethodDxo(DeliveryMethodDxo deliveryMethodDxo) { - this.deliveryMethodDxo = deliveryMethodDxo; + public void setSystemDxo(SystemDxo systemDxo) { + this.systemDxo = systemDxo; } - /** - * @return paymentMethodService - */ - public PaymentMethodService getPaymentMethodService() { - return paymentMethodService; - } - - /** - * @param paymentMethodService 設定する paymentMethodService - */ - public void setPaymentMethodService( - PaymentMethodService paymentMethodService) { - this.paymentMethodService = paymentMethodService; - } - - /** - * @return paymentMethodDxo - */ - public PaymentMethodDxo getPaymentMethodDxo() { - return paymentMethodDxo; - } - - /** - * @param paymentMethodDxo 設定する paymentMethodDxo - */ - public void setPaymentMethodDxo(PaymentMethodDxo paymentMethodDxo) { - this.paymentMethodDxo = paymentMethodDxo; - } - - /** - * @return cardTypeService - */ - public CardTypeService getCardTypeService() { - return cardTypeService; - } - - /** - * @param cardTypeService 設定する cardTypeService - */ - public void setCardTypeService(CardTypeService cardTypeService) { - this.cardTypeService = cardTypeService; - } - - /** - * @return cardTypeDxo - */ - public CardTypeDxo getCardTypeDxo() { - return cardTypeDxo; - } - - /** - * @param cardTypeDxo 設定する cardTypeDxo - */ - public void setCardTypeDxo(CardTypeDxo cardTypeDxo) { - this.cardTypeDxo = cardTypeDxo; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -36,7 +36,7 @@ private int cardCodeIndex; - private List> cardCodeItems; + private List> cardCodeItems; private String cardCode; @@ -231,14 +231,14 @@ /** * @return cardCodeItems */ - public List> getCardCodeItems() { + public List> getCardCodeItems() { return cardCodeItems; } /** * @param cardCodeItems 設定する cardCodeItems */ - public void setCardCodeItems(List> cardCodeItems) { + public void setCardCodeItems(List> cardCodeItems) { this.cardCodeItems = cardCodeItems; } @@ -341,21 +341,32 @@ public void setCreditcard(boolean creditcard) { this.creditcard = creditcard; } - - public static String getDoNextSrc() { - return FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm.png"; - } - - public static String getDoNextOnmouseover() { - return "src='" + FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm_over.png'"; - } - - public static String getDoNextOnmousedown() { - return "src='" + FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm_down.png'"; - } - - public static String getDoNextOnmouseout() { - return "src='" + FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/images/buttons/gococonfirm.png'"; - } + public static String getDoNextSrc() { + return FacesContext.getCurrentInstance().getExternalContext() + .getRequestContextPath() + + "/images/buttons/gococonfirm.png"; + } + + public static String getDoNextOnmouseover() { + return "src='" + + FacesContext.getCurrentInstance().getExternalContext() + .getRequestContextPath() + + "/images/buttons/gococonfirm_over.png'"; + } + + public static String getDoNextOnmousedown() { + return "src='" + + FacesContext.getCurrentInstance().getExternalContext() + .getRequestContextPath() + + "/images/buttons/gococonfirm_down.png'"; + } + + public static String getDoNextOnmouseout() { + return "src='" + + FacesContext.getCurrentInstance().getExternalContext() + .getRequestContextPath() + + "/images/buttons/gococonfirm.png'"; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -11,41 +11,39 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.dxo.CustomerDxo; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.Zone; import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class UserAddressSelectAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 761671774909133184L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(UserAddressSelectAction.class); // LOG CODE: ?PC023? + private UserAddressSelectPage userAddressSelectPage; private CustomerService customerService; - private LanguageService languageService; - private CustomerDxo customerDxo; public Class initialize() { // state items List> stateItems = new ArrayList>(); - String states = getUserAddressSelectPage().getLabelHelper() - .getLabelValue("state.items"); + String states = userAddressSelectPage.getLabelHelper().getLabelValue( + "state.items"); String[] stateArray = states.split(","); for (String state : stateArray) { Map map = new HashMap(); @@ -53,7 +51,7 @@ map.put("value", state); stateItems.add(map); } - getUserAddressSelectPage().setStateItems(stateItems); + userAddressSelectPage.setStateItems(stateItems); return null; } @@ -65,40 +63,45 @@ return UserInfoEditPage.class; } - // check user info - Customer customer = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customer == null) { - return UserInfoEditPage.class; - } + try { + // check user info + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + return UserInfoEditPage.class; + } - // set default address book - AddressBook defaultAddressBook = getCustomerService() - .getDefaultAddressBook(customer.getCustomerId()); - if (defaultAddressBook != null) { - getUserAddressSelectPage().setAddressBookId( - defaultAddressBook.getAddressBookId().toString()); - } else { - FacesMessageUtil - .addWarnMessage("could.not.find.default.address.book"); - return UserInfoEditPage.class; - } + // set default address book + AddressBook defaultAddressBook = customer.getDefaultAddressBook(); + if (defaultAddressBook != null) { + userAddressSelectPage.setAddressBookId(defaultAddressBook + .getAddressBookId().toString()); + } else { + FacesMessageUtil + .addWarnMessage("could.not.find.default.address.book"); + return UserInfoEditPage.class; + } - List> list = new ArrayList>(); - List addressBookList = getCustomerService() - .getAddressBookList(customer.getCustomerId()); - //TODO Dxo?? - for (AddressBook addressBook : addressBookList) { - Map map = new HashMap(); - map.put("value", addressBook.getAddressBookId().toString()); - //TODO address format - map.put("label", addressBook.getPostcode() + " " - + addressBook.getState() + addressBook.getCity() - + addressBook.getStreetAddress() + " " - + addressBook.getLastname() + addressBook.getFirstname()); - list.add(map); + List> list = new ArrayList>(); + List addressBookList = customerService + .getAddressBookListByCustomerId(customer.getCustomerId()); + //TODO Dxo?? + for (AddressBook addressBook : addressBookList) { + Map map = new HashMap(); + map.put("value", addressBook.getAddressBookId().toString()); + //TODO address format + map.put("label", addressBook.getPostcode() + " " + + addressBook.getState() + addressBook.getCity() + + addressBook.getStreetAddress() + " " + + addressBook.getLastname() + + addressBook.getFirstname()); + list.add(map); + } + userAddressSelectPage.setAddressBookIdItems(list); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.load.customer"); + logger.log("EPC0231", new Object[] { this.toString() }, e); } - getUserAddressSelectPage().setAddressBookIdItems(list); // render FacesMessages FacesMessageUtil.renderMessages(); @@ -107,21 +110,21 @@ // private void postprocessingForRender() { // // postcode - // if (getUserAddressSelectPage().getPostcode() != null) { - // String[] postcode = getUserAddressSelectPage().getPostcode().split( + // if (userAddressSelectPage.getPostcode() != null) { + // String[] postcode = userAddressSelectPage.getPostcode().split( // "-"); // if (postcode.length == 2) { - // getUserAddressSelectPage().setPrimaryPostcode(postcode[0]); - // getUserAddressSelectPage().setSecondaryPostcode(postcode[1]); + // userAddressSelectPage.setPrimaryPostcode(postcode[0]); + // userAddressSelectPage.setSecondaryPostcode(postcode[1]); // } // } // } private void preprocessingForUpdate() { // postcode - getUserAddressSelectPage().setPostcode( - getUserAddressSelectPage().getPrimaryPostcode() + "-" - + getUserAddressSelectPage().getSecondaryPostcode()); + userAddressSelectPage.setPostcode(userAddressSelectPage + .getPrimaryPostcode() + + "-" + userAddressSelectPage.getSecondaryPostcode()); } public Class doEdit() { @@ -133,9 +136,8 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId") public Class doAdd() { // convert cp932 to jis - getUserAddressSelectPage().setStreetAddress( - SystemUtil.convertToJIS(getUserAddressSelectPage() - .getStreetAddress())); + userAddressSelectPage.setStreetAddress(SystemUtil + .convertToJIS(userAddressSelectPage.getStreetAddress())); // check login String remoteUser = FacesContext.getCurrentInstance() @@ -144,33 +146,36 @@ return UserInfoEditPage.class; } - // check user info - Customer customer = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customer == null) { - return UserInfoEditPage.class; - } + try { + // check user info + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + return UserInfoEditPage.class; + } - preprocessingForUpdate(); + preprocessingForUpdate(); - AddressBook addressBook = new AddressBook(); - getCustomerDxo().convert(getUserAddressSelectPage(), addressBook); - addressBook.setAddressBookId(null); - addressBook.setCustomerId(customer.getCustomerId()); - //TODO zone and check if it's null - Zone zones = getCustomerService().getZone(new BigDecimal(130)); - addressBook.setZoneId(zones.getZoneId()); - //TODO countries and check if it's null - addressBook.setCountryId(zones.getCountry().getCountryId()); - //TODO select language - addressBook.setLanguageId(getLanguageService().getDefaultLanguage() - .getLanguageId()); - // set default id - addressBook.setDefaultAddress(PompeiConstants.FALSE_BIGDECIMAL); - getCustomerService().addAddressBook(addressBook); + AddressBook addressBook = new AddressBook(); + customerDxo.convertFromPageToAddressBook(userAddressSelectPage, + addressBook); + addressBook.setAddressBookId(null); + addressBook.setCustomerId(customer.getCustomerId()); - FacesMessageUtil.addInfoMessage("added.addressbook"); - return UserAddressSelectPage.class; + //TODO country + //TODO delivery zone + + // set default id + addressBook.setDefaultAddress(PompeiConstants.FALSE_BIGDECIMAL); + customerService.addAddressBook(addressBook); + + FacesMessageUtil.addInfoMessage("added.addressbook"); + return UserAddressSelectPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.add.addressbook"); + logger.log("EPC0232", new Object[] { this.toString() }, e); + } + return null; } public Class doDelete() { @@ -181,57 +186,65 @@ return UserInfoEditPage.class; } - // check user info - Customer customers = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customers == null) { - return UserInfoEditPage.class; - } + try { + // check user info + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + return UserInfoEditPage.class; + } - if (getUserAddressSelectPage().getAddressBookId() == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.address.book.id.inuseraddressselect"); - return UserAddressSelectPage.class; - } + if (userAddressSelectPage.getAddressBookId() == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.address.book.id.inuseraddressselect"); + return UserAddressSelectPage.class; + } - BigDecimal addressBookId = null; - try { - addressBookId = new BigDecimal(getUserAddressSelectPage() - .getAddressBookId()); - } catch (NumberFormatException e) { - FacesMessageUtil - .addErrorMessage("invalid.address.book.id.inuseraddressselect"); - return UserAddressSelectPage.class; - } + BigDecimal addressBookId = null; + try { + addressBookId = new BigDecimal(userAddressSelectPage + .getAddressBookId()); + } catch (NumberFormatException e) { + FacesMessageUtil + .addErrorMessage("invalid.address.book.id.inuseraddressselect"); + return UserAddressSelectPage.class; + } - // check if address book is default - AddressBook defaultAddressBook = getCustomerService() - .getDefaultAddressBook(customers.getCustomerId()); - if (defaultAddressBook != null - && addressBookId.equals(defaultAddressBook.getAddressBookId())) { - FacesMessageUtil - .addErrorMessage("could.not.delete.default.address.book.in.useraddressselect"); - return UserAddressSelectPage.class; - } + // check if address book is default + AddressBook defaultAddressBook = customer.getDefaultAddressBook(); + if (defaultAddressBook != null + && addressBookId.equals(defaultAddressBook + .getAddressBookId())) { + FacesMessageUtil + .addErrorMessage("could.not.delete.default.address.book.in.useraddressselect"); + return UserAddressSelectPage.class; + } - AddressBook addressBook = getCustomerService().getAddressBook( - addressBookId); - if (addressBook == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.address.book.inuseraddressselect"); + AddressBook addressBook = customerService + .getAddressBook(addressBookId); + if (addressBook == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.address.book.inuseraddressselect"); + return UserAddressSelectPage.class; + } + customerService.deleteAddressBook(addressBookId); + + FacesMessageUtil.addInfoMessage("deleted.address.book"); return UserAddressSelectPage.class; + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.addressbook"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.delete.addressbook"); + logger.log("EPC0233", new Object[] { this.toString() }, e); } - getCustomerService().deleteAddressBook(addressBook); - - FacesMessageUtil.addInfoMessage("deleted.address.book"); return null; } @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId") public Class doNext() { Map map = (Map) SessionUtil - .getFromLocalScope(getUserAddressSelectPage() - .getOrderProcessId()); + .getFromLocalScope(userAddressSelectPage.getOrderProcessId()); if (map == null) { // expires session FacesMessageUtil @@ -239,66 +252,34 @@ return UserInfoEditPage.class; } // set address book - map.put(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID, - getUserAddressSelectPage().getAddressBookId()); + map.put(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID, userAddressSelectPage + .getAddressBookId()); return PaymentSelectPage.class; } - /** - * @return userAddressSelectPage - */ public UserAddressSelectPage getUserAddressSelectPage() { return userAddressSelectPage; } - /** - * @param userAddressSelectPage 設定する userAddressSelectPage - */ public void setUserAddressSelectPage( UserAddressSelectPage userAddressSelectPage) { this.userAddressSelectPage = userAddressSelectPage; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return customerDxo - */ public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo 設定する customerDxo - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,8 +1,6 @@ package jp.sf.pal.pompei.web.user.checkout; import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -14,44 +12,39 @@ import jp.sf.pal.common.util.DateUtil; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.dxo.CustomerDxo; import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.CustomerBasket; -import jp.sf.pal.pompei.exentity.Zone; -import jp.sf.pal.pompei.service.CartService; import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class UserInfoEditAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -8211846393931284507L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(UserInfoEditAction.class); // LOG CODE: ?PC022? + private UserInfoEditPage userInfoEditPage; private CustomerService customerService; - private LanguageService languageService; - - private CartService cartService; - private CustomerDxo customerDxo; public Class initialize() { // state items List> stateItems = new ArrayList>(); - String states = getUserInfoEditPage().getLabelHelper().getLabelValue( + String states = userInfoEditPage.getLabelHelper().getLabelValue( "state.items"); String[] stateArray = states.split(","); for (String state : stateArray) { @@ -60,7 +53,7 @@ map.put("value", state); stateItems.add(map); } - getUserInfoEditPage().setStateItems(stateItems); + userInfoEditPage.setStateItems(stateItems); // dayOfBirth Date now = new Date(); List> yearOfDayOfBirthItems = new ArrayList>(); @@ -71,8 +64,8 @@ map.put("value", Integer.toString(year - i)); yearOfDayOfBirthItems.add(map); } - getUserInfoEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems); - getUserInfoEditPage().setYearOfDayOfBirth(Integer.valueOf(year)); + userInfoEditPage.setYearOfDayOfBirthItems(yearOfDayOfBirthItems); + userInfoEditPage.setYearOfDayOfBirth(Integer.valueOf(year)); List> monthOfDayOfBirthItems = new ArrayList>(); for (int i = 1; i < 13; i++) { @@ -81,9 +74,9 @@ map.put("value", Integer.toString(i)); monthOfDayOfBirthItems.add(map); } - getUserInfoEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); - getUserInfoEditPage().setMonthOfDayOfBirth( - Integer.valueOf(DateUtil.getMonth(now) + 1)); + userInfoEditPage.setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); + userInfoEditPage.setMonthOfDayOfBirth(Integer.valueOf(DateUtil + .getMonth(now) + 1)); List> dateOfDayOfBirthItems = new ArrayList>(); for (int i = 1; i < 32; i++) { @@ -92,9 +85,9 @@ map.put("value", Integer.toString(i)); dateOfDayOfBirthItems.add(map); } - getUserInfoEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems); - getUserInfoEditPage().setDateOfDayOfBirth( - Integer.valueOf(DateUtil.getDate(now))); + userInfoEditPage.setDateOfDayOfBirthItems(dateOfDayOfBirthItems); + userInfoEditPage.setDateOfDayOfBirth(Integer.valueOf(DateUtil + .getDate(now))); return null; } @@ -103,40 +96,52 @@ String remoteUser = FacesContext.getCurrentInstance() .getExternalContext().getRemoteUser(); if (remoteUser == null) { - getUserInfoEditPage().setLogin(false); - getUserInfoEditPage().setUser(false); + userInfoEditPage.setLogin(false); + userInfoEditPage.setUser(false); return null; } - getUserInfoEditPage().setLogin(true); - getUserInfoEditPage().setPortalId(remoteUser); + userInfoEditPage.setLogin(true); + userInfoEditPage.setPortalId(remoteUser); - Customer customer = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customer == null) { - getUserInfoEditPage().setUser(false); - return null; - } - getUserInfoEditPage().setUser(true); + try { + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + userInfoEditPage.setUser(false); + return null; + } + userInfoEditPage.setUser(true); - getCustomerDxo().convert(customer, getUserInfoEditPage()); - // set default address - AddressBook defaultAddressBook = getCustomerService() - .getDefaultAddressBook(customer.getCustomerId()); - if (defaultAddressBook != null) { - getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage()); - } + // set default address + AddressBook defaultAddressBook = customerService + .getDefaultAddressBook(customer.getCustomerId()); + if (defaultAddressBook != null) { + customerDxo.convertFromAddressBookToPage(defaultAddressBook, + userInfoEditPage); + } - if (getUserInfoEditPage().isEdit()) { - postprocessingForRender(); - } + // set customer + customerDxo.convertFromCustomerToPage(customer, userInfoEditPage); - // check cart - List customerBasketList = getCartService() - .getCustomerBasketList(customer.getCustomerId()); - if (customerBasketList != null && !customerBasketList.isEmpty()) { - getUserInfoEditPage().setBasket(true); - } else { - getUserInfoEditPage().setBasket(false); + if (userInfoEditPage.isEdit()) { + postprocessingForRender(); + } + + // check cart + List customerBasketList = customerService + .getBasketListByCustomerId(customer.getCustomerId(), + SystemUtil.getCurrentLanguage()); + if (customerBasketList != null && !customerBasketList.isEmpty()) { + userInfoEditPage.setBasket(true); + } else { + userInfoEditPage.setBasket(false); + } + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.load.customer"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.load.customer"); + logger.log("EPC0221", new Object[] { this.toString() }, e); } // render FacesMessages @@ -146,58 +151,53 @@ private void postprocessingForRender() { // day of birth - if (getUserInfoEditPage().getDayOfBirth() != null) { - Date b = getUserInfoEditPage().getDayOfBirth(); - getUserInfoEditPage().setYearOfDayOfBirth( - DateUtil.getYear(b) + 1900); - getUserInfoEditPage() - .setMonthOfDayOfBirth(DateUtil.getMonth(b) + 1); - getUserInfoEditPage().setDateOfDayOfBirth(DateUtil.getDate(b)); + if (userInfoEditPage.getDayOfBirth() != null) { + Date b = userInfoEditPage.getDayOfBirth(); + userInfoEditPage.setYearOfDayOfBirth(DateUtil.getYear(b) + 1900); + userInfoEditPage.setMonthOfDayOfBirth(DateUtil.getMonth(b) + 1); + userInfoEditPage.setDateOfDayOfBirth(DateUtil.getDate(b)); } // postcode - if (getUserInfoEditPage().getPostcode() != null) { - String[] postcode = getUserInfoEditPage().getPostcode().split("-"); + if (userInfoEditPage.getPostcode() != null) { + String[] postcode = userInfoEditPage.getPostcode().split("-"); if (postcode.length == 2) { - getUserInfoEditPage().setPrimaryPostcode(postcode[0]); - getUserInfoEditPage().setSecondaryPostcode(postcode[1]); + userInfoEditPage.setPrimaryPostcode(postcode[0]); + userInfoEditPage.setSecondaryPostcode(postcode[1]); } } // email Confirmation - getUserInfoEditPage().setEmailAddressConfirm( - getUserInfoEditPage().getEmailAddress()); + userInfoEditPage.setEmailAddressConfirm(userInfoEditPage + .getEmailAddress()); } private void preprocessingForUpdate() { // day of birth - getUserInfoEditPage().setDayOfBirth( - DateUtil.get( - getUserInfoEditPage().getYearOfDayOfBirth() - 1900, - getUserInfoEditPage().getMonthOfDayOfBirth() - 1, - getUserInfoEditPage().getDateOfDayOfBirth())); + userInfoEditPage.setDayOfBirth(DateUtil.get(userInfoEditPage + .getYearOfDayOfBirth() - 1900, userInfoEditPage + .getMonthOfDayOfBirth() - 1, userInfoEditPage + .getDateOfDayOfBirth())); // postcode - getUserInfoEditPage().setPostcode( - getUserInfoEditPage().getPrimaryPostcode() + "-" - + getUserInfoEditPage().getSecondaryPostcode()); + userInfoEditPage.setPostcode(userInfoEditPage.getPrimaryPostcode() + + "-" + userInfoEditPage.getSecondaryPostcode()); } public Class doUpdate() { // convert cp932 to jis - getUserInfoEditPage().setStreetAddress( - SystemUtil.convertToJIS(getUserInfoEditPage() - .getStreetAddress())); + userInfoEditPage.setStreetAddress(SystemUtil + .convertToJIS(userInfoEditPage.getStreetAddress())); // check email - if (!getUserInfoEditPage().getEmailAddress().equals( - getUserInfoEditPage().getEmailAddressConfirm())) { + if (!userInfoEditPage.getEmailAddress().equals( + userInfoEditPage.getEmailAddressConfirm())) { FacesMessageUtil.addWarnMessage("email.address.does.not.match"); return null; } preprocessingForUpdate(); - if (PompeiConstants.UPDATE_MODE.equals(getUserInfoEditPage().getMode())) { + if (PompeiConstants.UPDATE_MODE.equals(userInfoEditPage.getMode())) { // update // check login String remoteUser = FacesContext.getCurrentInstance() @@ -207,57 +207,58 @@ return null; } - Customer customer = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customer == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.customer.in.userinfoedit"); - return null; - } + try { + Customer customer = customerService + .getCustomerByPortalId(remoteUser); + if (customer == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.customer.in.userinfoedit"); + return null; + } - AddressBook defaultAddressBook = getCustomerService() - .getDefaultAddressBook(customer.getCustomerId()); - if (defaultAddressBook == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.default.address.book.in.userinfoedit"); - return null; - } + AddressBook defaultAddressBook = customer + .getDefaultAddressBook(); - Date now = new Date(); - customer.setLastModified(new Timestamp(now.getTime())); + // do not put customerId and addressBookId on user's userInfoEdit.html + customerDxo.convertFromPageToCustomer(userInfoEditPage, + customer); + customerDxo.convertFromPageToAddressBook(userInfoEditPage, + defaultAddressBook); - // do not put customerId and addressBookId on user's userInfoEdit.html - getCustomerDxo().convert(getUserInfoEditPage(), customer); - getCustomerDxo().convert(getUserInfoEditPage(), defaultAddressBook); + customerService.updateCustomer(customer); - getCustomerService().updateCustomer(customer, defaultAddressBook); - - getUserInfoEditPage().setMode(null); - FacesMessageUtil.addInfoMessage("updated.customer"); + userInfoEditPage.setMode(null); + FacesMessageUtil.addInfoMessage("updated.customer"); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.update.customer"); + logger.log("EPC0222", new Object[] { this.toString() }, e); + } } else { - // new - Date now = new Date(); - Customer customer = new Customer(); - customer.setDateAdded(new Timestamp(now.getTime())); - customer.setLastModified(new Timestamp(now.getTime())); - AddressBook addressBook = new AddressBook(); - getCustomerDxo().convert(getUserInfoEditPage(), customer); - getCustomerDxo().convert(getUserInfoEditPage(), addressBook); + try { + // new + Customer customer = new Customer(); + AddressBook addressBook = customer.getDefaultAddressBook(); + customerDxo.convertFromPageToCustomer(userInfoEditPage, + customer); + customerDxo.convertFromPageToAddressBook(userInfoEditPage, + addressBook); - //TODO zone and check if it's null - Zone zones = getCustomerService().getZone(new BigDecimal(130)); - addressBook.setZoneId(zones.getZoneId()); - //TODO countries and check if it's null - addressBook.setCountryId(zones.getCountry().getCountryId()); - //TODO select language - addressBook.setLanguageId(getLanguageService().getDefaultLanguage() - .getLanguageId()); - // set default address - addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL); + //TODO country + //TODO delivery zone + // set default address + addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL); - getCustomerService().addCustomer(customer, addressBook); + customerService.addCustomer(customer); - FacesMessageUtil.addInfoMessage("added.customer"); + FacesMessageUtil.addInfoMessage("added.customer"); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.create.customer"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, + e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.create.customer"); + logger.log("EPC0223", new Object[] { this.toString() }, e); + } } return UserInfoEditPage.class; @@ -266,100 +267,52 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId") public Class doNext() { // start order process - if (getUserInfoEditPage().getCustomerId() == null) { + if (userInfoEditPage.getCustomerId() == null) { FacesMessageUtil .addErrorMessage("could.not.find.customer.id.in.userinfoedit"); return UserInfoEditAction.class; } - getUserInfoEditPage().setOrderProcessId( - getUserInfoEditPage().getCustomerId() - + String.valueOf(new Date().getTime())); + userInfoEditPage.setOrderProcessId(userInfoEditPage.getCustomerId() + + String.valueOf(new Date().getTime())); // set info to session - SessionUtil.removeFromLocalScope(getUserInfoEditPage() - .getOrderProcessId()); - SessionUtil.putToLocalScope(getUserInfoEditPage().getOrderProcessId(), + SessionUtil.removeFromLocalScope(userInfoEditPage.getOrderProcessId()); + SessionUtil.putToLocalScope(userInfoEditPage.getOrderProcessId(), new HashMap()); return UserAddressSelectPage.class; } public Class doModify() { - getUserInfoEditPage().setMode(PompeiConstants.UPDATE_MODE); + userInfoEditPage.setMode(PompeiConstants.UPDATE_MODE); return UserInfoEditPage.class; } public Class doCancel() { - getUserInfoEditPage().setMode(null); + userInfoEditPage.setMode(null); return UserInfoEditPage.class; } - /** - * @return userInfoEditPage - */ public UserInfoEditPage getUserInfoEditPage() { return userInfoEditPage; } - /** - * @param userInfoEditPage 設定する userInfoEditPage - */ public void setUserInfoEditPage(UserInfoEditPage userInfoEditPage) { this.userInfoEditPage = userInfoEditPage; } - /** - * @return customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService 設定する customerService - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return customerDxo - */ public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo 設定する customerDxo - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - - /** - * @return cartService - */ - public CartService getCartService() { - return cartService; - } - - /** - * @param cartService 設定する cartService - */ - public void setCartService(CartService cartService) { - this.cartService = cartService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -8,26 +8,31 @@ import javax.faces.context.FacesContext; +import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.dxo.CategoryDxo; -import jp.sf.pal.pompei.service.CategoryService; +import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + public class CategoryListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 8175924737246519774L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(CategoryListAction.class); // LOG CODE: ?PC016? + private CategoryListPage categoryListPage; - private CategoryService categoryService; + private ProductService productService; - private CategoryDxo categoryDxo; + private ProductDxo productDxo; public Class initialize() { return null; @@ -54,65 +59,77 @@ public Class prerender() { BigDecimal currentCategoryId = getCurrentCategoryId(); - // current category - if (getCategoryListPage().getCategoryId() == null) { - getCategoryListPage().setCategoryId(currentCategoryId); - if (getCategoryListPage().getCategoryId() == null) { - getCategoryListPage().setCategoryId( - PompeiConstants.ROOT_CATEGORY_ID); - } - // refresh breadcrumb - List> breadcrumbItems = new ArrayList>(); - getCategoryDxo().convert( - getCategoryService().getCategoryDescriptionBreadcrumb( - getCategoryListPage().getCategoryId()), - breadcrumbItems); - getCategoryListPage().setBreadcrumbItems(breadcrumbItems); + try { + // current category + if (categoryListPage.getCategoryId() == null) { + categoryListPage.setCategoryId(currentCategoryId); + if (categoryListPage.getCategoryId() == null) { + categoryListPage + .setCategoryId(PompeiConstants.ROOT_CATEGORY_ID); + } + // refresh breadcrumb + List> breadcrumbItems = new ArrayList>(); + productDxo + .convertFromCategoryToBreadcrumb(productService + .getCategoryBreadcrumb(categoryListPage + .getCategoryId(), SystemUtil + .getCurrentLanguage()), breadcrumbItems); + categoryListPage.setBreadcrumbItems(breadcrumbItems); - // set current id - SessionUtil.putToApplicationScope( - PompeiConstants.CURRENT_CATEGORY_ID, getCategoryListPage() - .getCategoryId()); - } else if (!getCategoryListPage().getCategoryId().equals( - currentCategoryId)) { - // update categoryId - getCategoryListPage().setCategoryId(currentCategoryId); - // refresh breadcrumb - List> breadcrumbItems = new ArrayList>(); - getCategoryDxo().convert( - getCategoryService().getCategoryDescriptionBreadcrumb( - getCategoryListPage().getCategoryId()), - breadcrumbItems); - getCategoryListPage().setBreadcrumbItems(breadcrumbItems); + // set current id + SessionUtil.putToApplicationScope( + PompeiConstants.CURRENT_CATEGORY_ID, categoryListPage + .getCategoryId()); + } else if (!categoryListPage.getCategoryId().equals( + currentCategoryId)) { + // update categoryId + categoryListPage.setCategoryId(currentCategoryId); + // refresh breadcrumb + List> breadcrumbItems = new ArrayList>(); + productDxo + .convertFromCategoryToBreadcrumb(productService + .getCategoryBreadcrumb(categoryListPage + .getCategoryId(), SystemUtil + .getCurrentLanguage()), breadcrumbItems); + categoryListPage.setBreadcrumbItems(breadcrumbItems); - // set current id - SessionUtil.putToApplicationScope( - PompeiConstants.CURRENT_CATEGORY_ID, getCategoryListPage() - .getCategoryId()); + // set current id + SessionUtil.putToApplicationScope( + PompeiConstants.CURRENT_CATEGORY_ID, categoryListPage + .getCategoryId()); - } + } - // category breadcrumb - if (getCategoryListPage().getBreadcrumbItems() == null) { - // refresh breadcrumb - List> breadcrumbItems = new ArrayList>(); - getCategoryDxo().convert( - getCategoryService().getCategoryDescriptionBreadcrumb( - getCategoryListPage().getCategoryId()), - breadcrumbItems); - getCategoryListPage().setBreadcrumbItems(breadcrumbItems); - } + // category breadcrumb + if (categoryListPage.getBreadcrumbItems() == null) { + // refresh breadcrumb + List> breadcrumbItems = new ArrayList>(); + productDxo + .convertFromCategoryToBreadcrumb(productService + .getCategoryBreadcrumb(categoryListPage + .getCategoryId(), SystemUtil + .getCurrentLanguage()), breadcrumbItems); + categoryListPage.setBreadcrumbItems(breadcrumbItems); + } - // TODO check if breadcrumb should be put to session.. + // TODO check if breadcrumb should be put to session.. - // set sub categories - getCategoryListPage().setCategoryItems( - getCategoryDxo().convert( - getCategoryService().getSubCategoryDescriptionList( - getCategoryListPage().getCategoryId()))); + // set sub categories + List> categoryItems = new ArrayList>(); + productDxo.convertFromCategoryToMap(productService + .getSubCategoryList(categoryListPage.getCategoryId(), + SystemUtil.getCurrentLanguage()), categoryItems); + categoryListPage.setCategoryItems(categoryItems); - // set current category id - getCategoryListPage().setCurrentCategoryId(currentCategoryId); + // set current category id + categoryListPage.setCurrentCategoryId(currentCategoryId); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.load.category"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.load.category"); + logger.log("EPC0161", new Object[] { this.toString() }, e); + } return null; } @@ -120,51 +137,9 @@ public Class doFinish() { // set current id SessionUtil.putToApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID, - getCategoryListPage().getTargetId()); + categoryListPage.getTargetId()); return CategoryListPage.class; } - /** - * @return categoryListPage - */ - public CategoryListPage getCategoryListPage() { - return categoryListPage; - } - - /** - * @param categoryListPage 設定する categoryListPage - */ - public void setCategoryListPage(CategoryListPage categoryListPage) { - this.categoryListPage = categoryListPage; - } - - /** - * @return categoryService - */ - public CategoryService getCategoryService() { - return categoryService; - } - - /** - * @param categoryService 設定する categoryService - */ - public void setCategoryService(CategoryService categoryService) { - this.categoryService = categoryService; - } - - /** - * @return categoryDxo - */ - public CategoryDxo getCategoryDxo() { - return categoryDxo; - } - - /** - * @param categoryDxo 設定する categoryDxo - */ - public void setCategoryDxo(CategoryDxo categoryDxo) { - this.categoryDxo = categoryDxo; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -9,39 +9,35 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiDBException; import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.exentity.Basket; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.CustomerBasket; -import jp.sf.pal.pompei.exentity.Manufacturer; import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.exentity.ProductImage; -import jp.sf.pal.pompei.service.CartService; import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.SystemUtil; -import jp.sf.pal.pompei.util.UploadedFileUtil; import jp.sf.pal.pompei.util.UrlBuilderUtil; +import org.seasar.framework.log.Logger; + public class ProductDetailsAction implements Serializable { + private static final long serialVersionUID = -5249493116727297180L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -5249493116727297180L; + private static final Logger logger = Logger + .getLogger(ProductDetailsAction.class); // LOG CODE: ?PC015? - /** */ private ProductDetailsPage productDetailsPage; - /** */ private ProductService productService; private CustomerService customerService; - private CartService cartService; - - /** */ private ProductDxo productDxo; public Class initialize() { @@ -55,7 +51,7 @@ if (productId != null) { try { long id = Long.parseLong(productId); - getProductDetailsPage().setProductId(BigDecimal.valueOf(id)); + productDetailsPage.setProductId(BigDecimal.valueOf(id)); return true; } catch (NumberFormatException e) { } @@ -69,18 +65,18 @@ String remoteUser = FacesContext.getCurrentInstance() .getExternalContext().getRemoteUser(); if (remoteUser == null) { - getProductDetailsPage().setLogin(false); - getProductDetailsPage().setUser(false); + productDetailsPage.setLogin(false); + productDetailsPage.setUser(false); } else { - getProductDetailsPage().setLogin(true); + productDetailsPage.setLogin(true); // check user - Customer customers = getCustomerService().getCustomerByPortalId( - remoteUser); + Customer customers = customerService + .getCustomerByPortalId(remoteUser); if (customers == null) { FacesMessageUtil.addWarnMessage("need.to.register.as.customer"); - getProductDetailsPage().setUser(false); + productDetailsPage.setUser(false); } else { - getProductDetailsPage().setUser(true); + productDetailsPage.setUser(true); } } @@ -98,60 +94,62 @@ // check product if (!isProductDetails()) { - if (getProductDetailsPage().getProductId() == null) { + if (productDetailsPage.getProductId() == null) { SessionUtil.putToLocalScope( PompeiConstants.IS_FROM_DETAILS_PAGE, Boolean.TRUE); return ProductListPage.class; } } - ProductDescription description = productService - .getProdcutDescription(getProductDetailsPage().getProductId()); - productDxo.convert(description, productDetailsPage); + try { + Product product = productService.getProduct(productDetailsPage + .getProductId(), SystemUtil.getCurrentLanguage()); + productDxo.convertFromProductToPage(product, productDetailsPage); - Manufacturer manufacturers = productService.getManufacturer(description - .getProduct().getManufacturerId()); - productDetailsPage.setManufacturersName(manufacturers.getName()); + // TODO details image + // FileData productImage = productService + // .getProductImageByProductIdAndType( + // productDetailsPage.getProductId(), + // PompeiConstants.DETAILS_IMAGE_TYPE); + // if (productImage != null) { + // productDetailsPage.setDetailsImageUrl(UploadedFileUtil + // .getProductImageUrl(productImage.getImageName())); + // } else { + // // default image + // productDetailsPage + // .setDetailsImageUrl(UploadedFileUtil + // .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); + // } - // details image - ProductImage productImage = getProductService() - .getProductImageByProductIdAndType( - productDetailsPage.getProductId(), - PompeiConstants.DETAILS_IMAGE_TYPE); - if (productImage != null) { - getProductDetailsPage().setDetailsImageUrl( - UploadedFileUtil.getProductImageUrl(productImage - .getImageName())); - } else { - // default image - getProductDetailsPage() - .setDetailsImageUrl( - UploadedFileUtil - .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); + // TODO large image + // ProductImage largeProductImage = productService + // .getProductImageByProductIdAndType( + // productDetailsPage.getProductId(), + // PompeiConstants.LARGE_IMAGE_TYPE); + // if (largeProductImage != null) { + // productDetailsPage.setLargeImageUrl(UploadedFileUtil + // .getProductImageUrl(largeProductImage.getImageName())); + // } else { + // // default image + // productDetailsPage + // .setLargeImageUrl(UploadedFileUtil + // .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); + // } + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("could.not.load.product"); + logger.log(e.getMessageId(), new Object[] { this.toString() }, e); + return ProductListPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.load.product"); + logger.log("EPC0151", new Object[] { this.toString() }, e); + return ProductListPage.class; } - // large image - ProductImage largeProductImage = getProductService() - .getProductImageByProductIdAndType( - productDetailsPage.getProductId(), - PompeiConstants.LARGE_IMAGE_TYPE); - if (largeProductImage != null) { - getProductDetailsPage().setLargeImageUrl( - UploadedFileUtil.getProductImageUrl(largeProductImage - .getImageName())); - } else { - // default image - getProductDetailsPage() - .setLargeImageUrl( - UploadedFileUtil - .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); - } - // set order quantity - getProductDetailsPage().setOrderQuantity(BigDecimal.valueOf(1)); + productDetailsPage.setOrderQuantity(BigDecimal.valueOf(1)); // set title - SystemUtil.setWindowTitle(getProductDetailsPage().getLabelHelper() + SystemUtil.setWindowTitle(productDetailsPage.getLabelHelper() .getLabelValue("windowTitle")); // render faces messages @@ -172,62 +170,76 @@ return null; } - Customer customers = getCustomerService().getCustomerByPortalId( - remoteUser); - if (customers == null) { - FacesMessageUtil.addWarnMessage("need.to.register.as.customer"); - return null; - } + try { + Customer customers = customerService + .getCustomerByPortalId(remoteUser); + if (customers == null) { + FacesMessageUtil.addWarnMessage("need.to.register.as.customer"); + return null; + } - Product products = productService.getProdcut(productDetailsPage - .getProductId()); - if (products == null) { - FacesMessageUtil - .addErrorMessage("could.not.find.product.in.productdetail"); - return null; - } - getCartService().cleanupCustomerBasket(customers.getCustomerId()); + Product products = productService.getProduct(productDetailsPage + .getProductId(), SystemUtil.getCurrentLanguage()); + if (products == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.product.in.productdetail"); + return null; + } - CustomerBasket customersBasket = getCartService().getCustomerBasket( - customers.getCustomerId(), products.getProductId()); - if (customersBasket == null) { - // new - customersBasket = new CustomerBasket(); - customersBasket.setCustomerId(customers.getCustomerId()); - customersBasket.setProductId(products.getProductId()); - customersBasket.setQuantity(getProductDetailsPage() - .getOrderQuantity()); - customersBasket.setDateAdded(new Timestamp(new Date().getTime())); - customersBasket.setProduct(products); - customersBasket.setFinalPrice(calculateFinalPrice(customersBasket)); - cartService.addCustomerBasket(customersBasket); - FacesMessageUtil.addInfoMessage("added.new.product.to.cart"); - } else { - // add - customersBasket.setQuantity(customersBasket.getQuantity().add( - getProductDetailsPage().getOrderQuantity())); - customersBasket.setDateAdded(new Timestamp(new Date().getTime())); - customersBasket.setFinalPrice(calculateFinalPrice(customersBasket)); - cartService.updateCustomerBasket(customersBasket); - FacesMessageUtil.addInfoMessage("added.product.to.cart"); - } + //TODO expiredTime needs to be moved to portlet.xml + customerService.cleanupBasket(customers.getCustomerId(), System + .currentTimeMillis() + - 24 * 60 * 60 * 1000); - // jump to cart page - StringBuilder buf = new StringBuilder(); - buf.append("\n"); - getProductDetailsPage().setJumpToCart(buf.toString()); + Basket customersBasket = customerService.getBasket(customers + .getCustomerId(), products.getProductId(), SystemUtil + .getCurrentLanguage()); + if (customersBasket == null) { + // new + customersBasket = new Basket(); + customersBasket.setCustomerId(customers.getCustomerId()); + customersBasket.setProductId(products.getProductId()); + customersBasket.setQuantity(productDetailsPage + .getOrderQuantity()); + customersBasket.setUpdatedDate(new Timestamp(new Date() + .getTime())); + customersBasket.setProduct(products); + customersBasket + .setFinalPrice(calculateFinalPrice(customersBasket)); + customerService.addBasket(customersBasket); + FacesMessageUtil.addInfoMessage("added.new.product.to.cart"); + } else { + // add + customersBasket.setQuantity(customersBasket.getQuantity().add( + productDetailsPage.getOrderQuantity())); + customersBasket.setUpdatedDate(new Timestamp(new Date() + .getTime())); + customersBasket + .setFinalPrice(calculateFinalPrice(customersBasket)); + customerService.updateBasket(customersBasket); + FacesMessageUtil.addInfoMessage("added.product.to.cart"); + } + // jump to cart page + StringBuilder buf = new StringBuilder(); + buf.append("\n"); + productDetailsPage.setJumpToCart(buf.toString()); + } catch (PompeiDBException e) { + FacesMessageUtil.addErrorMessage("failed.to.add.product.to.cart"); + logger.log("EPC0152", new Object[] { this.toString() }, e); + } + return null; } - private BigDecimal calculateFinalPrice(CustomerBasket customersBasket) { + private BigDecimal calculateFinalPrice(Basket customersBasket) { if (customersBasket != null) { //TODO tax return customersBasket.getProduct().getPrice().multiply( @@ -236,62 +248,4 @@ return null; } - /** - * @return productDetailsPage - */ - public ProductDetailsPage getProductDetailsPage() { - return productDetailsPage; - } - - /** - * @param productDetailsPage 設定する productDetailsPage - */ - public void setProductDetailsPage(ProductDetailsPage productDetailsPage) { - this.productDetailsPage = productDetailsPage; - } - - public ProductDxo getProductDxo() { - return productDxo; - } - - public void setProductDxo(ProductDxo productDxo) { - this.productDxo = productDxo; - } - - public ProductService getProductService() { - return productService; - } - - public void setProductService(ProductService productService) { - this.productService = productService; - } - - /** - * @return customerService - */ - public CustomerService getCustomerService() { - return customerService; - } - - /** - * @param customerService 設定する customerService - */ - public void setCustomerService(CustomerService customerService) { - this.customerService = customerService; - } - - /** - * @return cartService - */ - public CartService getCartService() { - return cartService; - } - - /** - * @param cartService 設定する cartService - */ - public void setCartService(CartService cartService) { - this.cartService = cartService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -12,49 +12,38 @@ import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; -import jp.sf.pal.pompei.dxo.CategoryDxo; import jp.sf.pal.pompei.dxo.PagerDxo; import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.exentity.FileData; import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.exentity.ProductImage; import jp.sf.pal.pompei.pager.ProductPager; -import jp.sf.pal.pompei.service.CategoryService; import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.PagingResultBeanWrapper; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.SystemUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; +import jp.sf.pal.pompei.web.admin.order.OrderListAction; -import org.seasar.teeda.extension.util.LabelHelper; +import org.seasar.framework.log.Logger; public class ProductListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 5503626496198881360L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(ProductListAction.class); // LOG CODE: ?PC014? + private ProductListPage productListPage; - /** */ private ProductService productService; - /** */ private ProductDxo productDxo; - /** */ - private CategoryService categoryService; - - /** */ - private CategoryDxo categoryDxo; - private PagerDxo pagerDxo; - private LabelHelper labelHelper; - private ProductPager productPager; public Class initialize() { @@ -92,7 +81,7 @@ } try { long id = Long.parseLong(productId); - getProductListPage().setProductId(BigDecimal.valueOf(id)); + productListPage.setProductId(BigDecimal.valueOf(id)); return true; } catch (NumberFormatException e) { } @@ -127,9 +116,9 @@ if (isChangeCategory) { // change category - getProductListPage().setPageNumber( - PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER); - getProductListPage().setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE); + productListPage + .setPageNumber(PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER); + productListPage.setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE); // clear flag from details page SessionUtil @@ -140,50 +129,52 @@ } // set page number and size - if (getProductListPage().getPageNumber() != 0 - && getProductListPage().getPageSize() != 0) { - getPagerDxo().convert(getProductListPage(), getProductPager()); + if (productListPage.getPageNumber() != 0 + && productListPage.getPageSize() != 0) { + pagerDxo.convert(productListPage, productPager); } } // set display mode - if (getProductListPage().getDisplayMode() != null) { - getProductPager().setDisplayMode( - getProductListPage().getDisplayMode()); + if (productListPage.getDisplayMode() != null) { + productPager.setDisplayMode(productListPage.getDisplayMode()); } else { - String displayMode = getProductPager().getDisplayMode(); + String displayMode = productPager.getDisplayMode(); if (displayMode == null) { // set default displayMode = PompeiConstants.THUMBNAIL_DISPLAY; - getProductPager().setDisplayMode(displayMode); + productPager.setDisplayMode(displayMode); } - getProductListPage().setDisplayMode(displayMode); + productListPage.setDisplayMode(displayMode); } // set order mode - if (getProductListPage().getOrderMode() != null) { - getProductPager().setOrderMode(getProductListPage().getOrderMode()); + if (productListPage.getOrderMode() != null) { + productPager.setOrderMode(productListPage.getOrderMode()); } else { - String orderMode = getProductPager().getOrderMode(); + String orderMode = productPager.getOrderMode(); if (orderMode == null) { // set default orderMode = PompeiConstants.CHEAP_ORDER; - getProductPager().setOrderMode(orderMode); + productPager.setOrderMode(orderMode); } - getProductListPage().setOrderMode(orderMode); + productListPage.setOrderMode(orderMode); } // set categoryId to pager - getProductPager().setCategoryId(currentCategoryId); + productPager.setCategoryId(currentCategoryId); + //TODO catch an exception + //商品一覧の取得 - PagingResultBean productList = getProductService() - .getProductListByPager(getProductPager()); + PagingResultBean productList = productService + .getProductListByPager(productPager, SystemUtil + .getCurrentLanguage()); List> sList = new ArrayList>(); - getProductDxo().convert(productList, sList); - getProductListPage().setProductItems(sList); - getPagerDxo().convert(new PagingResultBeanWrapper(productList), - getProductListPage()); + productDxo.convertFromProductToMap(productList, sList); + productListPage.setProductItems(sList); + pagerDxo.convert(new PagingResultBeanWrapper(productList), + productListPage); // page range productList.setPageRangeSize(PompeiConstants.DEFAULT_PAGE_RANGE_SIZE); @@ -194,19 +185,18 @@ map.put("pageNumber", Integer.valueOf(i)); pageNumberItems.add(map); } - getProductListPage().setPageNumberItems(pageNumberItems); + productListPage.setPageNumberItems(pageNumberItems); // load thumbnail loadThumbnail(sList); // default display mode - if (getProductListPage().getDisplayMode() == null) { - getProductListPage().setDisplayMode( - PompeiConstants.THUMBNAIL_DISPLAY); + if (productListPage.getDisplayMode() == null) { + productListPage.setDisplayMode(PompeiConstants.THUMBNAIL_DISPLAY); } // set title - SystemUtil.setWindowTitle(getProductListPage().getLabelHelper() + SystemUtil.setWindowTitle(productListPage.getLabelHelper() .getLabelValue("windowTitle")); // render faces messages @@ -216,15 +206,13 @@ private void loadThumbnail(List> productList) { for (Map map : productList) { - BigDecimal productId = (BigDecimal) map.get("productId"); - if (productId != null) { - ProductImage productImage = getProductService() - .getProductImageByProductIdAndType(productId, - PompeiConstants.THUMBNAIL_IMAGE_TYPE); - if (productImage != null) { + BigDecimal fileDataId = (BigDecimal) map.get("fileDataId"); + if (fileDataId != null) { + FileData fileData = productService.getFileData(fileDataId); + if (fileData != null) { map.put(PompeiConstants.THUMBNAIL_IMAGE_URL, - UploadedFileUtil.getProductImageUrl(productImage - .getImageName())); + UploadedFileUtil.getProductImageUrl(fileData + .getName())); } else { // set default image path map @@ -238,96 +226,4 @@ } } - /** - * @return productListPage - */ - public ProductListPage getProductListPage() { - return productListPage; - } - - /** - * @param productListPage 設定する productListPage - */ - public void setProductListPage(ProductListPage productListPage) { - this.productListPage = productListPage; - } - - public CategoryDxo getCategoryDxo() { - return categoryDxo; - } - - public void setCategoryDxo(CategoryDxo categoriesDxo) { - this.categoryDxo = categoriesDxo; - } - - public CategoryService getCategoryService() { - return categoryService; - } - - public void setCategoryService(CategoryService categoryService) { - this.categoryService = categoryService; - } - - public ProductDxo getProductDxo() { - return productDxo; - } - - public void setProductDxo(ProductDxo productDxo) { - this.productDxo = productDxo; - } - - public ProductService getProductService() { - return productService; - } - - public void setProductService(ProductService productService) { - this.productService = productService; - } - - public String doCart() { - - return "../cart/productList"; - } - - /** - * @return labelHelper - */ - public LabelHelper getLabelHelper() { - return labelHelper; - } - - /** - * @param labelHelper 設定する labelHelper - */ - public void setLabelHelper(LabelHelper labelHelper) { - this.labelHelper = labelHelper; - } - - /** - * @return productPager - */ - public ProductPager getProductPager() { - return productPager; - } - - /** - * @param productPager 設定する productPager - */ - public void setProductPager(ProductPager productPager) { - this.productPager = productPager; - } - - /** - * @return pagerDxo - */ - public PagerDxo getPagerDxo() { - return pagerDxo; - } - - /** - * @param pagerDxo 設定する pagerDxo - */ - public void setPagerDxo(PagerDxo pagerDxo) { - this.pagerDxo = pagerDxo; - } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -5,8 +5,6 @@ import java.util.Map; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.UrlBuilderUtil; import jp.sf.pal.pompei.web.PagingResultPage; @@ -15,9 +13,6 @@ public class ProductListPage extends PagingResultPage { - /** - * - */ private static final long serialVersionUID = -2356477849446203183L; private LabelHelper labelHelper; @@ -36,8 +31,10 @@ private String orderMode; - private LanguageService languageService; + private String name; + private String title; + public int getProductIndex() { return productIndex; } @@ -70,59 +67,36 @@ this.productId = productsId; } - public String getCartLinkHref() { - return UrlBuilderUtil.createCartUrl(); + public String getName() { + return name; } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; + public void setName(String name) { + this.name = name; } - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; + public String getTitle() { + return title; } + public void setTitle(String title) { + this.title = title; + } + + public String getCartLinkHref() { + return UrlBuilderUtil.createCartUrl(); + } + public String getProductName() { - //TODO - if (getProductItems() != null - && getProductIndex() < getProductItems().size()) { - List list = (List) productItems - .get(productIndex).get( - PompeiConstants.PRODUCT_DESCRIPTION_LIST); - for (ProductDescription pd : list) { - BigDecimal languagesId = getLanguageService() - .getCurrentLanguage().getLanguageId(); - if (pd.getLanguageId().equals(languagesId)) { - return pd.getName(); - } - } - // TODO need default lang? + if (getName() != null) { + return getName(); } return "-"; } public String getProductTitle() { - //TODO - if (getProductItems() != null - && getProductIndex() < getProductItems().size()) { - List 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? + if (getTitle() != null) { + return getTitle(); } return "-"; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -10,28 +10,28 @@ import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.exentity.FileData; import jp.sf.pal.pompei.exentity.Product; -import jp.sf.pal.pompei.exentity.ProductImage; import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.SystemUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; +import org.seasar.framework.log.Logger; + public class TopProductListAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -3171043762530754438L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(TopProductListAction.class); // LOG CODE: ?PC017? + private TopProductListPage topProductListPage; - /** */ private ProductService productService; - /** */ private ProductDxo productDxo; public Class initialize() { @@ -45,11 +45,11 @@ int num = SystemUtil.getNumOfTopProducts(); //商品一覧の取得 - PagingResultBean productList = getProductService() - .getTopProductList(type, num); + PagingResultBean productList = productService + .getTopProductList(type, num, SystemUtil.getCurrentLanguage()); List> sList = new ArrayList>(); - getProductDxo().convert(productList, sList); - getTopProductListPage().setProductItems(sList); + productDxo.convertFromProductToMap(productList, sList); + topProductListPage.setProductItems(sList); // load thumbnail loadThumbnail(sList); @@ -61,16 +61,13 @@ private void loadThumbnail(List> productList) { for (Map map : productList) { - BigDecimal productId = (BigDecimal) map.get("productId"); - if (productId != null) { - // TODO improvement - ProductImage productImage = getProductService() - .getProductImageByProductIdAndType(productId, - PompeiConstants.THUMBNAIL_IMAGE_TYPE); - if (productImage != null) { + BigDecimal fileDataId = (BigDecimal) map.get("fileDataId"); + if (fileDataId != null) { + FileData fileData = productService.getFileData(fileDataId); + if (fileData != null) { map.put(PompeiConstants.THUMBNAIL_IMAGE_URL, - UploadedFileUtil.getProductImageUrl(productImage - .getImageName())); + UploadedFileUtil.getProductImageUrl(fileData + .getName())); } else { // set default image path map @@ -84,46 +81,4 @@ } } - /** - * @return the topProductListPage - */ - public TopProductListPage getTopProductListPage() { - return topProductListPage; - } - - /** - * @param topProductListPage the topProductListPage to set - */ - public void setTopProductListPage(TopProductListPage topProductListPage) { - this.topProductListPage = topProductListPage; - } - - /** - * @return the productService - */ - public ProductService getProductService() { - return productService; - } - - /** - * @param productService the productService to set - */ - public void setProductService(ProductService productService) { - this.productService = productService; - } - - /** - * @return the productDxo - */ - public ProductDxo getProductDxo() { - return productDxo; - } - - /** - * @param productDxo the productDxo to set - */ - public void setProductDxo(ProductDxo productDxo) { - this.productDxo = productDxo; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java 2008-04-08 05:03:44 UTC (rev 880) @@ -6,17 +6,12 @@ import java.util.Map; import jp.sf.pal.pompei.PompeiConstants; -import jp.sf.pal.pompei.exentity.ProductDescription; -import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.UrlBuilderUtil; import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; public class TopProductListPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -8096518146757092176L; private int productIndex; @@ -29,8 +24,10 @@ @BigDecimalConverter(pattern = "###,###") private BigDecimal price; - private LanguageService languageService; + private String name; + private String title; + public int getProductIndex() { return productIndex; } @@ -67,55 +64,16 @@ return UrlBuilderUtil.createCartUrl(); } - /** - * @return languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService 設定する languageService - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - public String getProductName() { - //TODO - if (getProductItems() != null - && getProductIndex() < getProductItems().size()) { - List list = (List) productItems - .get(productIndex).get( - PompeiConstants.PRODUCT_DESCRIPTION_LIST); - for (ProductDescription pd : list) { - BigDecimal languagesId = getLanguageService() - .getCurrentLanguage().getLanguageId(); - if (pd.getLanguageId().equals(languagesId)) { - return pd.getName(); - } - } - // TODO need default lang? + if (getName() != null) { + return getName(); } return "-"; } public String getProductTitle() { - //TODO - if (getProductItems() != null - && getProductIndex() < getProductItems().size()) { - List 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? + if (getTitle() != null) { + return getTitle(); } return "-"; } @@ -141,4 +99,20 @@ public String getProductNameLinkHref() { return getProductLinkHref(); } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -4,16 +4,18 @@ import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class SignupCompleteAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 2689633390570340463L; /** - * + * Logger for this class */ + private static final Logger logger = Logger + .getLogger(SignupCompleteAction.class); // LOG CODE: ?PC021? + private SignupCompletePage signupCompletePage; public Class initialize() { @@ -24,7 +26,7 @@ getSignupCompletePage().setNotifiedEmailAddress( getSignupCompletePage().getEmailAddress()); getSignupCompletePage().setEmailAddress(null); - + // render faces messages FacesMessageUtil.renderMessages(); return null; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -1,93 +1,100 @@ package jp.sf.pal.pompei.web.user.signup; import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.Timestamp; +import java.io.StringWriter; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; -import jp.sf.pal.common.CommonException; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; + import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.PompeiException; import jp.sf.pal.pompei.dxo.CustomerDxo; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; -import jp.sf.pal.pompei.exentity.Zone; import jp.sf.pal.pompei.service.CustomerService; -import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.SystemUtil; +import jp.sf.pal.pompei.util.UserRegistrationUtil; +import jp.sf.pal.pompei.util.VelocityUtil; +import org.apache.jetspeed.JetspeedActions; +import org.apache.jetspeed.administration.AdministrationEmailException; +import org.apache.jetspeed.om.common.SecurityConstraint; +import org.apache.jetspeed.om.folder.Folder; +import org.apache.jetspeed.page.PageManager; +import org.apache.jetspeed.security.User; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class SignupConfirmAction implements Serializable { - /** - * - */ private static final long serialVersionUID = 4440511977300860903L; /** * Logger for this class */ private static final Logger logger = Logger - .getLogger(SignupConfirmAction.class); + .getLogger(SignupConfirmAction.class); // LOG CODE: ?PC020? - /** - * - */ private SignupConfirmPage signupConfirmPage; private CustomerDxo customerDxo; private CustomerService customerService; - private LanguageService languageService; - public Class initialize() { return null; } public Class prerender() { - getSignupConfirmPage().setUserSecretAnswer( - PompeiConstants.DUMMY_SECRET_ANSWER); + signupConfirmPage + .setUserSecretAnswer(PompeiConstants.DUMMY_SECRET_ANSWER); // render faces messages FacesMessageUtil.renderMessages(); return null; } - public Class doCancel() { - return SignupEditPage.class; - } - @TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress") public Class doOnceCreate() { // convert cp932 to jis - getSignupConfirmPage().setStreetAddress( - SystemUtil.convertToJIS(getSignupConfirmPage() - .getStreetAddress())); + signupConfirmPage.setStreetAddress(SystemUtil + .convertToJIS(signupConfirmPage.getStreetAddress())); // new Date now = new Date(); Customer customer = new Customer(); - customer.setDateAdded(new Timestamp(now.getTime())); - customer.setLastModified(new Timestamp(now.getTime())); - AddressBook addressBook = new AddressBook(); - getCustomerDxo().convert(getSignupConfirmPage(), customer); - getCustomerDxo().convert(getSignupConfirmPage(), addressBook); + customerDxo.convertFromPageToCustomer(signupConfirmPage, customer); + AddressBook addressBook = null; + if (customer.getAddressBookList() != null + && !customer.getAddressBookList().isEmpty()) { + addressBook = customer.getAddressBookList().get(0); + } else { + addressBook = new AddressBook(); + List addressBookList = new ArrayList(); + addressBookList.add(addressBook); + customer.setAddressBookList(addressBookList); + } + customerDxo + .convertFromPageToAddressBook(signupConfirmPage, addressBook); - //TODO zone and check if it's null - Zone zones = getCustomerService().getZone(new BigDecimal(130)); - addressBook.setZoneId(zones.getZoneId()); - //TODO countries and check if it's null - addressBook.setCountryId(zones.getCountry().getCountryId()); - //TODO select language - addressBook.setLanguageId(getLanguageService().getDefaultLanguage() - .getLanguageId()); + //TODO country + //TODO delivery zone + // set default address addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL); @@ -102,70 +109,70 @@ SystemUtil .getMessageDigest((String) SessionUtil .getFromLocalScope(PompeiConstants.USER_SECRET_ANSWER))); - } catch (CommonException e) { + } catch (PompeiException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log(e); return null; } - userInfo.put(PompeiConstants.USER_NAME, getSignupConfirmPage() - .getUserName()); + userInfo + .put(PompeiConstants.USER_NAME, signupConfirmPage.getUserName()); userInfo.put(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL, - getSignupConfirmPage().getEmailAddress()); - userInfo.put(PompeiConstants.USER_SECRET_QUESTION, - getSignupConfirmPage().getUserSecretQuestion()); + signupConfirmPage.getEmailAddress()); + userInfo.put(PompeiConstants.USER_SECRET_QUESTION, signupConfirmPage + .getUserSecretQuestion()); userInfo.put("user.home-info.telecom.mobile.number", - convertNotNull(getSignupConfirmPage().getCellphone())); + convertNotNull(signupConfirmPage.getCellphone())); userInfo.put("user.home-info.postal.city", - convertNotNull(getSignupConfirmPage().getCity())); - userInfo.put("user.employer", convertNotNull(getSignupConfirmPage() + convertNotNull(signupConfirmPage.getCity())); + userInfo.put("user.employer", convertNotNull(signupConfirmPage .getCompany())); - userInfo.put("user.department", convertNotNull(getSignupConfirmPage() + userInfo.put("user.department", convertNotNull(signupConfirmPage .getDepartment())); userInfo.put("user.home-info.online.email", - convertNotNull(getSignupConfirmPage().getEmailAddress())); + convertNotNull(signupConfirmPage.getEmailAddress())); userInfo.put("user.home-info.telecom.fax.number", - convertNotNull(getSignupConfirmPage().getFax())); - userInfo.put("user.name.given", convertNotNull(getSignupConfirmPage() + convertNotNull(signupConfirmPage.getFax())); + userInfo.put("user.name.given", convertNotNull(signupConfirmPage .getFirstname())); - userInfo - .put("user.name.given.yomi", - convertNotNull(getSignupConfirmPage() - .getFirstnameDescription())); - userInfo.put("user.gender", convertNotNull(getSignupConfirmPage() + userInfo.put("user.name.given.yomi", convertNotNull(signupConfirmPage + .getFirstnameDescription())); + userInfo.put("user.gender", convertNotNull(signupConfirmPage .getGender())); - userInfo.put("user.name.family", convertNotNull(getSignupConfirmPage() + userInfo.put("user.name.family", convertNotNull(signupConfirmPage .getLastname())); - userInfo - .put("user.name.family.yomi", - convertNotNull(getSignupConfirmPage() - .getLastnameDescription())); + userInfo.put("user.name.family.yomi", convertNotNull(signupConfirmPage + .getLastnameDescription())); userInfo.put("user.home-info.postal.postalcode", - convertNotNull(getSignupConfirmPage().getPostcode())); + convertNotNull(signupConfirmPage.getPostcode())); userInfo.put("user.home-info.postal.stateprov", - convertNotNull(getSignupConfirmPage().getState())); + convertNotNull(signupConfirmPage.getState())); userInfo.put("user.home-info.postal.street", - convertNotNull(getSignupConfirmPage().getStreetAddress())); + convertNotNull(signupConfirmPage.getStreetAddress())); userInfo.put("user.home-info.telecom.telephone.number", - convertNotNull(getSignupConfirmPage().getTelephone())); - userInfo.put("user.bdate", convertNotNull(getSignupConfirmPage() + convertNotNull(signupConfirmPage.getTelephone())); + userInfo.put("user.bdate", convertNotNull(signupConfirmPage .getDayOfBirth().toString())); try { - getCustomerService().addCustomer(userInfo, customer, addressBook); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log(e); + signupCustomer(userInfo, customer); + } catch (PompeiException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId(), e.getArgs()); + logger.log("EPC0201", new Object[] { this.toString() }, e); return null; } catch (Exception e) { FacesMessageUtil .addErrorMessage("could.not.create.user.by.system.error"); - logger.log(e); + logger.log("EPC0202", new Object[] { this.toString() }, e); return null; } return SignupCompletePage.class; } + public Class doCancel() { + return SignupEditPage.class; + } + private String convertNotNull(String str) { if (str == null) { return ""; @@ -173,60 +180,273 @@ return str; } - /** - * @return the signupConfirmPage - */ + protected void signupCustomer(Map userInfo, + Customer customer) throws PompeiException { + + String password = userInfo.remove(PompeiConstants.USER_PASSWORD); + String verifyPassword = userInfo + .remove(PompeiConstants.USER_VERIFY_PASSWORD); + if (!UserRegistrationUtil + .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) { + if (password == null || password.equals("")) { + throw new PompeiException("error.lacking.password", + "The password is null."); + } + } + + if (UserRegistrationUtil + .getBoolean(PompeiConstants.FORCE_USE_EMAIL_AS_USERNAME)) { + // force user.name to be same as email + userInfo.put(PompeiConstants.USER_NAME, userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL)); + } + + boolean userIdExistsFlag = true; + try { + SystemUtil.getUserManager().getUser( + userInfo.get(PompeiConstants.USER_NAME)); + } catch (org.apache.jetspeed.security.SecurityException e) { + userIdExistsFlag = false; + } + + if (userIdExistsFlag) { + throw new PompeiException("error.userid_already_exists", + "The user id already exists."); + } + + if (UserRegistrationUtil.getBoolean(PompeiConstants.FORCE_UNIQUE_EMAIL)) { + boolean emailExistsFlag = true; + User user = null; + try { + user = SystemUtil + .getPortalAdministration() + .lookupUserFromEmail( + userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL)); + } catch (AdministrationEmailException e) { + emailExistsFlag = false; + } + if ((emailExistsFlag) || (user != null)) { + throw new PompeiException("error.email_already_exists", + "The email already exists."); + } + + } + + if (UserRegistrationUtil + .getBoolean(PompeiConstants.FORCE_GENERATED_PASSWORD)) { + try { + password = SystemUtil.getPortalAdministration() + .generatePassword(); + } catch (Exception e) { + throw new PompeiException("error.failed_to_generate_password", + "Could not create password.", e); + } + } else { + if (verifyPassword == null || !verifyPassword.equals(password)) { + throw new PompeiException("error.two_passwords_do_not_match", + "Two passwords do not match."); + } + } + + String userName = userInfo.get(PompeiConstants.USER_NAME); + Customer c = customerService.getCustomerByPortalId(userName); + if (c != null) { + try { + customerService.deleteCustomer(c.getCustomerId()); + } catch (Exception e) { + //TODO nothing? + } + } + + try { + SystemUtil.getPortalAdministration().registerUser( + userName, + password, + UserRegistrationUtil.getStringList(PompeiConstants.ROLES), + UserRegistrationUtil.getStringList(PompeiConstants.GROUPS), + userInfo, // note use of only + // PLT.D values here. + UserRegistrationUtil.getStringMap(PompeiConstants.RULES), + PompeiConstants.DEFAULT_USER_TEMPLATE_FOLDER); // TODO default template path + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer); + throw new PompeiException("error.failed_to_add", + "Could not register a user.", e); + } + + // set security constraint + String userhome = Folder.USER_FOLDER + userName; + try { + PageManager pageManager = SystemUtil.getPageManager(); + SecurityConstraint sc = pageManager.newPageSecurityConstraint(); + sc.setUsers(parseCSVList(userName)); + List 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); + throw new PompeiException("could.not.access.folder", + "Could not access a folder: " + userhome, e); + } + + // set portal id + customer.setPortalId(userName); + + try { + // create customer + customerService.addCustomer(customer); + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer); + throw new PompeiException("could.not.insert.customer.data", + "Could not insert customer data. ", e); + } + + if (UserRegistrationUtil.getBoolean(PompeiConstants.SEND_MAIL)) { + if (password != null) { + userInfo.put("password", password); + } + + try { + //TODO move user-signup.vm to init-param + sendSignupMail(userInfo, userInfo + .get(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), + SystemUtil.getAdministratorEmail(), "user-signup.vm"); + } catch (Exception e) { + cancelToAddCustomer(userInfo, customer); + throw new PompeiException( + "error.registration_completed_but_could_not_send", + "Could not send a registration mail.", e); + } + } + + } + + private void sendSignupMail(Map userInfo, String to, + String from, String templateName) throws Exception { + // set velocity context + VelocityContext context = new VelocityContext(); + context.put("map", userInfo); + + VelocityUtil.init(); + StringWriter sw = new StringWriter(); + String templatePath = SystemUtil + .getSignupNotificationTemplatePath(templateName); + // TODO i18n: encoding + Template template = VelocityUtil.getTemplate(templatePath, "UTF-8"); + + template.merge(context, sw); + + String content = sw.toString(); + if (content == null) { + throw new PompeiException("signup.content.is.null"); + } + int index = content.indexOf("\n"); + String subject = null; + String body = null; + if (index != -1) { + subject = content.substring(0, index); + body = content.substring(index); + } else { + // TODO should throw exception? + subject = content; + body = content; + } + + Properties props = System.getProperties(); + // set smtp server + props.put("mail.smtp.host", SystemUtil.getSmtpHost()); + Session session = Session.getDefaultInstance(props, null); + MimeMessage mimeMessage = new MimeMessage(session); + mimeMessage.setFrom(new InternetAddress(from)); + mimeMessage.setRecipients(Message.RecipientType.TO, to); + //TODO i18n: encoding + mimeMessage.setSubject(subject, "iso-2022-jp"); + //TODO i18n: encoding + mimeMessage.setText(body, "iso-2022-jp"); + mimeMessage.setHeader("Content-Type", "text/plain"); + mimeMessage.setSentDate(new Date()); + + Transport.send(mimeMessage); + + } + + protected void cancelToAddCustomer(Map userInfo, + Customer customer) { + // delete customer + if (customer.getCustomerId() != null) { + try { + customerService.deleteCustomer(customer.getCustomerId()); + } catch (Exception e) { + } + } + + try { + String userhome = Folder.USER_FOLDER + + userInfo.get(PompeiConstants.USER_NAME); + PageManager pageManager = SystemUtil.getPageManager(); + Folder folder = pageManager.getFolder(userhome); + pageManager.removeFolder(folder); + } catch (Exception e) { + } + + try { + SystemUtil.getUserManager().removeUser( + userInfo.get(PompeiConstants.USER_NAME)); + } catch (Exception e) { + } + } + + private List 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 SignupConfirmPage getSignupConfirmPage() { return signupConfirmPage; } - /** - * @param signupConfirmPage the signupConfirmPage to set - */ public void setSignupConfirmPage(SignupConfirmPage signupConfirmPage) { this.signupConfirmPage = signupConfirmPage; } - /** - * @return the customerDxo - */ public CustomerDxo getCustomerDxo() { return customerDxo; } - /** - * @param customerDxo the customerDxo to set - */ public void setCustomerDxo(CustomerDxo customerDxo) { this.customerDxo = customerDxo; } - /** - * @return the customerService - */ public CustomerService getCustomerService() { return customerService; } - /** - * @param customerService the customerService to set - */ public void setCustomerService(CustomerService customerService) { this.customerService = customerService; } - /** - * @return the languageService - */ - public LanguageService getLanguageService() { - return languageService; - } - - /** - * @param languageService the languageService to set - */ - public void setLanguageService(LanguageService languageService) { - this.languageService = languageService; - } - } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2008-04-08 05:03:44 UTC (rev 880) @@ -13,36 +13,30 @@ import java.util.List; import java.util.Map; -import org.seasar.framework.log.Logger; - import jp.sf.pal.common.util.DateUtil; import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.SystemUtil; +import org.seasar.framework.log.Logger; + public class SignupEditAction implements Serializable { - /** - * - */ private static final long serialVersionUID = -2384511292540333093L; /** * Logger for this class */ private static final Logger logger = Logger - .getLogger(SignupEditAction.class); + .getLogger(SignupEditAction.class); // LOG CODE: ?PC019? - /** - * - */ private SignupEditPage signupEditPage; public Class initialize() { // state items List> stateItems = new ArrayList>(); - String states = getSignupEditPage().getLabelHelper().getLabelValue( + String states = signupEditPage.getLabelHelper().getLabelValue( "state.items"); String[] stateArray = states.split(","); for (String state : stateArray) { @@ -51,7 +45,7 @@ map.put("value", state); stateItems.add(map); } - getSignupEditPage().setStateItems(stateItems); + signupEditPage.setStateItems(stateItems); // dayOfBirth Date now = new Date(); List> yearOfDayOfBirthItems = new ArrayList>(); @@ -62,8 +56,8 @@ map.put("value", Integer.toString(year - i)); yearOfDayOfBirthItems.add(map); } - getSignupEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems); - getSignupEditPage().setYearOfDayOfBirth(Integer.valueOf(year)); + signupEditPage.setYearOfDayOfBirthItems(yearOfDayOfBirthItems); + signupEditPage.setYearOfDayOfBirth(Integer.valueOf(year)); List> monthOfDayOfBirthItems = new ArrayList>(); for (int i = 1; i < 13; i++) { @@ -72,9 +66,9 @@ map.put("value", Integer.toString(i)); monthOfDayOfBirthItems.add(map); } - getSignupEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); - getSignupEditPage().setMonthOfDayOfBirth( - Integer.valueOf(DateUtil.getMonth(now) + 1)); + signupEditPage.setMonthOfDayOfBirthItems(monthOfDayOfBirthItems); + signupEditPage.setMonthOfDayOfBirth(Integer.valueOf(DateUtil + .getMonth(now) + 1)); List> dateOfDayOfBirthItems = new ArrayList>(); for (int i = 1; i < 32; i++) { @@ -83,35 +77,35 @@ map.put("value", Integer.toString(i)); dateOfDayOfBirthItems.add(map); } - getSignupEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems); - getSignupEditPage().setDateOfDayOfBirth( - Integer.valueOf(DateUtil.getDate(now))); + signupEditPage.setDateOfDayOfBirthItems(dateOfDayOfBirthItems); + signupEditPage.setDateOfDayOfBirth(Integer.valueOf(DateUtil + .getDate(now))); // Load Secret Question List> questionItems = new ArrayList>(); - int numOfQuestions = Integer.parseInt(getSignupEditPage() - .getLabelHelper().getLabelValue("secretQuestion.num")); + int numOfQuestions = Integer.parseInt(signupEditPage.getLabelHelper() + .getLabelValue("secretQuestion.num")); for (int i = 1; i <= numOfQuestions; i++) { Map map = new HashMap(2); - String value = getSignupEditPage().getLabelHelper().getLabelValue( + String value = signupEditPage.getLabelHelper().getLabelValue( "secretQuestion." + i); map.put("label", value); map.put("value", value); questionItems.add(map); } - getSignupEditPage().setUserSecretQuestionSelectionItems(questionItems); + signupEditPage.setUserSecretQuestionSelectionItems(questionItems); return null; } public Class prerender() { // Load Term Of Service - String filename = getSignupEditPage().getLabelHelper().getLabelValue( + String filename = signupEditPage.getLabelHelper().getLabelValue( "termOfServiceFile"); if (filename == null) { filename = "/WEB-INF/template/term_of_service.txt"; } - String encoding = getSignupEditPage().getLabelHelper().getLabelValue( + String encoding = signupEditPage.getLabelHelper().getLabelValue( "termOfServiceEncoding"); if (encoding == null) { encoding = "UTF-8"; @@ -128,13 +122,13 @@ } } catch (UnsupportedEncodingException e) { FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); - logger.log("EPC0001", new Object[] { this.toString() }, e); + logger.log("EPC0191", new Object[] { this.toString() }, e); } catch (FileNotFoundException e) { FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); - logger.log("EPC0002", new Object[] { this.toString() }, e); + logger.log("EPC0192", new Object[] { this.toString() }, e); } catch (IOException e) { FacesMessageUtil.addErrorMessage("could.not.read.term.of.service"); - logger.log("EPC0003", new Object[] { this.toString() }, e); + logger.log("EPC0193", new Object[] { this.toString() }, e); } finally { if (reader != null) { try { @@ -143,10 +137,10 @@ } } } - getSignupEditPage().setTermOfService(buf.toString()); + signupEditPage.setTermOfService(buf.toString()); // reset secret answer - getSignupEditPage().setUserSecretAnswer(""); + signupEditPage.setUserSecretAnswer(""); // render faces messages FacesMessageUtil.renderMessages(); @@ -155,31 +149,30 @@ private void preprocessingForUpdate() { // day of birth - getSignupEditPage().setDayOfBirth( - DateUtil.get(getSignupEditPage().getYearOfDayOfBirth() - 1900, - getSignupEditPage().getMonthOfDayOfBirth() - 1, - getSignupEditPage().getDateOfDayOfBirth())); + signupEditPage.setDayOfBirth(DateUtil.get(signupEditPage + .getYearOfDayOfBirth() - 1900, signupEditPage + .getMonthOfDayOfBirth() - 1, signupEditPage + .getDateOfDayOfBirth())); // postcode - getSignupEditPage().setPostcode( - getSignupEditPage().getPrimaryPostcode() + "-" - + getSignupEditPage().getSecondaryPostcode()); + signupEditPage.setPostcode(signupEditPage.getPrimaryPostcode() + "-" + + signupEditPage.getSecondaryPostcode()); } public Class doConfirm() { // TODO teeda bug? required validator for radio button does not work - if (getSignupEditPage().getGender() == null) { + if (signupEditPage.getGender() == null) { FacesMessageUtil.addErrorMessage("need.to.select.gender"); return null; } - if (getSignupEditPage().getUserSecretQuestionSelection() != null) { - getSignupEditPage().setUserSecretQuestion( - getSignupEditPage().getUserSecretQuestionSelection()); + if (signupEditPage.getUserSecretQuestionSelection() != null) { + signupEditPage.setUserSecretQuestion(signupEditPage + .getUserSecretQuestionSelection()); } // check secret question - if (getSignupEditPage().getUserSecretQuestion() == null - || getSignupEditPage().getUserSecretQuestion().equals("")) { + if (signupEditPage.getUserSecretQuestion() == null + || signupEditPage.getUserSecretQuestion().equals("")) { FacesMessageUtil.addErrorMessage("type.secret.question"); return null; } @@ -188,23 +181,16 @@ // put secret answer to session SessionUtil.putToLocalScope(PompeiConstants.USER_SECRET_ANSWER, - getSignupEditPage().getUserSecretAnswer()); - getSignupEditPage().setUserSecretAnswer( - PompeiConstants.DUMMY_SECRET_ANSWER); + signupEditPage.getUserSecretAnswer()); + signupEditPage.setUserSecretAnswer(PompeiConstants.DUMMY_SECRET_ANSWER); return SignupConfirmPage.class; } - /** - * @return signupEditPage - */ public SignupEditPage getSignupEditPage() { return signupEditPage; } - /** - * @param signupEditPage 設定する signupEditPage - */ public void setSignupEditPage(SignupEditPage signupEditPage) { this.signupEditPage = signupEditPage; } Modified: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2008-04-08 05:03:44 UTC (rev 880) @@ -1,5 +1,80 @@ EPC0001=Could not read a term of service. EPC0002=Could not read a term of service. EPC0003=Could not read a term of service. -EPC0004=Could not send order notification. -EPC0005=Could not send order notification when order occurs. \ No newline at end of file +EPC0005=Could not send order notification when order occurs. + + +EPC0021=Could not load a category: {0} +EPC0022=Failed to add a category: {0} +EPC0023=Failed to update a category: {0} + +EPC0031=Could not load manufacturers: {0} +EPC0032=Failed to delete a manufacturer: {0} + +EPC0041=Could not load a manufacturer: {0} +EPC0043=Failed to add a manufacturer: {0} +EPC0042=Failed to update a manufacturer: {0} + +EPC0051=Could not load product: {0} +EPC0052=Could not load a category: {0} +EPC0053=Failed to delete a product: {0} + +EPC0061=Could not load a manufacturer: {0} +EPC0062=Could not load a tax type: {0} +EPC0063=Could not load a delivery type: {0} +EPC0064=Could not load a product: {0} +EPC0065=Failed to add a product: {0} +EPC0066=Failed to update a product: {0} + +EPC0091=Could not load a order form: {0} +EPC0092=Failed to update a order form: {0} +EPC0093=Failed to delete a order form: {0} + +EPC0101=Could not load a order notification: {0} +EPC0102=Could not send order notification. + +EPC0131=Could not load a customer: {0} +EPC0132=Failed to update a customer: {0} +EPC0133=Failed to delete a customer: {0} +EPC0134=Failed to delete a customer: {0} + +EPC0151=Could not load a product: {0} +EPC0152=Failed to add a product to cart:: {0} + +EPC0161=Could not load a category: {0} + +EPC0181=Could not load a product in a cart: {0} +EPC0182=Failed to delete a product in a cart: {0} + +EPC0191=Could not read a term of service. +EPC0192=Could not read a term of service. +EPC0193=Could not read a term of service. + +EPC0201=Could not add a customer: {0} +EPC0202=Could not add a customer: {0} + +EPC0221=Failed to load a customer info: {0} +EPC0222=Failed to update a customer info: {0} +EPC0223=Failed to create a customer info: {0} + +EPC0231=Failed to load a customer info: {0} +EPC0232=Failed to add a address book: {0} +EPC0233=Failed to delete a address book: {0} + +EPC0241=Failed to load a customer info: {0} +EPC0242=Failed to load a system info: {0} +EPC0243=System Error: {0} + +EPC0251=Could not calculate a payment fee: {0} +EPC0252=Could not calculate a payment fee: {0} +EPC0253=Could not calculate a payment fee: {0} +EPC0254=Could not calculate a delivery price: {0} +EPC0255=Could not calculate a delivery price: {0} +EPC0256=Could not calculate a delivery price: {0} +EPC0257=Could not load an order info: {0} +EPC0258=The product is a shortage: {0} +EPC0259=Could not send order notification when order occurs: {0} +EPC0260=Could not send order notification when order occurs: {0} +EPC0261=Could not send order notification: {0} +EPC0262=System Error: {0} + Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2008-04-08 05:03:44 UTC (rev 880) @@ -31,6 +31,8 @@ customer.is.not.specified.in.customerconfirm.for.delete=\u4f1a\u54e1\u60c5\u5831\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 deleted.customer.in.customerconfirm=\u4f1a\u54e1\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 unexpected.action.in.customerconfirm=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.update.customer.in.customerconfirm=\u4f1a\u54e1\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.delete.customer.in.customerconfirm=\u4f1a\u54e1\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # CustomerEditAction.java invalid.parameter.in.customeredit=\u4f1a\u54e1\u60c5\u5831\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 @@ -42,35 +44,66 @@ could.not.find.order.in.orderconfirm.for.delete=\u6ce8\u6587\u60c5\u5831(ID:{0})\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 deleted.order.info.in.orderconfirm=\u6ce8\u6587\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 unexpected.action.in.orderconfirm=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.update.order.in.orderconfirm=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.delete.order.in.orderconfirm=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # OrderEditAction.java invalid.mode.in.orderedit=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +# OrderNotificationAction.java +could.not.find.order.notification=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u901a\u77e5\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + # CategoryEditAction.java updated.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 added.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.load.category=\u5bfe\u8c61\u306e\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.add.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.update.category.in.categoryedit=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # CategoryListAction.java has.child.categories=\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308b\u30ab\u30c6\u30b4\u30ea\u5185\u306b\u30b5\u30d6\u30ab\u30c6\u30b4\u30ea\u304c\u6b8b\u3063\u3066\u3044\u307e\u3059\u3002\u30b5\u30d6\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3057\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u524a\u9664\u3057\u3066\u304f\u3060\u3055\u3044\u3002 deleted.category=\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.delete.category=\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.load.category.for.breadcrumb=\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +# CategoryListAction.java +failed.to.load.category=\u30ab\u30c6\u30b4\u30ea\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + # ManufacturerEditAction.java updated.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 added.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +could.not.find.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +faild.to.update.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +faild.to.add.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # ManufacturerListAction.java deleted.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.load.manufacturers=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.delete.manufacturer=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # ProductEditAction.java added.product=\u5546\u54c1\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 updated.product=\u5546\u54c1\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 unexpected.action.in.productedit=\u6307\u5b9a\u3055\u308c\u305f\u5546\u54c1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.load.manufacturers=\u30e1\u30fc\u30ab\u30fc\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.load.taxtypes=\u7a0e\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.load.deliveryypes=\u914d\u9001\u65b9\u6cd5\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.load.product=\u5546\u54c1\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.add.product=\u5546\u54c1\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.update.product=\u5546\u54c1\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # ProductListAction.java deleted.product=\u5546\u54c1\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.find.products=\u5546\u54c1\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.delete.product=\u5546\u54c1\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +# ProductEditAction.java +failed.to.add.product.to.cart=\u30ab\u30fc\u30c8\u3078\u306e\u5546\u54c1\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + # ProductListAction.java for cart deleted.product.from.cart=\u30ab\u30fc\u30c8\u304b\u3089\u5546\u54c1\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +failed.to.load.product.in.basket=\u30ab\u30fc\u30c8\u5185\u306e\u5546\u54c1\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.delete.product.in.basket=\u30ab\u30fc\u30c8\u5185\u306e\u5546\u54c1\u60c5\u5831\u3092\u524a\u9664\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # CheckoutConfirmAction.java expire.order.process.in.checkoutconfirm=\u6ce8\u6587\u30d7\u30ed\u30bb\u30b9\u306e\u6709\u52b9\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 @@ -103,6 +136,8 @@ could.not.find.card.type.in.paymentselect=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u306e\u7a2e\u985e\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.card.expire.in.paymentselect=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u306e\u6709\u52b9\u671f\u9650\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.delivery.method.id.in.paymentselect=\u6307\u5b9a\u3055\u308c\u305f\u914d\u9054\u65b9\u6cd5\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +failed.to.load.system.info=\u30b7\u30b9\u30c6\u30e0\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +system.error.occur.in.payment=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # UserAddressSelectAction.java added.addressbook=\u4f4f\u6240\u60c5\u5831\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 @@ -113,6 +148,8 @@ deleted.address.book=\u4f4f\u6240\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 expire.order.process.in.useraddressselect=\u6ce8\u6587\u30d7\u30ed\u30bb\u30b9\u306e\u6709\u52b9\u671f\u9650\u304c\u5207\u308c\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u6ce8\u6587\u3057\u306a\u304a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.default.address.book=\u4f4f\u6240\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u5c11\u306a\u304f\u3066\u3082 1 \u3064\u306e\u4f4f\u6240\u60c5\u5831\u306e\u767b\u9332\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002 +failed.to.add.addressbook=\u4f4f\u6240\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.delete.addressbook=\u4f4f\u6240\u60c5\u5831\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # UserInfoEditAction.java added.customer=\u4f1a\u54e1\u60c5\u5831\u3092\u767b\u9332\u3057\u307e\u3057\u305f\u3002 @@ -121,6 +158,9 @@ could.not.find.customer.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 could.not.find.default.address.book.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002 email.address.does.not.match=\u78ba\u8a8d\u7528\u306b\u5165\u529b\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002 +failed.to.load.customer=\u4f1a\u54e1\u60c5\u5831\u306e\u8aad\u307f\u8fbc\u307f\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.update.customer=\u4f1a\u54e1\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +failed.to.create.customer=\u4f1a\u54e1\u60c5\u5831\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 # ProductDetailsAction.java could.not.find.product.in.productdetail=\u5bfe\u8c61\u306e\u5546\u54c1\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 @@ -159,3 +199,7 @@ failed.to.send.some.order.notification=\u6b21\u306e\u6ce8\u6587\u901a\u77e5\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} sent.order.notifications=\u6ce8\u6587\u901a\u77e5\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002 +# CheckoutConfirmAction.java +failed.to.load.order.in.checkout.process=\u6ce8\u6587\u51e6\u7406\u4e2d\u306b\u6ce8\u6587\u60c5\u5831\u3092\u8aad\u307f\u8fbc\u3080\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +system.error.occurs.in.order.process=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + Deleted: pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/resources/dbflute.dicon 2008-04-08 05:03:44 UTC (rev 880) @@ -1,617 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - - - - dbflute.interceptor - - - - requiresNewTx - requiredTx - - - - Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jdbc.dicon 2008-04-08 05:03:44 UTC (rev 880) @@ -19,139 +19,30 @@ --> - - - - "org.apache.derby.jdbc.EmbeddedDriver" - - - "jdbc:derby:directory:" + container.getComponent(@java.lang.Class @ forName("javax.servlet.ServletContext")).getRealPath("/WEB-INF/db/pompei") - - "" - "" - - - - + + @org.seasar.framework.util.DriverManagerUtil @ deregisterAllDrivers() + + - - - - - - - - - + 600 10 - true - - - - + - - \ No newline at end of file + Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/addcart_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/adduserinfo_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtolist_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/backtoshopping_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelco_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/cancelupdate_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/coconfirm_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/continueshopping_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/create_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/createuserinfo_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/delete_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/deleteaddress_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goaddressselect_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gocheckout_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gococonfirm_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gologin_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/gopaymentselect_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister2_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/goregister_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/modifyuserinfo_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/reedit_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/search_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupcomplete_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/signupedit_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateCart_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_down.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_down.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_over.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/images/buttons/updateuserinfo_over.png ___________________________________________________________________ Name: svn:mime-type + image/png Deleted: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html 2008-04-08 05:03:44 UTC (rev 880) @@ -1,70 +0,0 @@ - - - - - - 配送方法登録/編集画面 - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - - -
- - - -
- - -
- - Deleted: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html 2008-04-08 05:03:44 UTC (rev 880) @@ -1,55 +0,0 @@ - - - - - - 配送方法設定画面 - - - -
-
- -
- - - - - - - - - - - - - - - - - - -
表示順配送方法名コード名 
- 2 - - 配送方法 - - コード - - -
-
- - -
- - Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2008-04-08 05:03:44 UTC (rev 880) @@ -51,15 +51,9 @@ - 通貨コード: - - abc - - - 配送お問い合わせ番号: - abc + abc @@ -107,13 +101,13 @@ 最終更新日時: - yyyy/MM/DD + yyyy/MM/DD - - - + + + @@ -131,7 +125,7 @@ カードコード: - abc + abc @@ -153,7 +147,9 @@ - + + + @@ -177,6 +173,9 @@ + + + @@ -195,6 +194,9 @@ + + + @@ -313,8 +315,9 @@ - - + + + @@ -396,8 +399,18 @@ - - + + + + + + + + + + + + @@ -479,8 +492,9 @@ - - + + + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2008-04-08 05:03:44 UTC (rev 880) @@ -53,15 +53,9 @@ - 通貨コード: - - - - - 配送お問い合わせ番号: - + @@ -111,13 +105,13 @@ 最終更新日時: - yyyy/MM/DD + yyyy/MM/DD - + @@ -135,7 +129,7 @@ カードコード: - + @@ -157,7 +151,9 @@ + + @@ -181,6 +177,9 @@ + + + @@ -199,6 +198,9 @@ + + + @@ -320,8 +322,9 @@ - - + + + @@ -403,8 +406,18 @@ - - + + + + + + + + + + + + @@ -486,8 +499,9 @@ - - + + + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html 2008-04-08 05:03:44 UTC (rev 880) @@ -19,15 +19,30 @@ + + + - + + + + + + + + + + + + + + + + - - -
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html 2008-04-08 05:03:44 UTC (rev 880) @@ -31,16 +31,16 @@ 表示順 + ページID カテゴリ名 - イメージ   2 + ID  カテゴリ -   @@ -49,7 +49,7 @@
- + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html 2008-04-08 05:03:44 UTC (rev 880) @@ -28,15 +28,13 @@ -   1 - アディダス&nbsp; - ドイツのスポーツメーカー&nbsp; + アディダス Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html 2008-04-08 04:59:55 UTC (rev 879) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html 2008-04-08 05:03:44 UTC (rev 880) @@ -1,6 +1,6 @@ - + 商品登録編集画面 @@ -18,25 +18,40 @@ - +
- + - + - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + - - + + - + - + - + + - + - + - + - + + + + + -
商品コード商品コード(変更不可)
型番
在庫数在庫数
価格
定価
販売価格
重量
サイズ
購入制限数
発売日
販売期間:開始日時
販売期間:終了日時
ステータス @@ -45,15 +60,6 @@
総注文数
総レビュー数
評価値
メーカー @@ -62,39 +68,69 @@
税種別 +
税種別ID配送種別
イメージ - 商品名
サムネイル - キャッチコピー
商品名メーカーのURL
キャッチコピーページID
メーカーのURL
総表示数
説明文
商品説明

+ <% if(!"".equals(request.getAttribute(WebPartsPortlet.URL))){ %> + + <% } %> + + " /> + + + Added: webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/edit.jsp (rev 0) +++ webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/edit.jsp 2008-04-25 22:13:49 UTC (rev 890) @@ -0,0 +1,53 @@ +<%-- +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"%> +<%@ page import="jp.sf.pal.webparts.WebPartsPortlet"%> + + + +<%=request.getAttribute(WebPartsPortlet.MESSAGE)%> +
+
+
+
+ <% if(!"".equals(request.getAttribute(WebPartsPortlet.URL))){ %> + + <% } %> +
+ " /> + + +
Added: webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/view.jsp (rev 0) +++ webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/view.jsp 2008-04-25 22:13:49 UTC (rev 890) @@ -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. +--%> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%> +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> +<%@ page import="jp.sf.pal.webparts.WebPartsPortlet"%> + + + +<%= request.getAttribute(WebPartsPortlet.CODE) %> + + Property changes on: webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/jsp/view.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/portlet.xml (rev 0) +++ webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/portlet.xml 2008-04-25 22:13:49 UTC (rev 890) @@ -0,0 +1,90 @@ + + + + + + WebPartsPortlet + Web Parts + This portlet displays a Gadgets or BlogParts content, like Google Gadgets. + jp.sf.pal.webparts.WebPartsPortlet + -1 + + jp.sf.pal.webparts.Title + Web Parts + + + jp.sf.pal.webparts.Code + Please set a code in EDIT mode. + + + jp.sf.pal.webparts.Url + + + + text/html + VIEW + EDIT + + en + ja + jp.sf.pal.webparts.resources.WebPartsResources + + Web Parts + Web Parts + BlogParts,Gadgets + + + + WebPartsPortletForJetspeed + Web Parts For Jetspeed + This portlet displays a Gadgets or BlogParts content, like Google Gadgets. + jp.sf.pal.webparts.jetspeed.WebPartsPortlet + -1 + + jp.sf.pal.webparts.Title + Web Parts + + + jp.sf.pal.webparts.Code + Please set a code in EDIT mode. + + + jp.sf.pal.webparts.Url + + + + jp.sf.pal.webparts.UsePagePreferences + true + + + text/html + VIEW + EDIT + + en + ja + jp.sf.pal.webparts.resources.WebPartsResources + + Web Parts + Web Parts + BlogParts,Gadgets + + + + + + Property changes on: webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Added: webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/web.xml =================================================================== --- webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/web.xml (rev 0) +++ webparts/trunk/webparts-portlet/src/main/webapp/WEB-INF/web.xml 2008-04-25 22:13:49 UTC (rev 890) @@ -0,0 +1,15 @@ + + + + Web Parts + + ProxyServlet + jp.sf.pal.webparts.ProxyServlet + + + ProxyServlet + /proxy + + From svnnotify @ sourceforge.jp Sun Apr 27 07:50:43 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 27 Apr 2008 07:50:43 +0900 Subject: [pal-cvs 3155] [891] removed unneeded portlets. Message-ID: <1209250243.368245.20387.nullmailer@users.sourceforge.jp> Revision: 891 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=891 Author: shinsuke Date: 2008-04-27 07:50:43 +0900 (Sun, 27 Apr 2008) Log Message: ----------- removed unneeded portlets. Modified Paths: -------------- pal-admin/trunk/.classpath pal-admin/trunk/pom.xml pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Removed Paths: ------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties 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/publicPortalRegistrationRegister.html pal-admin/trunk/src/main/webapp/view/withdraw/ -------------- next part -------------- Modified: pal-admin/trunk/.classpath =================================================================== --- pal-admin/trunk/.classpath 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/.classpath 2008-04-26 22:50:43 UTC (rev 891) @@ -16,7 +16,7 @@ - + @@ -26,7 +26,7 @@ - + Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/pom.xml 2008-04-26 22:50:43 UTC (rev 891) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-admin - 0.7 + 1.0 war Administration tools for PAL Portal @@ -141,12 +141,12 @@ org.seasar.teeda teeda-core - 1.0.13-rc4 + 1.0.13 org.seasar.teeda teeda-extension - 1.0.13-rc4 + 1.0.13 org.seasar.teeda @@ -157,7 +157,7 @@ org.seasar.teeda teeda-tiger - 1.0.13-rc4 + 1.0.13 org.apache.geronimo.specs @@ -243,7 +243,7 @@ org.apache.portals.jetspeed-2 jetspeed-api - 2.1.2_pal-1.0-beta6 + 2.1.3_pal-1.0.3 provided @@ -251,7 +251,7 @@ org.apache.portals.jetspeed-2 jetspeed-locator - 2.1.2_pal-1.0-beta6 + 2.1.3_pal-1.0.3 org.apache.pluto @@ -264,12 +264,12 @@ org.seasar.container s2-framework - 2.4.23 + 2.4.24 org.seasar.container s2-extension - 2.4.23 + 2.4.24 log4j @@ -280,7 +280,7 @@ org.seasar.container s2-tiger - 2.4.23 + 2.4.24 org.easymock 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 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/RolePrincipal.java 2008-04-26 22:50:43 UTC (rev 891) @@ -59,4 +59,9 @@ return name; } + public boolean isMapping() { + // TODO this method is added in j2 2.1.3. needs to check if true is needed. + return false; + } + } 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 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2008-04-26 22:50:43 UTC (rev 891) @@ -34,25 +34,20 @@ import javax.portlet.PortletConfig; import javax.portlet.PortletRequest; import javax.portlet.PortletResponse; -import javax.security.auth.Subject; import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.util.PALAdminUtil; import jp.sf.pal.admin.util.PortalComponentUtil; import jp.sf.pal.admin.util.UserRegistrationUtil; import jp.sf.pal.admin.web.registration.AbstractForgottenPasswordPage; -import jp.sf.pal.admin.web.registration.AbstractPublicPortalRegistrationPage; import jp.sf.pal.admin.web.registration.AbstractResetPasswordPage; import jp.sf.pal.admin.web.registration.AbstractUserRegistrationPage; -import jp.sf.pal.admin.web.registration.PublicPortalSecretAnswerPage; -import jp.sf.pal.admin.web.withdraw.PublicPortalWithdrawalConfirmPage; import jp.sf.pal.common.CommonException; import org.apache.jetspeed.JetspeedActions; import org.apache.jetspeed.PortalReservedParameters; import org.apache.jetspeed.administration.AdministrationEmailException; import org.apache.jetspeed.administration.RegistrationException; -import org.apache.jetspeed.audit.AuditActivity; import org.apache.jetspeed.locator.JetspeedTemplateLocator; import org.apache.jetspeed.locator.LocatorDescriptor; import org.apache.jetspeed.locator.TemplateDescriptor; @@ -61,14 +56,12 @@ import org.apache.jetspeed.om.folder.Folder; import org.apache.jetspeed.om.folder.FolderNotFoundException; import org.apache.jetspeed.om.folder.InvalidFolderException; -import org.apache.jetspeed.page.FolderNotRemovedException; import org.apache.jetspeed.page.FolderNotUpdatedException; import org.apache.jetspeed.page.PageManager; import org.apache.jetspeed.page.document.NodeException; import org.apache.jetspeed.request.RequestContext; import org.apache.jetspeed.security.SecurityException; import org.apache.jetspeed.security.User; -import org.apache.jetspeed.security.UserManager; import org.apache.jetspeed.security.UserPrincipal; import org.seasar.teeda.extension.util.LabelHelper; @@ -277,45 +270,6 @@ } - public void setSecretQuestion(PublicPortalSecretAnswerPage page) - throws CommonException { - User user = null; - try { - user = PortalComponentUtil.getPortalAdministration() - .lookupUserFromEmail(page.getEmail()); - } catch (Exception e) { - page.setUserSecretQuestion(page.getLabelHelper().getLabelValue( - "secretQuestion.1")); - throw new CommonException("forgotten.email_address_not_found", - "The email is not found..", e); - } - - page.setUserSecretQuestion(user.getUserAttributes().get( - "user.secret.question", "-")); - } - - public boolean checkSecretAnswer(PublicPortalSecretAnswerPage page) - throws CommonException { - User user = null; - try { - user = PortalComponentUtil.getPortalAdministration() - .lookupUserFromEmail(page.getEmail()); - } catch (Exception e) { - throw new CommonException("forgotten.email_address_not_found", - "The email is not found..", e); - } - - String userSecretAnswer = user.getUserAttributes().get( - "user.secret.answer", ""); - if (userSecretAnswer.equals(page.getUserSecretAnswer())) { - return true; - } else if (page.getUserSecretAnswer() == null - && userSecretAnswer.equals("")) { - return true; - } - return false; - } - public void sendNewPassword(AbstractForgottenPasswordPage page) throws CommonException { @@ -500,92 +454,6 @@ return url; } - public void loadPage(AbstractPublicPortalRegistrationPage page) - throws CommonException { - Principal userPrincipal = FacesContext.getCurrentInstance() - .getExternalContext().getUserPrincipal(); - if (userPrincipal == null) { - throw new CommonException("could.not.find.your.credential", - "User principal is null."); - } - - User user; - try { - user = PortalComponentUtil.getUserManager().getUser( - userPrincipal.getName()); - if (user == null) { - throw new CommonException("could.not.find.your.account", - "User is null."); - } - } catch (SecurityException e) { - throw new CommonException("could.not.find.your.account", - "User is null.", e); - } - - Preferences userAttributes = user.getUserAttributes(); - updateUserInfo(page, userAttributes); - } - - public void update(AbstractPublicPortalRegistrationPage page) - throws CommonException { - Principal userPrincipal = page.getFacesContext().getExternalContext() - .getUserPrincipal(); - if (userPrincipal == null) { - throw new CommonException("could.not.find.your.credential", - "User principal is null."); - } - - if (page.getPassword() != null && !page.getPassword().equals("")) { - if (page.getPassword().equals(page.getVerifyPassword())) { - try { - PortalComponentUtil.getUserManager().setPassword( - userPrincipal.getName(), null, page.getPassword()); - // audit - PortalComponentUtil.getAuditActivity().logUserActivity( - userPrincipal.getName(), getIPAddress(), - AuditActivity.PASSWORD_CHANGE_SUCCESS, - PALAdminConstants.USER_ADMINISTRATION_ACTIVITY); - } catch (SecurityException e) { - throw new CommonException("could.not.update.password", - "Could not update a password.", e); - } - } else { - throw new CommonException("could.not.match.passwords", - "Could not match passwords."); - } - } - - User user; - try { - user = PortalComponentUtil.getUserManager().getUser( - userPrincipal.getName()); - if (user == null) { - throw new CommonException("could.not.find.your.account", - "User is null."); - } - - // refresh/update Subject in session - Subject subject = user.getSubject(); - RequestContext requestContext = (RequestContext) FacesContext - .getCurrentInstance().getExternalContext().getRequestMap() - .get(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); - requestContext.setSessionAttribute( - PortalReservedParameters.SESSION_KEY_SUBJECT, subject); - } catch (SecurityException e) { - throw new CommonException("could.not.find.your.account", - "User is null.", e); - } - - Preferences userAttributes = user.getUserAttributes(); - Map userInfo = createUserInfoMap(page); - for (Iterator> ite = userInfo.entrySet() - .iterator(); ite.hasNext();) { - Map.Entry entry = ite.next(); - userAttributes.put(entry.getKey(), entry.getValue()); - } - - } - protected String getIPAddress() { RequestContext requestContext = (RequestContext) FacesContext .getCurrentInstance().getExternalContext().getRequestMap().get( @@ -882,38 +750,6 @@ "user.business-info.online.uri", "")); } - if (page instanceof AbstractPublicPortalRegistrationPage) { - AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) page; - if (userAttributes.get("user.bdate.year", null) != null) { - p.setUserBdateYear(userAttributes.getInt("user.bdate.year", 0)); - } - if (userAttributes.get("user.bdate.month", null) != null) { - p.setUserBdateMonth(userAttributes - .getInt("user.bdate.month", 0)); - } - if (userAttributes.get("user.bdate.date", null) != null) { - p.setUserBdateDate(userAttributes.getInt("user.bdate.date", 0)); - } - if (userAttributes.get("user.industry", null) != null) { - p.setUserIndustry(userAttributes.get("user.industry", "")); - } - if (userAttributes.get("user.secret.question", null) != null) { - p.setUserSecretQuestion(userAttributes.get( - "user.secret.question", "")); - } - if (userAttributes.get("user.secret.answer", null) != null) { - p.setUserSecretAnswer(userAttributes.get("user.secret.answer", - "")); - } - if (userAttributes.get("user.name.given.yomi", null) != null) { - p.setUserNameGivenYomi(userAttributes.get( - "user.name.given.yomi", "")); - } - if (userAttributes.get("user.name.family.yomi", null) != null) { - p.setUserNameFamilyYomi(userAttributes.get( - "user.name.family.yomi", "")); - } - } } protected Map createUserInfoMap( @@ -1189,106 +1025,6 @@ .getUserBusinessInfoOnlineUri()); } - if (page instanceof AbstractPublicPortalRegistrationPage) { - AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) page; - if (p.getUserBdateYear() != null) { - userInfo - .put("user.bdate.year", p.getUserBdateYear().toString()); - } - if (p.getUserBdateMonth() != null) { - userInfo.put("user.bdate.month", p.getUserBdateMonth() - .toString()); - } - if (p.getUserBdateDate() != null) { - userInfo - .put("user.bdate.date", p.getUserBdateDate().toString()); - } - if (p.getUserIndustry() != null) { - userInfo.put("user.industry", p.getUserIndustry()); - } - if (p.getUserSecretQuestion() != null) { - userInfo.put("user.secret.question", p.getUserSecretQuestion()); - } - if (p.getUserSecretAnswer() != null) { - if (!PALAdminConstants.SECRET_ANSWER_DISPLAY.equals(p - .getUserSecretAnswer())) { - userInfo.put("user.secret.answer", p.getUserSecretAnswer()); - } - } - if (p.getUserNameGivenYomi() != null) { - userInfo.put("user.name.given.yomi", p.getUserNameGivenYomi()); - } - if (p.getUserNameFamilyYomi() != null) { - userInfo - .put("user.name.family.yomi", p.getUserNameFamilyYomi()); - } - - } return userInfo; } - - public void withdraw(PublicPortalWithdrawalConfirmPage page) - throws CommonException { - UserManager userManager = PortalComponentUtil.getUserManager(); - // check password - if (!userManager.authenticate(page.getUsername(), page.getPassword())) { - throw new CommonException("invalid.password"); - } - - // remove user - User user; - try { - user = userManager.getUser(page.getUsername()); - } catch (SecurityException e) { - throw new CommonException("could.not.remove.user", e); - } - if (user == null) { - throw new CommonException("could.not.find.user"); - } - if (PALAdminConstants.TRUE.equals(PALAdminUtil - .getConfigInitParameter(PALAdminConstants.REMOVE_USER))) { - // remove user - try { - userManager.removeUser(page.getUsername()); - } catch (SecurityException e) { - throw new CommonException("could.not.remove.user", e); - } - } else { - // disabled email - String email = user.getUserAttributes().get( - "user.business-info.online.email", null); - if (email != null) { - user.getUserAttributes().remove( - "user.business-info.online.email"); - user.getUserAttributes().put( - "backup." + "user.business-info.online.email", email); - } - - // disabled user - try { - userManager.setPasswordEnabled(page.getUsername(), false); - } catch (SecurityException e) { - throw new CommonException("could.not.remove.user", e); - } - } - - if (PALAdminConstants.TRUE.equals(PALAdminUtil - .getConfigInitParameter(PALAdminConstants.REMOVE_USER_FOLDER))) { - String userhome = Folder.USER_FOLDER + page.getUsername(); - PageManager pageManager = PortalComponentUtil.getPageManager(); - try { - Folder folder = pageManager.getFolder(userhome); - pageManager.removeFolder(folder); - } catch (FolderNotFoundException e) { - } catch (InvalidFolderException e) { - } catch (FolderNotRemovedException e) { - } catch (NodeException e) { - } - } - - PortalComponentUtil.getRequestContext().getRequest().getSession() - .invalidate(); - //TODO destination - //PortalComponentUtil.getRequestContext().getResponse().sendRedirect(response.encodeURL(destination)); - } } Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,125 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -public abstract class AbstractPublicPortalRegistrationPage extends - AbstractUserRegistrationPage implements Serializable { - - private String userNameFamilyYomi; - - private String userNameGivenYomi; - - private String termOfService; - - private Integer userBdateDate; - - private Integer userBdateMonth; - - private Integer userBdateYear; - - private String userIndustry; - - private String userSecretAnswer; - - private String userSecretQuestion; - - public String getTermOfService() { - return termOfService; - } - - public void setTermOfService(String termOfService) { - this.termOfService = termOfService; - } - - public Integer getUserBdateDate() { - return userBdateDate; - } - - public void setUserBdateDate(Integer userBdateDate) { - this.userBdateDate = userBdateDate; - } - - public Integer getUserBdateMonth() { - return userBdateMonth; - } - - public void setUserBdateMonth(Integer userBdateMonth) { - this.userBdateMonth = userBdateMonth; - } - - public Integer getUserBdateYear() { - return userBdateYear; - } - - public void setUserBdateYear(Integer userBdateYear) { - this.userBdateYear = userBdateYear; - } - - public String getUserIndustry() { - return userIndustry; - } - - public void setUserIndustry(String userIndustry) { - this.userIndustry = userIndustry; - } - - public String getUserSecretAnswer() { - return userSecretAnswer; - } - - public void setUserSecretAnswer(String userSecretAnswer) { - this.userSecretAnswer = userSecretAnswer; - } - - public String getUserSecretQuestion() { - return userSecretQuestion; - } - - public void setUserSecretQuestion(String userSecretQuestion) { - this.userSecretQuestion = userSecretQuestion; - } - - /** - * @return the userNameFamilyYomi - */ - public String getUserNameFamilyYomi() { - return userNameFamilyYomi; - } - - /** - * @param userNameFamilyYomi the userNameFamilyYomi to set - */ - public void setUserNameFamilyYomi(String userNameFamilyYomi) { - this.userNameFamilyYomi = userNameFamilyYomi; - } - - /** - * @return the userNameGivenYomi - */ - public String getUserNameGivenYomi() { - return userNameGivenYomi; - } - - /** - * @param userNameGivenYomi the userNameGivenYomi to set - */ - public void setUserNameGivenYomi(String userNameGivenYomi) { - this.userNameGivenYomi = userNameGivenYomi; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,39 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -import jp.sf.pal.common.util.FacesMessageUtil; - -public class PortalRegistrationCompletedPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -9086102477020421786L; - - public Class initialize() { - return null; - } - - public Class prerender() { - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,185 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -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.HashMap; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.admin.PALAdminConstants; -import jp.sf.pal.admin.util.PALAdminUtil; -import jp.sf.pal.admin.util.UserRegistrationUtil; -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - -import org.seasar.framework.log.Logger; - -public class PortalRegistrationRegisterPage extends - AbstractPublicPortalRegistrationPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -4113768516238946252L; - - /** - * Logger for this class - */ - private static final Logger logger = Logger - .getLogger(PortalRegistrationRegisterPage.class); - - public static final String userName_TRequiredValidator = null; - - public static final String userName_lengthValidator = "minimum=6, maximum=32"; - - public static final String userName_TRegularExpressionValidator = "pattern='[a-zA-Z][0-9a-zA-Z._]+'"; - - public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; - - public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; - - // public static final String userSecretQuestion_TRequiredValidator = null; - - public static final String userSecretQuestion_lengthValidator = "maximum=100"; - - public static final String userSecretAnswer_TRequiredValidator = null; - - public static final String userSecretAnswer_lengthValidator = "maximum=100"; - - private String userSecretQuestionSelection; - - private List> userSecretQuestionSelectionItems; - - public String getUserSecretQuestionSelection() { - return userSecretQuestionSelection; - } - - public void setUserSecretQuestionSelection( - String userSecretQuestionSelection) { - this.userSecretQuestionSelection = userSecretQuestionSelection; - } - - public List> getUserSecretQuestionSelectionItems() { - return userSecretQuestionSelectionItems; - } - - public void setUserSecretQuestionSelectionItems( - List> userSecretQuestionSelectionItems) { - this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems; - } - - public Class doFinish() { - if (getUserBusinessInfoOnlineEmail() != null) { - setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail()); - } - - if (userSecretQuestionSelection != null) { - setUserSecretQuestion(userSecretQuestionSelection); - } - - try { - setUserSecretAnswer(getUserRegistrationService().getMessageDigest( - getUserSecretAnswer())); - getUserRegistrationService().register(this); - if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) { - FacesMessageUtil.addInfoMessage("success.check_your_email"); - return PortalRegistrationCompletedPage.class; - } else { - FacesMessageUtil.addInfoMessage("success.login_above"); - } - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0001", new Object[] { this.toString() }, e); - - } - - return null; - } - - public Class initialize() { - return null; - } - - public Class prerender() { - // Load Term Of Service - String filename = getLabelHelper().getLabelValue("termOfServiceFile"); - if (filename == null) { - filename = "/WEB-INF/template/term_of_service.txt"; - } - String encoding = getLabelHelper().getLabelValue( - "termOfServiceEncoding"); - if (encoding == null) { - encoding = "UTF-8"; - } - StringBuffer buf = new StringBuffer(); - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader( - new FileInputStream(PALAdminUtil - .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) { - } - } - } - setTermOfService(buf.toString()); - - // Load Secret Question - List> questionItems = new ArrayList>(); - int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue( - "secretQuestion.num")); - for (int i = 1; i <= numOfQuestions; i++) { - Map map = new HashMap(2); - String value = getLabelHelper() - .getLabelValue("secretQuestion." + i); - map.put("label", value); - map.put("value", value); - questionItems.add(map); - } - setUserSecretQuestionSelectionItems(questionItems); - - // reset secret answer - setUserSecretAnswer(""); - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,86 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -import jp.sf.pal.admin.PALAdminConstants; -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - -import org.seasar.framework.log.Logger; - -public class PortalRegistrationUpdatePage extends - AbstractPublicPortalRegistrationPage implements Serializable { - /** - * - */ - private static final long serialVersionUID = -3639991850557070723L; - - /** - * Logger for this class - */ - private static final Logger logger = Logger - .getLogger(PortalRegistrationUpdatePage.class); - - public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; - - public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; - - public static final String userSecretQuestion_TRequiredValidator = null; - - public static final String userSecretQuestion_lengthValidator = "maximum=100"; - - public static final String userSecretAnswer_TRequiredValidator = null; - - public static final String userSecretAnswer_lengthValidator = "maximum=100"; - - public Class doFinish() { - try { - if (!PALAdminConstants.SECRET_ANSWER_DISPLAY - .equals(getUserSecretAnswer())) { - setUserSecretAnswer(getUserRegistrationService() - .getMessageDigest(getUserSecretAnswer())); - } - getUserRegistrationService().update(this); - FacesMessageUtil.addInfoMessage("updated.user.info"); - return PortalRegistrationUpdatePage.class; - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0001", new Object[] { this.toString() }, e); - } - return null; - } - - public Class initialize() { - return null; - } - - public Class prerender() { - try { - getUserRegistrationService().loadPage(this); - setUserSecretAnswer(PALAdminConstants.SECRET_ANSWER_DISPLAY); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0001", new Object[] { this.toString() }, e); - } - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,60 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -import org.seasar.framework.log.Logger; - -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - -public class PublicPortalForgottenPasswordCompletedPage extends - AbstractResetPasswordPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -5203115307227054989L; - - /** - * Logger for this class - */ - private static final Logger logger = Logger - .getLogger(ResetPasswordPage.class); - - public Class initialize() { - return null; - } - - public Class prerender() { - if (getGuid() != null) { - try { - getUserRegistrationService().updatePassword(this); - FacesMessageUtil - .addInfoMessage("forgotten.successful_pw_update"); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0003", new Object[] { this.toString() }, e); - } - } - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,59 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import javax.faces.context.FacesContext; - -import jp.sf.pal.common.util.FacesMessageUtil; - -public class PublicPortalForgottenPasswordPage extends - AbstractForgottenPasswordPage { - - /** - * - */ - private static final long serialVersionUID = 362540675380114688L; - - public static final String email_TRequiredValidator = null; - - public static final String email_lengthValidator = "minimum=5, maximum=80"; - - public Class doNext() { - //TODO check email - return PublicPortalSecretAnswerPage.class; - } - - public Class initialize() { - return null; - } - - public Class prerender() { - setGuid((String) FacesContext.getCurrentInstance().getExternalContext() - .getRequestParameterMap().get("guid")); - if (getGuid() != null) { - return PublicPortalForgottenPasswordCompletedPage.class; - } - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - - public String getDoNextValue() { - return getLabelHelper().getLabelValue("Next"); - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,39 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -import jp.sf.pal.common.util.FacesMessageUtil; - -public class PublicPortalRegistrationCompletedPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -5112166307058162379L; - - public Class initialize() { - return null; - } - - public Class prerender() { - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,251 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jp.sf.pal.admin.PALAdminConstants; -import jp.sf.pal.admin.util.PALAdminUtil; -import jp.sf.pal.admin.util.UserRegistrationUtil; -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - -import org.seasar.framework.log.Logger; - -public class PublicPortalRegistrationRegisterPage extends - AbstractPublicPortalRegistrationPage { - /** - * - */ - private static final long serialVersionUID = 5818687558352917312L; - - /** - * Logger for this class - */ - private static final Logger logger = Logger - .getLogger(PublicPortalRegistrationRegisterPage.class); - - public static final String userName_TRequiredValidator = null; - - public static final String userName_lengthValidator = "minimum=6, maximum=32"; - - public static final String userName_TRegularExpressionValidator = "pattern='[a-zA-Z][0-9a-zA-Z._]+'"; - - public static final String userNameFamily_TRequiredValidator = null; - - public static final String userNameFamily_lengthValidator = " maximum=30"; - - public static final String userNameGiven_TRequiredValidator = null; - - public static final String userNameGiven_lengthValidator = "maximum=30"; - - public static final String userNameFamilyYomi_TRequiredValidator = null; - - public static final String userNameFamilyYomi_lengthValidator = " maximum=30"; - - public static final String userNameGivenYomi_TRequiredValidator = null; - - public static final String userNameGivenYomi_lengthValidator = "maximum=30"; - - public static final String userHomeInfoPostalPostalcode_TRequiredValidator = null; - - public static final String userHomeInfoPostalPostalcode_lengthValidator = "maximum=8"; - - public static final String userGender_TRequiredValidator = null; - - public static final String userBdateYear_TRequiredValidator = null; - - public static final String userBdateYear_TNumberLengthValidator = "integralMax=4"; - - public static final String userBdateMonth_TRequiredValidator = null; - - public static final String userBdateMonth_TNumberLengthValidator = "integralMax=2"; - - public static final String userBdateDate_TRequiredValidator = null; - - public static final String userBdateDate_TNumberLengthValidator = "integralMax=2"; - - public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; - - public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; - - public static final String userIndustry_TRequiredValidator = null; - - public static final String userJobtitle_TRequiredValidator = null; - - // public static final String userSecretQuestion_TRequiredValidator = null; - - public static final String userSecretQuestion_lengthValidator = "maximum=100"; - - public static final String userSecretAnswer_TRequiredValidator = null; - - public static final String userSecretAnswer_lengthValidator = "maximum=100"; - - private String userSecretQuestionSelection; - - private List> userSecretQuestionSelectionItems; - - private int userSecretQuestionSelectionIndex; - - /** - * @return the userSecretQuestionSelection - */ - public String getUserSecretQuestionSelection() { - return userSecretQuestionSelection; - } - - /** - * @param userSecretQuestionSelection the userSecretQuestionSelection to set - */ - public void setUserSecretQuestionSelection( - String userSecretQuestionSelection) { - this.userSecretQuestionSelection = userSecretQuestionSelection; - } - - /** - * @return the userSecretQuestionSelectionItems - */ - public List> getUserSecretQuestionSelectionItems() { - return userSecretQuestionSelectionItems; - } - - /** - * @param userSecretQuestionSelectionItems the userSecretQuestionSelectionItems to set - */ - public void setUserSecretQuestionSelectionItems( - List> userSecretQuestionSelectionItems) { - this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems; - } - - /** - * @return the userSecretQuestionSelectionIndex - */ - public int getUserSecretQuestionSelectionIndex() { - return userSecretQuestionSelectionIndex; - } - - /** - * @param userSecretQuestionSelectionIndex the userSecretQuestionSelectionIndex to set - */ - public void setUserSecretQuestionSelectionIndex( - int userSecretQuestionSelectionIndex) { - this.userSecretQuestionSelectionIndex = userSecretQuestionSelectionIndex; - } - - public Class doFinish() { - if (getUserBusinessInfoOnlineEmail() != null) { - setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail()); - } - - if (userSecretQuestionSelection != null) { - setUserSecretQuestion(userSecretQuestionSelection); - } - - try { - setUserSecretAnswer(getUserRegistrationService().getMessageDigest( - getUserSecretAnswer())); - getUserRegistrationService().register(this); - if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) { - FacesMessageUtil.addInfoMessage("success.check_your_email"); - return PublicPortalRegistrationCompletedPage.class; - } else { - FacesMessageUtil.addInfoMessage("success.login_above"); - } - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0001", new Object[] { this.toString() }, e); - - } - - return null; - } - - public Class initialize() { - return null; - } - - public Class prerender() { - // Load Term Of Service - String filename = getLabelHelper().getLabelValue("termOfServiceFile"); - if (filename == null) { - filename = "/WEB-INF/template/term_of_service.txt"; - } - String encoding = getLabelHelper().getLabelValue( - "termOfServiceEncoding"); - if (encoding == null) { - encoding = "UTF-8"; - } - StringBuffer buf = new StringBuffer(); - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader( - new FileInputStream(PALAdminUtil - .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) { - } - } - } - setTermOfService(buf.toString()); - - // Load Secret Question - List> questionItems = new ArrayList>(); - int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue( - "secretQuestion.num")); - for (int i = 1; i <= numOfQuestions; i++) { - Map map = new HashMap(2); - String value = getLabelHelper() - .getLabelValue("secretQuestion." + i); - map.put("label", value); - map.put("value", value); - questionItems.add(map); - } - setUserSecretQuestionSelectionItems(questionItems); - - // reset secret answer - setUserSecretAnswer(""); - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,128 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -import jp.sf.pal.admin.PALAdminConstants; -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - -import org.seasar.framework.log.Logger; - -public class PublicPortalRegistrationUpdatePage extends - AbstractPublicPortalRegistrationPage implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -2415175365437526156L; - - /** - * Logger for this class - */ - private static final Logger logger = Logger - .getLogger(PublicPortalRegistrationUpdatePage.class); - - public static final String userName_TRequiredValidator = null; - - public static final String userName_lengthValidator = "minimum=6, maximum=32"; - - public static final String userNameFamily_TRequiredValidator = null; - - public static final String userNameFamily_lengthValidator = " maximum=30"; - - public static final String userNameGiven_TRequiredValidator = null; - - public static final String userNameGiven_lengthValidator = "maximum=30"; - - public static final String userNameFamilyYomi_TRequiredValidator = null; - - public static final String userNameFamilyYomi_lengthValidator = " maximum=30"; - - public static final String userNameGivenYomi_TRequiredValidator = null; - - public static final String userNameGivenYomi_lengthValidator = "maximum=30"; - - public static final String userHomeInfoPostalPostalcode_TRequiredValidator = null; - - public static final String userHomeInfoPostalPostalcode_lengthValidator = "maximum=8"; - - public static final String userGender_TRequiredValidator = null; - - public static final String userBdateYear_TRequiredValidator = null; - - public static final String userBdateYear_TNumberLengthValidator = "integralMax=4"; - - public static final String userBdateMonth_TRequiredValidator = null; - - public static final String userBdateMonth_TNumberLengthValidator = "integralMax=2"; - - public static final String userBdateDate_TRequiredValidator = null; - - public static final String userBdateDate_TNumberLengthValidator = "integralMax=2"; - - public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; - - public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; - - public static final String userIndustry_TRequiredValidator = null; - - public static final String userJobtitle_TRequiredValidator = null; - - public static final String userSecretQuestion_TRequiredValidator = null; - - public static final String userSecretQuestion_lengthValidator = "maximum=100"; - - public static final String userSecretAnswer_TRequiredValidator = null; - - public static final String userSecretAnswer_lengthValidator = "maximum=100"; - - public Class doFinish() { - try { - if (!PALAdminConstants.SECRET_ANSWER_DISPLAY - .equals(getUserSecretAnswer())) { - setUserSecretAnswer(getUserRegistrationService() - .getMessageDigest(getUserSecretAnswer())); - } - getUserRegistrationService().update(this); - FacesMessageUtil.addInfoMessage("updated.user.info"); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0001", new Object[] { this.toString() }, e); - } - return null; - } - - public Class initialize() { - return null; - } - - public Class prerender() { - try { - getUserRegistrationService().loadPage(this); - setUserSecretAnswer(PALAdminConstants.SECRET_ANSWER_DISPLAY); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0001", new Object[] { this.toString() }, e); - } - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - -} Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2008-04-26 22:50:43 UTC (rev 891) @@ -1,134 +0,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. - */ -package jp.sf.pal.admin.web.registration; - -import java.io.Serializable; - -import javax.faces.context.FacesContext; - -import jp.sf.pal.admin.PALAdminConstants; -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; - -public class PublicPortalSecretAnswerPage extends AbstractForgottenPasswordPage - implements Serializable { - /** - * - */ - private static final long serialVersionUID = -3654426468628202950L; - - /** - * Logger for this class - */ - private static final Logger logger = Logger - .getLogger(PublicPortalSecretAnswerPage.class); - - private String userSecretAnswer; - - private String userSecretQuestion; - - public String getUserSecretAnswer() { - return userSecretAnswer; - } - - public void setUserSecretAnswer(String userSecretAnswer) { - this.userSecretAnswer = userSecretAnswer; - } - - public String getUserSecretQuestion() { - return userSecretQuestion; - } - - public void setUserSecretQuestion(String userSecretQuestion) { - this.userSecretQuestion = userSecretQuestion; - } - - public Class doFinish() { - try { - if (!PALAdminConstants.SECRET_ANSWER_DISPLAY - .equals(getUserSecretAnswer())) { - setUserSecretAnswer(getUserRegistrationService() - .getMessageDigest(getUserSecretAnswer())); - } - if (getUserRegistrationService().checkSecretAnswer(this)) { - try { - getUserRegistrationService().sendNewPassword(this); - FacesMessageUtil.addInfoMessage("an_email_has_been_sent"); - return PublicPortalForgottenPasswordCompletedPage.class; - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log("EPA0002", new Object[] { this.toString() }, e); - setUserSecretAnswer(null); - } - - } else { - FacesMessageUtil.addInfoMessage("incorrect.scret.answer"); - setUserSecretAnswer(null); - } - } catch (CommonException e) { - // FacesMessageUtil.addErrorMessage(e.getMessageId()); - FacesMessageUtil.addInfoMessage("incorrect.scret.answer"); - logger.log("EPA0002", new Object[] { this.toString() }, e); - setUserSecretAnswer(null); - } - return null; - } - - @TakeOver(type = TakeOverType.NEVER) - public Class doBack() { - return PublicPortalForgottenPasswordPage.class; - } - - public Class initialize() { - return null; - } - - public Class prerender() { - setGuid((String) FacesContext.getCurrentInstance().getExternalContext() - .getRequestParameterMap().get("guid")); - if (getGuid() != null) { - return PublicPortalForgottenPasswordCompletedPage.class; - } - - if (getEmail() == null) { - return PublicPortalForgottenPasswordPage.class; - } - - try { - getUserRegistrationService().setSecretQuestion(this); - } catch (CommonException e) { - logger.log("EPA0005", new Object[] { this.toString() }, e); - // return PublicPortalForgottenPasswordPage.class; - } - - // render FacesMessage - FacesMessageUtil.renderMessages(); - return null; - } - - public String getDoFinishValue() { - return getLabelHelper().getLabelValue("Finish"); - } - - public String getDoBackValue() { - return getLabelHelper().getLabelValue("Back"); - } - -} Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties =================================================================== Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties 2008-04-26 22:50:43 UTC (rev 891) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u9000\u4f1a\u7533\u8acb -javax.portlet.short-title=\u9000\u4f1a -javax.portlet.keywords=\u9000\u4f1a,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 - Modified: pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2008-04-26 22:50:43 UTC (rev 891) @@ -26,28 +26,6 @@ true - UserRegistrationPortlet - public-view - true - true - - - PublicPortalForgottenPasswordPortlet - public-view - true - true - - - PublicPortalRegistrationPortlet - public-view - true - true - - - PublicPortalRegistrationUpdatePortlet - public-view - - SiteEditorPortlet AEUV true Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-04-26 22:50:43 UTC (rev 891) @@ -204,159 +204,6 @@ - Provides users with the ability register as a new user with the public portal. - ポータルの新規登録する機能を提供します。 - PublicPortalRegistrationPortlet - Registration For Public Portal - 一般公開用ユーザー登録 - org.apache.portals.bridges.portletfilter.FilterPortlet - - portlet-class - org.seasar.teeda.core.portlet.FacesPortlet - - - portlet-filters - jp.sf.pal.admin.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/registration/publicPortalRegistrationRegister.html - - - This option will generate a new password for each user registration - jp.sf.pal.admin.ForceGeneratedPassword - true - - - This option will force email address to be system wide unique - jp.sf.pal.admin.ForceUniqueEmail - true - - - This option will use the email address as the username - jp.sf.pal.admin.ForceUseEmailAsUsername - false - - - This is the template in which you setup an email to be sent after user exists - jp.sf.pal.admin.EmailTemplateLocation - /WEB-INF/template/userreg/ - - - This is the template in which you setup an email to be sent after user exists - jp.sf.pal.admin.EmailTemplateName - userRegistrationEmail.vm - - - Profiling rules to be assigned at registration. - jp.sf.pal.admin.RuleNames - page - - - Profiling rules to be assigned at registration. - jp.sf.pal.admin.RuleValues - j2 - - - Profiling rules to be assigned at registration. - jp.sf.pal.admin.SendMail - true - - 0 - - text/html - VIEW - - en - ja - jp.sf.pal.admin.resources.UserRegistration - - User Registration - Registration - Registration - - - - Provides users with the ability to request a new password to be sent to their email address. - ユーザーに新規パスワードをメールアドレスに送信要求をする機能を提供します。 - PublicPortalForgottenPasswordPortlet - Forgotten Password for Public Portal - 一般公開用パスワード再発行 - org.apache.portals.bridges.portletfilter.FilterPortlet - - portlet-class - org.seasar.teeda.core.portlet.FacesPortlet - - - portlet-filters - jp.sf.pal.admin.filter.ForgottenPasswordFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter - - - view-page - /view/registration/publicPortalForgottenPassword.html - - - This is the template in which you setup an email to be sent after user exists - jp.sf.pal.admin.EmailTemplateLocation - /WEB-INF/template/userreg/ - - - This is the template in which you setup an email to be sent after user exists - jp.sf.pal.admin.EmailTemplateName - forgottenPasswdEmail.vm - - - jp.sf.pal.admin.ReturnPath - /forgot.psml - - 0 - - text/html - VIEW - - en - ja - jp.sf.pal.admin.resources.ForgottenPassword - - Forgotten Password - Forgotten Password - tools,users,password,forgotten,lost,passwd - - - - Provides features for changing user information of the current, logged on user. - 現在ログインしているユーザーの情報を変更するための機能を提供します。 - PublicPortalRegistrationUpdatePortlet - Update User Information for Public Portal - 一般公開用ユーザー更新 - org.apache.portals.bridges.portletfilter.FilterPortlet - - portlet-class - org.seasar.teeda.core.portlet.FacesPortlet - - - portlet-filters - jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter - - - view-page - /view/registration/publicPortalRegistrationUpdate.html - - 0 - - text/html - VIEW - - en - ja - jp.sf.pal.admin.resources.UserRegistrationUpdate - - Update User Information - Information Update - Update - - - Provides features for managing a site configuration. サイトを管理する機能を提供します。 SiteEditorPortlet @@ -390,153 +237,6 @@ - Provides users with the ability register as a new user with a portal. - ポータルの新規登録する機能を提供します。 - PortalRegistrationPortlet - Registration For Portal - ポータルユーザー登録 - org.apache.portals.bridges.portletfilter.FilterPortlet - - portlet-class - org.seasar.teeda.core.portlet.FacesPortlet - - - portlet-filters - jp.sf.pal.admin.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/registration/portalRegistrationRegister.html - - - This option will generate a new password for each user registration - jp.sf.pal.admin.ForceGeneratedPassword - true - - - This option will force email address to be system wide unique - jp.sf.pal.admin.ForceUniqueEmail - true - - - This option will use the email address as the username - jp.sf.pal.admin.ForceUseEmailAsUsername - false - - - This is the template in which you setup an email to be sent after user exists - jp.sf.pal.admin.EmailTemplateLocation - /WEB-INF/template/userreg/ - - - This is the template in which you setup an email to be sent after user exists - jp.sf.pal.admin.EmailTemplateName - userRegistrationEmail.vm - - - Profiling rules to be assigned at registration. - jp.sf.pal.admin.RuleNames - page - - - Profiling rules to be assigned at registration. - jp.sf.pal.admin.RuleValues - j2 - - - Profiling rules to be assigned at registration. - jp.sf.pal.admin.SendMail - true - - 0 - - text/html - VIEW - - en - ja - jp.sf.pal.admin.resources.UserRegistration - - User Registration - Registration - Registration - - - - Provides features for changing user information of the current, logged on user. - 現在ログインしているユーザーの情報を変更するための機能を提供します。 - PortalRegistrationUpdatePortlet - Update User Information for Portal - ポータルユーザー更新 - org.apache.portals.bridges.portletfilter.FilterPortlet - - portlet-class - org.seasar.teeda.core.portlet.FacesPortlet - - - portlet-filters - jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter - - - view-page - /view/registration/portalRegistrationUpdate.html - - 0 - - text/html - VIEW - - en - ja - jp.sf.pal.admin.resources.UserRegistrationUpdate - - Update User Information - Information Update - Update - - - - Provides features for a withdrawal from portal. - ポータル上から退会するための機能を提供します。 - PublicPortalWithdrawalPortlet - User Withdrawal - ユーザー退会 - org.apache.portals.bridges.portletfilter.FilterPortlet - - portlet-class - org.seasar.teeda.core.portlet.FacesPortlet - - - portlet-filters - jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter - - - view-page - /view/withdraw/publicPortalWithdrawal.html - - - jp.sf.pal.admin.withdraw.RemoveUser - true - - - jp.sf.pal.admin.withdraw.RemoveUserFolder - true - - 0 - - text/html - VIEW - - en - ja - jp.sf.pal.admin.resources.PublicPortalWithdrawal - - Withdrawal - Withdrawal - Withdrawal - - - Provides features for managing permissions. パーミッションを管理する機能を提供します。 PermissionEditor Deleted: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html 2008-04-26 22:50:43 UTC (rev 891) @@ -1,23 +0,0 @@ - - - - - - - - -
- -
- -
- -
- -
- -
- - Deleted: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html 2008-04-26 22:50:43 UTC (rev 891) @@ -1,148 +0,0 @@ - - - - - - - - -
- -
- -
- -
- * - -
-
- -
-
- - - - - - - - - - - - -
*: - - - -
- -
-
-
-
- -
-
    -
  • - -
  • -
  • - -
  • -
-
-
-
- -
-
- - - - - - - - -
*: - - - -
-
-
-
- -
-
    -
  • - -
  • -
-
-
-
- -
-
- - - - - - - - - - - - - - - - -
- *: - - -
- - - -
-
- *: - - -
-
-
-
- -
-
    -
  • - -
  • -
-
-
-
- -
-
- -
-
-
-
- -
-
- - Deleted: pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html 2008-04-26 22:50:43 UTC (rev 891) @@ -1,128 +0,0 @@ - - - - - - - - -
- -
- -
- -
- * - -
-
- -
-
- - - - - - - - - - - - -
: - - - -
: - - -
-
-
-
- -
-
    -
  • - -
  • -
  • - -
  • -
-
-
-
- -
-
- - - - - - - - -
*: - - - -
-
-
-
- -
-
    -
  • - -
  • -
-
-
-
- -
-
- - - - - - - - - - - - -
*: - - -
*: - - -
-
-
-
- -
-
    -
  • - -
  • -
-
-
-
- -
-
- - Deleted: pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2008-04-25 22:13:49 UTC (rev 890) +++ pal-admin/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2008-04-26 22:50:43 UTC (rev 891) @@ -1,327 +0,0 @@ - - - - - - - - -
- -
- -
- -
- * - -
-
- -
-
- - - - - - - - - - - - -
*: - - - -
- -
-
-
-
- -
-
    -
  • - -
  • -
  • - -
  • -
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
*: - - - - - -
*: - - - - - -
*: - - - -
- -
*: - - - - - - - -
*: - - - - - - - -
*: - - - -
*: - - - - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
-
-
*: - - - - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
- - -
-
-
-
-
-
- -
-
    -
  • - -
  • -
  • - -
  • -
  • - -
  • -
-
-
-
- -
-
- - - - - - - - - - - - - - - - -
- *: - - -
- - - -
-
- *: - - -
-
-
-
- -
-
    -
  • - -
  • -
-
-
-
- -
-
- -
-
-
-
- -
-
- - From svnnotify @ sourceforge.jp Sun Apr 27 07:52:03 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 27 Apr 2008 07:52:03 +0900 Subject: [pal-cvs 3156] [892] updated eclipse file. Message-ID: <1209250323.792324.21415.nullmailer@users.sourceforge.jp> Revision: 892 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=892 Author: shinsuke Date: 2008-04-27 07:52:03 +0900 (Sun, 27 Apr 2008) Log Message: ----------- updated eclipse file. Modified Paths: -------------- pal-admin/trunk/.classpath -------------- next part -------------- Modified: pal-admin/trunk/.classpath =================================================================== --- pal-admin/trunk/.classpath 2008-04-26 22:50:43 UTC (rev 891) +++ pal-admin/trunk/.classpath 2008-04-26 22:52:03 UTC (rev 892) @@ -7,30 +7,29 @@ + + + - - + - - - - + + + - - - + - + From svnnotify @ sourceforge.jp Mon Apr 28 09:19:26 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 28 Apr 2008 09:19:26 +0900 Subject: [pal-cvs 3157] [893] version 1.0 Message-ID: <1209341966.257431.20189.nullmailer@users.sourceforge.jp> Revision: 893 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=893 Author: shinsuke Date: 2008-04-28 09:19:26 +0900 (Mon, 28 Apr 2008) Log Message: ----------- version 1.0 Added Paths: ----------- pal-admin/tags/pal-admin-1.0/ -------------- next part -------------- Copied: pal-admin/tags/pal-admin-1.0 (from rev 892, pal-admin/trunk) From svnnotify @ sourceforge.jp Mon Apr 28 17:41:20 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 28 Apr 2008 17:41:20 +0900 Subject: [pal-cvs 3158] [894] separated from pal-admin. Message-ID: <1209372080.973281.13283.nullmailer@users.sourceforge.jp> Revision: 894 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=894 Author: shinsuke Date: 2008-04-28 17:41:20 +0900 (Mon, 28 Apr 2008) Log Message: ----------- separated from pal-admin. Added Paths: ----------- pal-admin-ex/ -------------- next part -------------- From svnnotify @ sourceforge.jp Mon Apr 28 17:41:28 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 28 Apr 2008 17:41:28 +0900 Subject: [pal-cvs 3159] [895] created trunk Message-ID: <1209372088.456316.13400.nullmailer@users.sourceforge.jp> Revision: 895 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=895 Author: shinsuke Date: 2008-04-28 17:41:28 +0900 (Mon, 28 Apr 2008) Log Message: ----------- created trunk Added Paths: ----------- pal-admin-ex/trunk/ -------------- next part -------------- From svnnotify @ sourceforge.jp Mon Apr 28 17:45:08 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 28 Apr 2008 17:45:08 +0900 Subject: [pal-cvs 3160] [896] separated from pal-admin. Message-ID: <1209372308.829438.16450.nullmailer@users.sourceforge.jp> Revision: 896 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=896 Author: shinsuke Date: 2008-04-28 17:45:08 +0900 (Mon, 28 Apr 2008) Log Message: ----------- separated from pal-admin. Added Paths: ----------- pal-admin-ex/trunk/.classpath pal-admin-ex/trunk/.project pal-admin-ex/trunk/.settings/ pal-admin-ex/trunk/.settings/org.eclipse.core.resources.prefs pal-admin-ex/trunk/.settings/org.eclipse.jdt.core.prefs pal-admin-ex/trunk/.settings/org.eclipse.jdt.ui.prefs pal-admin-ex/trunk/.settings/org.seasar.dolteng.eclipse.prefs pal-admin-ex/trunk/LICENSE.TXT pal-admin-ex/trunk/NOTICE.txt pal-admin-ex/trunk/pom.xml pal-admin-ex/trunk/src/ pal-admin-ex/trunk/src/main/ pal-admin-ex/trunk/src/main/java/ pal-admin-ex/trunk/src/main/java/jp/ pal-admin-ex/trunk/src/main/java/jp/sf/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/service/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java pal-admin-ex/trunk/src/main/resources/ pal-admin-ex/trunk/src/main/resources/PAMessages.properties pal-admin-ex/trunk/src/main/resources/app.dicon pal-admin-ex/trunk/src/main/resources/appMessages.properties pal-admin-ex/trunk/src/main/resources/appMessages_ja.properties pal-admin-ex/trunk/src/main/resources/app_aop.dicon pal-admin-ex/trunk/src/main/resources/convention.dicon pal-admin-ex/trunk/src/main/resources/creator.dicon pal-admin-ex/trunk/src/main/resources/customizer.dicon pal-admin-ex/trunk/src/main/resources/env.txt pal-admin-ex/trunk/src/main/resources/jdbc.dicon pal-admin-ex/trunk/src/main/resources/jp/ pal-admin-ex/trunk/src/main/resources/jp/sf/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/label.properties pal-admin-ex/trunk/src/main/resources/s2container.dicon pal-admin-ex/trunk/src/main/resources/teedaCustomize.dicon pal-admin-ex/trunk/src/main/resources/teedaErrorPage.dicon pal-admin-ex/trunk/src/main/webapp/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/faces-config.xml pal-admin-ex/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml pal-admin-ex/trunk/src/main/webapp/WEB-INF/portlet.xml pal-admin-ex/trunk/src/main/webapp/WEB-INF/sun-web.xml pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/forgottenPasswdEmail.vm pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/forgottenPasswdEmail.vm pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/userRegistrationEmail.vm pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm pal-admin-ex/trunk/src/main/webapp/WEB-INF/web.xml pal-admin-ex/trunk/src/main/webapp/WEB-INF/weblogic.xml pal-admin-ex/trunk/src/main/webapp/css/ pal-admin-ex/trunk/src/main/webapp/css/global.css pal-admin-ex/trunk/src/main/webapp/images/ pal-admin-ex/trunk/src/main/webapp/view/ pal-admin-ex/trunk/src/main/webapp/view/error/ pal-admin-ex/trunk/src/main/webapp/view/error/error.html pal-admin-ex/trunk/src/main/webapp/view/registration/ pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html pal-admin-ex/trunk/src/main/webapp/view/withdraw/ pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html -------------- next part -------------- Added: pal-admin-ex/trunk/.classpath =================================================================== --- pal-admin-ex/trunk/.classpath (rev 0) +++ pal-admin-ex/trunk/.classpath 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: pal-admin-ex/trunk/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/.project =================================================================== --- pal-admin-ex/trunk/.project (rev 0) +++ pal-admin-ex/trunk/.project 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,18 @@ + + pal-admin-ex + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + 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 Property changes on: pal-admin-ex/trunk/.project ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/.settings/org.eclipse.core.resources.prefs =================================================================== --- pal-admin-ex/trunk/.settings/org.eclipse.core.resources.prefs (rev 0) +++ pal-admin-ex/trunk/.settings/org.eclipse.core.resources.prefs 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,3 @@ +#Fri Nov 24 23:23:40 JST 2006 +eclipse.preferences.version=1 +encoding/=UTF-8 Added: pal-admin-ex/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- pal-admin-ex/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ pal-admin-ex/trunk/.settings/org.eclipse.jdt.core.prefs 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,261 @@ +#Fri Jul 13 14:57:56 JST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 +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: pal-admin-ex/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- pal-admin-ex/trunk/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ pal-admin-ex/trunk/.settings/org.eclipse.jdt.ui.prefs 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,4 @@ +#Fri Jul 13 14:57:56 JST 2007 +eclipse.preferences.version=1 +formatter_profile=_Seasar +formatter_settings_version=11 Added: pal-admin-ex/trunk/.settings/org.seasar.dolteng.eclipse.prefs =================================================================== --- pal-admin-ex/trunk/.settings/org.seasar.dolteng.eclipse.prefs (rev 0) +++ pal-admin-ex/trunk/.settings/org.seasar.dolteng.eclipse.prefs 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,12 @@ +#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=/pal-admin +WebContentsRoot=src/main/webapp/ +eclipse.preferences.version=1 Added: pal-admin-ex/trunk/LICENSE.TXT =================================================================== --- pal-admin-ex/trunk/LICENSE.TXT (rev 0) +++ pal-admin-ex/trunk/LICENSE.TXT 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,190 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2004 The Apache Software Foundation + Added: pal-admin-ex/trunk/NOTICE.txt =================================================================== --- pal-admin-ex/trunk/NOTICE.txt (rev 0) +++ pal-admin-ex/trunk/NOTICE.txt 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,3 @@ +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + Property changes on: pal-admin-ex/trunk/NOTICE.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/pom.xml =================================================================== --- pal-admin-ex/trunk/pom.xml (rev 0) +++ pal-admin-ex/trunk/pom.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,329 @@ + + + 4.0.0 + jp.sf.pal + pal-admin-ex + 0.1 + war + Administration Extension Tools for PAL Portal + + 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:svn:http://svn.sourceforge.jp/svnroot/pal/pal-admin-ex/trunk/ + scm:svn:svn+ssh://${username}@svn.sourceforge.jp/svnroot/pal/pal-admin-ex/trunk/ + http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi/pal-admin-ex/trunk/?root=pal + + + Portal Application Laboratory + http://pal.sourceforge.jp/ + + + pal-admin-ex + validate + + + + maven-compiler-plugin + + 1.5 + 1.5 + UTF-8 + + + + maven-deploy-plugin + + true + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0-SNAPSHOT + + + + clean + + + + + + + + + maven-source-plugin + + + source-jar + package + + jar + + + + + + + + + + maven2.marevol.com + Maven2 Repository on marevol.com + 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 + + + + + + javax.servlet + servlet-api + 2.3 + provided + + + portlet-api + portlet-api + 1.0 + provided + + + org.seasar.teeda + teeda-core + 1.0.13 + + + org.seasar.teeda + teeda-extension + 1.0.13 + + + org.seasar.teeda + teeda-ajax + + + + + org.seasar.teeda + teeda-tiger + 1.0.13 + + + org.apache.geronimo.specs + geronimo-ejb_2.1_spec + 1.0 + + + org.seasar.portlet + s2-portlet + 1.0.7 + + + org.apache.portals.bridges + portals-bridges-portletfilter + 1.0.4 + + + logkit + logkit + + + avalon-framework + avalon-framework + + + javax.servlet + servlet-api + + + log4j + log4j + + + + + jp.sf.pal + faces-response-filter + 0.2 + + + jp.sf.pal + common-utils + 0.3 + + + jp.sf.pal + portlet-output-optimizer + 0.2 + + + + commons-lang + commons-lang + 2.4 + + + + xerces + xercesImpl + 2.6.2 + + + xerces + xmlParserAPIs + 2.6.2 + + + + org.apache.portals.jetspeed-2 + jetspeed-api + 2.1.3_pal-1.0.3 + + provided + + + + org.apache.portals.jetspeed-2 + jetspeed-locator + 2.1.3_pal-1.0.3 + + + org.apache.pluto + pluto + 1.0.1 + + provided + + + + org.seasar.container + s2-framework + 2.4.24 + + + org.seasar.container + s2-extension + 2.4.24 + + + log4j + log4j + + + + + org.seasar.container + s2-tiger + 2.4.24 + + + org.easymock + easymock + + + + + junit + junit + 3.8.1 + test + + + + + + maven-project-info-reports-plugin + + + org.codehaus.mojo + changelog-maven-plugin + + + org.codehaus.mojo + taglist-maven-plugin + + + FIXME + TODO + XXX + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0-SNAPSHOT + + + + Property changes on: pal-admin-ex/trunk/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,213 @@ +/* + * 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; + +import org.apache.jetspeed.om.folder.Folder; + +public class PALAdminConstants { + public static final boolean DEBUG = false; + + public static final String PREFIX = "jp.sf.pal.admin."; + + public static final String ITEM_LABEL = "label"; + + public static final String ITEM_VALUE = "value"; + + public static final String TRUE = "true"; + + public static final String CPS_SECURITY_PROVIDER_COMPONENT = "cps:SecurityProvider"; + + public static final String SECURITY_PROVIDER_COMPONENT = PREFIX + + "SecurityProvider"; + + public static final String PORTAL_ADMINISTRATION_COMPONENT = PREFIX + + "PortalAdministration"; + + public static final String USER_MANAGER_COMPONENT = PREFIX + "UserManager"; + + public static final String ROLE_MANAGER_COMPONENT = PREFIX + "RoleManager"; + + public static final String GROUP_MANAGER_COMPONENT = PREFIX + + "GroupManager"; + + public static final String PROFILER_COMPONENT = PREFIX + "Profiler"; + + public static final String PAGE_MANAGER_COMPONENT = PREFIX + "PageManager"; + + public static final String APPLICATION_SERVER_MANAGER_COMPONENT = PREFIX + + "ApplicationServerManager"; + + public static final String PORTLET_REGISTRY_COMPONENT = PREFIX + + "PortletRegistry"; + + public static final String PERMISSION_MANAGER_COMPONENT = PREFIX + + "PermissionManager"; + + public static final String PORTLET_ENTITY_ACCESS_COMPONENT = PREFIX + + "PortletEntityAccess"; + + public static final String PORTLET_WINDOW_ACCESSOR_COMPONENT = PREFIX + + "PortletWindowAccessor"; + + public static final String SECURITY_ACCESS_CONTROLLER_COMPONENT = PREFIX + + "SecurityAccessController"; + + public static final String PORTLET_FACTORY_COMPONENT = PREFIX + + "PortletFactory"; + + public static final String DEPLOYMENT_MANAGER_COMPONENT = PREFIX + + "DeploymentManager"; + + public static final String DECORATION_FACTORY_COMPONENT = PREFIX + + "DecorationFactory"; + + public static final String AUDIT_ACTIVITY_COMPONENT = PREFIX + + "AuditActivity"; + + public static final String PREVIOUS_PAGE_NUMBER = "previousPageNumber"; + + public static final String NEXT_PAGE_NUMBER = "nextPageNumber"; + + //TODO move to portlet.xml file + public static final int DEFAULT_PAGER_LIMIT_SIZE = 25; + + 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 USER_CREDENTIAL_ACTIVE = PREFIX + "Active"; + + public static final String USER_CREDENTIAL_EXPIRED = PREFIX + "Expired"; + + public static final String USER_CREDENTIAL_EXTEND = PREFIX + "Extend"; + + public static final String USER_CREDENTIAL_EXTEND_UNLIMITED = PREFIX + + "ExtendUnlimited"; + + //TODO move to portlet.xml file + public static final String LOCATOR_PAGE = "page"; + + //TODO move to portlet.xml file + public static final String LOCATOR_MENU = "menu"; + + public static final int PORTLET_APPLICATION_TYPE_WEBAPP = 0; + + public static final int PORTLET_APPLICATION_TYPE_LOCAL = 1; + + public static final int PORTLET_APPLICATION_STATUS_RUNNING = 1; + + public static final int PORTLET_APPLICATION_STATUS_STOPPED = 0; + + public static final String PORTLET_MANAGEMENT_ACTION_START = "start"; + + public static final String PORTLET_MANAGEMENT_ACTION_STOP = "stop"; + + public static final String PORTLET_MANAGEMENT_ACTION_UNDEPLOY = "undeploy"; + + public static final String PORTLET_MANAGEMENT_ACTION_DELETE = "delete"; + + public static final String DEPLOYMENT_STATUS = PREFIX + "DeploymentStatus"; + + public static final String LOCAL_TEMP_FILENAME_PREFIX = "uploadedPortletApplication"; + + public static final String LOCAL_TEMP_FILENAME_SUFFIX = ".war"; + + public static final String PASSWORD = PREFIX + "Password"; + + 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 EMAIL_TEMPLATE_LOCATION = PREFIX + + "EmailTemplateLocation"; + + public static final String EMAIL_TEMPLATE_NAME = PREFIX + + "EmailTemplateName"; + + public static final String TEMPLATE_LOCATOR = PREFIX + "TemplateLocator"; + + public static final String FORCE_UNIQUE_EMAIL = PREFIX + "ForceUniqueEmail"; + + public static final String FORCE_GENERATED_PASSWORD = PREFIX + + "ForceGeneratedPassword"; + + public static final String FORCE_USE_EMAIL_AS_USERNAME = PREFIX + + "ForceUseEmailAsUsername"; + + public static final String SEND_MAIL = PREFIX + "SendMail"; + + public static final String RETURN_PATH = PREFIX + "ReturnPath"; + + public static final String USER_REGISTRATION_PARAMS = PREFIX + + "UserRegistrationParams"; + + public static final String DEFAULT_TEMPLATE_LOCATION = "/WEB-INF/template/userreg/"; + + public static final String DEFAULT_TEMPLATE_NAME = "userRegistrationEmail.vm"; + + public static final String CTX_RETURN_URL = "returnURL"; + + public static final String SEPARATOR = "::"; + + public static final String SECRET_ANSWER_DISPLAY = "*****************"; + + public static final String SECURITY_CONSTRAINT = "securityConstraint"; + + public static final String SECURITY_CONSTRAINTS_REF = "securityConstraintsRef"; + + public static final String SECURITY_CONSTRAINT_NAME = "securityConstraintName"; + + public static final String SECURITY_CONSTRAINT_TYPE = "securityConstraintType"; + + public static final String SECURITY_CONSTRAINT_PERMISSION = "securityConstraintPermission"; + + public static final String SECURITY_CONSTRAINT_ORDER = "applyOrder"; + + public static final String USER_ADMINISTRATION_ACTIVITY = "PAL User Administration"; + + public static final String REMOVE_USER = PREFIX + "withdraw.RemoveUser"; + + public static final String REMOVE_USER_FOLDER = PREFIX + + "withdraw.RemoveUserFolder"; + + public static final String USER_ADMINISTRATION = "PAL User Administration"; + + public static final String PASSWORD_VALIDATOR = "passwordValidator"; + + public static final String PAGE_EXTENSION = ".psml"; + + public static final String FALLBACK_CONTINUE = "continue"; + + public static final String FALLBACK_STOP = "stop"; + + public static final String FALLBACK_LOOP = "loop"; + + public static final String PORTLET_DECORATOR = "portletDecorator"; + + public static final String DEFAULT_PORTLET_DECORATOR = "default"; + + public static final String PAGE_DECORATOR = "pageDecorator"; + + public static final String DEFAULT_PAGE_DECORATOR = "default"; + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,41 @@ +/* + * 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; + +public class PALAdminException extends Exception { + + /** + * serial id + */ + private static final long serialVersionUID = 0L; + + public PALAdminException() { + super(); + } + + public PALAdminException(String message, Throwable cause) { + super(message, cause); + } + + public PALAdminException(String message) { + super(message); + } + + public PALAdminException(Throwable cause) { + super(cause); + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/PALAdminException.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,227 @@ +/* + * 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.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.admin.PALAdminConstants; + +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 DefaultUserRegistrationFilter 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(PALAdminConstants.EMAIL_TEMPLATE_LOCATION); + if (templateLocation == null) { + templateLocation = PALAdminConstants.DEFAULT_TEMPLATE_LOCATION; + } + templateLocation = portletContext.getRealPath(templateLocation); + userRegistrationParams.put(PALAdminConstants.EMAIL_TEMPLATE_LOCATION, + templateLocation); + + String templateName = portletConfig + .getInitParameter(PALAdminConstants.EMAIL_TEMPLATE_NAME); + if (templateName == null) { + templateName = PALAdminConstants.DEFAULT_TEMPLATE_NAME; + } + userRegistrationParams.put(PALAdminConstants.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(PALAdminConstants.TEMPLATE_LOCATOR, + templateLocator); + } catch (FileNotFoundException e) { + throw new PortletException("Could not start the template locator.", + e); + } + } + + public void processActionFilter(ActionRequest request, + ActionResponse response, PortletFilterChain chain) + throws PortletException, IOException { + request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT, + pageManager); + request.setAttribute(PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT, + portalAdministration); + request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PALAdminConstants.USER_REGISTRATION_PARAMS, + userRegistrationParams); + 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.PAGE_MANAGER_COMPONENT, + pageManager); + request.setAttribute(PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT, + portalAdministration); + request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT, + userManager); + request.setAttribute(PALAdminConstants.USER_REGISTRATION_PARAMS, + userRegistrationParams); + request.setAttribute(PALAdminConstants.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; + } + +} \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/DefaultUserRegistrationFilter.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,40 @@ +/* + * 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; +import javax.portlet.PortletException; + +import jp.sf.pal.admin.PALAdminConstants; + +import org.apache.portals.bridges.portletfilter.PortletFilterConfig; + +public class ForgottenPasswordFilter extends DefaultUserRegistrationFilter { + public ForgottenPasswordFilter() { + super(); + } + + public void init(PortletFilterConfig filterConfig) throws PortletException { + super.init(filterConfig); + + PortletConfig portletConfig = filterConfig.getPortletConfig(); + + String returnContextPath = portletConfig + .getInitParameter(PALAdminConstants.RETURN_PATH); + getUserRegistrationParams().put(PALAdminConstants.RETURN_PATH, + returnContextPath); + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/ForgottenPasswordFilter.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,99 @@ +/* + * 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.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.portlet.PortletConfig; +import javax.portlet.PortletException; + +import jp.sf.pal.admin.PALAdminConstants; + +import org.apache.portals.bridges.portletfilter.PortletFilter; +import org.apache.portals.bridges.portletfilter.PortletFilterConfig; + +public class UserRegistrationFilter extends DefaultUserRegistrationFilter + implements PortletFilter { + public UserRegistrationFilter() { + super(); + } + + public void init(PortletFilterConfig filterConfig) throws PortletException { + super.init(filterConfig); + + PortletConfig portletConfig = filterConfig.getPortletConfig(); + + // roles + List roles = getInitParameterList(portletConfig, + PALAdminConstants.ROLES); + getUserRegistrationParams().put(PALAdminConstants.ROLES, roles); + + // groups + List groups = getInitParameterList(portletConfig, + PALAdminConstants.GROUPS); + getUserRegistrationParams().put(PALAdminConstants.GROUPS, groups); + + // rules (name,value pairs) + List names = getInitParameterList(portletConfig, + PALAdminConstants.RULE_NAMES); + List values = getInitParameterList(portletConfig, + PALAdminConstants.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(PALAdminConstants.RULES, rules); + + // user attributes ? + + Boolean forceGeneratedPasswords = Boolean + .valueOf( + portletConfig + .getInitParameter(PALAdminConstants.FORCE_GENERATED_PASSWORD)) + .booleanValue(); + getUserRegistrationParams().put( + PALAdminConstants.FORCE_GENERATED_PASSWORD, + forceGeneratedPasswords); + + Boolean forceEmailAsUsername = Boolean + .valueOf( + portletConfig + .getInitParameter(PALAdminConstants.FORCE_USE_EMAIL_AS_USERNAME)) + .booleanValue(); + getUserRegistrationParams().put( + PALAdminConstants.FORCE_USE_EMAIL_AS_USERNAME, + forceEmailAsUsername); + + Boolean forceEmailsToBeSystemUnique = Boolean + .valueOf( + portletConfig + .getInitParameter(PALAdminConstants.FORCE_UNIQUE_EMAIL)) + .booleanValue(); + if (forceEmailAsUsername) { + // just to be sure + forceEmailsToBeSystemUnique = Boolean.TRUE; + } + getUserRegistrationParams().put(PALAdminConstants.FORCE_UNIQUE_EMAIL, + forceEmailsToBeSystemUnique); + + Boolean sendMail = Boolean.valueOf(portletConfig + .getInitParameter(PALAdminConstants.SEND_MAIL)); + getUserRegistrationParams().put(PALAdminConstants.SEND_MAIL, sendMail); + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/filter/UserRegistrationFilter.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,1294 @@ +/* + * 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; +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.Principal; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.prefs.BackingStoreException; +import java.util.prefs.Preferences; + +import javax.faces.context.FacesContext; +import javax.portlet.PortletConfig; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.security.auth.Subject; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.admin.util.PALAdminUtil; +import jp.sf.pal.admin.util.PortalComponentUtil; +import jp.sf.pal.admin.util.UserRegistrationUtil; +import jp.sf.pal.admin.web.registration.AbstractForgottenPasswordPage; +import jp.sf.pal.admin.web.registration.AbstractPublicPortalRegistrationPage; +import jp.sf.pal.admin.web.registration.AbstractResetPasswordPage; +import jp.sf.pal.admin.web.registration.AbstractUserRegistrationPage; +import jp.sf.pal.admin.web.registration.PublicPortalSecretAnswerPage; +import jp.sf.pal.admin.web.withdraw.PublicPortalWithdrawalConfirmPage; +import jp.sf.pal.common.CommonException; + +import org.apache.jetspeed.JetspeedActions; +import org.apache.jetspeed.PortalReservedParameters; +import org.apache.jetspeed.administration.AdministrationEmailException; +import org.apache.jetspeed.administration.RegistrationException; +import org.apache.jetspeed.audit.AuditActivity; +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.om.folder.FolderNotFoundException; +import org.apache.jetspeed.om.folder.InvalidFolderException; +import org.apache.jetspeed.page.FolderNotRemovedException; +import org.apache.jetspeed.page.FolderNotUpdatedException; +import org.apache.jetspeed.page.PageManager; +import org.apache.jetspeed.page.document.NodeException; +import org.apache.jetspeed.request.RequestContext; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.User; +import org.apache.jetspeed.security.UserManager; +import org.apache.jetspeed.security.UserPrincipal; +import org.seasar.teeda.extension.util.LabelHelper; + +public class UserRegistrationService implements Serializable { + /** + * + */ + private static final long serialVersionUID = 2841077517815298990L; + + private static final String PATH_SEPARATOR = "/"; + + private static final String EMAIL_SUBJECT_USER_REGISTRATION = "email.subject.registration"; + + private static final String EMAIL_SUBJECT_FORGOTTEN_PASSWORD = "email.subject.forgotten.password"; + + private static final String CTX_NEW_PASSWORD = "password"; + + private static final String CTX_USER_NAME = "username"; + + private static final String CTX_RETURN_URL = "returnURL"; + + public String getMessageDigest(String str) throws CommonException { + if (str == null) { + str = ""; + } + // TODO move following params to portlet.xml + String algorithm = "MD5"; + String encoding = "UTF-8"; + 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 void register(AbstractUserRegistrationPage page) + throws CommonException { + + if (!UserRegistrationUtil + .getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD)) { + if (page.getPassword() == null || page.getPassword().equals("")) { + throw new CommonException("error.lacking.password", + "The password is null."); + } + } + + if (UserRegistrationUtil + .getBoolean(PALAdminConstants.FORCE_USE_EMAIL_AS_USERNAME)) { + // force user.name to be same as email + page.setUserName(page.getUserBusinessInfoOnlineEmail()); + } + + boolean userIdExistsFlag = true; + try { + PortalComponentUtil.getUserManager().getUser(page.getUserName()); + } 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(PALAdminConstants.FORCE_UNIQUE_EMAIL)) { + boolean emailExistsFlag = true; + User user = null; + try { + user = PortalComponentUtil.getPortalAdministration() + .lookupUserFromEmail( + page.getUserBusinessInfoOnlineEmail()); + } catch (AdministrationEmailException e) { + emailExistsFlag = false; + } + if ((emailExistsFlag) || (user != null)) { + throw new CommonException("error.email_already_exists", + "The email already exists."); + } + + } + + if (UserRegistrationUtil + .getBoolean(PALAdminConstants.FORCE_GENERATED_PASSWORD)) { + try { + String password = PortalComponentUtil.getPortalAdministration() + .generatePassword(); + page.setPassword(password); + } catch (Exception e) { + throw new CommonException("error.failed_to_add", + "Could not create password.", e); + } + } else { + if (!page.getPassword().equals(page.getVerifyPassword())) { + throw new CommonException("error.two_passwords_do_not_match", + "Two passwords do not match."); + } + } + + // we think we're good to go, let's create the user! + Map userInfo = createUserInfoMap(page); + + try { + PortalComponentUtil.getPortalAdministration() + .registerUser( + page.getUserName(), + page.getPassword(), + UserRegistrationUtil + .getStringList(PALAdminConstants.ROLES), + UserRegistrationUtil + .getStringList(PALAdminConstants.GROUPS), + userInfo, // note use of only + // PLT.D values here. + UserRegistrationUtil + .getStringMap(PALAdminConstants.RULES), + PALAdminConstants.DEFAULT_USER_TEMPLATE_FOLDER); // TODO default template path + } catch (RegistrationException e) { + throw new CommonException("error.failed_to_add", + "Could not register a user.", e); + } + + // set security constraint + String userhome = Folder.USER_FOLDER + page.getUserName(); + PageManager pageManager = PortalComponentUtil.getPageManager(); + SecurityConstraint sc = pageManager.newPageSecurityConstraint(); + sc.setUsers(PALAdminUtil.parseCSVList(page.getUserName())); + List permissions = new ArrayList(); + permissions.add(JetspeedActions.VIEW); + permissions.add(JetspeedActions.EDIT); + permissions.add(JetspeedActions.HELP); + sc.setPermissions(permissions); + Folder userFolder; + try { + userFolder = pageManager.getFolder(userhome); + } catch (FolderNotFoundException e) { + throw new CommonException("could.not.access.folder", + "Could not access a folder: " + userhome, e); + } catch (InvalidFolderException e) { + throw new CommonException("could.not.access.folder", + "Could not access a folder: " + userhome, e); + } catch (NodeException e) { + throw new CommonException("could.not.access.folder", + "Could not access a folder: " + userhome, e); + } + if (userFolder.getSecurityConstraints() == null) { + userFolder.setSecurityConstraints(pageManager + .newSecurityConstraints()); + } + userFolder.getSecurityConstraints().getSecurityConstraints().add(sc); + try { + pageManager.updateFolder(userFolder); + pageManager.reset(); + } catch (FolderNotUpdatedException e) { + //TODO remove user + throw new CommonException("could.not.update.folder", + "Could not update a folder: " + userFolder.getPath(), e); + } catch (NodeException e) { + //TODO remove user + throw new CommonException("could.not.update.folder", + "Could not update a folder: " + userFolder.getPath(), e); + } + + // template + String templ = getTemplatePath(page.getFacesContext()); + + if (templ == null) { + throw new CommonException( + "error.registration_completed_but_could_not_send", + "Email template is not available."); + } + + if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) { + if (page.getPassword() != null) { + userInfo.put("password", page.getPassword()); + } + + try { + PortalComponentUtil.getPortalAdministration().sendEmail( + (PortletConfig) page.getFacesContext() + .getExternalContext().getRequestMap().get( + "javax.portlet.PortletConfig"), + page.getUserBusinessInfoOnlineEmail(), + getUserRegistrationEmailSubject(page.getLabelHelper()), + templ, userInfo); + } catch (AdministrationEmailException e) { + throw new CommonException( + "error.registration_completed_but_could_not_send", + "Could not send a registration mail.", e); + } + } + + } + + public void setSecretQuestion(PublicPortalSecretAnswerPage page) + throws CommonException { + User user = null; + try { + user = PortalComponentUtil.getPortalAdministration() + .lookupUserFromEmail(page.getEmail()); + } catch (Exception e) { + page.setUserSecretQuestion(page.getLabelHelper().getLabelValue( + "secretQuestion.1")); + throw new CommonException("forgotten.email_address_not_found", + "The email is not found..", e); + } + + page.setUserSecretQuestion(user.getUserAttributes().get( + "user.secret.question", "-")); + } + + public boolean checkSecretAnswer(PublicPortalSecretAnswerPage page) + throws CommonException { + User user = null; + try { + user = PortalComponentUtil.getPortalAdministration() + .lookupUserFromEmail(page.getEmail()); + } catch (Exception e) { + throw new CommonException("forgotten.email_address_not_found", + "The email is not found..", e); + } + + String userSecretAnswer = user.getUserAttributes().get( + "user.secret.answer", ""); + if (userSecretAnswer.equals(page.getUserSecretAnswer())) { + return true; + } else if (page.getUserSecretAnswer() == null + && userSecretAnswer.equals("")) { + return true; + } + return false; + } + + public void sendNewPassword(AbstractForgottenPasswordPage page) + throws CommonException { + + User user = null; + try { + user = PortalComponentUtil.getPortalAdministration() + .lookupUserFromEmail(page.getEmail()); + } catch (Exception e) { + throw new CommonException("forgotten.email_address_not_found", + "The email is not found..", e); + } + + String userName = getUserName(user); + + String newPassword = PortalComponentUtil.getPortalAdministration() + .generatePassword(); + + Map userAttributes = new HashMap(); + try { + Preferences pref = user.getUserAttributes(); + String[] keys = pref.keys(); + if (keys != null) { + for (int ix = 0; ix < keys.length; ix++) { + // TODO: how the hell do i tell the pref type + // ASSuming they are all strings (sigh) + userAttributes.put(keys[ix], pref.get(keys[ix], "")); + } + } + } catch (BackingStoreException e) { + throw new CommonException("failed_to_send", + "Could not access preferences. ", e); + } + + String urlGUID = makeGUID(userName, newPassword); + + // special attributes + userAttributes.put(CTX_RETURN_URL, generateReturnURL(page + .getFacesContext(), urlGUID)); + userAttributes.put(CTX_NEW_PASSWORD, newPassword); + userAttributes.put(CTX_USER_NAME, userName); + + String templ = getTemplatePath(page.getFacesContext()); + + if (templ == null) { + throw new CommonException("failed_to_send", + "Email template is not available."); + } + + try { + PortalComponentUtil.getPortalAdministration() + .sendEmail( + (PortletConfig) page.getFacesContext() + .getExternalContext().getRequestMap().get( + "javax.portlet.PortletConfig"), + page.getEmail(), + getForgottenPasswordEmailSubject(page + .getLabelHelper()), templ, userAttributes); + } catch (AdministrationEmailException e) { + throw new CommonException("failed_to_send", + "Could not send a mail.", e); + } + + //TODO this is currently hacked with a hash map... needs to move to either a DB table + // or to some sort of credential + Map map = new HashMap(); + map.put("user.name", userName); + map.put("password", newPassword); + PortalComponentUtil.getPortalAdministration().putNewLoginInfo(urlGUID, + map); + + } + + public void updatePassword(AbstractResetPasswordPage page) + throws CommonException { + Map map = PortalComponentUtil.getPortalAdministration() + .getNewLoginInfo(page.getGuid()); + if (map == null) { + throw new CommonException("forgotten.unable_to_update_pw", + "The login info is null. "); + } + String userName = (String) map.get("user.name"); + String newPassword = (String) map.get("password"); + + // Here's where a break should be. The following code should be put into the RETURN portlet + try { + PortalComponentUtil.getUserManager().setPassword(userName, null, + newPassword); + PortalComponentUtil.getUserManager().setPasswordUpdateRequired( + userName, true); + } catch (SecurityException e) { + throw new CommonException("forgotten.unable_to_update_pw", + "Could not update a password.", e); + } + // if we got here stuff is changed... removed the key from the map + PortalComponentUtil.getPortalAdministration().removeNewLoginInfo( + page.getGuid()); + } + + protected String getTemplatePath(FacesContext facesContext) { + JetspeedTemplateLocator templateLocator = UserRegistrationUtil + .getTemplateLocator(); + String templateLocation = UserRegistrationUtil + .getString(PALAdminConstants.EMAIL_TEMPLATE_LOCATION); + String templateName = UserRegistrationUtil + .getString(PALAdminConstants.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; + } + } + + protected String getUserRegistrationEmailSubject(LabelHelper labelHelper) { + String emailSubject = labelHelper + .getLabelValue(EMAIL_SUBJECT_USER_REGISTRATION); + if (emailSubject == null) + emailSubject = "Registration Confirmation"; + return emailSubject; + } + + protected String getForgottenPasswordEmailSubject(LabelHelper labelHelper) { + String emailSubject = labelHelper + .getLabelValue(EMAIL_SUBJECT_FORGOTTEN_PASSWORD); + if (emailSubject == null) + emailSubject = "Password Notification"; + return emailSubject; + + } + + protected String getUserName(User user) { + Principal principal = null; + Iterator principals = user.getSubject().getPrincipals().iterator(); + while (principals.hasNext()) { + Object o = principals.next(); + if (o instanceof UserPrincipal) { + principal = (Principal) o; + return principal.toString(); + } + + } + return null; + } + + protected 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(); + long val = num * d; + String retval = Long.toHexString(val); + return retval; + } + + protected String generateReturnURL(FacesContext facesContext, String urlGUID) { + String fullPath = UserRegistrationUtil + .getString(PALAdminConstants.RETURN_PATH) + + "?guid=" + urlGUID; + // NOTE: getPortalURL will encode the fullPath for us + String url = PortalComponentUtil.getPortalAdministration() + .getPortalURL( + (PortletRequest) facesContext.getExternalContext() + .getRequest(), + (PortletResponse) facesContext.getExternalContext() + .getResponse(), fullPath); + return url; + } + + public void loadPage(AbstractPublicPortalRegistrationPage page) + throws CommonException { + Principal userPrincipal = FacesContext.getCurrentInstance() + .getExternalContext().getUserPrincipal(); + if (userPrincipal == null) { + throw new CommonException("could.not.find.your.credential", + "User principal is null."); + } + + User user; + try { + user = PortalComponentUtil.getUserManager().getUser( + userPrincipal.getName()); + if (user == null) { + throw new CommonException("could.not.find.your.account", + "User is null."); + } + } catch (SecurityException e) { + throw new CommonException("could.not.find.your.account", + "User is null.", e); + } + + Preferences userAttributes = user.getUserAttributes(); + updateUserInfo(page, userAttributes); + } + + public void update(AbstractPublicPortalRegistrationPage page) + throws CommonException { + Principal userPrincipal = page.getFacesContext().getExternalContext() + .getUserPrincipal(); + if (userPrincipal == null) { + throw new CommonException("could.not.find.your.credential", + "User principal is null."); + } + + if (page.getPassword() != null && !page.getPassword().equals("")) { + if (page.getPassword().equals(page.getVerifyPassword())) { + try { + PortalComponentUtil.getUserManager().setPassword( + userPrincipal.getName(), null, page.getPassword()); + // audit + PortalComponentUtil.getAuditActivity().logUserActivity( + userPrincipal.getName(), getIPAddress(), + AuditActivity.PASSWORD_CHANGE_SUCCESS, + PALAdminConstants.USER_ADMINISTRATION_ACTIVITY); + } catch (SecurityException e) { + throw new CommonException("could.not.update.password", + "Could not update a password.", e); + } + } else { + throw new CommonException("could.not.match.passwords", + "Could not match passwords."); + } + } + + User user; + try { + user = PortalComponentUtil.getUserManager().getUser( + userPrincipal.getName()); + if (user == null) { + throw new CommonException("could.not.find.your.account", + "User is null."); + } + + // refresh/update Subject in session + Subject subject = user.getSubject(); + RequestContext requestContext = (RequestContext) FacesContext + .getCurrentInstance().getExternalContext().getRequestMap() + .get(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); + requestContext.setSessionAttribute( + PortalReservedParameters.SESSION_KEY_SUBJECT, subject); + } catch (SecurityException e) { + throw new CommonException("could.not.find.your.account", + "User is null.", e); + } + + Preferences userAttributes = user.getUserAttributes(); + Map userInfo = createUserInfoMap(page); + for (Iterator> ite = userInfo.entrySet() + .iterator(); ite.hasNext();) { + Map.Entry entry = ite.next(); + userAttributes.put(entry.getKey(), entry.getValue()); + } + + } + + protected String getIPAddress() { + RequestContext requestContext = (RequestContext) FacesContext + .getCurrentInstance().getExternalContext().getRequestMap().get( + PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); + if (requestContext == null) + return ""; + return requestContext.getRequest().getRemoteAddr(); + } + + protected void updateUserInfo(AbstractUserRegistrationPage page, + Preferences userAttributes) { + if (userAttributes.get("user.business-info.online.email", null) != null) { + page.setUserBusinessInfoOnlineEmail(userAttributes.get( + "user.business-info.online.email", "")); + } + if (userAttributes.get("user.name", null) != null) { + page.setUserName(userAttributes.get("user.name", "")); + } + if (userAttributes.get("user.bdate", null) != null) { + page.setUserBdate(userAttributes.get("user.bdate", "")); + } + if (userAttributes.get("user.gender", null) != null) { + page.setUserGender(userAttributes.get("user.gender", "")); + } + if (userAttributes.get("user.employer", null) != null) { + page.setUserEmployer(userAttributes.get("user.employer", "")); + } + if (userAttributes.get("user.department", null) != null) { + page.setUserDepartment(userAttributes.get("user.department", "")); + } + if (userAttributes.get("user.jobtitle", null) != null) { + page.setUserJobtitle(userAttributes.get("user.jobtitle", "")); + } + if (userAttributes.get("user.name.prefix", null) != null) { + page.setUserNamePrefix(userAttributes.get("user.name.prefix", "")); + } + if (userAttributes.get("user.name.given", null) != null) { + page.setUserNameGiven(userAttributes.get("user.name.given", "")); + } + if (userAttributes.get("user.name.family", null) != null) { + page.setUserNameFamily(userAttributes.get("user.name.family", "")); + } + if (userAttributes.get("user.name.middle", null) != null) { + page.setUserNameMiddle(userAttributes.get("user.name.middle", "")); + } + if (userAttributes.get("user.name.suffix", null) != null) { + page.setUserNameSuffix(userAttributes.get("user.name.suffix", "")); + } + if (userAttributes.get("user.name.nickName", null) != null) { + page.setUserNameNickName(userAttributes.get("user.name.nickName", + "")); + } + if (userAttributes.get("user.home-info.postal.name", null) != null) { + page.setUserHomeInfoPostalName(userAttributes.get( + "user.home-info.postal.name", "")); + } + if (userAttributes.get("user.home-info.postal.street", null) != null) { + page.setUserHomeInfoPostalStreet(userAttributes.get( + "user.home-info.postal.street", "")); + } + if (userAttributes.get("user.home-info.postal.city", null) != null) { + page.setUserHomeInfoPostalCity(userAttributes.get( + "user.home-info.postal.city", "")); + } + if (userAttributes.get("user.home-info.postal.stateprov", null) != null) { + page.setUserHomeInfoPostalStateprov(userAttributes.get( + "user.home-info.postal.stateprov", "")); + } + if (userAttributes.get("user.home-info.postal.postalcode", null) != null) { + page.setUserHomeInfoPostalPostalcode(userAttributes.get( + "user.home-info.postal.postalcode", "")); + } + if (userAttributes.get("user.home-info.postal.country", null) != null) { + page.setUserHomeInfoPostalCountry(userAttributes.get( + "user.home-info.postal.country", "")); + } + if (userAttributes.get("user.home-info.postal.organization", null) != null) { + page.setUserHomeInfoPostalOrganization(userAttributes.get( + "user.home-info.postal.organization", "")); + } + if (userAttributes + .get("user.home-info.telecom.telephone.intcode", null) != null) { + page.setUserHomeInfoTelecomTelephoneIntcode(userAttributes.get( + "user.home-info.telecom.telephone.intcode", "")); + } + if (userAttributes + .get("user.home-info.telecom.telephone.loccode", null) != null) { + page.setUserHomeInfoTelecomTelephoneLoccode(userAttributes.get( + "user.home-info.telecom.telephone.loccode", "")); + } + if (userAttributes.get("user.home-info.telecom.telephone.number", null) != null) { + page.setUserHomeInfoTelecomTelephoneNumber(userAttributes.get( + "user.home-info.telecom.telephone.number", "")); + } + if (userAttributes.get("user.home-info.telecom.telephone.ext", null) != null) { + page.setUserHomeInfoTelecomTelephoneExt(userAttributes.get( + "user.home-info.telecom.telephone.ext", "")); + } + if (userAttributes + .get("user.home-info.telecom.telephone.comment", null) != null) { + page.setUserHomeInfoTelecomTelephoneComment(userAttributes.get( + "user.home-info.telecom.telephone.comment", "")); + } + if (userAttributes.get("user.home-info.telecom.fax.intcode", null) != null) { + page.setUserHomeInfoTelecomFaxIntcode(userAttributes.get( + "user.home-info.telecom.fax.intcode", "")); + } + if (userAttributes.get("user.home-info.telecom.fax.loccode", null) != null) { + page.setUserHomeInfoTelecomFaxLoccode(userAttributes.get( + "user.home-info.telecom.fax.loccode", "")); + } + if (userAttributes.get("user.home-info.telecom.fax.number", null) != null) { + page.setUserHomeInfoTelecomFaxNumber(userAttributes.get( + "user.home-info.telecom.fax.number", "")); + } + if (userAttributes.get("user.home-info.telecom.fax.ext", null) != null) { + page.setUserHomeInfoTelecomFaxExt(userAttributes.get( + "user.home-info.telecom.fax.ext", "")); + } + if (userAttributes.get("user.home-info.telecom.fax.comment", null) != null) { + page.setUserHomeInfoTelecomFaxComment(userAttributes.get( + "user.home-info.telecom.fax.comment", "")); + } + if (userAttributes.get("user.home-info.telecom.mobile.intcode", null) != null) { + page.setUserHomeInfoTelecomMobileIntcode(userAttributes.get( + "user.home-info.telecom.mobile.intcode", "")); + } + if (userAttributes.get("user.home-info.telecom.mobile.loccode", null) != null) { + page.setUserHomeInfoTelecomMobileLoccode(userAttributes.get( + "user.home-info.telecom.mobile.loccode", "")); + } + if (userAttributes.get("user.home-info.telecom.mobile.number", null) != null) { + page.setUserHomeInfoTelecomMobileNumber(userAttributes.get( + "user.home-info.telecom.mobile.number", "")); + } + if (userAttributes.get("user.home-info.telecom.mobile.ext", null) != null) { + page.setUserHomeInfoTelecomMobileExt(userAttributes.get( + "user.home-info.telecom.mobile.ext", "")); + } + if (userAttributes.get("user.home-info.telecom.mobile.comment", null) != null) { + page.setUserHomeInfoTelecomMobileComment(userAttributes.get( + "user.home-info.telecom.mobile.comment", "")); + } + if (userAttributes.get("user.home-info.telecom.pager.intcode", null) != null) { + page.setUserHomeInfoTelecomPagerIntcode(userAttributes.get( + "user.home-info.telecom.pager.intcode", "")); + } + if (userAttributes.get("user.home-info.telecom.pager.loccode", null) != null) { + page.setUserHomeInfoTelecomPagerLoccode(userAttributes.get( + "user.home-info.telecom.pager.loccode", "")); + } + if (userAttributes.get("user.home-info.telecom.pager.number", null) != null) { + page.setUserHomeInfoTelecomPagerNumber(userAttributes.get( + "user.home-info.telecom.pager.number", "")); + } + if (userAttributes.get("user.home-info.telecom.pager.ext", null) != null) { + page.setUserHomeInfoTelecomPagerExt(userAttributes.get( + "user.home-info.telecom.pager.ext", "")); + } + if (userAttributes.get("user.home-info.telecom.pager.comment", null) != null) { + page.setUserHomeInfoTelecomPagerComment(userAttributes.get( + "user.home-info.telecom.pager.comment", "")); + } + if (userAttributes.get("user.home-info.online.email", null) != null) { + page.setUserHomeInfoOnlineEmail(userAttributes.get( + "user.home-info.online.email", "")); + } + if (userAttributes.get("user.home-info.online.uri", null) != null) { + page.setUserHomeInfoOnlineUri(userAttributes.get( + "user.home-info.online.uri", "")); + } + if (userAttributes.get("user.business-info.postal.name", null) != null) { + page.setUserBusinessInfoPostalName(userAttributes.get( + "user.business-info.postal.name", "")); + } + if (userAttributes.get("user.business-info.postal.street", null) != null) { + page.setUserBusinessInfoPostalStreet(userAttributes.get( + "user.business-info.postal.street", "")); + } + if (userAttributes.get("user.business-info.postal.city", null) != null) { + page.setUserBusinessInfoPostalCity(userAttributes.get( + "user.business-info.postal.city", "")); + } + if (userAttributes.get("user.business-info.postal.stateprov", null) != null) { + page.setUserBusinessInfoPostalStateprov(userAttributes.get( + "user.business-info.postal.stateprov", "")); + } + if (userAttributes.get("user.business-info.postal.postalcode", null) != null) { + page.setUserBusinessInfoPostalPostalcode(userAttributes.get( + "user.business-info.postal.postalcode", "")); + } + if (userAttributes.get("user.business-info.postal.country", null) != null) { + page.setUserBusinessInfoPostalCountry(userAttributes.get( + "user.business-info.postal.country", "")); + } + if (userAttributes.get("user.business-info.postal.organization", null) != null) { + page.setUserBusinessInfoPostalOrganization(userAttributes.get( + "user.business-info.postal.organization", "")); + } + if (userAttributes.get("user.business-info.telecom.telephone.intcode", + null) != null) { + page.setUserBusinessInfoTelecomTelephoneIntcode(userAttributes.get( + "user.business-info.telecom.telephone.intcode", "")); + } + if (userAttributes.get("user.business-info.telecom.telephone.loccode", + null) != null) { + page.setUserBusinessInfoTelecomTelephoneLoccode(userAttributes.get( + "user.business-info.telecom.telephone.loccode", "")); + } + if (userAttributes.get("user.business-info.telecom.telephone.number", + null) != null) { + page.setUserBusinessInfoTelecomTelephoneNumber(userAttributes.get( + "user.business-info.telecom.telephone.number", "")); + } + if (userAttributes + .get("user.business-info.telecom.telephone.ext", null) != null) { + page.setUserBusinessInfoTelecomTelephoneExt(userAttributes.get( + "user.business-info.telecom.telephone.ext", "")); + } + if (userAttributes.get("user.business-info.telecom.telephone.comment", + null) != null) { + page.setUserBusinessInfoTelecomTelephoneComment(userAttributes.get( + "user.business-info.telecom.telephone.comment", "")); + } + if (userAttributes.get("user.business-info.telecom.fax.intcode", null) != null) { + page.setUserBusinessInfoTelecomFaxIntcode(userAttributes.get( + "user.business-info.telecom.fax.intcode", "")); + } + if (userAttributes.get("user.business-info.telecom.fax.loccode", null) != null) { + page.setUserBusinessInfoTelecomFaxLoccode(userAttributes.get( + "user.business-info.telecom.fax.loccode", "")); + } + if (userAttributes.get("user.business-info.telecom.fax.number", null) != null) { + page.setUserBusinessInfoTelecomFaxNumber(userAttributes.get( + "user.business-info.telecom.fax.number", "")); + } + if (userAttributes.get("user.business-info.telecom.fax.ext", null) != null) { + page.setUserBusinessInfoTelecomFaxExt(userAttributes.get( + "user.business-info.telecom.fax.ext", "")); + } + if (userAttributes.get("user.business-info.telecom.fax.comment", null) != null) { + page.setUserBusinessInfoTelecomFaxComment(userAttributes.get( + "user.business-info.telecom.fax.comment", "")); + } + if (userAttributes.get("user.business-info.telecom.mobile.intcode", + null) != null) { + page.setUserBusinessInfoTelecomMobileIntcode(userAttributes.get( + "user.business-info.telecom.mobile.intcode", "")); + } + if (userAttributes.get("user.business-info.telecom.mobile.loccode", + null) != null) { + page.setUserBusinessInfoTelecomMobileLoccode(userAttributes.get( + "user.business-info.telecom.mobile.loccode", "")); + } + if (userAttributes + .get("user.business-info.telecom.mobile.number", null) != null) { + page.setUserBusinessInfoTelecomMobileNumber(userAttributes.get( + "user.business-info.telecom.mobile.number", "")); + } + if (userAttributes.get("user.business-info.telecom.mobile.ext", null) != null) { + page.setUserBusinessInfoTelecomMobileExt(userAttributes.get( + "user.business-info.telecom.mobile.ext", "")); + } + if (userAttributes.get("user.business-info.telecom.mobile.comment", + null) != null) { + page.setUserBusinessInfoTelecomMobileComment(userAttributes.get( + "user.business-info.telecom.mobile.comment", "")); + } + if (userAttributes + .get("user.business-info.telecom.pager.intcode", null) != null) { + page.setUserBusinessInfoTelecomPagerIntcode(userAttributes.get( + "user.business-info.telecom.pager.intcode", "")); + } + if (userAttributes + .get("user.business-info.telecom.pager.loccode", null) != null) { + page.setUserBusinessInfoTelecomPagerLoccode(userAttributes.get( + "user.business-info.telecom.pager.loccode", "")); + } + if (userAttributes.get("user.business-info.telecom.pager.number", null) != null) { + page.setUserBusinessInfoTelecomPagerNumber(userAttributes.get( + "user.business-info.telecom.pager.number", "")); + } + if (userAttributes.get("user.business-info.telecom.pager.ext", null) != null) { + page.setUserBusinessInfoTelecomPagerExt(userAttributes.get( + "user.business-info.telecom.pager.ext", "")); + } + if (userAttributes + .get("user.business-info.telecom.pager.comment", null) != null) { + page.setUserBusinessInfoTelecomPagerComment(userAttributes.get( + "user.business-info.telecom.pager.comment", "")); + } + if (userAttributes.get("user.business-info.online.uri", null) != null) { + page.setUserBusinessInfoOnlineUri(userAttributes.get( + "user.business-info.online.uri", "")); + } + + if (page instanceof AbstractPublicPortalRegistrationPage) { + AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) page; + if (userAttributes.get("user.bdate.year", null) != null) { + p.setUserBdateYear(userAttributes.getInt("user.bdate.year", 0)); + } + if (userAttributes.get("user.bdate.month", null) != null) { + p.setUserBdateMonth(userAttributes + .getInt("user.bdate.month", 0)); + } + if (userAttributes.get("user.bdate.date", null) != null) { + p.setUserBdateDate(userAttributes.getInt("user.bdate.date", 0)); + } + if (userAttributes.get("user.industry", null) != null) { + p.setUserIndustry(userAttributes.get("user.industry", "")); + } + if (userAttributes.get("user.secret.question", null) != null) { + p.setUserSecretQuestion(userAttributes.get( + "user.secret.question", "")); + } + if (userAttributes.get("user.secret.answer", null) != null) { + p.setUserSecretAnswer(userAttributes.get("user.secret.answer", + "")); + } + if (userAttributes.get("user.name.given.yomi", null) != null) { + p.setUserNameGivenYomi(userAttributes.get( + "user.name.given.yomi", "")); + } + if (userAttributes.get("user.name.family.yomi", null) != null) { + p.setUserNameFamilyYomi(userAttributes.get( + "user.name.family.yomi", "")); + } + } + } + + protected Map createUserInfoMap( + AbstractUserRegistrationPage page) { + Map userInfo = new HashMap(); + + if (page.getUserBusinessInfoOnlineEmail() != null) { + userInfo.put("user.business-info.online.email", page + .getUserBusinessInfoOnlineEmail()); + } + if (page.getUserName() != null) { + userInfo.put("user.name", page.getUserName()); + } + if (page.getUserBdate() != null) { + userInfo.put("user.bdate", page.getUserBdate()); + } + if (page.getUserGender() != null) { + userInfo.put("user.gender", page.getUserGender()); + } + if (page.getUserEmployer() != null) { + userInfo.put("user.employer", page.getUserEmployer()); + } + if (page.getUserDepartment() != null) { + userInfo.put("user.department", page.getUserDepartment()); + } + if (page.getUserJobtitle() != null) { + userInfo.put("user.jobtitle", page.getUserJobtitle()); + } + if (page.getUserNamePrefix() != null) { + userInfo.put("user.name.prefix", page.getUserNamePrefix()); + } + if (page.getUserNameGiven() != null) { + userInfo.put("user.name.given", page.getUserNameGiven()); + } + if (page.getUserNameFamily() != null) { + userInfo.put("user.name.family", page.getUserNameFamily()); + } + if (page.getUserNameMiddle() != null) { + userInfo.put("user.name.middle", page.getUserNameMiddle()); + } + if (page.getUserNameSuffix() != null) { + userInfo.put("user.name.suffix", page.getUserNameSuffix()); + } + if (page.getUserNameNickName() != null) { + userInfo.put("user.name.nickName", page.getUserNameNickName()); + } + if (page.getUserHomeInfoPostalName() != null) { + userInfo.put("user.home-info.postal.name", page + .getUserHomeInfoPostalName()); + } + if (page.getUserHomeInfoPostalStreet() != null) { + userInfo.put("user.home-info.postal.street", page + .getUserHomeInfoPostalStreet()); + } + if (page.getUserHomeInfoPostalCity() != null) { + userInfo.put("user.home-info.postal.city", page + .getUserHomeInfoPostalCity()); + } + if (page.getUserHomeInfoPostalStateprov() != null) { + userInfo.put("user.home-info.postal.stateprov", page + .getUserHomeInfoPostalStateprov()); + } + if (page.getUserHomeInfoPostalPostalcode() != null) { + userInfo.put("user.home-info.postal.postalcode", page + .getUserHomeInfoPostalPostalcode()); + } + if (page.getUserHomeInfoPostalCountry() != null) { + userInfo.put("user.home-info.postal.country", page + .getUserHomeInfoPostalCountry()); + } + if (page.getUserHomeInfoPostalOrganization() != null) { + userInfo.put("user.home-info.postal.organization", page + .getUserHomeInfoPostalOrganization()); + } + if (page.getUserHomeInfoTelecomTelephoneIntcode() != null) { + userInfo.put("user.home-info.telecom.telephone.intcode", page + .getUserHomeInfoTelecomTelephoneIntcode()); + } + if (page.getUserHomeInfoTelecomTelephoneLoccode() != null) { + userInfo.put("user.home-info.telecom.telephone.loccode", page + .getUserHomeInfoTelecomTelephoneLoccode()); + } + if (page.getUserHomeInfoTelecomTelephoneNumber() != null) { + userInfo.put("user.home-info.telecom.telephone.number", page + .getUserHomeInfoTelecomTelephoneNumber()); + } + if (page.getUserHomeInfoTelecomTelephoneExt() != null) { + userInfo.put("user.home-info.telecom.telephone.ext", page + .getUserHomeInfoTelecomTelephoneExt()); + } + if (page.getUserHomeInfoTelecomTelephoneComment() != null) { + userInfo.put("user.home-info.telecom.telephone.comment", page + .getUserHomeInfoTelecomTelephoneComment()); + } + if (page.getUserHomeInfoTelecomFaxIntcode() != null) { + userInfo.put("user.home-info.telecom.fax.intcode", page + .getUserHomeInfoTelecomFaxIntcode()); + } + if (page.getUserHomeInfoTelecomFaxLoccode() != null) { + userInfo.put("user.home-info.telecom.fax.loccode", page + .getUserHomeInfoTelecomFaxLoccode()); + } + if (page.getUserHomeInfoTelecomFaxNumber() != null) { + userInfo.put("user.home-info.telecom.fax.number", page + .getUserHomeInfoTelecomFaxNumber()); + } + if (page.getUserHomeInfoTelecomFaxExt() != null) { + userInfo.put("user.home-info.telecom.fax.ext", page + .getUserHomeInfoTelecomFaxExt()); + } + if (page.getUserHomeInfoTelecomFaxComment() != null) { + userInfo.put("user.home-info.telecom.fax.comment", page + .getUserHomeInfoTelecomFaxComment()); + } + if (page.getUserHomeInfoTelecomMobileIntcode() != null) { + userInfo.put("user.home-info.telecom.mobile.intcode", page + .getUserHomeInfoTelecomMobileIntcode()); + } + if (page.getUserHomeInfoTelecomMobileLoccode() != null) { + userInfo.put("user.home-info.telecom.mobile.loccode", page + .getUserHomeInfoTelecomMobileLoccode()); + } + if (page.getUserHomeInfoTelecomMobileNumber() != null) { + userInfo.put("user.home-info.telecom.mobile.number", page + .getUserHomeInfoTelecomMobileNumber()); + } + if (page.getUserHomeInfoTelecomMobileExt() != null) { + userInfo.put("user.home-info.telecom.mobile.ext", page + .getUserHomeInfoTelecomMobileExt()); + } + if (page.getUserHomeInfoTelecomMobileComment() != null) { + userInfo.put("user.home-info.telecom.mobile.comment", page + .getUserHomeInfoTelecomMobileComment()); + } + if (page.getUserHomeInfoTelecomPagerIntcode() != null) { + userInfo.put("user.home-info.telecom.pager.intcode", page + .getUserHomeInfoTelecomPagerIntcode()); + } + if (page.getUserHomeInfoTelecomPagerLoccode() != null) { + userInfo.put("user.home-info.telecom.pager.loccode", page + .getUserHomeInfoTelecomPagerLoccode()); + } + if (page.getUserHomeInfoTelecomPagerNumber() != null) { + userInfo.put("user.home-info.telecom.pager.number", page + .getUserHomeInfoTelecomPagerNumber()); + } + if (page.getUserHomeInfoTelecomPagerExt() != null) { + userInfo.put("user.home-info.telecom.pager.ext", page + .getUserHomeInfoTelecomPagerExt()); + } + if (page.getUserHomeInfoTelecomPagerComment() != null) { + userInfo.put("user.home-info.telecom.pager.comment", page + .getUserHomeInfoTelecomPagerComment()); + } + if (page.getUserHomeInfoOnlineEmail() != null) { + userInfo.put("user.home-info.online.email", page + .getUserHomeInfoOnlineEmail()); + } + if (page.getUserHomeInfoOnlineUri() != null) { + userInfo.put("user.home-info.online.uri", page + .getUserHomeInfoOnlineUri()); + } + if (page.getUserBusinessInfoPostalName() != null) { + userInfo.put("user.business-info.postal.name", page + .getUserBusinessInfoPostalName()); + } + if (page.getUserBusinessInfoPostalStreet() != null) { + userInfo.put("user.business-info.postal.street", page + .getUserBusinessInfoPostalStreet()); + } + if (page.getUserBusinessInfoPostalCity() != null) { + userInfo.put("user.business-info.postal.city", page + .getUserBusinessInfoPostalCity()); + } + if (page.getUserBusinessInfoPostalStateprov() != null) { + userInfo.put("user.business-info.postal.stateprov", page + .getUserBusinessInfoPostalStateprov()); + } + if (page.getUserBusinessInfoPostalPostalcode() != null) { + userInfo.put("user.business-info.postal.postalcode", page + .getUserBusinessInfoPostalPostalcode()); + } + if (page.getUserBusinessInfoPostalCountry() != null) { + userInfo.put("user.business-info.postal.country", page + .getUserBusinessInfoPostalCountry()); + } + if (page.getUserBusinessInfoPostalOrganization() != null) { + userInfo.put("user.business-info.postal.organization", page + .getUserBusinessInfoPostalOrganization()); + } + if (page.getUserBusinessInfoTelecomTelephoneIntcode() != null) { + userInfo.put("user.business-info.telecom.telephone.intcode", page + .getUserBusinessInfoTelecomTelephoneIntcode()); + } + if (page.getUserBusinessInfoTelecomTelephoneLoccode() != null) { + userInfo.put("user.business-info.telecom.telephone.loccode", page + .getUserBusinessInfoTelecomTelephoneLoccode()); + } + if (page.getUserBusinessInfoTelecomTelephoneNumber() != null) { + userInfo.put("user.business-info.telecom.telephone.number", page + .getUserBusinessInfoTelecomTelephoneNumber()); + } + if (page.getUserBusinessInfoTelecomTelephoneExt() != null) { + userInfo.put("user.business-info.telecom.telephone.ext", page + .getUserBusinessInfoTelecomTelephoneExt()); + } + if (page.getUserBusinessInfoTelecomTelephoneComment() != null) { + userInfo.put("user.business-info.telecom.telephone.comment", page + .getUserBusinessInfoTelecomTelephoneComment()); + } + if (page.getUserBusinessInfoTelecomFaxIntcode() != null) { + userInfo.put("user.business-info.telecom.fax.intcode", page + .getUserBusinessInfoTelecomFaxIntcode()); + } + if (page.getUserBusinessInfoTelecomFaxLoccode() != null) { + userInfo.put("user.business-info.telecom.fax.loccode", page + .getUserBusinessInfoTelecomFaxLoccode()); + } + if (page.getUserBusinessInfoTelecomFaxNumber() != null) { + userInfo.put("user.business-info.telecom.fax.number", page + .getUserBusinessInfoTelecomFaxNumber()); + } + if (page.getUserBusinessInfoTelecomFaxExt() != null) { + userInfo.put("user.business-info.telecom.fax.ext", page + .getUserBusinessInfoTelecomFaxExt()); + } + if (page.getUserBusinessInfoTelecomFaxComment() != null) { + userInfo.put("user.business-info.telecom.fax.comment", page + .getUserBusinessInfoTelecomFaxComment()); + } + if (page.getUserBusinessInfoTelecomMobileIntcode() != null) { + userInfo.put("user.business-info.telecom.mobile.intcode", page + .getUserBusinessInfoTelecomMobileIntcode()); + } + if (page.getUserBusinessInfoTelecomMobileLoccode() != null) { + userInfo.put("user.business-info.telecom.mobile.loccode", page + .getUserBusinessInfoTelecomMobileLoccode()); + } + if (page.getUserBusinessInfoTelecomMobileNumber() != null) { + userInfo.put("user.business-info.telecom.mobile.number", page + .getUserBusinessInfoTelecomMobileNumber()); + } + if (page.getUserBusinessInfoTelecomMobileExt() != null) { + userInfo.put("user.business-info.telecom.mobile.ext", page + .getUserBusinessInfoTelecomMobileExt()); + } + if (page.getUserBusinessInfoTelecomMobileComment() != null) { + userInfo.put("user.business-info.telecom.mobile.comment", page + .getUserBusinessInfoTelecomMobileComment()); + } + if (page.getUserBusinessInfoTelecomPagerIntcode() != null) { + userInfo.put("user.business-info.telecom.pager.intcode", page + .getUserBusinessInfoTelecomPagerIntcode()); + } + if (page.getUserBusinessInfoTelecomPagerLoccode() != null) { + userInfo.put("user.business-info.telecom.pager.loccode", page + .getUserBusinessInfoTelecomPagerLoccode()); + } + if (page.getUserBusinessInfoTelecomPagerNumber() != null) { + userInfo.put("user.business-info.telecom.pager.number", page + .getUserBusinessInfoTelecomPagerNumber()); + } + if (page.getUserBusinessInfoTelecomPagerExt() != null) { + userInfo.put("user.business-info.telecom.pager.ext", page + .getUserBusinessInfoTelecomPagerExt()); + } + if (page.getUserBusinessInfoTelecomPagerComment() != null) { + userInfo.put("user.business-info.telecom.pager.comment", page + .getUserBusinessInfoTelecomPagerComment()); + } + if (page.getUserBusinessInfoOnlineUri() != null) { + userInfo.put("user.business-info.online.uri", page + .getUserBusinessInfoOnlineUri()); + } + + if (page instanceof AbstractPublicPortalRegistrationPage) { + AbstractPublicPortalRegistrationPage p = (AbstractPublicPortalRegistrationPage) page; + if (p.getUserBdateYear() != null) { + userInfo + .put("user.bdate.year", p.getUserBdateYear().toString()); + } + if (p.getUserBdateMonth() != null) { + userInfo.put("user.bdate.month", p.getUserBdateMonth() + .toString()); + } + if (p.getUserBdateDate() != null) { + userInfo + .put("user.bdate.date", p.getUserBdateDate().toString()); + } + if (p.getUserIndustry() != null) { + userInfo.put("user.industry", p.getUserIndustry()); + } + if (p.getUserSecretQuestion() != null) { + userInfo.put("user.secret.question", p.getUserSecretQuestion()); + } + if (p.getUserSecretAnswer() != null) { + if (!PALAdminConstants.SECRET_ANSWER_DISPLAY.equals(p + .getUserSecretAnswer())) { + userInfo.put("user.secret.answer", p.getUserSecretAnswer()); + } + } + if (p.getUserNameGivenYomi() != null) { + userInfo.put("user.name.given.yomi", p.getUserNameGivenYomi()); + } + if (p.getUserNameFamilyYomi() != null) { + userInfo + .put("user.name.family.yomi", p.getUserNameFamilyYomi()); + } + + } + return userInfo; + } + + public void withdraw(PublicPortalWithdrawalConfirmPage page) + throws CommonException { + UserManager userManager = PortalComponentUtil.getUserManager(); + // check password + if (!userManager.authenticate(page.getUsername(), page.getPassword())) { + throw new CommonException("invalid.password"); + } + + // remove user + User user; + try { + user = userManager.getUser(page.getUsername()); + } catch (SecurityException e) { + throw new CommonException("could.not.remove.user", e); + } + if (user == null) { + throw new CommonException("could.not.find.user"); + } + if (PALAdminConstants.TRUE.equals(PALAdminUtil + .getConfigInitParameter(PALAdminConstants.REMOVE_USER))) { + // remove user + try { + userManager.removeUser(page.getUsername()); + } catch (SecurityException e) { + throw new CommonException("could.not.remove.user", e); + } + } else { + // disabled email + String email = user.getUserAttributes().get( + "user.business-info.online.email", null); + if (email != null) { + user.getUserAttributes().remove( + "user.business-info.online.email"); + user.getUserAttributes().put( + "backup." + "user.business-info.online.email", email); + } + + // disabled user + try { + userManager.setPasswordEnabled(page.getUsername(), false); + } catch (SecurityException e) { + throw new CommonException("could.not.remove.user", e); + } + } + + if (PALAdminConstants.TRUE.equals(PALAdminUtil + .getConfigInitParameter(PALAdminConstants.REMOVE_USER_FOLDER))) { + String userhome = Folder.USER_FOLDER + page.getUsername(); + PageManager pageManager = PortalComponentUtil.getPageManager(); + try { + Folder folder = pageManager.getFolder(userhome); + pageManager.removeFolder(folder); + } catch (FolderNotFoundException e) { + } catch (InvalidFolderException e) { + } catch (FolderNotRemovedException e) { + } catch (NodeException e) { + } + } + + PortalComponentUtil.getRequestContext().getRequest().getSession() + .invalidate(); + //TODO destination + //PortalComponentUtil.getRequestContext().getResponse().sendRedirect(response.encodeURL(destination)); + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/service/UserRegistrationService.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,260 @@ +/* + * 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.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.Principal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +import javax.faces.context.FacesContext; +import javax.portlet.PortletConfig; +import javax.security.auth.Subject; + +import jp.sf.pal.admin.PALAdminConstants; + +import org.apache.jetspeed.JetspeedActions; +import org.apache.jetspeed.om.common.SecuredResource; +import org.apache.jetspeed.profiler.rules.RuleCriterion; + +public class PALAdminUtil { + /** + * @return the facesContext + */ + private static FacesContext getFacesContext() { + return FacesContext.getCurrentInstance(); + } + + public static boolean isEmpty(String s) { + if (s == null) + return true; + + if (s.trim().equals("")) + return true; + + return false; + } + + public static Principal getPrincipal(Subject subject, Class cls) { + Principal principal = null; + Iterator principals = subject.getPrincipals().iterator(); + while (principals.hasNext()) { + Principal p = (Principal) principals.next(); + if (cls.isInstance(p)) { + principal = p; + break; + } + } + return principal; + } + + public static Map createItem(String label, String value) { + Map map = new HashMap(); + map.put("label", label); + map.put("value", value); + return map; + } + + public static List> createItems(Iterator items) { + ArrayList> list = new ArrayList>(); + while (items.hasNext()) { + String value = items.next(); + list.add(PALAdminUtil.createItem(value, value)); + } + return list; + } + + public static String toStringFromList(List list) { + StringBuffer buf = new StringBuffer(); + for (Iterator ite = list.iterator(); ite.hasNext();) { + buf.append(ite.next()); + if (ite.hasNext()) { + buf.append(", "); + } + } + return buf.toString(); + } + + public static String toStringFromArray(Object[] strs) { + StringBuffer buf = new StringBuffer(); + for (int i = 0; i < strs.length; i++) { + buf.append(strs[i].toString()); + if (i + 1 < strs.length) { + buf.append(", "); + } + } + return buf.toString(); + } + + public static void drain(InputStream in, OutputStream out) + throws IOException { + try { + byte[] buf = new byte[8192]; + int len = in.read(buf); + + while (len != -1) { + out.write(buf, 0, len); + len = in.read(buf); + } + out.flush(); + } catch (IOException e) { + throw e; + } finally { + try { + out.close(); + } catch (IOException e) { + } + try { + in.close(); + } catch (IOException e) { + } + } + } + + public static void setPasswordToSession(String value) { + getFacesContext().getExternalContext().getSessionMap().put( + PALAdminConstants.PASSWORD, value); + } + + public static String getPasswordFromSession() { + return (String) getFacesContext().getExternalContext().getSessionMap() + .get(PALAdminConstants.PASSWORD); + } + + public static void removePasswordFromSession() { + getFacesContext().getExternalContext().getSessionMap().remove( + PALAdminConstants.PASSWORD); + } + + public static String getContextRealPath(String path) { + return getPortletConfig().getPortletContext().getRealPath(path); + } + + public static String getConfigInitParameter(String key) { + return getPortletConfig().getInitParameter(key); + } + + public static PortletConfig getPortletConfig() { + String name = "javax.portlet.PortletConfig"; + FacesContext context = FacesContext.getCurrentInstance(); + if (context == null) { + throw new IllegalStateException( + "Could not find FacesContext instance."); + } + return (PortletConfig) context.getExternalContext().getRequestMap() + .get(name); + } + + public static String formatCSVList(List list) { + if ((list != null) && !list.isEmpty()) { + StringBuffer csv = new StringBuffer(); + Iterator listIter = list.iterator(); + while (listIter.hasNext()) { + if (csv.length() > 0) { + csv.append(","); + } + csv.append((String) listIter.next()); + } + return csv.toString(); + } + return ""; + } + + public static 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 static boolean checkAccess(SecuredResource securedResource, + String actions) { + try { + securedResource.checkAccess(actions); + return true; + } catch (SecurityException e) { + return false; + } + } + + public static List> createPermissionsList() { + List> list = new ArrayList>(); + //TODO + Map map = null; + + map = new HashMap(); + map.put("label", "View"); + map.put("value", JetspeedActions.VIEW); + list.add(map); + map = new HashMap(); + map.put("label", "Edit"); + map.put("value", JetspeedActions.EDIT); + list.add(map); + map = new HashMap(); + map.put("label", "Help"); + map.put("value", JetspeedActions.HELP); + list.add(map); + // map = new HashMap(); + // map.put("label", "Print"); + // map.put("value", JetspeedActions.PRINT); + // list.add(map); + + return list; + } + + public static String convertFallbackType(int fallbackType) { + if (fallbackType == RuleCriterion.FALLBACK_CONTINUE) { + return PALAdminConstants.FALLBACK_CONTINUE; + } else if (fallbackType == RuleCriterion.FALLBACK_LOOP) { + return PALAdminConstants.FALLBACK_LOOP; + } else if (fallbackType == RuleCriterion.FALLBACK_STOP) { + return PALAdminConstants.FALLBACK_STOP; + } + return null; + } + + public static String getPortletDecoratorName() { + String name = getPortletConfig().getInitParameter( + PALAdminConstants.PORTLET_DECORATOR); + if (name == null) { + return PALAdminConstants.DEFAULT_PORTLET_DECORATOR; + } + return name; + } + + public static String getPageDecoratorName() { + String name = getPortletConfig().getInitParameter( + PALAdminConstants.PAGE_DECORATOR); + if (name == null) { + return PALAdminConstants.DEFAULT_PAGE_DECORATOR; + } + return name; + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PALAdminUtil.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,153 @@ +/* + * 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 javax.faces.context.FacesContext; + +import jp.sf.pal.admin.PALAdminConstants; + +import org.apache.jetspeed.PortalReservedParameters; +import org.apache.jetspeed.administration.PortalAdministration; +import org.apache.jetspeed.audit.AuditActivity; +import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent; +import org.apache.jetspeed.components.portletregistry.PortletRegistry; +import org.apache.jetspeed.container.window.PortletWindowAccessor; +import org.apache.jetspeed.decoration.DecorationFactory; +import org.apache.jetspeed.deployment.DeploymentManager; +import org.apache.jetspeed.factory.PortletFactory; +import org.apache.jetspeed.page.PageManager; +import org.apache.jetspeed.profiler.Profiler; +import org.apache.jetspeed.request.RequestContext; +import org.apache.jetspeed.security.GroupManager; +import org.apache.jetspeed.security.PermissionManager; +import org.apache.jetspeed.security.RoleManager; +import org.apache.jetspeed.security.SecurityAccessController; +import org.apache.jetspeed.security.SecurityProvider; +import org.apache.jetspeed.security.UserManager; +import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager; + +public class PortalComponentUtil { + /** + * @return the facesContext + */ + private static FacesContext getFacesContext() { + return FacesContext.getCurrentInstance(); + } + + public static UserManager getUserManager() { + return (UserManager) getFacesContext().getExternalContext() + .getRequestMap().get(PALAdminConstants.USER_MANAGER_COMPONENT); + } + + public static RoleManager getRoleManager() { + return (RoleManager) getFacesContext().getExternalContext() + .getRequestMap().get(PALAdminConstants.ROLE_MANAGER_COMPONENT); + } + + public static GroupManager getGroupManager() { + return (GroupManager) getFacesContext().getExternalContext() + .getRequestMap().get(PALAdminConstants.GROUP_MANAGER_COMPONENT); + } + + public static Profiler getProfiler() { + return (Profiler) getFacesContext().getExternalContext() + .getRequestMap().get(PALAdminConstants.PROFILER_COMPONENT); + } + + public static PageManager getPageManager() { + return (PageManager) getFacesContext().getExternalContext() + .getRequestMap().get(PALAdminConstants.PAGE_MANAGER_COMPONENT); + } + + public static SecurityProvider getSecurityProvider() { + return (SecurityProvider) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.SECURITY_PROVIDER_COMPONENT); + } + + public static ApplicationServerManager getApplicationServerManager() { + return (ApplicationServerManager) getFacesContext() + .getExternalContext().getRequestMap().get( + PALAdminConstants.APPLICATION_SERVER_MANAGER_COMPONENT); + } + + public static PortletRegistry getPortletRegistry() { + return (PortletRegistry) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.PORTLET_REGISTRY_COMPONENT); + } + + public static PortletFactory getPortletFactory() { + return (PortletFactory) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.PORTLET_FACTORY_COMPONENT); + } + + public static DeploymentManager getDeploymentManager() { + return (DeploymentManager) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.DEPLOYMENT_MANAGER_COMPONENT); + } + + public static PortalAdministration getPortalAdministration() { + return (PortalAdministration) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.PORTAL_ADMINISTRATION_COMPONENT); + } + + public static DecorationFactory getDecorationFactory() { + return (DecorationFactory) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.DECORATION_FACTORY_COMPONENT); + } + + public static PermissionManager getPermissionManager() { + return (PermissionManager) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.PERMISSION_MANAGER_COMPONENT); + } + + public static PortletEntityAccessComponent getPortletEntityAccessComponent() { + return (PortletEntityAccessComponent) getFacesContext() + .getExternalContext().getRequestMap().get( + PALAdminConstants.PORTLET_ENTITY_ACCESS_COMPONENT); + } + + public static PortletWindowAccessor getPortletWindowAccessor() { + return (PortletWindowAccessor) getFacesContext().getExternalContext() + .getRequestMap().get( + PALAdminConstants.PORTLET_WINDOW_ACCESSOR_COMPONENT); + } + + public static SecurityAccessController getSecurityAccessController() { + return (SecurityAccessController) getFacesContext() + .getExternalContext().getRequestMap().get( + PALAdminConstants.SECURITY_ACCESS_CONTROLLER_COMPONENT); + } + + public static AuditActivity getAuditActivity() { + return (AuditActivity) getFacesContext().getExternalContext() + .getRequestMap() + .get(PALAdminConstants.AUDIT_ACTIVITY_COMPONENT); + } + + public static RequestContext getRequestContext() { + return (RequestContext) FacesContext.getCurrentInstance() + .getExternalContext().getRequestMap().get( + PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,90 @@ +/* + * 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; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.apache.jetspeed.locator.JetspeedTemplateLocator; + +import jp.sf.pal.admin.PALAdminConstants; + +public class UserRegistrationUtil { + private static FacesContext getFacesContext() { + return FacesContext.getCurrentInstance(); + } + + public static Map getUserRegistrationParams() { + Map params = (Map) getFacesContext() + .getExternalContext().getRequestMap().get( + PALAdminConstants.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( + PALAdminConstants.TEMPLATE_LOCATOR); + } + + 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(); + long val = num * d; + String retval = Long.toHexString(val); + return retval; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,49 @@ +/* + * 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; + +public abstract class AbstractCrudPage { + + private int crudType = 0; + + public AbstractCrudPage() { + } + + public int getCrudType() { + return this.crudType; + } + + public void setCrudType(int type) { + this.crudType = type; + } + + public boolean isCreate() { + return getCrudType() == CrudType.CREATE; + } + + public boolean isRead() { + return getCrudType() == CrudType.READ; + } + + public boolean isUpdate() { + return getCrudType() == CrudType.UPDATE; + } + + public boolean isDelete() { + return getCrudType() == CrudType.DELETE; + } + +} \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,112 @@ +/* + * 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; + +public abstract class AbstractPagerPage extends AbstractCrudPage implements + PagerPage { + + private Integer count; + + private Integer currentPageNumber; + + private Integer maxPageNumber; + + private Integer previousPageNumber; + + private Integer nextPageNumber; + + public AbstractPagerPage() { + super(); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#getCount() + */ + public Integer getCount() { + return count; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#setCount(java.lang.Integer) + */ + public void setCount(Integer count) { + this.count = count; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#getCurrentPageNumber() + */ + public Integer getCurrentPageNumber() { + return currentPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#setCurrentPageNumber(java.lang.Integer) + */ + public void setCurrentPageNumber(Integer currentPageNumber) { + this.currentPageNumber = currentPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#getMaxPageNumber() + */ + public Integer getMaxPageNumber() { + return maxPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#setMaxPageNumber(java.lang.Integer) + */ + public void setMaxPageNumber(Integer maxPageNumber) { + this.maxPageNumber = maxPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#getNextPageNumber() + */ + public Integer getNextPageNumber() { + return nextPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#setNextPageNumber(java.lang.Integer) + */ + public void setNextPageNumber(Integer nextPageNumber) { + this.nextPageNumber = nextPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#getPreviousPageNumber() + */ + public Integer getPreviousPageNumber() { + return previousPageNumber; + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.PagerPage#setPreviousPageNumber(java.lang.Integer) + */ + public void setPreviousPageNumber(Integer previousPageNumber) { + this.previousPageNumber = previousPageNumber; + } + + public boolean isPreviousPage() { + return getPreviousPageNumber() != null; + } + + public boolean isNextPage() { + return getNextPageNumber() != null; + } +} \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,45 @@ +/* + * 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; + +public final class CrudType { + + public static final int CREATE = 0; + + public static final int READ = 1; + + public static final int UPDATE = 2; + + public static final int DELETE = 3; + + public static String toString(int type) { + String result = ""; + switch (type) { + case CREATE: + result = "CREATE"; + break; + case UPDATE: + result = "UPDATE"; + break; + case DELETE: + result = "DELETE"; + break; + default: + break; + } + return result; + } +} \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/CrudType.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,40 @@ +/* + * 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; + +public interface PagerPage { + + public abstract Integer getCount(); + + public abstract void setCount(Integer count); + + public abstract Integer getCurrentPageNumber(); + + public abstract void setCurrentPageNumber(Integer currentPageNumber); + + public abstract Integer getMaxPageNumber(); + + public abstract void setMaxPageNumber(Integer maxPageNumber); + + public abstract Integer getNextPageNumber(); + + public abstract void setNextPageNumber(Integer nextPageNumber); + + public abstract Integer getPreviousPageNumber(); + + public abstract void setPreviousPageNumber(Integer previousPageNumber); + +} \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,106 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.admin.service.UserRegistrationService; + +import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractForgottenPasswordPage implements Serializable { + + private FacesContext facesContext; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + //TODO mail validator + @Required + private String email; + + private String guid; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + /** + * @return the guid + */ + public String getGuid() { + return guid; + } + + /** + * @param guid the guid to set + */ + public void setGuid(String guid) { + this.guid = guid; + } + + /** + * @return the facesContext + */ + public FacesContext getFacesContext() { + return facesContext; + } + + /** + * @param facesContext the facesContext to set + */ + public void setFacesContext(FacesContext facesContext) { + this.facesContext = facesContext; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractForgottenPasswordPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,125 @@ +/* + * 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.registration; + +import java.io.Serializable; + +public abstract class AbstractPublicPortalRegistrationPage extends + AbstractUserRegistrationPage implements Serializable { + + private String userNameFamilyYomi; + + private String userNameGivenYomi; + + private String termOfService; + + private Integer userBdateDate; + + private Integer userBdateMonth; + + private Integer userBdateYear; + + private String userIndustry; + + private String userSecretAnswer; + + private String userSecretQuestion; + + public String getTermOfService() { + return termOfService; + } + + public void setTermOfService(String termOfService) { + this.termOfService = termOfService; + } + + public Integer getUserBdateDate() { + return userBdateDate; + } + + public void setUserBdateDate(Integer userBdateDate) { + this.userBdateDate = userBdateDate; + } + + public Integer getUserBdateMonth() { + return userBdateMonth; + } + + public void setUserBdateMonth(Integer userBdateMonth) { + this.userBdateMonth = userBdateMonth; + } + + public Integer getUserBdateYear() { + return userBdateYear; + } + + public void setUserBdateYear(Integer userBdateYear) { + this.userBdateYear = userBdateYear; + } + + public String getUserIndustry() { + return userIndustry; + } + + public void setUserIndustry(String userIndustry) { + this.userIndustry = userIndustry; + } + + public String getUserSecretAnswer() { + return userSecretAnswer; + } + + public void setUserSecretAnswer(String userSecretAnswer) { + this.userSecretAnswer = userSecretAnswer; + } + + public String getUserSecretQuestion() { + return userSecretQuestion; + } + + public void setUserSecretQuestion(String userSecretQuestion) { + this.userSecretQuestion = userSecretQuestion; + } + + /** + * @return the userNameFamilyYomi + */ + public String getUserNameFamilyYomi() { + return userNameFamilyYomi; + } + + /** + * @param userNameFamilyYomi the userNameFamilyYomi to set + */ + public void setUserNameFamilyYomi(String userNameFamilyYomi) { + this.userNameFamilyYomi = userNameFamilyYomi; + } + + /** + * @return the userNameGivenYomi + */ + public String getUserNameGivenYomi() { + return userNameGivenYomi; + } + + /** + * @param userNameGivenYomi the userNameGivenYomi to set + */ + public void setUserNameGivenYomi(String userNameGivenYomi) { + this.userNameGivenYomi = userNameGivenYomi; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractPublicPortalRegistrationPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,69 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import jp.sf.pal.admin.service.UserRegistrationService; + +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractResetPasswordPage implements Serializable { + + private String guid; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractResetPasswordPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,921 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.admin.service.UserRegistrationService; + +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; + +public abstract class AbstractUserRegistrationPage implements Serializable { + + private FacesContext facesContext; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + @Length(maximum = 80) + private String password; + + @Length(maximum = 25) + private String userBdate; + + @Required + @Length(maximum = 80) + private String userBusinessInfoOnlineEmail; + + @Length(maximum = 80) + private String userBusinessInfoOnlineUri; + + @Length(maximum = 80) + private String userBusinessInfoPostalCity; + + @Length(maximum = 80) + private String userBusinessInfoPostalCountry; + + @Length(maximum = 80) + private String userBusinessInfoPostalName; + + @Length(maximum = 80) + private String userBusinessInfoPostalOrganization; + + @Length(maximum = 80) + private String userBusinessInfoPostalPostalcode; + + @Length(maximum = 80) + private String userBusinessInfoPostalStateprov; + + @Length(maximum = 80) + private String userBusinessInfoPostalStreet; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomFaxNumber; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomMobileNumber; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomPagerNumber; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneComment; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneExt; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneIntcode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneLoccode; + + @Length(maximum = 80) + private String userBusinessInfoTelecomTelephoneNumber; + + @Length(maximum = 80) + private String userDepartment; + + @Length(maximum = 80) + private String userEmployer; + + @Length(maximum = 10) + private String userGender; + + @Length(maximum = 80) + private String userHomeInfoOnlineEmail; + + @Length(maximum = 80) + private String userHomeInfoOnlineUri; + + @Length(maximum = 80) + private String userHomeInfoPostalCity; + + @Length(maximum = 80) + private String userHomeInfoPostalCountry; + + @Length(maximum = 80) + private String userHomeInfoPostalName; + + @Length(maximum = 80) + private String userHomeInfoPostalOrganization; + + @Length(maximum = 80) + private String userHomeInfoPostalPostalcode; + + @Length(maximum = 80) + private String userHomeInfoPostalStateprov; + + @Length(maximum = 80) + private String userHomeInfoPostalStreet; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomFaxNumber; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomMobileNumber; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomPagerNumber; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneComment; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneExt; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneIntcode; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneLoccode; + + @Length(maximum = 80) + private String userHomeInfoTelecomTelephoneNumber; + + @Length(maximum = 80) + private String userJobtitle; + + @Required + @Length(maximum = 80) + private String userName; + + @Length(maximum = 30) + private String userNameFamily; + + @Length(maximum = 30) + private String userNameGiven; + + @Length(maximum = 30) + private String userNameMiddle; + + @Length(maximum = 30) + private String userNameNickName; + + @Length(maximum = 10) + private String userNamePrefix; + + @Length(maximum = 10) + private String userNameSuffix; + + @Length(maximum = 80) + private String verifyPassword; + + /** + * @return the facesContext + */ + public FacesContext getFacesContext() { + return facesContext; + } + + /** + * @param facesContext the facesContext to set + */ + public void setFacesContext(FacesContext facesContext) { + this.facesContext = facesContext; + } + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUserBdate() { + return userBdate; + } + + public void setUserBdate(String userBdate) { + this.userBdate = userBdate; + } + + public String getUserBusinessInfoOnlineEmail() { + return userBusinessInfoOnlineEmail; + } + + public void setUserBusinessInfoOnlineEmail( + String userBusinessInfoOnlineEmail) { + this.userBusinessInfoOnlineEmail = userBusinessInfoOnlineEmail; + } + + public String getUserBusinessInfoOnlineUri() { + return userBusinessInfoOnlineUri; + } + + public void setUserBusinessInfoOnlineUri(String userBusinessInfoOnlineUri) { + this.userBusinessInfoOnlineUri = userBusinessInfoOnlineUri; + } + + public String getUserBusinessInfoPostalCity() { + return userBusinessInfoPostalCity; + } + + public void setUserBusinessInfoPostalCity(String userBusinessInfoPostalCity) { + this.userBusinessInfoPostalCity = userBusinessInfoPostalCity; + } + + public String getUserBusinessInfoPostalCountry() { + return userBusinessInfoPostalCountry; + } + + public void setUserBusinessInfoPostalCountry( + String userBusinessInfoPostalCountry) { + this.userBusinessInfoPostalCountry = userBusinessInfoPostalCountry; + } + + public String getUserBusinessInfoPostalName() { + return userBusinessInfoPostalName; + } + + public void setUserBusinessInfoPostalName(String userBusinessInfoPostalName) { + this.userBusinessInfoPostalName = userBusinessInfoPostalName; + } + + public String getUserBusinessInfoPostalOrganization() { + return userBusinessInfoPostalOrganization; + } + + public void setUserBusinessInfoPostalOrganization( + String userBusinessInfoPostalOrganization) { + this.userBusinessInfoPostalOrganization = userBusinessInfoPostalOrganization; + } + + public String getUserBusinessInfoPostalPostalcode() { + return userBusinessInfoPostalPostalcode; + } + + public void setUserBusinessInfoPostalPostalcode( + String userBusinessInfoPostalPostalcode) { + this.userBusinessInfoPostalPostalcode = userBusinessInfoPostalPostalcode; + } + + public String getUserBusinessInfoPostalStateprov() { + return userBusinessInfoPostalStateprov; + } + + public void setUserBusinessInfoPostalStateprov( + String userBusinessInfoPostalStateprov) { + this.userBusinessInfoPostalStateprov = userBusinessInfoPostalStateprov; + } + + public String getUserBusinessInfoPostalStreet() { + return userBusinessInfoPostalStreet; + } + + public void setUserBusinessInfoPostalStreet( + String userBusinessInfoPostalStreet) { + this.userBusinessInfoPostalStreet = userBusinessInfoPostalStreet; + } + + public String getUserBusinessInfoTelecomFaxComment() { + return userBusinessInfoTelecomFaxComment; + } + + public void setUserBusinessInfoTelecomFaxComment( + String userBusinessInfoTelecomFaxComment) { + this.userBusinessInfoTelecomFaxComment = userBusinessInfoTelecomFaxComment; + } + + public String getUserBusinessInfoTelecomFaxExt() { + return userBusinessInfoTelecomFaxExt; + } + + public void setUserBusinessInfoTelecomFaxExt( + String userBusinessInfoTelecomFaxExt) { + this.userBusinessInfoTelecomFaxExt = userBusinessInfoTelecomFaxExt; + } + + public String getUserBusinessInfoTelecomFaxIntcode() { + return userBusinessInfoTelecomFaxIntcode; + } + + public void setUserBusinessInfoTelecomFaxIntcode( + String userBusinessInfoTelecomFaxIntcode) { + this.userBusinessInfoTelecomFaxIntcode = userBusinessInfoTelecomFaxIntcode; + } + + public String getUserBusinessInfoTelecomFaxLoccode() { + return userBusinessInfoTelecomFaxLoccode; + } + + public void setUserBusinessInfoTelecomFaxLoccode( + String userBusinessInfoTelecomFaxLoccode) { + this.userBusinessInfoTelecomFaxLoccode = userBusinessInfoTelecomFaxLoccode; + } + + public String getUserBusinessInfoTelecomFaxNumber() { + return userBusinessInfoTelecomFaxNumber; + } + + public void setUserBusinessInfoTelecomFaxNumber( + String userBusinessInfoTelecomFaxNumber) { + this.userBusinessInfoTelecomFaxNumber = userBusinessInfoTelecomFaxNumber; + } + + public String getUserBusinessInfoTelecomMobileComment() { + return userBusinessInfoTelecomMobileComment; + } + + public void setUserBusinessInfoTelecomMobileComment( + String userBusinessInfoTelecomMobileComment) { + this.userBusinessInfoTelecomMobileComment = userBusinessInfoTelecomMobileComment; + } + + public String getUserBusinessInfoTelecomMobileExt() { + return userBusinessInfoTelecomMobileExt; + } + + public void setUserBusinessInfoTelecomMobileExt( + String userBusinessInfoTelecomMobileExt) { + this.userBusinessInfoTelecomMobileExt = userBusinessInfoTelecomMobileExt; + } + + public String getUserBusinessInfoTelecomMobileIntcode() { + return userBusinessInfoTelecomMobileIntcode; + } + + public void setUserBusinessInfoTelecomMobileIntcode( + String userBusinessInfoTelecomMobileIntcode) { + this.userBusinessInfoTelecomMobileIntcode = userBusinessInfoTelecomMobileIntcode; + } + + public String getUserBusinessInfoTelecomMobileLoccode() { + return userBusinessInfoTelecomMobileLoccode; + } + + public void setUserBusinessInfoTelecomMobileLoccode( + String userBusinessInfoTelecomMobileLoccode) { + this.userBusinessInfoTelecomMobileLoccode = userBusinessInfoTelecomMobileLoccode; + } + + public String getUserBusinessInfoTelecomMobileNumber() { + return userBusinessInfoTelecomMobileNumber; + } + + public void setUserBusinessInfoTelecomMobileNumber( + String userBusinessInfoTelecomMobileNumber) { + this.userBusinessInfoTelecomMobileNumber = userBusinessInfoTelecomMobileNumber; + } + + public String getUserBusinessInfoTelecomPagerComment() { + return userBusinessInfoTelecomPagerComment; + } + + public void setUserBusinessInfoTelecomPagerComment( + String userBusinessInfoTelecomPagerComment) { + this.userBusinessInfoTelecomPagerComment = userBusinessInfoTelecomPagerComment; + } + + public String getUserBusinessInfoTelecomPagerExt() { + return userBusinessInfoTelecomPagerExt; + } + + public void setUserBusinessInfoTelecomPagerExt( + String userBusinessInfoTelecomPagerExt) { + this.userBusinessInfoTelecomPagerExt = userBusinessInfoTelecomPagerExt; + } + + public String getUserBusinessInfoTelecomPagerIntcode() { + return userBusinessInfoTelecomPagerIntcode; + } + + public void setUserBusinessInfoTelecomPagerIntcode( + String userBusinessInfoTelecomPagerIntcode) { + this.userBusinessInfoTelecomPagerIntcode = userBusinessInfoTelecomPagerIntcode; + } + + public String getUserBusinessInfoTelecomPagerLoccode() { + return userBusinessInfoTelecomPagerLoccode; + } + + public void setUserBusinessInfoTelecomPagerLoccode( + String userBusinessInfoTelecomPagerLoccode) { + this.userBusinessInfoTelecomPagerLoccode = userBusinessInfoTelecomPagerLoccode; + } + + public String getUserBusinessInfoTelecomPagerNumber() { + return userBusinessInfoTelecomPagerNumber; + } + + public void setUserBusinessInfoTelecomPagerNumber( + String userBusinessInfoTelecomPagerNumber) { + this.userBusinessInfoTelecomPagerNumber = userBusinessInfoTelecomPagerNumber; + } + + public String getUserBusinessInfoTelecomTelephoneComment() { + return userBusinessInfoTelecomTelephoneComment; + } + + public void setUserBusinessInfoTelecomTelephoneComment( + String userBusinessInfoTelecomTelephoneComment) { + this.userBusinessInfoTelecomTelephoneComment = userBusinessInfoTelecomTelephoneComment; + } + + public String getUserBusinessInfoTelecomTelephoneExt() { + return userBusinessInfoTelecomTelephoneExt; + } + + public void setUserBusinessInfoTelecomTelephoneExt( + String userBusinessInfoTelecomTelephoneExt) { + this.userBusinessInfoTelecomTelephoneExt = userBusinessInfoTelecomTelephoneExt; + } + + public String getUserBusinessInfoTelecomTelephoneIntcode() { + return userBusinessInfoTelecomTelephoneIntcode; + } + + public void setUserBusinessInfoTelecomTelephoneIntcode( + String userBusinessInfoTelecomTelephoneIntcode) { + this.userBusinessInfoTelecomTelephoneIntcode = userBusinessInfoTelecomTelephoneIntcode; + } + + public String getUserBusinessInfoTelecomTelephoneLoccode() { + return userBusinessInfoTelecomTelephoneLoccode; + } + + public void setUserBusinessInfoTelecomTelephoneLoccode( + String userBusinessInfoTelecomTelephoneLoccode) { + this.userBusinessInfoTelecomTelephoneLoccode = userBusinessInfoTelecomTelephoneLoccode; + } + + public String getUserBusinessInfoTelecomTelephoneNumber() { + return userBusinessInfoTelecomTelephoneNumber; + } + + public void setUserBusinessInfoTelecomTelephoneNumber( + String userBusinessInfoTelecomTelephoneNumber) { + this.userBusinessInfoTelecomTelephoneNumber = userBusinessInfoTelecomTelephoneNumber; + } + + public String getUserDepartment() { + return userDepartment; + } + + public void setUserDepartment(String userDepartment) { + this.userDepartment = userDepartment; + } + + public String getUserEmployer() { + return userEmployer; + } + + public void setUserEmployer(String userEmployer) { + this.userEmployer = userEmployer; + } + + public String getUserGender() { + return userGender; + } + + public void setUserGender(String userGender) { + this.userGender = userGender; + } + + public String getUserHomeInfoOnlineEmail() { + return userHomeInfoOnlineEmail; + } + + public void setUserHomeInfoOnlineEmail(String userHomeInfoOnlineEmail) { + this.userHomeInfoOnlineEmail = userHomeInfoOnlineEmail; + } + + public String getUserHomeInfoOnlineUri() { + return userHomeInfoOnlineUri; + } + + public void setUserHomeInfoOnlineUri(String userHomeInfoOnlineUri) { + this.userHomeInfoOnlineUri = userHomeInfoOnlineUri; + } + + public String getUserHomeInfoPostalCity() { + return userHomeInfoPostalCity; + } + + public void setUserHomeInfoPostalCity(String userHomeInfoPostalCity) { + this.userHomeInfoPostalCity = userHomeInfoPostalCity; + } + + public String getUserHomeInfoPostalCountry() { + return userHomeInfoPostalCountry; + } + + public void setUserHomeInfoPostalCountry(String userHomeInfoPostalCountry) { + this.userHomeInfoPostalCountry = userHomeInfoPostalCountry; + } + + public String getUserHomeInfoPostalName() { + return userHomeInfoPostalName; + } + + public void setUserHomeInfoPostalName(String userHomeInfoPostalName) { + this.userHomeInfoPostalName = userHomeInfoPostalName; + } + + public String getUserHomeInfoPostalOrganization() { + return userHomeInfoPostalOrganization; + } + + public void setUserHomeInfoPostalOrganization( + String userHomeInfoPostalOrganization) { + this.userHomeInfoPostalOrganization = userHomeInfoPostalOrganization; + } + + public String getUserHomeInfoPostalPostalcode() { + return userHomeInfoPostalPostalcode; + } + + public void setUserHomeInfoPostalPostalcode( + String userHomeInfoPostalPostalcode) { + this.userHomeInfoPostalPostalcode = userHomeInfoPostalPostalcode; + } + + public String getUserHomeInfoPostalStateprov() { + return userHomeInfoPostalStateprov; + } + + public void setUserHomeInfoPostalStateprov( + String userHomeInfoPostalStateprov) { + this.userHomeInfoPostalStateprov = userHomeInfoPostalStateprov; + } + + public String getUserHomeInfoPostalStreet() { + return userHomeInfoPostalStreet; + } + + public void setUserHomeInfoPostalStreet(String userHomeInfoPostalStreet) { + this.userHomeInfoPostalStreet = userHomeInfoPostalStreet; + } + + public String getUserHomeInfoTelecomFaxComment() { + return userHomeInfoTelecomFaxComment; + } + + public void setUserHomeInfoTelecomFaxComment( + String userHomeInfoTelecomFaxComment) { + this.userHomeInfoTelecomFaxComment = userHomeInfoTelecomFaxComment; + } + + public String getUserHomeInfoTelecomFaxExt() { + return userHomeInfoTelecomFaxExt; + } + + public void setUserHomeInfoTelecomFaxExt(String userHomeInfoTelecomFaxExt) { + this.userHomeInfoTelecomFaxExt = userHomeInfoTelecomFaxExt; + } + + public String getUserHomeInfoTelecomFaxIntcode() { + return userHomeInfoTelecomFaxIntcode; + } + + public void setUserHomeInfoTelecomFaxIntcode( + String userHomeInfoTelecomFaxIntcode) { + this.userHomeInfoTelecomFaxIntcode = userHomeInfoTelecomFaxIntcode; + } + + public String getUserHomeInfoTelecomFaxLoccode() { + return userHomeInfoTelecomFaxLoccode; + } + + public void setUserHomeInfoTelecomFaxLoccode( + String userHomeInfoTelecomFaxLoccode) { + this.userHomeInfoTelecomFaxLoccode = userHomeInfoTelecomFaxLoccode; + } + + public String getUserHomeInfoTelecomFaxNumber() { + return userHomeInfoTelecomFaxNumber; + } + + public void setUserHomeInfoTelecomFaxNumber( + String userHomeInfoTelecomFaxNumber) { + this.userHomeInfoTelecomFaxNumber = userHomeInfoTelecomFaxNumber; + } + + public String getUserHomeInfoTelecomMobileComment() { + return userHomeInfoTelecomMobileComment; + } + + public void setUserHomeInfoTelecomMobileComment( + String userHomeInfoTelecomMobileComment) { + this.userHomeInfoTelecomMobileComment = userHomeInfoTelecomMobileComment; + } + + public String getUserHomeInfoTelecomMobileExt() { + return userHomeInfoTelecomMobileExt; + } + + public void setUserHomeInfoTelecomMobileExt( + String userHomeInfoTelecomMobileExt) { + this.userHomeInfoTelecomMobileExt = userHomeInfoTelecomMobileExt; + } + + public String getUserHomeInfoTelecomMobileIntcode() { + return userHomeInfoTelecomMobileIntcode; + } + + public void setUserHomeInfoTelecomMobileIntcode( + String userHomeInfoTelecomMobileIntcode) { + this.userHomeInfoTelecomMobileIntcode = userHomeInfoTelecomMobileIntcode; + } + + public String getUserHomeInfoTelecomMobileLoccode() { + return userHomeInfoTelecomMobileLoccode; + } + + public void setUserHomeInfoTelecomMobileLoccode( + String userHomeInfoTelecomMobileLoccode) { + this.userHomeInfoTelecomMobileLoccode = userHomeInfoTelecomMobileLoccode; + } + + public String getUserHomeInfoTelecomMobileNumber() { + return userHomeInfoTelecomMobileNumber; + } + + public void setUserHomeInfoTelecomMobileNumber( + String userHomeInfoTelecomMobileNumber) { + this.userHomeInfoTelecomMobileNumber = userHomeInfoTelecomMobileNumber; + } + + public String getUserHomeInfoTelecomPagerComment() { + return userHomeInfoTelecomPagerComment; + } + + public void setUserHomeInfoTelecomPagerComment( + String userHomeInfoTelecomPagerComment) { + this.userHomeInfoTelecomPagerComment = userHomeInfoTelecomPagerComment; + } + + public String getUserHomeInfoTelecomPagerExt() { + return userHomeInfoTelecomPagerExt; + } + + public void setUserHomeInfoTelecomPagerExt( + String userHomeInfoTelecomPagerExt) { + this.userHomeInfoTelecomPagerExt = userHomeInfoTelecomPagerExt; + } + + public String getUserHomeInfoTelecomPagerIntcode() { + return userHomeInfoTelecomPagerIntcode; + } + + public void setUserHomeInfoTelecomPagerIntcode( + String userHomeInfoTelecomPagerIntcode) { + this.userHomeInfoTelecomPagerIntcode = userHomeInfoTelecomPagerIntcode; + } + + public String getUserHomeInfoTelecomPagerLoccode() { + return userHomeInfoTelecomPagerLoccode; + } + + public void setUserHomeInfoTelecomPagerLoccode( + String userHomeInfoTelecomPagerLoccode) { + this.userHomeInfoTelecomPagerLoccode = userHomeInfoTelecomPagerLoccode; + } + + public String getUserHomeInfoTelecomPagerNumber() { + return userHomeInfoTelecomPagerNumber; + } + + public void setUserHomeInfoTelecomPagerNumber( + String userHomeInfoTelecomPagerNumber) { + this.userHomeInfoTelecomPagerNumber = userHomeInfoTelecomPagerNumber; + } + + public String getUserHomeInfoTelecomTelephoneComment() { + return userHomeInfoTelecomTelephoneComment; + } + + public void setUserHomeInfoTelecomTelephoneComment( + String userHomeInfoTelecomTelephoneComment) { + this.userHomeInfoTelecomTelephoneComment = userHomeInfoTelecomTelephoneComment; + } + + public String getUserHomeInfoTelecomTelephoneExt() { + return userHomeInfoTelecomTelephoneExt; + } + + public void setUserHomeInfoTelecomTelephoneExt( + String userHomeInfoTelecomTelephoneExt) { + this.userHomeInfoTelecomTelephoneExt = userHomeInfoTelecomTelephoneExt; + } + + public String getUserHomeInfoTelecomTelephoneIntcode() { + return userHomeInfoTelecomTelephoneIntcode; + } + + public void setUserHomeInfoTelecomTelephoneIntcode( + String userHomeInfoTelecomTelephoneIntcode) { + this.userHomeInfoTelecomTelephoneIntcode = userHomeInfoTelecomTelephoneIntcode; + } + + public String getUserHomeInfoTelecomTelephoneLoccode() { + return userHomeInfoTelecomTelephoneLoccode; + } + + public void setUserHomeInfoTelecomTelephoneLoccode( + String userHomeInfoTelecomTelephoneLoccode) { + this.userHomeInfoTelecomTelephoneLoccode = userHomeInfoTelecomTelephoneLoccode; + } + + public String getUserHomeInfoTelecomTelephoneNumber() { + return userHomeInfoTelecomTelephoneNumber; + } + + public void setUserHomeInfoTelecomTelephoneNumber( + String userHomeInfoTelecomTelephoneNumber) { + this.userHomeInfoTelecomTelephoneNumber = userHomeInfoTelecomTelephoneNumber; + } + + public String getUserJobtitle() { + return userJobtitle; + } + + public void setUserJobtitle(String userJobtitle) { + this.userJobtitle = userJobtitle; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserNameFamily() { + return userNameFamily; + } + + public void setUserNameFamily(String userNameFamily) { + this.userNameFamily = userNameFamily; + } + + public String getUserNameGiven() { + return userNameGiven; + } + + public void setUserNameGiven(String userNameGiven) { + this.userNameGiven = userNameGiven; + } + + public String getUserNameMiddle() { + return userNameMiddle; + } + + public void setUserNameMiddle(String userNameMiddle) { + this.userNameMiddle = userNameMiddle; + } + + public String getUserNameNickName() { + return userNameNickName; + } + + public void setUserNameNickName(String userNameNickName) { + this.userNameNickName = userNameNickName; + } + + public String getUserNamePrefix() { + return userNamePrefix; + } + + public void setUserNamePrefix(String userNamePrefix) { + this.userNamePrefix = userNamePrefix; + } + + public String getUserNameSuffix() { + return userNameSuffix; + } + + public void setUserNameSuffix(String userNameSuffix) { + this.userNameSuffix = userNameSuffix; + } + + public String getVerifyPassword() { + return verifyPassword; + } + + public void setVerifyPassword(String verifyPassword) { + this.verifyPassword = verifyPassword; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/AbstractUserRegistrationPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,36 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PortalRegistrationCompletedPage implements Serializable { + + private static final long serialVersionUID = -9086102477020421786L; + + public Class initialize() { + return null; + } + + public Class prerender() { + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationCompletedPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,182 @@ +/* + * 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.registration; + +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.HashMap; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.admin.util.PALAdminUtil; +import jp.sf.pal.admin.util.UserRegistrationUtil; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class PortalRegistrationRegisterPage extends + AbstractPublicPortalRegistrationPage implements Serializable { + + private static final long serialVersionUID = -4113768516238946252L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortalRegistrationRegisterPage.class); + + public static final String userName_TRequiredValidator = null; + + public static final String userName_lengthValidator = "minimum=6, maximum=32"; + + public static final String userName_TRegularExpressionValidator = "pattern='[a-zA-Z][0-9a-zA-Z._]+'"; + + public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; + + public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; + + // public static final String userSecretQuestion_TRequiredValidator = null; + + public static final String userSecretQuestion_lengthValidator = "maximum=100"; + + public static final String userSecretAnswer_TRequiredValidator = null; + + public static final String userSecretAnswer_lengthValidator = "maximum=100"; + + private String userSecretQuestionSelection; + + private List> userSecretQuestionSelectionItems; + + public String getUserSecretQuestionSelection() { + return userSecretQuestionSelection; + } + + public void setUserSecretQuestionSelection( + String userSecretQuestionSelection) { + this.userSecretQuestionSelection = userSecretQuestionSelection; + } + + public List> getUserSecretQuestionSelectionItems() { + return userSecretQuestionSelectionItems; + } + + public void setUserSecretQuestionSelectionItems( + List> userSecretQuestionSelectionItems) { + this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems; + } + + public Class doFinish() { + if (getUserBusinessInfoOnlineEmail() != null) { + setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail()); + } + + if (userSecretQuestionSelection != null) { + setUserSecretQuestion(userSecretQuestionSelection); + } + + try { + setUserSecretAnswer(getUserRegistrationService().getMessageDigest( + getUserSecretAnswer())); + getUserRegistrationService().register(this); + if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) { + FacesMessageUtil.addInfoMessage("success.check_your_email"); + return PortalRegistrationCompletedPage.class; + } else { + FacesMessageUtil.addInfoMessage("success.login_above"); + } + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0001", new Object[] { this.toString() }, e); + + } + + return null; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + // Load Term Of Service + String filename = getLabelHelper().getLabelValue("termOfServiceFile"); + if (filename == null) { + filename = "/WEB-INF/template/term_of_service.txt"; + } + String encoding = getLabelHelper().getLabelValue( + "termOfServiceEncoding"); + if (encoding == null) { + encoding = "UTF-8"; + } + StringBuffer buf = new StringBuffer(); + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader( + new FileInputStream(PALAdminUtil + .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) { + } + } + } + setTermOfService(buf.toString()); + + // Load Secret Question + List> questionItems = new ArrayList>(); + int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue( + "secretQuestion.num")); + for (int i = 1; i <= numOfQuestions; i++) { + Map map = new HashMap(2); + String value = getLabelHelper() + .getLabelValue("secretQuestion." + i); + map.put("label", value); + map.put("value", value); + questionItems.add(map); + } + setUserSecretQuestionSelectionItems(questionItems); + + // reset secret answer + setUserSecretAnswer(""); + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationRegisterPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,84 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class PortalRegistrationUpdatePage extends + AbstractPublicPortalRegistrationPage implements Serializable { + + private static final long serialVersionUID = -3639991850557070723L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortalRegistrationUpdatePage.class); + + public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; + + public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; + + public static final String userSecretQuestion_TRequiredValidator = null; + + public static final String userSecretQuestion_lengthValidator = "maximum=100"; + + public static final String userSecretAnswer_TRequiredValidator = null; + + public static final String userSecretAnswer_lengthValidator = "maximum=100"; + + public Class doFinish() { + try { + if (!PALAdminConstants.SECRET_ANSWER_DISPLAY + .equals(getUserSecretAnswer())) { + setUserSecretAnswer(getUserRegistrationService() + .getMessageDigest(getUserSecretAnswer())); + } + getUserRegistrationService().update(this); + FacesMessageUtil.addInfoMessage("updated.user.info"); + return PortalRegistrationUpdatePage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0001", new Object[] { this.toString() }, e); + } + return null; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + try { + getUserRegistrationService().loadPage(this); + setUserSecretAnswer(PALAdminConstants.SECRET_ANSWER_DISPLAY); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0001", new Object[] { this.toString() }, e); + } + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PortalRegistrationUpdatePage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,57 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import org.seasar.framework.log.Logger; + +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PublicPortalForgottenPasswordCompletedPage extends + AbstractResetPasswordPage implements Serializable { + + private static final long serialVersionUID = -5203115307227054989L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PublicPortalForgottenPasswordCompletedPage.class); + + public Class initialize() { + return null; + } + + public Class prerender() { + if (getGuid() != null) { + try { + getUserRegistrationService().updatePassword(this); + FacesMessageUtil + .addInfoMessage("forgotten.successful_pw_update"); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0003", new Object[] { this.toString() }, e); + } + } + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordCompletedPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -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.web.registration; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PublicPortalForgottenPasswordPage extends + AbstractForgottenPasswordPage { + + private static final long serialVersionUID = 362540675380114688L; + + public static final String email_TRequiredValidator = null; + + public static final String email_lengthValidator = "minimum=5, maximum=80"; + + public Class doNext() { + //TODO check email + return PublicPortalSecretAnswerPage.class; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + setGuid((String) FacesContext.getCurrentInstance().getExternalContext() + .getRequestParameterMap().get("guid")); + if (getGuid() != null) { + return PublicPortalForgottenPasswordCompletedPage.class; + } + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + + public String getDoNextValue() { + return getLabelHelper().getLabelValue("Next"); + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalForgottenPasswordPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,36 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import jp.sf.pal.common.util.FacesMessageUtil; + +public class PublicPortalRegistrationCompletedPage implements Serializable { + + private static final long serialVersionUID = -5112166307058162379L; + + public Class initialize() { + return null; + } + + public Class prerender() { + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationCompletedPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,251 @@ +/* + * 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.registration; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.admin.util.PALAdminUtil; +import jp.sf.pal.admin.util.UserRegistrationUtil; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class PublicPortalRegistrationRegisterPage extends + AbstractPublicPortalRegistrationPage { + /** + * + */ + private static final long serialVersionUID = 5818687558352917312L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PublicPortalRegistrationRegisterPage.class); + + public static final String userName_TRequiredValidator = null; + + public static final String userName_lengthValidator = "minimum=6, maximum=32"; + + public static final String userName_TRegularExpressionValidator = "pattern='[a-zA-Z][0-9a-zA-Z._]+'"; + + public static final String userNameFamily_TRequiredValidator = null; + + public static final String userNameFamily_lengthValidator = " maximum=30"; + + public static final String userNameGiven_TRequiredValidator = null; + + public static final String userNameGiven_lengthValidator = "maximum=30"; + + public static final String userNameFamilyYomi_TRequiredValidator = null; + + public static final String userNameFamilyYomi_lengthValidator = " maximum=30"; + + public static final String userNameGivenYomi_TRequiredValidator = null; + + public static final String userNameGivenYomi_lengthValidator = "maximum=30"; + + public static final String userHomeInfoPostalPostalcode_TRequiredValidator = null; + + public static final String userHomeInfoPostalPostalcode_lengthValidator = "maximum=8"; + + public static final String userGender_TRequiredValidator = null; + + public static final String userBdateYear_TRequiredValidator = null; + + public static final String userBdateYear_TNumberLengthValidator = "integralMax=4"; + + public static final String userBdateMonth_TRequiredValidator = null; + + public static final String userBdateMonth_TNumberLengthValidator = "integralMax=2"; + + public static final String userBdateDate_TRequiredValidator = null; + + public static final String userBdateDate_TNumberLengthValidator = "integralMax=2"; + + public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; + + public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; + + public static final String userIndustry_TRequiredValidator = null; + + public static final String userJobtitle_TRequiredValidator = null; + + // public static final String userSecretQuestion_TRequiredValidator = null; + + public static final String userSecretQuestion_lengthValidator = "maximum=100"; + + public static final String userSecretAnswer_TRequiredValidator = null; + + public static final String userSecretAnswer_lengthValidator = "maximum=100"; + + private String userSecretQuestionSelection; + + private List> userSecretQuestionSelectionItems; + + private int userSecretQuestionSelectionIndex; + + /** + * @return the userSecretQuestionSelection + */ + public String getUserSecretQuestionSelection() { + return userSecretQuestionSelection; + } + + /** + * @param userSecretQuestionSelection the userSecretQuestionSelection to set + */ + public void setUserSecretQuestionSelection( + String userSecretQuestionSelection) { + this.userSecretQuestionSelection = userSecretQuestionSelection; + } + + /** + * @return the userSecretQuestionSelectionItems + */ + public List> getUserSecretQuestionSelectionItems() { + return userSecretQuestionSelectionItems; + } + + /** + * @param userSecretQuestionSelectionItems the userSecretQuestionSelectionItems to set + */ + public void setUserSecretQuestionSelectionItems( + List> userSecretQuestionSelectionItems) { + this.userSecretQuestionSelectionItems = userSecretQuestionSelectionItems; + } + + /** + * @return the userSecretQuestionSelectionIndex + */ + public int getUserSecretQuestionSelectionIndex() { + return userSecretQuestionSelectionIndex; + } + + /** + * @param userSecretQuestionSelectionIndex the userSecretQuestionSelectionIndex to set + */ + public void setUserSecretQuestionSelectionIndex( + int userSecretQuestionSelectionIndex) { + this.userSecretQuestionSelectionIndex = userSecretQuestionSelectionIndex; + } + + public Class doFinish() { + if (getUserBusinessInfoOnlineEmail() != null) { + setUserHomeInfoOnlineEmail(getUserBusinessInfoOnlineEmail()); + } + + if (userSecretQuestionSelection != null) { + setUserSecretQuestion(userSecretQuestionSelection); + } + + try { + setUserSecretAnswer(getUserRegistrationService().getMessageDigest( + getUserSecretAnswer())); + getUserRegistrationService().register(this); + if (UserRegistrationUtil.getBoolean(PALAdminConstants.SEND_MAIL)) { + FacesMessageUtil.addInfoMessage("success.check_your_email"); + return PublicPortalRegistrationCompletedPage.class; + } else { + FacesMessageUtil.addInfoMessage("success.login_above"); + } + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0001", new Object[] { this.toString() }, e); + + } + + return null; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + // Load Term Of Service + String filename = getLabelHelper().getLabelValue("termOfServiceFile"); + if (filename == null) { + filename = "/WEB-INF/template/term_of_service.txt"; + } + String encoding = getLabelHelper().getLabelValue( + "termOfServiceEncoding"); + if (encoding == null) { + encoding = "UTF-8"; + } + StringBuffer buf = new StringBuffer(); + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader( + new FileInputStream(PALAdminUtil + .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) { + } + } + } + setTermOfService(buf.toString()); + + // Load Secret Question + List> questionItems = new ArrayList>(); + int numOfQuestions = Integer.parseInt(getLabelHelper().getLabelValue( + "secretQuestion.num")); + for (int i = 1; i <= numOfQuestions; i++) { + Map map = new HashMap(2); + String value = getLabelHelper() + .getLabelValue("secretQuestion." + i); + map.put("label", value); + map.put("value", value); + questionItems.add(map); + } + setUserSecretQuestionSelectionItems(questionItems); + + // reset secret answer + setUserSecretAnswer(""); + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationRegisterPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,125 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import jp.sf.pal.admin.PALAdminConstants; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; + +public class PublicPortalRegistrationUpdatePage extends + AbstractPublicPortalRegistrationPage implements Serializable { + + private static final long serialVersionUID = -2415175365437526156L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PublicPortalRegistrationUpdatePage.class); + + public static final String userName_TRequiredValidator = null; + + public static final String userName_lengthValidator = "minimum=6, maximum=32"; + + public static final String userNameFamily_TRequiredValidator = null; + + public static final String userNameFamily_lengthValidator = " maximum=30"; + + public static final String userNameGiven_TRequiredValidator = null; + + public static final String userNameGiven_lengthValidator = "maximum=30"; + + public static final String userNameFamilyYomi_TRequiredValidator = null; + + public static final String userNameFamilyYomi_lengthValidator = " maximum=30"; + + public static final String userNameGivenYomi_TRequiredValidator = null; + + public static final String userNameGivenYomi_lengthValidator = "maximum=30"; + + public static final String userHomeInfoPostalPostalcode_TRequiredValidator = null; + + public static final String userHomeInfoPostalPostalcode_lengthValidator = "maximum=8"; + + public static final String userGender_TRequiredValidator = null; + + public static final String userBdateYear_TRequiredValidator = null; + + public static final String userBdateYear_TNumberLengthValidator = "integralMax=4"; + + public static final String userBdateMonth_TRequiredValidator = null; + + public static final String userBdateMonth_TNumberLengthValidator = "integralMax=2"; + + public static final String userBdateDate_TRequiredValidator = null; + + public static final String userBdateDate_TNumberLengthValidator = "integralMax=2"; + + public static final String userBusinessInfoOnlineEmail_TRequiredValidator = null; + + public static final String userBusinessInfoOnlineEmail_lengthValidator = "minimum=5, maximum=80"; + + public static final String userIndustry_TRequiredValidator = null; + + public static final String userJobtitle_TRequiredValidator = null; + + public static final String userSecretQuestion_TRequiredValidator = null; + + public static final String userSecretQuestion_lengthValidator = "maximum=100"; + + public static final String userSecretAnswer_TRequiredValidator = null; + + public static final String userSecretAnswer_lengthValidator = "maximum=100"; + + public Class doFinish() { + try { + if (!PALAdminConstants.SECRET_ANSWER_DISPLAY + .equals(getUserSecretAnswer())) { + setUserSecretAnswer(getUserRegistrationService() + .getMessageDigest(getUserSecretAnswer())); + } + getUserRegistrationService().update(this); + FacesMessageUtil.addInfoMessage("updated.user.info"); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0001", new Object[] { this.toString() }, e); + } + return null; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + try { + getUserRegistrationService().loadPage(this); + setUserSecretAnswer(PALAdminConstants.SECRET_ANSWER_DISPLAY); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0001", new Object[] { this.toString() }, e); + } + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalRegistrationUpdatePage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,132 @@ +/* + * 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.registration; + +import java.io.Serializable; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.admin.PALAdminConstants; +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; + +public class PublicPortalSecretAnswerPage extends AbstractForgottenPasswordPage + implements Serializable { + + private static final long serialVersionUID = -3654426468628202950L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PublicPortalSecretAnswerPage.class); + + private String userSecretAnswer; + + private String userSecretQuestion; + + public String getUserSecretAnswer() { + return userSecretAnswer; + } + + public void setUserSecretAnswer(String userSecretAnswer) { + this.userSecretAnswer = userSecretAnswer; + } + + public String getUserSecretQuestion() { + return userSecretQuestion; + } + + public void setUserSecretQuestion(String userSecretQuestion) { + this.userSecretQuestion = userSecretQuestion; + } + + public Class doFinish() { + try { + if (!PALAdminConstants.SECRET_ANSWER_DISPLAY + .equals(getUserSecretAnswer())) { + setUserSecretAnswer(getUserRegistrationService() + .getMessageDigest(getUserSecretAnswer())); + } + if (getUserRegistrationService().checkSecretAnswer(this)) { + try { + getUserRegistrationService().sendNewPassword(this); + FacesMessageUtil.addInfoMessage("an_email_has_been_sent"); + return PublicPortalForgottenPasswordCompletedPage.class; + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0002", new Object[] { this.toString() }, e); + setUserSecretAnswer(null); + } + + } else { + FacesMessageUtil.addInfoMessage("incorrect.scret.answer"); + setUserSecretAnswer(null); + } + } catch (CommonException e) { + // FacesMessageUtil.addErrorMessage(e.getMessageId()); + FacesMessageUtil.addInfoMessage("incorrect.scret.answer"); + logger.log("EPA0002", new Object[] { this.toString() }, e); + setUserSecretAnswer(null); + } + return null; + } + + @TakeOver(type = TakeOverType.NEVER) + public Class doBack() { + return PublicPortalForgottenPasswordPage.class; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + setGuid((String) FacesContext.getCurrentInstance().getExternalContext() + .getRequestParameterMap().get("guid")); + if (getGuid() != null) { + return PublicPortalForgottenPasswordCompletedPage.class; + } + + if (getEmail() == null) { + return PublicPortalForgottenPasswordPage.class; + } + + try { + getUserRegistrationService().setSecretQuestion(this); + } catch (CommonException e) { + logger.log("EPA0005", new Object[] { this.toString() }, e); + // return PublicPortalForgottenPasswordPage.class; + } + + // render FacesMessage + FacesMessageUtil.renderMessages(); + return null; + } + + public String getDoFinishValue() { + return getLabelHelper().getLabelValue("Finish"); + } + + public String getDoBackValue() { + return getLabelHelper().getLabelValue("Back"); + } + +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/registration/PublicPortalSecretAnswerPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,128 @@ +/* + * 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; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.admin.service.UserRegistrationService; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; + +public class PublicPortalWithdrawalConfirmPage implements Serializable { + + private static final long serialVersionUID = 8488575299043325615L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PublicPortalWithdrawalConfirmPage.class); + + private String password; + + private String username; + + private LabelHelper labelHelper; + + private UserRegistrationService userRegistrationService; + + /** + * @return the userRegistrationService + */ + public UserRegistrationService getUserRegistrationService() { + return userRegistrationService; + } + + /** + * @param userRegistrationService the userRegistrationService to set + */ + public void setUserRegistrationService( + UserRegistrationService userRegistrationService) { + this.userRegistrationService = userRegistrationService; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public Class doFinish() { + try { + getUserRegistrationService().withdraw(this); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.error(e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.remove.user"); + logger.error(e); + } + return null; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + username = FacesContext.getCurrentInstance().getExternalContext() + .getRemoteUser(); + if (username == null) { + FacesMessageUtil.addWarnMessage("login.first"); + return PublicPortalWithdrawalPage.class; + } + + FacesMessageUtil.renderMessages(); + return null; + } + + public String getDoFinishValue() { + return getLabelHelper().getLabelValue("finish"); + } + + public String getDoCancelValue() { + return getLabelHelper().getLabelValue("cancel"); + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalConfirmPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java =================================================================== --- pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java (rev 0) +++ pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,60 @@ +/* + * 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; + +import jp.sf.pal.common.util.FacesMessageUtil; + +import org.seasar.teeda.extension.util.LabelHelper; + +public class PublicPortalWithdrawalPage implements Serializable { + + private static final long serialVersionUID = -5259684745193320666L; + + private LabelHelper labelHelper; + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public Class doNext() { + return PublicPortalWithdrawalConfirmPage.class; + } + + public Class initialize() { + return null; + } + + public Class prerender() { + FacesMessageUtil.renderMessages(); + return null; + } + + public String getDoNextValue() { + return getLabelHelper().getLabelValue("next"); + } +} Property changes on: pal-admin-ex/trunk/src/main/java/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawalPage.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/PAMessages.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/PAMessages.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,144 @@ +EPA0001=Could not register a user. +EPA0002=Could not send a forgotten password mail. +EPA0003=Could not update a password. +EPA0004=Could not read a term of service. +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. +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. +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. +EPA0046=Could not change the password. +EPA0047=Could not get a username. +EPA0048=Could not find security definitions. +EPA0049=Could not find a security definition. +EPA0050=Could not find a security definition. +EPA0051=Could not add a security definition. +EPA0052=Could not update a security definition. +EPA0053=Could not delete a security definition. +EPA0054=Could not find security constraints. +EPA0055=Could not add a security constraint. +EPA0056=Could not add a security constraint. +EPA0057=Could not remove a security constraint. +EPA0058=Could not remove a security constraint. +EPA0059=Could not find global security constraints. +EPA0060=Could not find a global security constraint. +EPA0061=Could not add a global security constraint. +EPA0062=Could not update a global security constraint. +EPA0063=Could not delete a global security constraint. +EPA0064=Could not find a profiling rule. +EPA0065=Could not find a profiling rule. +EPA0066=Could not add a profiling rule. +EPA0067=Could not update a profiling rule. +EPA0068=Could not delete a profiling rule. +EPA0069=Could not find rule criteria. +EPA0070=Could not find a rule criterion. +EPA0071=Could not add a rule criterion. +EPA0072=Could not update a rule criterion. +EPA0073=Could not delete a rule criterion. + +EPA0074=Could not load a page. +EPA0075=Could not update a page. +EPA0076=Could not update a page. +EPA0077=Could not delete a page. +EPA0078=Could not delete a page. +EPA0079=Could not load a page. +EPA0080=Could not add a metadata to the page. +EPA0081=Could not add a metadata to the page. +EPA0082=Could not delete a metadata from the page. +EPA0083=Could not delete a metadata from the page. +EPA0084=Could not load a page. +EPA0085=Could not add a security constraint to the page. +EPA0086=Could not add a security constraint to the page. +EPA0087=Could not add a security constraint ref to the page. +EPA0088=Could not add a security constraint ref to the page. +EPA0089=Could not remove a security constraint from the page. +EPA0090=Could not remove a security constraint from the page. +EPA0091=Could not remove a security constraint ref from the page. +EPA0092=Could not remove a security constraint ref from the page. +EPA0093=Could not load a folder. +EPA0094=Could not add a folder to the folder. +EPA0095=Could not add a folder to the folder. +EPA0096=Could not add a page to the folder. +EPA0097=Could not add a page to the folder. +EPA0098=Could not load a folder. +EPA0099=Could not update a folder. +EPA0100=Could not update a folder. +EPA0101=Could not delete a folder. +EPA0102=Could not delete a folder. +EPA0103=Could not load a folder. +EPA0104=Could not add a metadata to the folder. +EPA0105=Could not add a metadata to the folder. +EPA0106=Could not delete a metadata from the folder. +EPA0107=Could not delete a metadata from the folder. +EPA0108=Could not load a folder. +EPA0109=Could not change a document order. +EPA0110=Could not change a document order. +EPA0111=Could not change a document order. +EPA0112=Could not change a document order. +EPA0113=Could not add a document order. +EPA0114=Could not add a document order. +EPA0115=Could not remove a document order. +EPA0116=Could not remove a document order. +EPA0117=Could not load a folder. +EPA0118=Could not add a security constraint to the folder. +EPA0119=Could not add a security constraint to the folder. +EPA0120=Could not add a security constraint ref to the folder. +EPA0121=Could not add a security constraint ref to the folder. +EPA0122=Could not remove a security constraint from the folder. +EPA0123=Could not remove a security constraint from the folder. +EPA0124=Could not remove a security constraint ref from the folder. +EPA0125=Could not remove a security constraint ref from the folder. +EPA0126=Could not load a layout. +EPA0127=Could not add a portlet to the layout. +EPA0128=Could not add a portlet to the layout. +EPA0129=Could not add a layout to the layout. +EPA0130=Could not add a layout to the layout. +EPA0131=Could not load a layout. +EPA0132=Could not update a layout. +EPA0133=Could not update a layout. +EPA0134=Could not delete a layout. +EPA0135=Could not delete a layout. +EPA0136=Could not load a portlet. +EPA0137=Could not update a portlet. +EPA0138=Could not update a portlet. +EPA0139=Could not delete a portlet. +EPA0140=Could not delete a portlet. + + Property changes on: pal-admin-ex/trunk/src/main/resources/PAMessages.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/app.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/app.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/app.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,10 @@ + + + + + + + + + Added: pal-admin-ex/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/appMessages.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/appMessages.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,298 @@ +# Validator +org.seasar.teeda.extension.validator.TRegularExpressionValidator.INVALID=Validation Error +org.seasar.teeda.extension.validator.TRegularExpressionValidator.INVALID_detail=Value({1}) uses unsupported character(s). + +# Messages +added.new.user=Added a new User({0}). +failed.to.add.new.user=Failed to add a new User({0}). +deleted.user=Delete the User({0}). +failed.to.delete.user=Failed to delete the User({0}). +cannot.delete.current.user=Cannot delete a current login user. + +added.new.role=Added a new Role({0}). +failed.to.add.new.role=Failed to add a new Role({0}). +deleted.role=Delete the Role({0}). +failed.to.delete.role=Failed to delete the Role({0}). + +added.new.group=Added a new Group({0}). +failed.to.add.new.group=Failed to add a new Group({0}). +deleted.group=Delete the Group({0}). +failed.to.delete.group=Failed to delete the Group({0}). + +added.new.userattribute=Added a new User Attribute({0}). +updated.new.userattribute=Updated a User Attribute({0}). +failed.to.add.new.userattribute=Failed to add a new User Attribute({0}). +failed.to.update.new.userattribute=Failed to update a User Attribute({0}). +deleted.userattribute=Delete the User Attribute({0}). +failed.to.delete.userattribute=Failed to delete the User Attribute({0}). + +could.not.find.user=Could not find the target user. +updated.user.information= Updated the target user information({0}). +failed.to.update.user.information=Failed to updated the user information({0}). +confirm.password.does.not.match=The re-type password does not match. + +added.group.to.user= Added the group({1}) to the user({0}). +failed.to.add.group.to.user=Failed to add the group({1}) to the user({0}). +removed.groups.from.user=Removed groups({1}) from the user({0}). +failed.to.remove.groups.from.user=Failed to remove groups({1}) from the user({0}). +invalid.group.or.user.name=Invalid group or user name. +group.exists.in.user=The group({1}) exists in the user({0}). + +added.role.to.user= Added the role({1}) to the user({0}). +failed.to.add.role.to.user=Failed to add the role({1}) to the user({0}). +removed.roles.from.user=Removed roles({1}) from the user({0}). +failed.to.remove.roles.from.user=Failed to remove roles({1}) from the user({0}). +invalid.role.or.user.name=Invalid role or user name. +role.exists.in.user=The role({1}) exists in the user({0}). + +added.principalRule.to.user= Added the profiling rule({1}/{2}) to the user({0}). +failed.to.add.principalRule.to.user=Failed to add the profiling rule({1}/{2}) to the user({0}). +removed.principalRules.from.user=Removed profiling rules({1}) from the user({0}). +failed.to.remove.principalRules.from.user=Failed to remove profiling rules({1}) from the user({0}). +principalRule.exists.in.user=The profiling rule({1}/{2}) exists in the user({0}). +invalid.profilingRule.or.user.name=Invalid profiling rule or user name. + +invalid.action.for.portlet.application=Invalid action for the portlet application. +started.portlet.application=Started the portlet application. +failed.to.start.portlet.application=Failed to start the portlet application. +stopped.portlet.application=Stopped the portlet application. +failed.to.stop.portlet.application=Failed to stop the portlet application. +undeployed.portlet.application=Undeployed the portlet application. +failed.to.undeploy.portlet.application=Failed to undeploy the portlet application. +deleted.portlet.application=Deleted the portlet application. +failed.to.delete.portlet.application=Failed to delete the portlet application. + +invalid.upload.file=Invalid upload file. +started.portlet.application.deployment=Started the portlet application deployment. +failed.to.start.portlet.application.deployment=Failed to start the portlet application deployment. + +invalid.portlet.parameter=Invalid portlet parameters. + +invalid.repository.parameters=Invalid repository parameters. + +added.new.repository=Added a new repository. +failed.to.add.new.repository=Failed to add a new repository. +updated.repository=Updated the repository. +failed.to.update.repository=Failed to update the repository. +deleted.repository=Deleted the repository. +failed.to.delete.repository=Failed to delete the repository. + +failed.to.get.users=Failed to load users. +failed.to.get.userattributes=Failed to load user attributes. + +error.lacking.password=You must enter a password. +error.userid_already_exists=Requested User ID already exists. Please select another User Id. +error.email_already_exists=The requested email address is already being used in the system. If you already have an account, consider using the forgotten password portlet to retreive your password. +error.failed_to_add=Failed to add user. +success.login_above=You have completed the user registration process. Please login above. +success.check_your_email= You have completed the user registration process. An email containing your username and password has been sent to you. +error.registration_completed_but_could_not_send=You have completed the user registration process. But a system could not send a registration mail to you. Please contact a site administrator. + +forgotten.email_address_not_found=Sorry but we could not find this email address on file. Please check your email address. +failed_to_send=Failed to send password. Please contact a site administrator if you see this message again. +an_email_has_been_sent=An email has been sent to you. Please change your password after logging in to portal with a new password in the mail. +forgotten.successful_pw_update = Your password has been updated! Please login using it! +forgotten.unable_to_update_pw=Failed to update your password, try again please. If you see this error message again, please contact a site administrator. + +could.not.read.term.of.service=Could not read a term of service. +incorrect.scret.answer=Incorrect secret password. + +could.not.find.your.credential=Could not find your credntial. Please login and try again. +could.not.find.your.account=Could not find your account. Please login and try again. +could.not.match.passwords=Could not match password and verify passoword. +could.not.update.password=Could not update a password. Please contact a site administrator. +updated.user.info=Updated user information + +could.not.access.folder=Could not access the target folder. Please contact a site administrator. +could.not.access.page=Could not access the target page. Please contact a site administrator. +could.not.find.page=Could not find the target page. Please contact a site administrator. +could.not.update.page=Could not update the target page. Please try again. If you see this error message again, please contact a site administrator. +updated.page=Updated the target page. + +could.not.find.folder=Could not find the target folder. Please contact a site administrator. +could.not.update.folder=Could not update the target folder. Please try again. If you see this error message again, please contact a site administrator. +updated.folder=Updated the target folder. + +could.not.find.layout=Could not find the target layout. Please contact a site administrator. +could.not.update.layout=Could not update the target layout. Please try again. If you see this error message again, please contact a site administrator. +updated.layout=Updated the target layout. + +could.not.find.portlet=Could not find the target portlet. Please contact a site administrator. +could.not.update.portlet=Could not update the target portlet. Please try again. If you see this error message again, please contact a site administrator. +updated.portlet=Updated the target portlet. + +need.to.specify.layout=Need to specify a layout. +could.not.add.layout=Could not add a layout. Please try again. If you see this error message again, please contact a site administrator. +added.layout=Added layout. + +need.to.specify.portlet=Need to specify a portlet. +could.not.add.portlet=Could not add a portlet. Please try again. If you see this error message again, please contact a site administrator. +added.portlet=Added portlet. + +added.folder=Added folder. +could.not.add.folder=Could not add a folder. Please try again. If you see this error message again, please contact a site administrator. +could.not.change.folder.order=Could not change a folder order. Please try again. If you see this error message again, please contact a site administrator. +could.not.add.default.page=Could not add a default page. Please try again. If you see this error message again, please contact a site administrator. +could.not.change.default.page.order=Could not change a default page order. Please try again. If you see this error message again, please contact a site administrator. +need.to.specify.folder.name=Need to specify a folder name. +added.page=Added page. +could.not.add.page=Could not add a page. Please try again. If you see this error message again, please contact a site administrator. +could.not.change.page.order=Could not change a page order. Please try again. If you see this error message again, please contact a site administrator. +need.to.specify.page.name=Need to specify a page name. + +could.not.delete.root.folder=Could not delete a root folder. +could.not.delete.folder=Could not delete the folder. Please try again. If you see this error message again, please contact a site administrator. +deleted.folder=Deleted folder. + +could.not.delete.page=Could not delete the page. Please try again. If you see this error message again, please contact a site administrator. +deleted.page=Deleted page. + +could.not.delete.layout=Could not delete the layout. Please try again. If you see this error message again, please contact a site administrator. +deleted.layout=Deleted layout. +could.not.delete.root.layout=Cannot delete a root layout. + +could.not.delete.portlet=Could not delete the portlet. Please try again. If you see this error message again, please contact a site administrator. +deleted.portlet=Deleted portlet. + +could.not.encode.secret.password=System error occurs. Please contact a site administrator. + +could.not.access.page.security=System error occurs. Please contact a site administrator. + +need.to.specify.users.roles.groups=Need to specify users, roles or groups. +need.to.specify.permissions=Need to specify permissions. +need.to.specify.security.constraint.ref=Need to specify a security constraint ref. + +added.page.security=Added page security. +could.not.add.page.security=Could not add a page security. Please try again. If you see this error message again, please contact a site administrator. +could.not.find.page.security=Could not find a page security. Please try again. If you see this error message again, please contact a site administrator. +removed.page.security=Removed page security. +could.not.remove.page.security=Could not remove a page security. Please try again. If you see this error message again, please contact a site administrator. + +added.folder.security=Added folder security. +could.not.add.folder.security=Could not add a folder security. Please try again. If you see this error message again, please contact a site administrator. +could.not.find.folder.security=Could not find a fodoRemoveConstraintReflder security. Please try again. If you see this error message again, please contact a site administrator. +removed.folder.security=Removed folder security. +could.not.remove.folder.security=Could not remove a folder security. Please try again. If you see this error message again, please contact a site administrator. + +invalid.path=Invalid path. Please try again. If you see this error message again, please contact a site administrator. +could.not.access.path=Could not access the path. + +updated.layout.but.could.not.update.cache=Updated layout configuration, but could not update a cache. If you see this error message again, please contact a site administrator. +updated.portlet.but.could.not.update.cache=Updated portlet configuration, but could not update a cache. If you see this error message again, please contact a site administrator. + +updated.document.order=Updated the document order. +could.not.update.document.order=Could not update the document order. If you see this error message again, please contact a site administrator. +added.document.order=Added the document order. +could.not.add.document.order=Could not add the document order. If you see this error message again, please contact a site administrator. +deleted.document.order=Deleted the document order. +could.not.delete.document.order=Could not delete the document order. If you see this error message again, please contact a site administrator. +document.already.exists=The document already exists. +document.does.not.exist=The document does not exist. + +could.not.find.metadata=Could not find the metadata. If you see this error message again, please contact a site administrator. +added.metadata=Added the metadata +could.not.add.metadata=Could not add the metadata. If you see this error message again, please contact a site administrator. +deleted.metadata=Deleted the metadata. +could.not.delete.metadata=Could not delete the metadata. If you see this error message again, please contact a site administrator. +could.not.find.field=Could not find the field data. If you see this error message again, please contact a site administrator. + +login.first=Please login first. +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. + +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. + +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. + +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. + +need.to.select.groups=Please select groups to remove them. +need.to.select.roles=Please select roles to remove them. +need.to.select.profiling.rules=Please select profiling rules to remove them. + +could.not.find.security.definitions=Could not find security definitions. If you see this error message again, please contact a site administrator. +could.not.find.security.definition=Could not find the security definition. If you see this error message again, please contact a site administrator. +added.security.definition=Added a security definition. +could.not.add.security.definition=Could not add a security definition. If you see this error message again, please contact a site administrator. +updated.security.definition=Updated a security definition. +could.not.update.security.definition=Could not update a security definition. If you see this error message again, please contact a site administrator. +deleted.security.definition=Deleted a security definition. +could.not.delete.security.definition=Could not delete a security definition. If you see this error message again, please contact a site administrator. +invalid.definition.name=Invalid definition name. If you see this error message again, please contact a site administrator. +added.page.security.constraint=Added a security constraint. +could.not.add.page.security.constraint=Could not add the security constraint. If you see this error message again, please contact a site administrator. +removed.page.security.constraint=Removed a security constraint. +could.not.remove.page.security.constraint=Could not remove the security constraint. If you see this error message again, please contact a site administrator. + +could.not.find.global.security.constraint=Could not find the global security constraint. If you see this error message again, please contact a site administrator. +added.global.security.constraint=Added a global security constraint. +could.not.add.global.security.constraint=Could not add a global security constraint. If you see this error message again, please contact a site administrator. +updated.global.security.constraint=Updated a global security constraint. +could.not.update.global.security.constraint=Could not update a global security constraint. If you see this error message again, please contact a site administrator. +deleted.global.security.constraint=Deleted a global security constraint. +could.not.delete.global.security.constraint=Could not delete a global security constraint. If you see this error message again, please contact a site administrator. +global.security.constraint.already.exists=The global security constraint already exists. +global.security.constraint.does.not.exist=The global security constraint does not exist. + +could.not.find.profiling.rule=Could not find a profiling rule. If you see this error message again, please contact a site administrator. +added.profiling.rule=Added a profiling rule. +could.not.add.profiling.rule=Could not add a profiling rule. If you see this error message again, please contact a site administrator. +updated.profiling.rule=Updated a profiling rule. +could.not.update.profiling.rule=Could not update a profiling rule. If you see this error message again, please contact a site administrator. +deleted.profiling.rule=Deleted a profiling rule. +could.not.delete.profiling.rule=Could not delete a profiling rule. If you see this error message again, please contact a site administrator. +profiling.rule.already.exists=The profiling rule already exists. +profiling.rule.does.not.exist=The profiling rule does not exist. + +could.not.find.rule.criteria=Could not find rule criteria. If you see this error message again, please contact a site administrator. +could.not.find.rule.criterion=Could not find a rule criterion. If you see this error message again, please contact a site administrator. +added.rule.criterion=Added a rule criterion. +could.not.add.rule.criterion=Could not add a rule criterion. If you see this error message again, please contact a site administrator. +updated.rule.criterion=Updated a rule criterion. +could.not.update.rule.criterion=Could not update a rule criterion. If you see this error message again, please contact a site administrator. +deleted.rule.criterion=Deleted a rule criterion. +could.not.delete.rule.criterion=Could not delete a rule criterion. If you see this error message again, please contact a site administrator. +rule.criterion.already.exists=The rule criterion already exists. +rule.criterion.does.not.exist=The rule criterion does not exist. + Property changes on: pal-admin-ex/trunk/src/main/resources/appMessages.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/appMessages_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/appMessages_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,276 @@ +# Validator +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 +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 +cannot.delete.current.user=\u73fe\u5728\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u30fc\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\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 +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 +updated.new.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u66f4\u65b0\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 +failed.to.update.new.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u66f4\u65b0\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\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\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 +confirm.password.does.not.match=\u78ba\u8a8d\u7528\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\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= \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= \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 +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\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=\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\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\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=\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\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\u306f\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\u30ec\u30a4\u30a2\u30a6\u30c8\u306f\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\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 + +added.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\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\u5236\u7d04\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\u5236\u7d04\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\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\u5236\u7d04\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\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\u5236\u7d04\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\u5236\u7d04\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\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.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 + +could.not.find.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u898b\u3064\u304b\u308a\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 +added.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\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 +deleted.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\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 + +could.not.find.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u304c\u898b\u3064\u304b\u308a\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 +added.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u8ffd\u52a0\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 +deleted.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u524a\u9664\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 + +could.not.find.target.action=\u5bfe\u8c61\u306e\u64cd\u4f5c\u304c\u898b\u3064\u304b\u308a\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 + +could.not.find.portlet.permissions=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\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 +could.not.find.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\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 +could.not.add.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\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 +could.not.update.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\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 +could.not.delete.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\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 +added.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +deleted.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.find.folder.permissions=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\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 +could.not.find.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\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 +could.not.add.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\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 +could.not.update.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\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 +could.not.delete.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\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 +added.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +deleted.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.find.page.permissions=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\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 +could.not.find.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\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 +could.not.add.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\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 +could.not.update.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\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 +could.not.delete.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\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 +added.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +deleted.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.change.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\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 +changed.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3057\u307e\u3057\u305f\u3002 +invalid.current.password=\u4e0d\u6b63\u306a\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002 +invalid.new.password=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e0d\u6b63\u3067\u3059\u3002\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002 +password.already.used=\u305d\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u65e2\u306b\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002 + +need.to.select.groups=\u524a\u9664\u3059\u308b\u30b0\u30eb\u30fc\u30d7\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +need.to.select.roles=\u524a\u9664\u3059\u308b\u30ed\u30fc\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +need.to.select.profiling.rules=\u524a\u9664\u3059\u308b\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + +could.not.find.security.definitions=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u898b\u3064\u3051\u3089\u308c\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 +could.not.find.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u898b\u3064\u3051\u3089\u308c\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 +added.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u8ffd\u52a0\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.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +could.not.update.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\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 +deleted.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.security.definition=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u3092\u524a\u9664\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 +invalid.definition.name=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5b9a\u7fa9\u540d\u304c\u4e0d\u6b63\u3067\u3059\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.page.security.constraint=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.page.security.constraint=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\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 +removed.page.security.constraint=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.page.security.constraint=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\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 + +could.not.find.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u898b\u3064\u3051\u3089\u308c\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 +added.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\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.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +could.not.update.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\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 +deleted.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\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 +global.security.constraint.already.exists=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002 +global.security.constraint.does.not.exist=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u305b\u3093\u3002 Property changes on: pal-admin-ex/trunk/src/main/resources/appMessages_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/app_aop.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/app_aop.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/app_aop.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,8 @@ + + + + + + + Added: pal-admin-ex/trunk/src/main/resources/convention.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/convention.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/convention.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,10 @@ + + + + + + "jp.sf.pal.admin" + + + Added: pal-admin-ex/trunk/src/main/resources/creator.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/creator.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/creator.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + Added: pal-admin-ex/trunk/src/main/resources/customizer.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/customizer.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/customizer.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,107 @@ + + + + + "aop.traceInterceptor" + + + "aop.traceInterceptor" + "do.*, initialize, prerender" + + + "app_aop.actionSupportInterceptor" + "do.*, initialize, prerender" + + + + commandAspectCustomizer + + + actionSupportAspectCustomizer + + + + + + defaultCustomizer + + + + + + + "dxo.interceptor" + + + + defaultCustomizer + + + dxoSupportAspectCustomizer + + + + + defaultCustomizer + + + + + defaultCustomizer + + + + + "aop.traceInterceptor" + + + "app_aop.appFacesExceptionThrowsInterceptor" + + + "do.*, initialize, prerender" + + + + pageSupportAspectCustomizer + + + + + "aop.traceInterceptor" + + + + + + serviceSupportAspectCustomizer + + + + + + + + + + + + + Added: pal-admin-ex/trunk/src/main/resources/env.txt =================================================================== --- pal-admin-ex/trunk/src/main/resources/env.txt (rev 0) +++ pal-admin-ex/trunk/src/main/resources/env.txt 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1 @@ +product Property changes on: pal-admin-ex/trunk/src/main/resources/env.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jdbc.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/jdbc.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jdbc.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,144 @@ + + + + + + + + + + + + 100 + + + + + + + + "org.h2.Driver" + + + "jdbc:h2:tcp://localhost:9092/demo" + + "sa" + "" + + + + + + + + + + + + + + + 600 + 10 + true + + + + + + + + + + \ No newline at end of file Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration.properties =================================================================== Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate.properties =================================================================== Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0 +javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0 +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u66f4\u65b0,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistrationUpdate_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 +javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PortalRegistration_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword.properties =================================================================== Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c +javax.portlet.short-title=\u518d\u767a\u884c +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7,\u65b0\u898f\u30e6\u30fc\u30b6\u30fc + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalForgottenPassword_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration.properties =================================================================== Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate.properties =================================================================== Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0 +javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0 +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u66f4\u65b0,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistrationUpdate_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 +javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 +javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalRegistration_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties =================================================================== Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,5 @@ +# portlet info +javax.portlet.title=\u9000\u4f1a\u7533\u8acb +javax.portlet.short-title=\u9000\u4f1a +javax.portlet.keywords=\u9000\u4f1a,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,16 @@ +userTab=User +roleTab=Role +groupTab=Group + +portletsTab=Portlets +deployerTab=Deployer + +previousPage=Previous +nextPage=Next +previousPageAtHeader=Previous +nextPageAtHeader=Next +previousPageAtFooter=Previous +nextPageAtFooter=Next +found= found. +action=Action: +filter=Filter: Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,16 @@ +userTab=\u30e6\u30fc\u30b6\u30fc +roleTab=\u30ed\u30fc\u30eb +groupTab=\u30b0\u30eb\u30fc\u30d7 + +portletsTab=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +deployerTab=\u30c7\u30d7\u30ed\u30a4\u30e4\u30fc + +previousPage=\u524d\u3078 +nextPage=\u6b21\u3078 +previousPageAtHeader=\u524d\u3078 +nextPageAtHeader=\u6b21\u3078 +previousPageAtFooter=\u524d\u3078 +nextPageAtFooter=\u6b21\u3078 +found= \u4ef6\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002 +action=\u30a2\u30af\u30b7\u30e7\u30f3: +filter=\u30d5\u30a3\u30eb\u30bf\u30fc: Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,327 @@ +userName= Username +userBdate= Birthday +userGender= Gender +userEmployer= Employer +userDepartment= Department +userJobtitle= Job Title +userNamePrefix= Title +userNameGiven= Given Name +userNameFamily= Family Name +userNameMiddle= Middle Name +userNameSuffix= Suffix +userNameNickName= Nick Name +userHomeInfoPostalName= Postal Name +userHomeInfoPostalStreet= Street Address +userHomeInfoPostalCity= City +userHomeInfoPostalStateprov= State +userHomeInfoPostalPostalcode= Zip +userHomeInfoPostalCountry= Country +userHomeInfoPostalOrganization= Organization +userHomeInfoTelecomTelephoneIntcode= Home International Code +userHomeInfoTelecomTelephoneLoccode= Home Phone Area Code +userHomeInfoTelecomTelephoneNumber= Home Phone Number +userHomeInfoTelecomTelephoneExt= Home Phone Extension +userHomeInfoTelecomTelephoneComment= Home Phone Comment +userHomeInfoTelecomFaxIntcode= Home Fax International Code +userHomeInfoTelecomFaxLoccode= Home Fax Area Code +userHomeInfoTelecomFaxNumber= Home Fax Number +userHomeInfoTelecomFaxExt= Home Fax Extension +userHomeInfoTelecomFaxComment= Home Fax Comments +userHomeInfoTelecomMobileIntcode= Home Mobile International Coe +userHomeInfoTelecomMobileLoccode= Home Mobile Area Code +userHomeInfoTelecomMobileNumber= Home Mobile Number +userHomeInfoTelecomMobileExt= Home Mobile Extension +userHomeInfoTelecomMobileComment= Home Mobile Comments +userHomeInfoTelecomPagerIntcode= Home Pager International Code +userHomeInfoTelecomPagerLoccode= Home Pager Area Code +userHomeInfoTelecomPagerNumber= Home Pager Number +userHomeInfoTelecomPagerExt= Home Pager Extension +userHomeInfoTelecomPagerComment= Home Pager Comment +userHomeInfoOnlineEmail= Home Email +userHomeInfoOnlineUri= Home URL +userBusinessInfoPostalName= Business Postal Name +userBusinessInfoPostalStreet= Business Street Address +userBusinessInfoPostalCity= Business City +userBusinessInfoPostalStateprov= Business State +userBusinessInfoPostalPostalcode= Business Zip +userBusinessInfoPostalCountry= Business Country +userBusinessInfoPostalOrganization= Business Name +userBusinessInfoTelecomTelephoneIntcode= Business Telephone International Code +userBusinessInfoTelecomTelephoneLoccode= Business Telephone Area Code +userBusinessInfoTelecomTelephoneNumber= Business Telephone Number +userBusinessInfoTelecomTelephoneExt= Business Telephone Extension +userBusinessInfoTelecomTelephoneComment= Business Telephone Comment +userBusinessInfoTelecomFaxIntcode= Business Fax International Code +userBusinessInfoTelecomFaxLoccode= Business Fax Area Code +userBusinessInfoTelecomFaxNumber= Business Fax Number +userBusinessInfoTelecomFaxExt= Business Fax Extension +userBusinessInfoTelecomFaxComment= Business Fax Comment +userBusinessInfoTelecomMobileIntcode= Business Mobile International Code +userBusinessInfoTelecomMobileLoccode= Business Mobile Area Code +userBusinessInfoTelecomMobileNumber= Business Mobile Number +userBusinessInfoTelecomMobileExt= Business Mobile Extension +userBusinessInfoTelecomMobileComment= Business Mobile Comment +userBusinessInfoTelecomPagerIntcode= Business Pager International Code +userBusinessInfoTelecomPagerLoccode= Business Pager Area Code +userBusinessInfoTelecomPagerNumber= Business Pager Number +userBusinessInfoTelecomPagerExt= Business Pager Extension +userBusinessInfoTelecomPagerComment= Business Page Comment +userBusinessInfoOnlineEmail= Business Email +userBusinessInfoOnlineUri= Business Url +password=Password +verifyPassword=Verify Password +email=Email + +pageMessage=If you have forgotten your password, we can create a new one and send it to you via your email address. You must enter the exact same email address with which you originally registered. + +email.subject.registration=Registration Confirmation For Portal Account +email.subject.forgotten.password=Password Notification For Portal Account + +login=Login +sendNewPassword=Send New Password +RequestNewPassword=Request New Password +SignUp=Sign Up + +# Public Portal Registration +publicPortalRegistrationRegister.requiredDescription=\u304c\u3064\u3044\u3066\u3044\u308b\u9805\u76ee\u306f\u304b\u306a\u3089\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationRegister.userIdTitle=\u30e6\u30fc\u30b6\u30fc ID \u306e\u5165\u529b +publicPortalRegistrationRegister.typeUserId=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationRegister.userId=\u30e6\u30fc\u30b6\u30fc ID +publicPortalRegistrationRegister.userIdCondition= (6\u301c32\u5b57\u306e\u534a\u89d2\u82f1\u6570\u5b57) +publicPortalRegistrationRegister.userIdExample= (\u4f8b\uff1ahoge2000\u3001foo777\u306a\u3069) +publicPortalRegistrationRegister.userIdHint=\u30e6\u30fc\u30b6\u30fc ID \u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationRegister.userIdBeginWithAlphabet=\u6700\u521d\u306e\u6587\u5b57\u306f\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8 +publicPortalRegistrationRegister.underscoreAvailable=\u8a18\u53f7\u306f\u3001\u30a2\u30f3\u30c0\u30fc\u30d0\u30fc ( _ ) \u306e\u307f\u4f7f\u7528\u53ef\u80fd\u3067\u3059 +publicPortalRegistrationRegister.userInfoTitle=\u304a\u5ba2\u69d8\u60c5\u5831\u306e\u5165\u529b +publicPortalRegistrationRegister.typeUserInfo=\u30e6\u30fc\u30b6\u30fc ID \u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5143\u306b\u672c\u4eba\u78ba\u8a8d\u3092\u884c\u3044\u307e\u3059\u3002\u6b63\u78ba\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationRegister.userHomeInfoPostalPostalcode=\u90f5\u4fbf\u756a\u53f7 +publicPortalRegistrationRegister.userHomeInfoPostalPostalcodeCondition= (\u534a\u89d2\u6570\u5b57\uff17\u6841) +publicPortalRegistrationRegister.userHomeInfoPostalPostalcodeExample= (\u4f8b\uff1a123-0001\u30011230001) +publicPortalRegistrationRegister.userGender=\u6027\u5225 +publicPortalRegistrationRegister.male=\u7537\u6027 +publicPortalRegistrationRegister.female=\u5973\u6027 +publicPortalRegistrationRegister.userBdate=\u751f\u5e74\u6708\u65e5 +publicPortalRegistrationRegister.userBdateYear=\u5e74 +publicPortalRegistrationRegister.userBdateMonth=\u6708 +publicPortalRegistrationRegister.userBdateDate=\u65e5 +publicPortalRegistrationRegister.userBusinessInfoOnlineEmail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +publicPortalRegistrationRegister.userBusinessInfoOnlineEmailCondition= (\u534a\u89d2) +publicPortalRegistrationRegister.userIndustry=\u696d\u7a2e +publicPortalRegistrationRegister.ComputerInternet=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u7ba1\u7406/\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8) +publicPortalRegistrationRegister.ComputerHardware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30cf\u30fc\u30c9\u30a6\u30a8\u30a2) +publicPortalRegistrationRegister.ComputerSoftware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30bd\u30d5\u30c8\u30a6\u30a8\u30a2) +publicPortalRegistrationRegister.Research=\u6559\u80b2/\u7814\u7a76 +publicPortalRegistrationRegister.Engineering=\u30a8\u30f3\u30b8\u30cb\u30a2/\u5efa\u7bc9 +publicPortalRegistrationRegister.Finance=\u9280\u884c/\u91d1\u878d/\u4e0d\u52d5\u7523 +publicPortalRegistrationRegister.Manufacturing=\u88fd\u9020/\u6d41\u901a +publicPortalRegistrationRegister.Service=\u30b5\u30fc\u30d3\u30b9 +publicPortalRegistrationRegister.Healthcare=\u533b\u85ac/\u5065\u5eb7 +publicPortalRegistrationRegister.Publication=\u5a2f\u697d/\u30e1\u30c7\u30a3\u30a2/\u51fa\u7248 +publicPortalRegistrationRegister.Travel=\u65c5\u884c/\u63a5\u5ba2\u696d +publicPortalRegistrationRegister.Retail=\u5c0f\u58f2/\u5378\u58f2 +publicPortalRegistrationRegister.Nonprofit=\u975e\u55b6\u5229\u56e3\u4f53 +publicPortalRegistrationRegister.Government=\u653f\u5e9c/\u81ea\u6cbb\u4f53 +publicPortalRegistrationRegister.Law=\u6cd5\u5f8b +publicPortalRegistrationRegister.unemployed=\u7121\u8077 +publicPortalRegistrationRegister.other=\u305d\u306e\u4ed6 +publicPortalRegistrationRegister.userJobtitle=\u8077\u7a2e +publicPortalRegistrationRegister.Officer=\u5f79\u54e1/\u7ba1\u7406\u8077 +publicPortalRegistrationRegister.Specialist=\u5c02\u9580\u8077 (\u533b\u5e2b\u3001\u5f01\u8b77\u58eb\u7b49) +publicPortalRegistrationRegister.Teacher=\u6559\u54e1 +publicPortalRegistrationRegister.ComputerEngineer=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u9023\u6280\u8853\u8005 +publicPortalRegistrationRegister.Engineer=\u305d\u306e\u4ed6\u6280\u8853\u8005 +publicPortalRegistrationRegister.Support=\u30b5\u30fc\u30d3\u30b9/\u30ab\u30b9\u30bf\u30de\u30fc\u30b5\u30dd\u30fc\u30c8 +publicPortalRegistrationRegister.Administrative=\u4e8b\u52d9\u8077 +publicPortalRegistrationRegister.Sales=\u55b6\u696d/\u30de\u30fc\u30b1\u30c6\u30a3\u30f3\u30b0 +publicPortalRegistrationRegister.Salesclerk=\u8ca9\u58f2\u54e1 +publicPortalRegistrationRegister.Student=\u5927\u5b66\u751f/\u5927\u5b66\u9662\u751f +publicPortalRegistrationRegister.Kid=\u5c0f/\u4e2d/\u9ad8\u6821\u751f +publicPortalRegistrationRegister.Homemaker=\u4e3b\u5a66 +publicPortalRegistrationRegister.SelfEmployed=\u81ea\u55b6\u696d +publicPortalRegistrationRegister.retirement=\u5b9a\u5e74\u9000\u8077\u8005 +publicPortalRegistrationRegister.userInfoHint=\u304a\u5ba2\u69d8\u60c5\u5831\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationRegister.liveInOversea=\u6d77\u5916\u5728\u4f4f\u306e\u65b9\u306f\u3001000-0000\u3068\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +publicPortalRegistrationRegister.bdataYearDescription=\u751f\u5e74\u6708\u65e5\u306e\u5e74\u306f\u897f\u66a6\u3067\u304a\u9858\u3044\u3057\u307e\u3059 +publicPortalRegistrationRegister.aboutEmail=\u767b\u9332\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3057\u3066\u3044\u305f\u3060\u304f\u4e0a\u3067\u3001\u91cd\u8981\u306a\u304a\u77e5\u3089\u305b\u306a\u3069\u3092\u304a\u9001\u308a\u3059\u308b\u305f\u3081\u306e\u300c\u767b\u9332\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u300d \u306b\u306a\u308a\u307e\u3059\u3002\u9023\u7d61\u53ef\u80fd\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +publicPortalRegistrationRegister.userSecretQATitle=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048 +publicPortalRegistrationRegister.userSecretQADescription=\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3067\u3059\u3002\u3042\u306a\u305f\u3057\u304b\u77e5\u3089\u306a\u3044\u8cea\u554f\u3068\u7b54\u3048\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationRegister.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +publicPortalRegistrationRegister.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +publicPortalRegistrationRegister.userSecretQAHint=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationRegister.aboutCharacters=\u79d8\u5bc6\u306e\u7b54\u3048\u306f\u3001\u3072\u3089\u304c\u306a\u3001\u30ab\u30bf\u30ab\u30ca\u3001\u5927\u6587\u5b57\u3001\u5c0f\u6587\u5b57\u3001\u534a\u89d2\u3001\u5168\u89d2\u3067\u533a\u5225\u3055\u308c\u307e\u3059 +publicPortalRegistrationRegister.SignUp=\u5229\u7528\u898f\u7d04\u306b\u540c\u610f\u3057\u3066\u767b\u9332 +publicPortalRegistrationRegister.termOfService=\u5229\u7528\u898f\u7d04 +publicPortalRegistrationRegister.name=\u6c0f\u540d +publicPortalRegistrationRegister.userNameFamily= (\u59d3) +publicPortalRegistrationRegister.userNameGiven= (\u540d) +publicPortalRegistrationRegister.nameYomi=\u6c0f\u540d(\u3075\u308a\u304c\u306a) +publicPortalRegistrationRegister.userNameFamilyYomi= (\u59d3) +publicPortalRegistrationRegister.userNameGivenYomi= (\u540d) +publicPortalRegistrationRegister.otherUserSecretQuestion=\u4e0a\u8a18\u4ee5\u5916\u306e\u8cea\u554f\u3092\u767b\u9332\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002 + +publicPortalRegistrationCompleted.registAgain=\u518d\u5ea6\u3001\u30e6\u30fc\u30b6\u30fc\u3092\u767b\u9332\u3059\u308b\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationCompleted.registLink=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 + +publicPortalForgottenPassword.pageMessage=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u65b9\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3078\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9001\u4fe1\u3057\u307e\u3059\u3002\u4ee5\u4e0b\u306b\u767b\u9332\u3057\u305f\u6b63\u78ba\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalForgottenPassword.Next=\u6b21\u3078 +publicPortalSecretAnswer.pageMessage=\u30e6\u30fc\u30b6\u30fc\u767b\u9332\u6642\u306b\u5165\u529b\u3057\u305f\u300c\u79d8\u5bc6\u306e\u8cea\u554f\u300d\u306b\u5bfe\u3059\u308b\u300c\u79d8\u5bc6\u306e\u7b54\u3048\u300d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalSecretAnswer.Finish=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1 +publicPortalSecretAnswer.Back=\u623b\u308b +publicPortalSecretAnswer.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +publicPortalSecretAnswer.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +publicPortalForgottenPasswordCompleted.forgottenPasswordAgain=\u518d\u5ea6\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c\u3092\u884c\u3046\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalForgottenPasswordCompleted.forgottenPasswordLink=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c + +# Public Portal Registration Update +publicPortalRegistrationUpdate.requiredDescription=\u304c\u3064\u3044\u3066\u3044\u308b\u9805\u76ee\u306f\u304b\u306a\u3089\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationUpdate.userIdTitle=\u30e6\u30fc\u30b6\u30fc ID \u306e\u5165\u529b +publicPortalRegistrationUpdate.typeUserId=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationUpdate.userId=\u30e6\u30fc\u30b6\u30fc ID +publicPortalRegistrationUpdate.userIdCondition= (6\u301c32\u5b57\u306e\u534a\u89d2\u82f1\u6570\u5b57) +publicPortalRegistrationUpdate.userIdExample= (\u4f8b\uff1ahoge2000\u3001foo777\u306a\u3069) +publicPortalRegistrationUpdate.userIdHint=\u30e6\u30fc\u30b6\u30fc ID \u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationUpdate.userIdBeginWithAlphabet=\u6700\u521d\u306e\u6587\u5b57\u306f\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8 +publicPortalRegistrationUpdate.underscoreAvailable=\u8a18\u53f7\u306f\u3001\u30a2\u30f3\u30c0\u30fc\u30d0\u30fc ( _ ) \u306e\u307f\u4f7f\u7528\u53ef\u80fd\u3067\u3059 +publicPortalRegistrationUpdate.userInfoTitle=\u304a\u5ba2\u69d8\u60c5\u5831\u306e\u5165\u529b +publicPortalRegistrationUpdate.typeUserInfo=\u30e6\u30fc\u30b6\u30fc ID \u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5143\u306b\u672c\u4eba\u78ba\u8a8d\u3092\u884c\u3044\u307e\u3059\u3002\u6b63\u78ba\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationUpdate.userHomeInfoPostalPostalcode=\u90f5\u4fbf\u756a\u53f7 +publicPortalRegistrationUpdate.userHomeInfoPostalPostalcodeCondition= (\u534a\u89d2\u6570\u5b57\uff17\u6841) +publicPortalRegistrationUpdate.userHomeInfoPostalPostalcodeExample= (\u4f8b\uff1a123-0001\u30011230001) +publicPortalRegistrationUpdate.userGender=\u6027\u5225 +publicPortalRegistrationUpdate.male=\u7537\u6027 +publicPortalRegistrationUpdate.female=\u5973\u6027 +publicPortalRegistrationUpdate.userBdate=\u751f\u5e74\u6708\u65e5 +publicPortalRegistrationUpdate.userBdateYear=\u5e74 +publicPortalRegistrationUpdate.userBdateMonth=\u6708 +publicPortalRegistrationUpdate.userBdateDate=\u65e5 +publicPortalRegistrationUpdate.userBusinessInfoOnlineEmail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +publicPortalRegistrationUpdate.userBusinessInfoOnlineEmailCondition= (\u534a\u89d2) +publicPortalRegistrationUpdate.userIndustry=\u696d\u7a2e +publicPortalRegistrationUpdate.ComputerInternet=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u7ba1\u7406/\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8) +publicPortalRegistrationUpdate.ComputerHardware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30cf\u30fc\u30c9\u30a6\u30a8\u30a2) +publicPortalRegistrationUpdate.ComputerSoftware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30bd\u30d5\u30c8\u30a6\u30a8\u30a2) +publicPortalRegistrationUpdate.Research=\u6559\u80b2/\u7814\u7a76 +publicPortalRegistrationUpdate.Engineering=\u30a8\u30f3\u30b8\u30cb\u30a2/\u5efa\u7bc9 +publicPortalRegistrationUpdate.Finance=\u9280\u884c/\u91d1\u878d/\u4e0d\u52d5\u7523 +publicPortalRegistrationUpdate.Manufacturing=\u88fd\u9020/\u6d41\u901a +publicPortalRegistrationUpdate.Service=\u30b5\u30fc\u30d3\u30b9 +publicPortalRegistrationUpdate.Healthcare=\u533b\u85ac/\u5065\u5eb7 +publicPortalRegistrationUpdate.Publication=\u5a2f\u697d/\u30e1\u30c7\u30a3\u30a2/\u51fa\u7248 +publicPortalRegistrationUpdate.Travel=\u65c5\u884c/\u63a5\u5ba2\u696d +publicPortalRegistrationUpdate.Retail=\u5c0f\u58f2/\u5378\u58f2 +publicPortalRegistrationUpdate.Nonprofit=\u975e\u55b6\u5229\u56e3\u4f53 +publicPortalRegistrationUpdate.Government=\u653f\u5e9c/\u81ea\u6cbb\u4f53 +publicPortalRegistrationUpdate.Law=\u6cd5\u5f8b +publicPortalRegistrationUpdate.unemployed=\u7121\u8077 +publicPortalRegistrationUpdate.other=\u305d\u306e\u4ed6 +publicPortalRegistrationUpdate.userJobtitle=\u8077\u7a2e +publicPortalRegistrationUpdate.Officer=\u5f79\u54e1/\u7ba1\u7406\u8077 +publicPortalRegistrationUpdate.Specialist=\u5c02\u9580\u8077 (\u533b\u5e2b\u3001\u5f01\u8b77\u58eb\u7b49) +publicPortalRegistrationUpdate.Teacher=\u6559\u54e1 +publicPortalRegistrationUpdate.ComputerEngineer=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u9023\u6280\u8853\u8005 +publicPortalRegistrationUpdate.Engineer=\u305d\u306e\u4ed6\u6280\u8853\u8005 +publicPortalRegistrationUpdate.Support=\u30b5\u30fc\u30d3\u30b9/\u30ab\u30b9\u30bf\u30de\u30fc\u30b5\u30dd\u30fc\u30c8 +publicPortalRegistrationUpdate.Administrative=\u4e8b\u52d9\u8077 +publicPortalRegistrationUpdate.Sales=\u55b6\u696d/\u30de\u30fc\u30b1\u30c6\u30a3\u30f3\u30b0 +publicPortalRegistrationUpdate.Salesclerk=\u8ca9\u58f2\u54e1 +publicPortalRegistrationUpdate.Student=\u5927\u5b66\u751f/\u5927\u5b66\u9662\u751f +publicPortalRegistrationUpdate.Kid=\u5c0f/\u4e2d/\u9ad8\u6821\u751f +publicPortalRegistrationUpdate.Homemaker=\u4e3b\u5a66 +publicPortalRegistrationUpdate.SelfEmployed=\u81ea\u55b6\u696d +publicPortalRegistrationUpdate.retirement=\u5b9a\u5e74\u9000\u8077\u8005 +publicPortalRegistrationUpdate.userInfoHint=\u304a\u5ba2\u69d8\u60c5\u5831\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationUpdate.liveInOversea=\u6d77\u5916\u5728\u4f4f\u306e\u65b9\u306f\u3001000-0000\u3068\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +publicPortalRegistrationUpdate.bdataYearDescription=\u751f\u5e74\u6708\u65e5\u306e\u5e74\u306f\u897f\u66a6\u3067\u304a\u9858\u3044\u3057\u307e\u3059 +publicPortalRegistrationUpdate.aboutEmail=\u767b\u9332\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3057\u3066\u3044\u305f\u3060\u304f\u4e0a\u3067\u3001\u91cd\u8981\u306a\u304a\u77e5\u3089\u305b\u306a\u3069\u3092\u304a\u9001\u308a\u3059\u308b\u305f\u3081\u306e\u300c\u767b\u9332\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u300d \u306b\u306a\u308a\u307e\u3059\u3002\u9023\u7d61\u53ef\u80fd\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +publicPortalRegistrationUpdate.userSecretQATitle=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048 +publicPortalRegistrationUpdate.userSecretQADescription=\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3067\u3059\u3002\u3042\u306a\u305f\u3057\u304b\u77e5\u3089\u306a\u3044\u8cea\u554f\u3068\u7b54\u3048\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationUpdate.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +publicPortalRegistrationUpdate.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +publicPortalRegistrationUpdate.userSecretQAHint=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationUpdate.aboutCharacters=\u79d8\u5bc6\u306e\u7b54\u3048\u306f\u3001\u3072\u3089\u304c\u306a\u3001\u30ab\u30bf\u30ab\u30ca\u3001\u5927\u6587\u5b57\u3001\u5c0f\u6587\u5b57\u3001\u534a\u89d2\u3001\u5168\u89d2\u3067\u533a\u5225\u3055\u308c\u307e\u3059 +publicPortalRegistrationUpdate.SignUp=\u66f4\u65b0 +publicPortalRegistrationUpdate.termOfService=\u5229\u7528\u898f\u7d04 +publicPortalRegistrationUpdate.name=\u6c0f\u540d +publicPortalRegistrationUpdate.userNameFamily= (\u59d3) +publicPortalRegistrationUpdate.userNameGiven= (\u540d) +publicPortalRegistrationUpdate.nameYomi=\u6c0f\u540d(\u3075\u308a\u304c\u306a) +publicPortalRegistrationUpdate.userNameFamilyYomi= (\u59d3) +publicPortalRegistrationUpdate.userNameGivenYomi= (\u540d) +publicPortalRegistrationUpdate.userPasswordTitle=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u66f4\u65b0 +publicPortalRegistrationUpdate.typeUserPassword=\u66f4\u65b0\u3059\u308b\u5834\u5408\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationUpdate.passowrd=\u30d1\u30b9\u30ef\u30fc\u30c9 +publicPortalRegistrationUpdate.verifyPassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u78ba\u8a8d +publicPortalRegistrationUpdate.passwordCondition=\uff086\u301c80\u5b57\u306e\u6587\u5b57\uff09 +publicPortalRegistrationUpdate.userPasswordHint=\u30d1\u30b9\u30ef\u30fc\u30c9\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistrationUpdate.charAvailable=\u6587\u5b57\u306f\u534a\u89d2\u82f1\u6570\u5b57\u304c\u5229\u7528\u53ef\u80fd\u3067\u3059 + +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 + +# Portal Registration +portalRegistrationRegister.requiredDescription=\u304c\u3064\u3044\u3066\u3044\u308b\u9805\u76ee\u306f\u304b\u306a\u3089\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationRegister.userIdTitle=\u30e6\u30fc\u30b6\u30fc ID \u306e\u5165\u529b +portalRegistrationRegister.typeUserId=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationRegister.userId=\u30e6\u30fc\u30b6\u30fc ID +portalRegistrationRegister.userIdCondition= (6\u301c32\u5b57\u306e\u534a\u89d2\u82f1\u6570\u5b57) +portalRegistrationRegister.userIdExample= (\u4f8b\uff1ahoge2000\u3001foo777\u306a\u3069) +portalRegistrationRegister.userIdHint=\u30e6\u30fc\u30b6\u30fc ID \u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +portalRegistrationRegister.userIdBeginWithAlphabet=\u6700\u521d\u306e\u6587\u5b57\u306f\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8 +portalRegistrationRegister.underscoreAvailable=\u8a18\u53f7\u306f\u3001\u30a2\u30f3\u30c0\u30fc\u30d0\u30fc ( _ ) \u306e\u307f\u4f7f\u7528\u53ef\u80fd\u3067\u3059 +portalRegistrationRegister.userBusinessInfoOnlineEmail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +portalRegistrationRegister.userBusinessInfoOnlineEmailCondition= (\u534a\u89d2) +portalRegistrationRegister.userSecretQATitle=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048 +portalRegistrationRegister.userSecretQADescription=\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3067\u3059\u3002\u3042\u306a\u305f\u3057\u304b\u77e5\u3089\u306a\u3044\u8cea\u554f\u3068\u7b54\u3048\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationRegister.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +portalRegistrationRegister.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +portalRegistrationRegister.userSecretQAHint=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +portalRegistrationRegister.aboutCharacters=\u79d8\u5bc6\u306e\u7b54\u3048\u306f\u3001\u3072\u3089\u304c\u306a\u3001\u30ab\u30bf\u30ab\u30ca\u3001\u5927\u6587\u5b57\u3001\u5c0f\u6587\u5b57\u3001\u534a\u89d2\u3001\u5168\u89d2\u3067\u533a\u5225\u3055\u308c\u307e\u3059 +portalRegistrationRegister.SignUp=\u5229\u7528\u898f\u7d04\u306b\u540c\u610f\u3057\u3066\u767b\u9332 +portalRegistrationRegister.termOfService=\u5229\u7528\u898f\u7d04 +portalRegistrationRegister.otherUserSecretQuestion=\u4e0a\u8a18\u4ee5\u5916\u306e\u8cea\u554f\u3092\u767b\u9332\u3059\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u3059\u3002 +portalRegistrationRegister.userInfoTitle=\u304a\u5ba2\u69d8\u60c5\u5831\u306e\u5165\u529b +portalRegistrationRegister.typeUserInfo=\u30e6\u30fc\u30b6\u30fc ID \u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5143\u306b\u672c\u4eba\u78ba\u8a8d\u3092\u884c\u3044\u307e\u3059\u3002\u6b63\u78ba\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationRegister.aboutEmail=\u767b\u9332\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3057\u3066\u3044\u305f\u3060\u304f\u4e0a\u3067\u3001\u91cd\u8981\u306a\u304a\u77e5\u3089\u305b\u306a\u3069\u3092\u304a\u9001\u308a\u3059\u308b\u305f\u3081\u306e\u300c\u767b\u9332\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u300d \u306b\u306a\u308a\u307e\u3059\u3002\u9023\u7d61\u53ef\u80fd\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 + +portalRegistrationCompleted.registAgain=\u518d\u5ea6\u3001\u30e6\u30fc\u30b6\u30fc\u3092\u767b\u9332\u3059\u308b\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationCompleted.registLink=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 + +# Portal Registration Update +portalRegistrationUpdate.requiredDescription=\u304c\u3064\u3044\u3066\u3044\u308b\u9805\u76ee\u306f\u304b\u306a\u3089\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationUpdate.userIdTitle=\u30e6\u30fc\u30b6\u30fc ID \u306e\u5165\u529b +portalRegistrationUpdate.typeUserId=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationUpdate.userId=\u30e6\u30fc\u30b6\u30fc ID +portalRegistrationUpdate.userIdCondition= (6\u301c32\u5b57\u306e\u534a\u89d2\u82f1\u6570\u5b57) +portalRegistrationUpdate.userIdExample= (\u4f8b\uff1ahoge2000\u3001foo777\u306a\u3069) +portalRegistrationUpdate.userIdHint=\u30e6\u30fc\u30b6\u30fc ID \u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +portalRegistrationUpdate.userIdBeginWithAlphabet=\u6700\u521d\u306e\u6587\u5b57\u306f\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8 +portalRegistrationUpdate.underscoreAvailable=\u8a18\u53f7\u306f\u3001\u30a2\u30f3\u30c0\u30fc\u30d0\u30fc ( _ ) \u306e\u307f\u4f7f\u7528\u53ef\u80fd\u3067\u3059 +portalRegistrationUpdate.userBusinessInfoOnlineEmail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +portalRegistrationUpdate.userBusinessInfoOnlineEmailCondition= (\u534a\u89d2) +portalRegistrationUpdate.userInfoHint=\u304a\u5ba2\u69d8\u60c5\u5831\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +portalRegistrationUpdate.aboutEmail=\u767b\u9332\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3057\u3066\u3044\u305f\u3060\u304f\u4e0a\u3067\u3001\u91cd\u8981\u306a\u304a\u77e5\u3089\u305b\u306a\u3069\u3092\u304a\u9001\u308a\u3059\u308b\u305f\u3081\u306e\u300c\u767b\u9332\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u300d \u306b\u306a\u308a\u307e\u3059\u3002\u9023\u7d61\u53ef\u80fd\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +portalRegistrationUpdate.userSecretQATitle=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048 +portalRegistrationUpdate.userSecretQADescription=\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3067\u3059\u3002\u3042\u306a\u305f\u3057\u304b\u77e5\u3089\u306a\u3044\u8cea\u554f\u3068\u7b54\u3048\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationUpdate.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +portalRegistrationUpdate.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +portalRegistrationUpdate.userSecretQAHint=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +portalRegistrationUpdate.aboutCharacters=\u79d8\u5bc6\u306e\u7b54\u3048\u306f\u3001\u3072\u3089\u304c\u306a\u3001\u30ab\u30bf\u30ab\u30ca\u3001\u5927\u6587\u5b57\u3001\u5c0f\u6587\u5b57\u3001\u534a\u89d2\u3001\u5168\u89d2\u3067\u533a\u5225\u3055\u308c\u307e\u3059 +portalRegistrationUpdate.SignUp=\u66f4\u65b0 +portalRegistrationUpdate.termOfService=\u5229\u7528\u898f\u7d04 +portalRegistrationUpdate.userPasswordTitle=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u66f4\u65b0 +portalRegistrationUpdate.typeUserPassword=\u66f4\u65b0\u3059\u308b\u5834\u5408\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +portalRegistrationUpdate.passowrd=\u30d1\u30b9\u30ef\u30fc\u30c9 +portalRegistrationUpdate.verifyPassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u78ba\u8a8d +portalRegistrationUpdate.passwordCondition=\uff086\u301c80\u5b57\u306e\u6587\u5b57\uff09 +portalRegistrationUpdate.userPasswordHint=\u30d1\u30b9\u30ef\u30fc\u30c9\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +portalRegistrationUpdate.charAvailable=\u6587\u5b57\u306f\u534a\u89d2\u82f1\u6570\u5b57\u304c\u5229\u7528\u53ef\u80fd\u3067\u3059 +portalRegistrationUpdate.userInfoTitle=\u304a\u5ba2\u69d8\u60c5\u5831\u306e\u5165\u529b +portalRegistrationUpdate.typeUserInfo=\u30e6\u30fc\u30b6\u30fc ID \u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5143\u306b\u672c\u4eba\u78ba\u8a8d\u3092\u884c\u3044\u307e\u3059\u3002\u6b63\u78ba\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,171 @@ +userName= \u30e6\u30fc\u30b6\u30fc\u540d +userBdate= \u8a95\u751f\u65e5 +userGender= \u6027\u5225 +userEmployer= \u96c7\u7528\u8005 +userDepartment= \u90e8\u9580 +userJobtitle= \u4ed5\u4e8b\u306e\u80a9\u66f8\u304d +userNamePrefix= \u656c\u79f0(\u524d\u306b\u4ed8\u3051\u308b) +userNameGiven= \u540d\u524d(\u540d) +userNameFamily= \u540d\u524d(\u59d3) +userNameMiddle= \u30df\u30c9\u30eb\u30cd\u30fc\u30e0 +userNameSuffix= \u656c\u79f0(\u5f8c\u306b\u4ed8\u3051\u308b) +userNameNickName= \u30cb\u30c3\u30af\u30cd\u30fc\u30e0 +userHomeInfoPostalName= \u4f4f\u6240 +userHomeInfoPostalStreet= \u901a\u308a\u30fb\u756a\u5730 +userHomeInfoPostalCity= \u90fd\u5e02 +userHomeInfoPostalStateprov= \u5dde/\u770c +userHomeInfoPostalPostalcode= \u90f5\u4fbf\u756a\u53f7 +userHomeInfoPostalCountry= \u56fd +userHomeInfoPostalOrganization= \u7d44\u7e54 +userHomeInfoTelecomTelephoneIntcode= \u81ea\u5b85\u7528\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userHomeInfoTelecomTelephoneLoccode= \u81ea\u5b85\u7528\u306e\u5e02\u5916\u5c40\u756a +userHomeInfoTelecomTelephoneNumber= \u81ea\u5b85\u7528\u306e\u96fb\u8a71\u756a\u53f7 +userHomeInfoTelecomTelephoneExt= \u81ea\u5b85\u7528\u306e\u5916\u7dda\u756a\u53f7 +userHomeInfoTelecomTelephoneComment= \u81ea\u5b85\u7528\u306e\u96fb\u8a71\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userHomeInfoTelecomFaxIntcode= \u81ea\u5b85\u7528\u306eFAX\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userHomeInfoTelecomFaxLoccode= \u81ea\u5b85\u7528\u306eFAX\u306e\u5e02\u5916\u5c40\u756a +userHomeInfoTelecomFaxNumber= \u81ea\u5b85\u7528\u306eFAX\u306e\u96fb\u8a71\u756a\u53f7 +userHomeInfoTelecomFaxExt= \u81ea\u5b85\u7528\u306eFAX\u306e\u5916\u7dda\u756a\u53f7 +userHomeInfoTelecomFaxComment= \u81ea\u5b85\u7528\u306eFAX\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userHomeInfoTelecomMobileIntcode= \u81ea\u5b85\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userHomeInfoTelecomMobileLoccode= \u81ea\u5b85\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u5e02\u5916\u5c40\u756a +userHomeInfoTelecomMobileNumber= \u81ea\u5b85\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u96fb\u8a71\u756a\u53f7 +userHomeInfoTelecomMobileExt= \u81ea\u5b85\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u5916\u7dda\u756a\u53f7 +userHomeInfoTelecomMobileComment= \u81ea\u5b85\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userHomeInfoTelecomPagerIntcode= \u81ea\u5b85\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userHomeInfoTelecomPagerLoccode= \u81ea\u5b85\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u5e02\u5916\u5c40\u756a +userHomeInfoTelecomPagerNumber= \u81ea\u5b85\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u96fb\u8a71\u756a\u53f7 +userHomeInfoTelecomPagerExt= \u81ea\u5b85\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u5916\u7dda\u756a\u53f7 +userHomeInfoTelecomPagerComment= \u81ea\u5b85\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userHomeInfoOnlineEmail= \u81ea\u5b85\u7528\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +userHomeInfoOnlineUri= \u81ea\u5b85\u7528\u306eURL +userBusinessInfoPostalName= \u4ed5\u4e8b\u7528\u306e\u4f4f\u6240 +userBusinessInfoPostalStreet= \u4ed5\u4e8b\u7528\u306e\u4f4f\u6240\u306e\u901a\u308a\u30fb\u756a\u5730 +userBusinessInfoPostalCity= \u4ed5\u4e8b\u7528\u306e\u4f4f\u6240\u306e\u90fd\u5e02 +userBusinessInfoPostalStateprov= \u4ed5\u4e8b\u7528\u306e\u4f4f\u6240\u306e\u5dde/\u770c +userBusinessInfoPostalPostalcode= \u4ed5\u4e8b\u7528\u306e\u4f4f\u6240\u306e\u90f5\u4fbf\u773c\u53f7 +userBusinessInfoPostalCountry= \u4ed5\u4e8b\u7528\u306e\u4f4f\u6240\u306e\u56fd +userBusinessInfoPostalOrganization= \u4ed5\u4e8b\u7528\u306e\u7d44\u7e54 +userBusinessInfoTelecomTelephoneIntcode= \u4ed5\u4e8b\u7528\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userBusinessInfoTelecomTelephoneLoccode= \u4ed5\u4e8b\u7528\u306e\u5e02\u5916\u5c40\u756a +userBusinessInfoTelecomTelephoneNumber= \u4ed5\u4e8b\u7528\u306e\u96fb\u8a71\u756a\u53f7 +userBusinessInfoTelecomTelephoneExt= \u4ed5\u4e8b\u7528\u306e\u5916\u7dda\u756a\u53f7 +userBusinessInfoTelecomTelephoneComment= \u4ed5\u4e8b\u7528\u306e\u96fb\u8a71\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userBusinessInfoTelecomFaxIntcode= \u4ed5\u4e8b\u7528\u306eFAX\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userBusinessInfoTelecomFaxLoccode= \u4ed5\u4e8b\u7528\u306eFAX\u306e\u5e02\u5916\u5c40\u756a +userBusinessInfoTelecomFaxNumber= \u4ed5\u4e8b\u7528\u306eFAX\u306e\u96fb\u8a71\u756a\u53f7 +userBusinessInfoTelecomFaxExt= \u4ed5\u4e8b\u7528\u306eFAX\u306e\u5916\u7dda\u756a\u53f7 +userBusinessInfoTelecomFaxComment= \u4ed5\u4e8b\u7528\u306eFAX\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userBusinessInfoTelecomMobileIntcode= \u4ed5\u4e8b\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userBusinessInfoTelecomMobileLoccode= \u4ed5\u4e8b\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u5e02\u5916\u5c40\u756a +userBusinessInfoTelecomMobileNumber= \u4ed5\u4e8b\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u96fb\u8a71\u756a\u53f7 +userBusinessInfoTelecomMobileExt= \u4ed5\u4e8b\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306e\u5916\u7dda\u756a\u53f7 +userBusinessInfoTelecomMobileComment= \u4ed5\u4e8b\u7528\u306e\u643a\u5e2f\u96fb\u8a71\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userBusinessInfoTelecomPagerIntcode= \u4ed5\u4e8b\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u56fd\u969b\u30b3\u30fc\u30c9 +userBusinessInfoTelecomPagerLoccode= \u4ed5\u4e8b\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u5e02\u5916\u5c40\u756a +userBusinessInfoTelecomPagerNumber= \u4ed5\u4e8b\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u96fb\u8a71\u756a\u53f7 +userBusinessInfoTelecomPagerExt= \u4ed5\u4e8b\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306e\u5916\u7dda\u756a\u53f7 +userBusinessInfoTelecomPagerComment= \u4ed5\u4e8b\u7528\u306e\u30dd\u30b1\u30d9\u30eb\u306b\u95a2\u3059\u308b\u30b3\u30e1\u30f3\u30c8 +userBusinessInfoOnlineEmail= \u4ed5\u4e8b\u7528\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +userBusinessInfoOnlineUri= \u4ed5\u4e8b\u7528\u306eURL +password=\u30d1\u30b9\u30ef\u30fc\u30c9 +verifyPassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u5165\u529b +email=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 + +pageMessage=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u65b9\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3078\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9001\u4fe1\u3057\u307e\u3059\u3002\u767b\u9332\u3057\u305f\u6b63\u78ba\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + +email.subject.registration=\u30dd\u30fc\u30bf\u30eb\u30a2\u30ab\u30a6\u30f3\u30c8\u767b\u9332\u306e\u78ba\u8a8d +email.subject.forgotten.password=\u30dd\u30fc\u30bf\u30eb\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u901a\u77e5 + +login=\u30ed\u30b0\u30a4\u30f3 +sendNewPassword=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1 +RequestNewPassword=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u7533\u8acb +SignUp=\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7 + +# Public Portal Registration +publicPortalRegistration.requiredDescription=\u304c\u3064\u3044\u3066\u3044\u308b\u9805\u76ee\u306f\u304b\u306a\u3089\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistration.userIdTitle=\u30e6\u30fc\u30b6\u30fc ID \u306e\u5165\u529b +publicPortalRegistration.typeUserId=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistration.userId=\u30e6\u30fc\u30b6\u30fc ID +publicPortalRegistration.userIdCondition= (6\u301c32\u5b57\u306e\u534a\u89d2\u82f1\u6570\u5b57) +publicPortalRegistration.userIdExample= (\u4f8b\uff1ahoge2000\u3001foo777\u306a\u3069) +publicPortalRegistration.userIdHint=\u30e6\u30fc\u30b6\u30fc ID \u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistration.userIdBeginWithAlphabet=\u6700\u521d\u306e\u6587\u5b57\u306f\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8 +publicPortalRegistration.underscoreAvailable=\u8a18\u53f7\u306f\u3001\u30a2\u30f3\u30c0\u30fc\u30d0\u30fc ( _ ) \u306e\u307f\u4f7f\u7528\u53ef\u80fd\u3067\u3059 +publicPortalRegistration.userInfoTitle=\u304a\u5ba2\u69d8\u60c5\u5831\u306e\u5165\u529b +publicPortalRegistration.typeUserInfo=\u30e6\u30fc\u30b6\u30fc ID \u3084\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5143\u306b\u672c\u4eba\u78ba\u8a8d\u3092\u884c\u3044\u307e\u3059\u3002\u6b63\u78ba\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistration.userHomeInfoPostalPostalcode=\u90f5\u4fbf\u756a\u53f7 +publicPortalRegistration.userHomeInfoPostalPostalcodeCondition= (\u534a\u89d2\u6570\u5b57\uff17\u6841) +publicPortalRegistration.userHomeInfoPostalPostalcodeExample= (\u4f8b\uff1a123-0001\u30011230001) +publicPortalRegistration.userGender=\u6027\u5225 +publicPortalRegistration.male=\u7537\u6027 +publicPortalRegistration.female=\u5973\u6027 +publicPortalRegistration.userBdate=\u751f\u5e74\u6708\u65e5 +publicPortalRegistration.userBdateYear=\u5e74 +publicPortalRegistration.userBdateMonth=\u6708 +publicPortalRegistration.userBdateDate=\u65e5 +publicPortalRegistration.userBusinessInfoOnlineEmail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +publicPortalRegistration.userBusinessInfoOnlineEmailCondition= (\u534a\u89d2) +publicPortalRegistration.userIndustry=\u696d\u7a2e +publicPortalRegistration.ComputerInternet=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u7ba1\u7406/\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8) +publicPortalRegistration.ComputerHardware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30cf\u30fc\u30c9\u30a6\u30a8\u30a2) +publicPortalRegistration.ComputerSoftware=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u4fc2 (\u30bd\u30d5\u30c8\u30a6\u30a8\u30a2) +publicPortalRegistration.Research=\u6559\u80b2/\u7814\u7a76 +publicPortalRegistration.Engineering=\u30a8\u30f3\u30b8\u30cb\u30a2/\u5efa\u7bc9 +publicPortalRegistration.Finance=\u9280\u884c/\u91d1\u878d/\u4e0d\u52d5\u7523 +publicPortalRegistration.Manufacturing=\u88fd\u9020/\u6d41\u901a +publicPortalRegistration.Service=\u30b5\u30fc\u30d3\u30b9 +publicPortalRegistration.Healthcare=\u533b\u85ac/\u5065\u5eb7 +publicPortalRegistration.Publication=\u5a2f\u697d/\u30e1\u30c7\u30a3\u30a2/\u51fa\u7248 +publicPortalRegistration.Travel=\u65c5\u884c/\u63a5\u5ba2\u696d +publicPortalRegistration.Retail=\u5c0f\u58f2/\u5378\u58f2 +publicPortalRegistration.Nonprofit=\u975e\u55b6\u5229\u56e3\u4f53 +publicPortalRegistration.Government=\u653f\u5e9c/\u81ea\u6cbb\u4f53 +publicPortalRegistration.Law=\u6cd5\u5f8b +publicPortalRegistration.unemployed=\u7121\u8077 +publicPortalRegistration.other=\u305d\u306e\u4ed6 +publicPortalRegistration.userJobtitle=\u8077\u7a2e +publicPortalRegistration.Officer=\u5f79\u54e1/\u7ba1\u7406\u8077 +publicPortalRegistration.Specialist=\u5c02\u9580\u8077 (\u533b\u5e2b\u3001\u5f01\u8b77\u58eb\u7b49) +publicPortalRegistration.Teacher=\u6559\u54e1 +publicPortalRegistration.ComputerEngineer=\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u95a2\u9023\u6280\u8853\u8005 +publicPortalRegistration.Engineer=\u305d\u306e\u4ed6\u6280\u8853\u8005 +publicPortalRegistration.Support=\u30b5\u30fc\u30d3\u30b9/\u30ab\u30b9\u30bf\u30de\u30fc\u30b5\u30dd\u30fc\u30c8 +publicPortalRegistration.Administrative=\u4e8b\u52d9\u8077 +publicPortalRegistration.Sales=\u55b6\u696d/\u30de\u30fc\u30b1\u30c6\u30a3\u30f3\u30b0 +publicPortalRegistration.Salesclerk=\u8ca9\u58f2\u54e1 +publicPortalRegistration.Student=\u5927\u5b66\u751f/\u5927\u5b66\u9662\u751f +publicPortalRegistration.Kid=\u5c0f/\u4e2d/\u9ad8\u6821\u751f +publicPortalRegistration.Homemaker=\u4e3b\u5a66 +publicPortalRegistration.SelfEmployed=\u81ea\u55b6\u696d +publicPortalRegistration.retirement=\u5b9a\u5e74\u9000\u8077\u8005 +publicPortalRegistration.userInfoHint=\u304a\u5ba2\u69d8\u60c5\u5831\u306b\u9593\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistration.liveInOversea=\u6d77\u5916\u5728\u4f4f\u306e\u65b9\u306f\u3001000-0000\u3068\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +publicPortalRegistration.bdataYearDescription=\u751f\u5e74\u6708\u65e5\u306e\u5e74\u306f\u897f\u66a6\u3067\u304a\u9858\u3044\u3057\u307e\u3059 +publicPortalRegistration.aboutEmail=\u767b\u9332\u3059\u308b\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u3092\u5229\u7528\u3057\u3066\u3044\u305f\u3060\u304f\u4e0a\u3067\u3001\u91cd\u8981\u306a\u304a\u77e5\u3089\u305b\u306a\u3069\u3092\u304a\u9001\u308a\u3059\u308b\u305f\u3081\u306e\u300c\u767b\u9332\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u300d \u306b\u306a\u308a\u307e\u3059\u3002\u9023\u7d61\u53ef\u80fd\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +publicPortalRegistration.userSecretQATitle=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048 +publicPortalRegistration.userSecretQADescription=\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u306b\u5fc5\u8981\u306a\u60c5\u5831\u3067\u3059\u3002\u3042\u306a\u305f\u3057\u304b\u77e5\u3089\u306a\u3044\u8cea\u554f\u3068\u7b54\u3048\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistration.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +publicPortalRegistration.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +publicPortalRegistration.userSecretQAHint=\u79d8\u5bc6\u306e\u8cea\u554f\u3068\u7b54\u3048\u306b\u95a2\u3059\u308b\u30d2\u30f3\u30c8 +publicPortalRegistration.aboutCharacters=\u79d8\u5bc6\u306e\u7b54\u3048\u306f\u3001\u3072\u3089\u304c\u306a\u3001\u30ab\u30bf\u30ab\u30ca\u3001\u5927\u6587\u5b57\u3001\u5c0f\u6587\u5b57\u3001\u534a\u89d2\u3001\u5168\u89d2\u3067\u533a\u5225\u3055\u308c\u307e\u3059 +publicPortalRegistration.SignUp=\u5229\u7528\u898f\u7d04\u306b\u540c\u610f\u3057\u3066\u767b\u9332 +publicPortalRegistration.termOfService=\u5229\u7528\u898f\u7d04 +publicPortalRegistration.name=\u6c0f\u540d +publicPortalRegistration.userNameFamily= (\u59d3) +publicPortalRegistration.userNameGiven= (\u540d) +publicPortalRegistration.nameYomi=\u6c0f\u540d(\u3075\u308a\u304c\u306a) +publicPortalRegistration.userNameFamilyYomi= (\u59d3) +publicPortalRegistration.userNameGivenYomi= (\u540d) +publicPortalRegistrationCompleted.registAgain=\u518d\u5ea6\u3001\u30e6\u30fc\u30b6\u30fc\u3092\u767b\u9332\u3059\u308b\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalRegistrationCompleted.registLink=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 + +publicPortalForgottenPassword.pageMessage=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u65b9\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3078\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u9001\u4fe1\u3057\u307e\u3059\u3002\u4ee5\u4e0b\u306b\u767b\u9332\u3057\u305f\u6b63\u78ba\u306a\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalForgottenPassword.Next=\u6b21\u3078 +publicPortalSecretAnswer.pageMessage=\u30e6\u30fc\u30b6\u30fc\u767b\u9332\u6642\u306b\u5165\u529b\u3057\u305f\u300c\u79d8\u5bc6\u306e\u8cea\u554f\u300d\u306b\u5bfe\u3059\u308b\u300c\u79d8\u5bc6\u306e\u7b54\u3048\u300d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalSecretAnswer.Finish=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9001\u4fe1 +publicPortalSecretAnswer.userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f +publicPortalSecretAnswer.userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +publicPortalForgottenPasswordCompleted.forgottenPasswordAgain=\u518d\u5ea6\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c\u3092\u884c\u3046\u5834\u5408\u306f\u3001\u4ee5\u4e0b\u306e\u30ea\u30f3\u30af\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalForgottenPasswordCompleted.forgottenPasswordLink=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c + Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/registration/label_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/label.properties =================================================================== --- pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/label.properties (rev 0) +++ pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/label.properties 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,9 @@ +publicPortalWithdrawal.pageMessage=\u9000\u4f1a\u3055\u308c\u308b\u5834\u5408\u306f\u3001\u300c\u9000\u4f1a\u3059\u308b\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalWithdrawal.next=\u9000\u4f1a\u3059\u308b + +publicPortalWithdrawalConfirm.checkInfo=\u3054\u672c\u4eba\u306b\u3088\u308b\u9000\u4f1a\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3059\u308b\u305f\u3081\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +publicPortalWithdrawalConfirm.userName=\u30e6\u30fc\u30b6\u30fc\u540d: +publicPortalWithdrawalConfirm.password=\u30d1\u30b9\u30ef\u30fc\u30c9: +publicPortalWithdrawalConfirm.confirmMessage=\u9000\u4f1a\u3055\u308c\u308b\u5834\u5408\u306f\u3001\u300c\u9000\u4f1a\u3059\u308b\u300d\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u300c\u9000\u4f1a\u3059\u308b\u300d\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3068\u3001\u81ea\u52d5\u3067\u30ed\u30b0\u30a2\u30a6\u30c8\u3057\u307e\u3059\u3002 +publicPortalWithdrawalConfirm.finish=\u9000\u4f1a\u3059\u308b +publicPortalWithdrawalConfirm.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb Property changes on: pal-admin-ex/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/label.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/resources/s2container.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/s2container.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/s2container.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,8 @@ + + + + + + + Added: pal-admin-ex/trunk/src/main/resources/teedaCustomize.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/teedaCustomize.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/teedaCustomize.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,13 @@ + + + + + true + + + + + "/images/" + + Added: pal-admin-ex/trunk/src/main/resources/teedaErrorPage.dicon =================================================================== --- pal-admin-ex/trunk/src/main/resources/teedaErrorPage.dicon (rev 0) +++ pal-admin-ex/trunk/src/main/resources/teedaErrorPage.dicon 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,14 @@ + + + + + + + + Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/faces-config.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,19 @@ + + + + + + + + + + appMessages + + en + ja + + + + \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,80 @@ + + + + admin + PAL Portal Administration Portlets + PAL Portal 管理ポートレット + PAL Team + + ForgottenPasswordPortlet + public-view + true + true + + + UserRegistrationPortlet + public-view + true + true + + + PublicPortalForgottenPasswordPortlet + public-view + true + true + + + PublicPortalRegistrationPortlet + public-view + true + true + + + PublicPortalRegistrationUpdatePortlet + public-view + + + SiteEditorPortlet + AEUV + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/portlet.xml (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,318 @@ + + + + + Provides users with the ability register as a new user with the public portal. + ポータルの新規登録する機能を提供します。 + PublicPortalRegistrationPortlet + Registration For Public Portal + 一般公開用ユーザー登録 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.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/registration/publicPortalRegistrationRegister.html + + + This option will generate a new password for each user registration + jp.sf.pal.admin.ForceGeneratedPassword + true + + + This option will force email address to be system wide unique + jp.sf.pal.admin.ForceUniqueEmail + true + + + This option will use the email address as the username + jp.sf.pal.admin.ForceUseEmailAsUsername + false + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.admin.EmailTemplateLocation + /WEB-INF/template/userreg/ + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.admin.EmailTemplateName + userRegistrationEmail.vm + + + Profiling rules to be assigned at registration. + jp.sf.pal.admin.RuleNames + page + + + Profiling rules to be assigned at registration. + jp.sf.pal.admin.RuleValues + j2 + + + Profiling rules to be assigned at registration. + jp.sf.pal.admin.SendMail + true + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.resources.PublicPortalRegistration + + User Registration + Registration + Registration + + + + Provides users with the ability to request a new password to be sent to their email address. + ユーザーに新規パスワードをメールアドレスに送信要求をする機能を提供します。 + PublicPortalForgottenPasswordPortlet + Forgotten Password for Public Portal + 一般公開用パスワード再発行 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.filter.ForgottenPasswordFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/registration/publicPortalForgottenPassword.html + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.admin.EmailTemplateLocation + /WEB-INF/template/userreg/ + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.admin.EmailTemplateName + forgottenPasswdEmail.vm + + + jp.sf.pal.admin.ReturnPath + /forgot.psml + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.resources.PublicPortalForgottenPassword + + Forgotten Password + Forgotten Password + tools,users,password,forgotten,lost,passwd + + + + Provides features for changing user information of the current, logged on user. + 現在ログインしているユーザーの情報を変更するための機能を提供します。 + PublicPortalRegistrationUpdatePortlet + Update User Information for Public Portal + 一般公開用ユーザー更新 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/registration/publicPortalRegistrationUpdate.html + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.resources.PublicPortalRegistrationUpdate + + Update User Information + Information Update + Update + + + + Provides users with the ability register as a new user with a portal. + ポータルの新規登録する機能を提供します。 + PortalRegistrationPortlet + Registration For Portal + ポータルユーザー登録 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.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/registration/portalRegistrationRegister.html + + + This option will generate a new password for each user registration + jp.sf.pal.admin.ForceGeneratedPassword + true + + + This option will force email address to be system wide unique + jp.sf.pal.admin.ForceUniqueEmail + true + + + This option will use the email address as the username + jp.sf.pal.admin.ForceUseEmailAsUsername + false + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.admin.EmailTemplateLocation + /WEB-INF/template/userreg/ + + + This is the template in which you setup an email to be sent after user exists + jp.sf.pal.admin.EmailTemplateName + userRegistrationEmail.vm + + + Profiling rules to be assigned at registration. + jp.sf.pal.admin.RuleNames + page + + + Profiling rules to be assigned at registration. + jp.sf.pal.admin.RuleValues + j2 + + + Profiling rules to be assigned at registration. + jp.sf.pal.admin.SendMail + true + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.resources.PortalRegistration + + User Registration + Registration + Registration + + + + Provides features for changing user information of the current, logged on user. + 現在ログインしているユーザーの情報を変更するための機能を提供します。 + PortalRegistrationUpdatePortlet + Update User Information for Portal + ポータルユーザー更新 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/registration/portalRegistrationUpdate.html + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.resources.PortalRegistrationUpdate + + Update User Information + Information Update + Update + + + + Provides features for a withdrawal from portal. + ポータル上から退会するための機能を提供します。 + PublicPortalWithdrawalPortlet + User Withdrawal + ユーザー退会 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.admin.filter.DefaultUserRegistrationFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/withdraw/publicPortalWithdrawal.html + + + jp.sf.pal.admin.withdraw.RemoveUser + true + + + jp.sf.pal.admin.withdraw.RemoveUserFolder + true + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.admin.resources.PublicPortalWithdrawal + + Withdrawal + Withdrawal + Withdrawal + + + Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/sun-web.xml =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/sun-web.xml (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/sun-web.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,7 @@ + + + + + + Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/sun-web.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt =================================================================== (Binary files differ) Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/term_of_service.txt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/forgottenPasswdEmail.vm =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/forgottenPasswdEmail.vm (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/forgottenPasswdEmail.vm 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,20 @@ +Hello $!{map.get("user.name.given")} $!{map.get("user.name.family")}: + +You have requested a new password for your account. + +The account username: $!{map.get("username")} +The new password is : $!{map.get("password")} + +To activate the new password you MUST click on the following link: +$!{map.get("returnURL")} +If you have received this email in error, and do NOT want to update your password, +please do NOT click on the link above, and your account will remain using your +original password. + + +Thanks, + +--- +PAL Portal +http://sourceforge.jp/projects/pal/ + Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/forgottenPasswdEmail.vm =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/forgottenPasswdEmail.vm (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/forgottenPasswdEmail.vm 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,21 @@ +こんにちは、$!{map.get("user.name.family")} $!{map.get("user.name.given")} さん + +ご利用のアカウントに関する新規パスワード作成依頼を受け付けました。 + +アカウントユーザー名: $!{map.get("username")} +新規パスワード: $!{map.get("password")} + +新規パスワードを有効にするためには、以下のリンクをクリックしてください。 + +$!{map.get("returnURL")} + +もし、誤ってこのメールを受け取った場合や、パスワードを更新したくない場合は、 +上のリンクをクリックしないでください。クリックしなければ、ご利用のアカウントで +現在のパスワードが保持されます。 + +以上をよろしくお願いいたします。 + +--- +PAL ポータル +http://sourceforge.jp/projects/pal/ + Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/userRegistrationEmail.vm =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/userRegistrationEmail.vm (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/html/ja/userRegistrationEmail.vm 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,17 @@ +こんにちは、$!{map.get("user.name.family")} $!{map.get("user.name.given")} さん + +PAL ポータルへようこそ! +登録していただきありがとうございます。PAL ポータルは JSR 168 に +合格したコンポーネントベースのポータルコンテナシステムです。 + +ユーザー名: $!{map.get("user.name")} +パスワード: $!{map.get("password")} + +パスワードは、ログインして変更できます。 + +以上をよろしくお願いいたします。 + +--- +PAL ポータル +http://sourceforge.jp/projects/pal/ + Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/template/userreg/email/userRegistrationEmail.vm 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,16 @@ +Hello $!{map.get("user.name.given")} $!{map.get("user.name.family")}: + +Welcome to PAL Portal! +Thanks you for registering. PAL Portal is a powerful component based +portlet container system conforming to JSR-168. + +Your username is: $!{map.get("user.name")} +Your password is: $!{map.get("password")} + +You may change your password online. + +--- +PAL Portal +http://sourceforge.jp/projects/pal/ + + Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/web.xml (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/web.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,136 @@ + + + + + + org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL + true + + + + javax.faces.STATE_SAVING_METHOD + server + + State saving method: "client" or "server" (= default) + See JSF Specification 2.5.2 + + + + javax.faces.DEFAULT_SUFFIX + .html + + + + s2filter + org.seasar.framework.container.filter.S2ContainerFilter + + + hotdeployfilter + org.seasar.framework.container.hotdeploy.HotdeployFilter + + + encodingfilter + org.seasar.extension.filter.EncodingFilter + + encoding + UTF-8 + + + + + + s2filter + /* + + + hotdeployfilter + /* + + + + encodingfilter + *.html + + + + + org.seasar.teeda.core.webapp.TeedaPortletExtendedConfigureListener + + + + facesServlet + javax.faces.webapp.FacesServlet + 2 + + + s2servlet + + org.seasar.framework.container.servlet.PortletExtendedS2ContainerServlet + 1 + + + facesServlet + *.html + + + s2servlet + /s2servlet + + + + index.html + + Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/WEB-INF/weblogic.xml =================================================================== --- pal-admin-ex/trunk/src/main/webapp/WEB-INF/weblogic.xml (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/WEB-INF/weblogic.xml 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,10 @@ + + + + + -1 + -1 + true + true + + Property changes on: pal-admin-ex/trunk/src/main/webapp/WEB-INF/weblogic.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/css/global.css =================================================================== --- pal-admin-ex/trunk/src/main/webapp/css/global.css (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/css/global.css 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,101 @@ +body { + padding:0; + background:#FFFFFF; +} + +td, th { + font-size: small; +} +.title { + font-size: large; + font-weight: bold; + color: #5671A0; +} +.small { + font-size: 70%; + color: white; +} +.small a, small a:visited { + color: white; +} +.smalltitle { + font-size: small; + font-weight: bold; + color: #5671A0; +} +.toolbar { + padding: 4px; + background-color: #7694C8; +} +.left { + text-align: left; +} +.right { + text-align: right; +} +.box { + border: thin solid #7694C8; +} +.label { + background-color: #ffffcc; +} +.error { + background-color: red; + color: white; +} +.display { + display: inline; +} +.notdisplay { + display: none; +} + +.level0 { +} +.level1 { +} + +.body { + margin-left:188px; +} +.header { + padding:4px; +} +.menu { + background:#FC0; + padding:0; + position:absolute; + width:120px; + top:145px; +} +.tablebg { + background-color: #EEF3FB; +} +.oddRow { + background-color: #FFFFFF; +} +.evenRow { + background-color: #EEF3FB; +} +.gridHeader { + background-color: green; + color: white; + font-weight: bold; + overflow: hidden; +} +.gridTable { + background-color: black; +} +.gridCell { + height: 25px; +} +.gridCellEdit { + border-width: 1px; + background-color: #FFC0CB; +} +.row_odd { + background-color: white; +} +.row_even { + background-color: #EEF3FB; +} Property changes on: pal-admin-ex/trunk/src/main/webapp/css/global.css ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/error/error.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/error/error.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/error/error.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,15 @@ + + + +AppFacesException Error Page + + +
+ +
+ +
+ +
+ + \ No newline at end of file Property changes on: pal-admin-ex/trunk/src/main/webapp/view/error/error.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,23 @@ + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationCompleted.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,148 @@ + + + + + + + + +
+ +
+ +
+ +
+ * + +
+
+ +
+
+ + + + + + + + + + + + +
*: + + + +
+ +
+
+
+
+ +
+
    +
  • + +
  • +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + +
*: + + + +
+
+
+
+ +
+
    +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + +
+ *: + + +
+ + + +
+
+ *: + + +
+
+
+
+ +
+
    +
  • + +
  • +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationRegister.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,128 @@ + + + + + + + + +
+ +
+ +
+ +
+ * + +
+
+ +
+
+ + + + + + + + + + + + +
: + + + +
: + + +
+
+
+
+ +
+
    +
  • + +
  • +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + +
*: + + + +
+
+
+
+ +
+
    +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + + + + + +
*: + + +
*: + + +
+
+
+
+ +
+
    +
  • + +
  • +
+
+
+
+ +
+
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/portalRegistrationUpdate.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,29 @@ + + + + + + + + +
+ +
+ +
+ + +
+ +
+
+ : + +
+
+ +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPassword.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,23 @@ + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalForgottenPasswordCompleted.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,23 @@ + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationCompleted.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,327 @@ + + + + + + + + +
+ +
+ +
+ +
+ * + +
+
+ +
+
+ + + + + + + + + + + + +
*: + + + +
+ +
+
+
+
+ +
+
    +
  • + +
  • +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*: + + + + + +
*: + + + + + +
*: + + + +
+ +
*: + + + + + + + +
*: + + + + + + + +
*: + + + +
*: + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
*: + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
+
+
+
+ +
+
    +
  • + +
  • +
  • + +
  • +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + +
+ *: + + +
+ + + +
+
+ *: + + +
+
+
+
+ +
+
    +
  • + +
  • +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationRegister.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,307 @@ + + + + + + + + +
+ +
+ +
+ +
+ * + +
+
+ +
+
+ + + + + + + + + + + + +
: + + + +
: + + +
+
+
+
+ +
+
    +
  • + +
  • +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*: + + + + + +
*: + + + + + +
*: + + + +
+ +
*: + + + + + + + +
*: + + + + + + + +
*: + + + +
*: + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
*: + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
+
+
+
+ +
+
    +
  • + +
  • +
  • + +
  • +
  • + +
  • +
+
+
+
+ +
+
+ + + + + + + + + + + + +
*: + + +
*: + + +
+
+
+
+ +
+
    +
  • + +
  • +
+
+
+
+ +
+
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalRegistrationUpdate.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,37 @@ + + + + + + + + +
+ +
+ +
+ + +
+
+ +
+ +
+ : + 質問 +
+
+ : + +
+
+
+ + +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/registration/publicPortalSecretAnswer.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,25 @@ + + + + + + + + +
+ +
+ +
+ + +
+ +
+
+ +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawal.html ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html =================================================================== --- pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html (rev 0) +++ pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html 2008-04-28 08:45:08 UTC (rev 896) @@ -0,0 +1,41 @@ + + + + + + + + +
+ +
+ +
+ + +
+ +
+
+ + + + + + + + + +
taro
+
+
+ +
+
+ + +
+ +
+ + Property changes on: pal-admin-ex/trunk/src/main/webapp/view/withdraw/publicPortalWithdrawalConfirm.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Mon Apr 28 18:21:50 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 28 Apr 2008 18:21:50 +0900 Subject: [pal-cvs 3161] [897] added output message. Message-ID: <1209374510.711879.12733.nullmailer@users.sourceforge.jp> Revision: 897 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=897 Author: shinsuke Date: 2008-04-28 18:21:50 +0900 (Mon, 28 Apr 2008) Log Message: ----------- added output message. Modified Paths: -------------- pal-portal/trunk/portlets/build.xml -------------- next part -------------- Modified: pal-portal/trunk/portlets/build.xml =================================================================== --- pal-portal/trunk/portlets/build.xml 2008-04-28 08:45:08 UTC (rev 896) +++ pal-portal/trunk/portlets/build.xml 2008-04-28 09:21:50 UTC (rev 897) @@ -35,7 +35,10 @@ description="--> Remove Portlets"> + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ + Processing... + ------------------------------------------------------------------------ Portlet ID: @{portlet} + ------------------------------------------------------------------------ Revision: 898 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=898 Author: sone Date: 2008-04-30 10:29:49 +0900 (Wed, 30 Apr 2008) Log Message: ----------- remove patches Removed Paths: ------------- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm pal-portal/trunk/portal/patches/src/webapp/index.jsp -------------- next part -------------- Deleted: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java =================================================================== --- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-04-30 01:29:49 UTC (rev 898) @@ -1,16 +0,0 @@ -Index: components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java -=================================================================== ---- components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (リビジョン 552638) -+++ components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (作業コピー) -@@ -211,6 +211,11 @@ - { - fileName = path + this.documentType; - } -+ // Check "_page" -+ if (fileName.startsWith("/_page/")) -+ { -+ fileName = path.substring("/_page".length()); -+ } - File f = new File(this.documentRootDir, fileName); - Writer writer = null; - Deleted: pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java =================================================================== --- pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2008-04-30 01:29:49 UTC (rev 898) @@ -1,17 +0,0 @@ -Index: components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java -=================================================================== ---- components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java (リビジョン 545568) -+++ components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java (作業コピー) -@@ -921,6 +921,12 @@ - */ - private FolderImpl getNodeFolder(String nodePath) throws NodeException, InvalidFolderException, FolderNotFoundException - { -+ // Check "_page" -+ if (nodePath.startsWith("/_page")) -+ { -+ nodePath = nodePath.substring("/_page".length()); -+ } -+ - int folderIndex = nodePath.lastIndexOf(Folder.PATH_SEPARATOR); - if (folderIndex > 0) - { Deleted: pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java =================================================================== --- pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-04-30 01:29:49 UTC (rev 898) @@ -1,106 +0,0 @@ -Index: components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java -=================================================================== ---- components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (リビジョン 553019) -+++ components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (作業コピー) -@@ -34,9 +34,13 @@ - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - import org.apache.jetspeed.om.folder.Folder; -+import org.apache.jetspeed.om.folder.FolderNotFoundException; -+import org.apache.jetspeed.om.folder.InvalidFolderException; -+import org.apache.jetspeed.om.page.ContentPageImpl; - import org.apache.jetspeed.om.page.Page; - import org.apache.jetspeed.page.PageManager; - import org.apache.jetspeed.page.PageManagerEventListener; -+import org.apache.jetspeed.page.PageNotFoundException; - import org.apache.jetspeed.page.document.Node; - import org.apache.jetspeed.page.document.NodeException; - import org.apache.jetspeed.page.document.NodeNotFoundException; -@@ -47,6 +51,7 @@ - import org.apache.jetspeed.portalsite.view.SiteViewMenuDefinitionLocator; - import org.apache.jetspeed.profiler.ProfileLocator; - import org.apache.jetspeed.profiler.ProfileLocatorProperty; -+import org.apache.jetspeed.request.RequestContext; - import org.apache.jetspeed.security.JSSubject; - import org.apache.jetspeed.security.UserPrincipal; - -@@ -207,6 +212,13 @@ - requestPath = locator.getRequestPath(); - } - -+ // Check "/_page/" -+ Page page = getRequestedPage(requestPath); -+ if (page != null) -+ { -+ return page; -+ } -+ - // attempt to select request page or folder using - // profile locators and site view; if fallback - // enabled, fallback on missing node or access -@@ -1259,4 +1271,65 @@ - } - return folderPageHistory; - } -+ -+ public static final String PAGE_PATH_NAVIGATION = "/_page/"; -+ -+ protected Page getRequestedPage(String path) -+ { -+ if (path == null || !path.startsWith(PAGE_PATH_NAVIGATION)) -+ { -+ return null; -+ } -+ -+ Page page = null; -+ -+ path = path.substring(PAGE_PATH_NAVIGATION.length() - 1); -+ -+ try -+ { -+ if (path.endsWith(Page.DOCUMENT_TYPE)) -+ { -+ page = getPageManager().getPage(path); -+ } -+ else -+ { -+ Folder folder = getPageManager().getFolder(path); -+ if (folder != null) -+ { -+ String defaultPage = folder.getDefaultPage(); -+ if (defaultPage != null) -+ { -+ page = folder.getPage(defaultPage); -+ } -+ //TODO -+ } -+ } -+ if (page != null) -+ { -+ page.setPath(PAGE_PATH_NAVIGATION + path.substring(1)); -+ return page; -+ } -+ } -+ catch (PageNotFoundException e) -+ { -+ log.warn("Exception in request pipeline: " + e.getMessage(), e); -+ } -+ catch (FolderNotFoundException e) -+ { -+ log.warn("Exception in request pipeline: " + e.getMessage(), e); -+ } -+ catch (InvalidFolderException e) -+ { -+ log.warn("Exception in request pipeline: " + e.getMessage(), e); -+ } -+ catch (NodeException e) -+ { -+ log.warn("Exception in request pipeline: " + e.getMessage(), e); -+ } -+ catch (Exception e) -+ { -+ log.warn("Exception in request pipeline: " + e.getMessage(), e); -+ } -+ return null; -+ } - } Deleted: pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java =================================================================== --- pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-04-30 01:29:49 UTC (rev 898) @@ -1,15 +0,0 @@ -Index: components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java -=================================================================== ---- components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java (リビジョン 545114) -+++ components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java (作業コピー) -@@ -1233,6 +1233,10 @@ - { - return pageProxy.getPage(); - } -+ else if(page instanceof Page) -+ { -+ return page; -+ } - return null; - } - } Deleted: pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml =================================================================== --- pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/etc/sql/j2-seed.xml 2008-04-30 01:29:49 UTC (rev 898) @@ -1,189 +0,0 @@ -Index: etc/sql/j2-seed.xml -=================================================================== ---- etc/sql/j2-seed.xml (リビジョン 519203) -+++ etc/sql/j2-seed.xml (作業コピー) -@@ -262,10 +262,13 @@ - manager - user - guest -+ site -+ - - - accounting -@@ -274,9 +277,10 @@ - - - -- -+ - user,manager,admin - -+ - - - -- -+ - user,manager - - - - - -+ - - -- guest -+ guest,site - - - - -- -+ - - -+ -+ -+ -+ user,site -+ -+ -+ -+ -+ -+ -+ - - - -- user,guest,subsite,subsite2 -+ user,guest - - - -@@ -393,6 +412,7 @@ - - - -+ - - admin - -@@ -468,6 +489,7 @@ - - - -+ - - admin - -@@ -488,11 +511,13 @@ - - - -+ - - - -@@ -632,6 +657,7 @@ - - - -+ - - - -@@ -730,5 +757,32 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - Deleted: pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml =================================================================== --- pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/etc/sql/min/j2-seed.xml 2008-04-30 01:29:49 UTC (rev 898) @@ -1,137 +0,0 @@ -Index: etc/sql/min/j2-seed.xml -=================================================================== ---- etc/sql/min/j2-seed.xml (リビジョン 530210) -+++ etc/sql/min/j2-seed.xml (作業コピー) -@@ -261,14 +261,18 @@ - admin - guest - user -+ site -+ siteadmin -+ - - - - - -- -+ - user,admin - - -@@ -285,14 +289,15 @@ - - - -- guest -+ guest,site - - - - -- -+ - - -+ -+ -+ -+ user,site,siteadmin -+ -+ -+ -+ -+ -+ -+ - - -+ -+ user,guest -+ -+ -+ -+ -+ user -+ -+ -+ -+ -+ admin -+ -+ -+ -+ - - admin - -@@ -385,6 +417,12 @@ - - - -+ -+ -+ -+ -+ -+ - - - -@@ -395,12 +433,6 @@ - - - -- -- -- -- -- -- - - - -@@ -516,5 +548,32 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - Deleted: pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql =================================================================== --- pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/etc/sql/mysql/populate-userinfo-for-default-psml.sql 2008-04-30 01:29:49 UTC (rev 898) @@ -1,127 +0,0 @@ -Index: etc/sql/mysql/populate-userinfo-for-default-psml.sql -=================================================================== ---- etc/sql/mysql/populate-userinfo-for-default-psml.sql (リビジョン 488564) -+++ etc/sql/mysql/populate-userinfo-for-default-psml.sql (作業コピー) -@@ -6,9 +6,9 @@ - INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562'); - INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/admin','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -@@ -17,21 +17,23 @@ - INSERT INTO SECURITY_PRINCIPAL VALUES(11,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/accounting','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(12,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/marketing','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(13,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/engineering','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'admin',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'manager',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+INSERT INTO SECURITY_PRINCIPAL VALUES(14,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/site','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'@@ADMIN_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'@@MANAGER_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+--INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+--INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+--INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); - INSERT INTO SECURITY_USER_ROLE VALUES(1,6); - INSERT INTO SECURITY_USER_ROLE VALUES(1,7); - INSERT INTO SECURITY_USER_ROLE VALUES(1,8); - INSERT INTO SECURITY_USER_ROLE VALUES(2,7); - INSERT INTO SECURITY_USER_ROLE VALUES(2,8); --INSERT INTO SECURITY_USER_ROLE VALUES(3,8); -+--INSERT INTO SECURITY_USER_ROLE VALUES(3,8); - INSERT INTO SECURITY_USER_ROLE VALUES(9,10); --INSERT INTO SECURITY_USER_ROLE VALUES(5,7); --INSERT INTO SECURITY_USER_GROUP VALUES(3,11); --INSERT INTO SECURITY_USER_GROUP VALUES(5,13); -+INSERT INTO SECURITY_USER_ROLE VALUES(9,14); -+--INSERT INTO SECURITY_USER_ROLE VALUES(5,7); -+--INSERT INTO SECURITY_USER_GROUP VALUES(3,11); -+--INSERT INTO SECURITY_USER_GROUP VALUES(5,13); - INSERT INTO SECURITY_PERMISSION VALUES(1,'org.apache.jetspeed.security.FolderPermission','<>','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(2,'org.apache.jetspeed.security.FolderPermission','<>','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(3,'org.apache.jetspeed.security.FolderPermission','/','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -@@ -46,8 +48,8 @@ - INSERT INTO SECURITY_PERMISSION VALUES(12,'org.apache.jetspeed.security.PagePermission','/rss.psml','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(13,'org.apache.jetspeed.security.FolderPermission','/_user/user','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(14,'org.apache.jetspeed.security.FolderPermission','/_user/user/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13); --INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14); - INSERT INTO PRINCIPAL_PERMISSION VALUES(6,1); - INSERT INTO PRINCIPAL_PERMISSION VALUES(7,2); - INSERT INTO PRINCIPAL_PERMISSION VALUES(8,3); -@@ -64,36 +66,39 @@ - INSERT INTO PRINCIPAL_PERMISSION VALUES(10,12); - - --INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); --INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); --INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+--INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); -+--INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); - --INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); --INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+--INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); - --INSERT INTO SECURITY_USER_ROLE VALUES(50,52); --INSERT INTO SECURITY_USER_ROLE VALUES(50,53); --INSERT INTO SECURITY_USER_ROLE VALUES(51,52); --INSERT INTO SECURITY_USER_ROLE VALUES(51,53); -+--INSERT INTO SECURITY_USER_ROLE VALUES(50,52); -+--INSERT INTO SECURITY_USER_ROLE VALUES(50,53); -+--INSERT INTO SECURITY_USER_ROLE VALUES(51,52); -+--INSERT INTO SECURITY_USER_ROLE VALUES(51,53); - --INSERT INTO SECURITY_PERMISSION VALUES(50,'org.apache.jetspeed.security.FolderPermission','/__subsite-root','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PERMISSION VALUES(51,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/-','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PERMISSION VALUES(52,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PERMISSION VALUES(53,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PERMISSION VALUES(54,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PERMISSION VALUES(55,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52); --INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53); --INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54); --INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55); --INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3); --INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50); --INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51); --INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3); --INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50); --INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51); -+--INSERT INTO SECURITY_PERMISSION VALUES(50,'org.apache.jetspeed.security.FolderPermission','/__subsite-root','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PERMISSION VALUES(51,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/-','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PERMISSION VALUES(52,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PERMISSION VALUES(53,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PERMISSION VALUES(54,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO SECURITY_PERMISSION VALUES(55,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50); -+--INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51); - - INSERT INTO SECURITY_PERMISSION VALUES(100,'org.apache.jetspeed.security.PortletPermission','j2-admin::*','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO PRINCIPAL_PERMISSION VALUES(6,100); - -+INSERT INTO SECURITY_PERMISSION VALUES(101,'org.apache.jetspeed.security.PortletPermission','cms-portlets::*','view, edit','2006-12-23 22:37:42','2006-12-23 22:37:42'); -+INSERT INTO PRINCIPAL_PERMISSION VALUES(14,101); -+ Deleted: pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql =================================================================== --- pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/etc/sql/populate-db-default.sql 2008-04-30 01:29:49 UTC (rev 898) @@ -1,13 +0,0 @@ -Index: etc/sql/populate-db-default.sql -=================================================================== ---- etc/sql/populate-db-default.sql (リビジョン 474669) -+++ etc/sql/populate-db-default.sql (作業コピー) -@@ -429,7 +429,7 @@ - 'Resolves pages based on the clients remote IP address.'); - insert into RULE_CRITERION values ('60', 'ip-address', 0, 'ip', 'ip', null, 0); - --insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'j2' ); -+insert into PRINCIPAL_RULE_ASSOC values ( 'guest', 'page', 'user-role-fallback' ); - insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'page', 'role-fallback' ); - insert into PRINCIPAL_RULE_ASSOC values ( 'jetspeed', 'menu', 'role-group' ); - insert into PRINCIPAL_RULE_ASSOC values ( 'user', 'page', 'j2' ); Deleted: pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql =================================================================== --- pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/etc/sql/populate-userinfo-for-default-psml.sql 2008-04-30 01:29:49 UTC (rev 898) @@ -1,128 +0,0 @@ -Index: etc/sql/populate-userinfo-for-default-psml.sql -=================================================================== ---- etc/sql/populate-userinfo-for-default-psml.sql (リビジョン 488564) -+++ etc/sql/populate-userinfo-for-default-psml.sql (作業コピー) -@@ -6,9 +6,9 @@ - INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562'); - INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(5,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/jetspeed','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(6,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/admin','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(7,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(8,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -@@ -17,21 +17,23 @@ - INSERT INTO SECURITY_PRINCIPAL VALUES(11,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/accounting','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(12,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/marketing','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PRINCIPAL VALUES(13,'org.apache.jetspeed.security.JetspeedGroupPrincipalImpl',0,1,'/group/engineering','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'admin',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'manager',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+INSERT INTO SECURITY_PRINCIPAL VALUES(14,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/site','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -+INSERT INTO SECURITY_CREDENTIAL VALUES(1,1,'@@ADMIN_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',1,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+INSERT INTO SECURITY_CREDENTIAL VALUES(2,2,'@@MANAGER_PASSWORD@@',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+-- INSERT INTO SECURITY_CREDENTIAL VALUES(3,3,'user',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+-- INSERT INTO SECURITY_CREDENTIAL VALUES(4,4,'tomcat',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); -+-- INSERT INTO SECURITY_CREDENTIAL VALUES(5,5,'jetspeed',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2004-05-22 16:27:12.572','2004-05-22 16:27:12.572',null,null,null); - INSERT INTO SECURITY_USER_ROLE VALUES(1,6); - INSERT INTO SECURITY_USER_ROLE VALUES(1,7); - INSERT INTO SECURITY_USER_ROLE VALUES(1,8); - INSERT INTO SECURITY_USER_ROLE VALUES(2,7); - INSERT INTO SECURITY_USER_ROLE VALUES(2,8); --INSERT INTO SECURITY_USER_ROLE VALUES(3,8); -+-- INSERT INTO SECURITY_USER_ROLE VALUES(3,8); - INSERT INTO SECURITY_USER_ROLE VALUES(9,10); --INSERT INTO SECURITY_USER_ROLE VALUES(5,7); --INSERT INTO SECURITY_USER_GROUP VALUES(3,11); --INSERT INTO SECURITY_USER_GROUP VALUES(5,13); -+INSERT INTO SECURITY_USER_ROLE VALUES(9,14); -+-- INSERT INTO SECURITY_USER_ROLE VALUES(5,7); -+-- INSERT INTO SECURITY_USER_GROUP VALUES(3,11); -+-- INSERT INTO SECURITY_USER_GROUP VALUES(5,13); - INSERT INTO SECURITY_PERMISSION VALUES(1,'org.apache.jetspeed.security.FolderPermission','<>','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(2,'org.apache.jetspeed.security.FolderPermission','<>','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(3,'org.apache.jetspeed.security.FolderPermission','/','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -@@ -46,8 +48,8 @@ - INSERT INTO SECURITY_PERMISSION VALUES(12,'org.apache.jetspeed.security.PagePermission','/rss.psml','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(13,'org.apache.jetspeed.security.FolderPermission','/_user/user','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(14,'org.apache.jetspeed.security.FolderPermission','/_user/user/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13); --INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(3,13); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(3,14); - INSERT INTO PRINCIPAL_PERMISSION VALUES(6,1); - INSERT INTO PRINCIPAL_PERMISSION VALUES(7,2); - INSERT INTO PRINCIPAL_PERMISSION VALUES(8,3); -@@ -63,18 +65,18 @@ - INSERT INTO PRINCIPAL_PERMISSION VALUES(10,11); - INSERT INTO PRINCIPAL_PERMISSION VALUES(10,12); - --INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); --INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); --INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); --INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(50,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(51,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+-- INSERT INTO SECURITY_CREDENTIAL VALUES(50,50,'subsite',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); -+-- INSERT INTO SECURITY_CREDENTIAL VALUES(51,51,'subsite2',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2005-01-01 00:00:00.000','2005-01-01 00:00:00.000',null,null,null); - --INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); --INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(52,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(53,'org.apache.jetspeed.security.JetspeedRolePrincipalImpl',0,1,'/role/subsite2','2005-01-01 00:00:00.000','2005-01-01 00:00:00.000'); - --INSERT INTO SECURITY_USER_ROLE VALUES(50,52); --INSERT INTO SECURITY_USER_ROLE VALUES(50,53); --INSERT INTO SECURITY_USER_ROLE VALUES(51,52); --INSERT INTO SECURITY_USER_ROLE VALUES(51,53); -+-- INSERT INTO SECURITY_USER_ROLE VALUES(50,52); -+-- INSERT INTO SECURITY_USER_ROLE VALUES(50,53); -+-- INSERT INTO SECURITY_USER_ROLE VALUES(51,52); -+-- INSERT INTO SECURITY_USER_ROLE VALUES(51,53); - - - INSERT INTO SECURITY_PERMISSION VALUES(50,'org.apache.jetspeed.security.FolderPermission','/__subsite-root','view','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); -@@ -83,21 +85,24 @@ - INSERT INTO SECURITY_PERMISSION VALUES(53,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(54,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO SECURITY_PERMISSION VALUES(55,'org.apache.jetspeed.security.FolderPermission','/__subsite-root/_role/subsite2/-','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); --INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52); --INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53); --INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54); --INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55); --INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3); --INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50); --INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51); --INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3); --INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50); --INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(50,52); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(50,53); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(51,54); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(51,55); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(52,3); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(52,50); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(52,51); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(53,3); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(53,50); -+-- INSERT INTO PRINCIPAL_PERMISSION VALUES(53,51); - - INSERT INTO SECURITY_PERMISSION VALUES(100,'org.apache.jetspeed.security.PortletPermission','j2-admin::*','view, edit','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572'); - INSERT INTO PRINCIPAL_PERMISSION VALUES(6,100); - -+INSERT INTO SECURITY_PERMISSION VALUES(101,'org.apache.jetspeed.security.PortletPermission','cms-portlets::*','view, edit','2006-12-23 22:37:42','2006-12-23 22:37:42'); -+INSERT INTO PRINCIPAL_PERMISSION VALUES(14,101); -+ - -- Test User for Mapping IP addresses to geographic locations - -- And ip-address Profile rule --INSERT INTO SECURITY_PRINCIPAL VALUES(60,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/geo','2006-09-03 12:07:25.234','2006-09-03 12:07:25.234'); --INSERT INTO SECURITY_CREDENTIAL VALUES(60,60,'geo',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2006-09-03 12:07:25.234','2006-09-03 12:07:25.234',null,null,null); -\ No newline at end of file -+-- INSERT INTO SECURITY_PRINCIPAL VALUES(60,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/geo','2006-09-03 12:07:25.234','2006-09-03 12:07:25.234'); -+-- INSERT INTO SECURITY_CREDENTIAL VALUES(60,60,'geo',0,'org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialImpl',0,0,1,0,0,'2006-09-03 12:07:25.234','2006-09-03 12:07:25.234',null,null,null); Deleted: pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java =================================================================== --- pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java 2008-04-30 01:29:49 UTC (rev 898) @@ -1,1782 +0,0 @@ -Index: layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java -=================================================================== ---- layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (リビジョン 539124) -+++ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java (作業コピー) -@@ -55,21 +55,32 @@ - protected final static Log log = LogFactory.getLog(MultiColumnPortlet.class); - - protected final static String PARAM_NUM_COLUMN = "columns"; -+ - protected final static int DEFAULT_NUM_COLUMN = 2; -+ - protected final static String PARAM_COLUMN_SIZES = "sizes"; -+ - protected final static String DEFAULT_ONE_COLUMN_SIZES = "100%"; -+ - protected final static String DEFAULT_TWO_COLUMN_SIZES = "50%,50%"; -+ - protected final static String DEFAULT_THREE_COLUMN_SIZES = "34%,33%,33%"; - - private int numColumns = 0; -+ - private String columnSizes = null; -+ - private String portletName = null; -+ - private String layoutType; -+ - private String editorType = null; -+ - protected DecorationFactory decorators; -+ - protected JetspeedDesktop desktop; - -- public void init( PortletConfig config ) throws PortletException -+ public void init(PortletConfig config) throws PortletException - { - super.init(config); - this.portletName = config.getPortletName(); -@@ -89,50 +100,57 @@ - { - switch (this.numColumns) - { -- case 1: this.columnSizes = DEFAULT_ONE_COLUMN_SIZES; break; -- case 2: this.columnSizes = DEFAULT_TWO_COLUMN_SIZES; break; -- case 3: this.columnSizes = DEFAULT_THREE_COLUMN_SIZES; break; -- default: this.columnSizes = null; break; -+ case 1: -+ this.columnSizes = DEFAULT_ONE_COLUMN_SIZES; -+ break; -+ case 2: -+ this.columnSizes = DEFAULT_TWO_COLUMN_SIZES; -+ break; -+ case 3: -+ this.columnSizes = DEFAULT_THREE_COLUMN_SIZES; -+ break; -+ default: -+ this.columnSizes = null; -+ break; - } - } - if (this.columnSizes == null) - { -- throw new PortletException("Column sizes cannot be defaulted for " + this.numColumns + " columns and are not specified for " + this.portletName); -+ throw new PortletException("Column sizes cannot be defaulted for " + this.numColumns -+ + " columns and are not specified for " + this.portletName); - } -- -- this.decorators = (DecorationFactory)getPortletContext().getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY); -+ -+ this.decorators = (DecorationFactory) getPortletContext().getAttribute(CommonPortletServices.CPS_DECORATION_FACTORY); - if (null == this.decorators) - { - throw new PortletException("Failed to find the Decoration Factory on portlet initialization"); - } -- -- this.desktop = (JetspeedDesktop)getPortletContext().getAttribute(CommonPortletServices.CPS_DESKTOP); -+ -+ this.desktop = (JetspeedDesktop) getPortletContext().getAttribute(CommonPortletServices.CPS_DESKTOP); - } - -- public void doView( RenderRequest request, RenderResponse response ) throws PortletException, IOException -+ public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException - { - RequestContext context = getRequestContext(request); - -- ContentPage requestPage = context.getPage(); -- PageEditAccess pageEditAccess = (PageEditAccess)context.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE); -- if ( requestPage == null || pageEditAccess == null ) -+ ContentPage requestPage = context.getPage(); -+ PageEditAccess pageEditAccess = (PageEditAccess) context.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE); -+ if (requestPage == null || pageEditAccess == null) - { - // Targetting this portlet REQUIRES that the ProfilerValve has been invoked! - throw new PortletException("Current request page or PageEditAccess not available."); - } -- -- Boolean editing = ( pageEditAccess.isEditing() && -- PortletMode.VIEW.equals(request.getPortletMode()) && -- request.isPortletModeAllowed(PortletMode.EDIT)) -- ? Boolean.TRUE : Boolean.FALSE; -- -+ -+ Boolean editing = (pageEditAccess.isEditing() && PortletMode.VIEW.equals(request.getPortletMode()) && request -+ .isPortletModeAllowed(PortletMode.EDIT)) ? Boolean.TRUE : Boolean.FALSE; -+ - PortletWindow window = context.getPortalURL().getNavigationalState().getMaximizedWindow(); - if (window != null) - { - super.doView(request, response); - return; - } -- -+ - // get fragment column sizes - Fragment f = getFragment(request, false); - String fragmentColumnSizes = columnSizes; -@@ -141,7 +159,7 @@ - { - fragmentColumnSizes = fragmentColumnSizesProperty; - } -- String [] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,"); -+ String[] fragmentColumnSizesArray = fragmentColumnSizes.split("\\,"); - List fragmentColumnSizesList = new ArrayList(fragmentColumnSizesArray.length); - for (int i = 0; (i < fragmentColumnSizesArray.length); i++) - { -@@ -157,16 +175,35 @@ - } - catch (LayoutEventException e1) - { -- throw new PortletException("Failed to build ColumnLayout "+e1.getMessage(), e1); -+ throw new PortletException("Failed to build ColumnLayout " + e1.getMessage(), e1); - } - -+ String prefName = request.getParameter("preferenceName"); -+ if (prefName != null) -+ { -+ request.setAttribute("preferenceName", prefName); -+ } -+ else -+ { -+ request.setAttribute("preferenceName", ""); -+ } -+ String prefState = request.getParameter("preferenceState"); -+ if (prefState != null) -+ { -+ request.setAttribute("preferenceState", prefState); -+ } -+ else -+ { -+ request.setAttribute("preferenceState", "hide"); -+ } -+ - // invoke the JSP associated with this portlet - request.setAttribute("columnLayout", layout); - request.setAttribute("numberOfColumns", new Integer(numColumns)); - request.setAttribute("decorationFactory", this.decorators); - request.setAttribute("columnSizes", fragmentColumnSizesList); -- request.setAttribute("editing",editing); -- request.setAttribute("fragmentNestingLevel",new Integer(getFragmentNestingLevel(requestPage,f.getId()))); -+ request.setAttribute("editing", editing); -+ request.setAttribute("fragmentNestingLevel", new Integer(getFragmentNestingLevel(requestPage, f.getId()))); - super.doView(request, response); - request.removeAttribute("decorationFactory"); - request.removeAttribute("columnLayout"); -@@ -176,794 +213,956 @@ - request.removeAttribute(("fragmentNestingLevel")); - } - -- public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException -+ protected void addLayout(ActionRequest request, ActionResponse response) throws PortletException - { -- RequestContext requestContext = (RequestContext)request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -- -- ContentPage requestPage = requestContext.getPage(); -- PageEditAccess pageEditAccess = (PageEditAccess)requestContext.getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE); -- if ( requestPage == null || pageEditAccess == null ) -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ String layout = request.getParameter("layout"); -+ if (layout != null && layout.length() > 0) - { -- // Targetting this portlet with an ActionRequest REQUIRES that the ProfilerValve has been invoked! -- throw new PortletException("Current request page or PageEditAccess not available."); -+ PortletWindow window = requestContext.getActionWindow(); -+ ContentFragment targetFragment = requestPage.getContentFragmentById(window.getId().toString()); -+ -+ if (targetFragment == null) -+ { -+ // ignore no longer consistent page definition -+ return; -+ } -+ -+ try -+ { -+ Fragment fragment = pageManager.newFragment(); -+ fragment.setType(Fragment.LAYOUT); -+ fragment.setName(layout); -+ -+ targetFragment.getFragments().add(fragment); -+ pageManager.updatePage(requestPage); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("failed to add portlet " + layout + " to page: " + requestPage + ": " + e.getMessage(), -+ e); -+ } - } -- -- String pageMode = request.getParameter("pageMode"); -- if ( pageMode != null ) -+ -+ } -+ -+ protected void changeLayout(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ String layout = request.getParameter("layout"); -+ if (layout != null && layout.length() > 0) - { -- if ( "view".equals(pageMode) ) -+ PortletWindow window = requestContext.getActionWindow(); -+ ContentFragment targetFragment = requestPage.getContentFragmentById(window.getId().toString()); -+ -+ if (targetFragment == null) - { -- pageEditAccess.setEditing(false); -+ // ignore no longer consistent page definition -+ return; - } -- else if ( "edit".equals(pageMode) && pageEditAccess.isEditAllowed() ) -+ -+ if (!layout.equals(targetFragment.getName())) - { -- if ( this.editorType != null && this.editorType.equals( "desktop" ) ) -+ try - { -- String redirectUrl = this.desktop.getPortalUrl( requestContext, requestContext.getPath() ); -- redirectUrl += "?editPage=true&portal=true"; -- response.sendRedirect( redirectUrl ); -+ // layout portlet change -+ targetFragment.setName(layout); -+ pageManager.updatePage(requestPage); -+ entityAccess.updatePortletEntity(window.getPortletEntity(), targetFragment); -+ entityAccess.storePortletEntity(window.getPortletEntity()); -+ -+ windowAccess.createPortletWindow(window.getPortletEntity(), targetFragment.getId()); -+ return; - } -- else -+ catch (Exception e) - { -- pageEditAccess.setEditing(true); -+ throw new PortletException("Unable to update page: " + e.getMessage(), e); - } - } -- return; - } -- -- if ( pageEditAccess.isEditAllowed() && request.isPortletModeAllowed(PortletMode.EDIT) ) -+ -+ } -+ -+ protected void addPage(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String jsPageName = request.getParameter("jsNewPageName"); -+ String jsPageTitle = request.getParameter("jsNewPageTitle"); -+ String jsPageShortTitle = request.getParameter("jsNewPageShortTitle"); -+ if (jsPageName != null && jsPageName.length() > 0 && jsPageName.indexOf(Folder.PATH_SEPARATOR) == -1) - { -- String layout = null; -- -- boolean addLayout = request.getParameter("jsAddLayout") != null; -- if ( addLayout || request.getParameter("jsChangeLayout") != null ) -+ try - { -- layout = request.getParameter("layout"); -- if ( layout != null && layout.length() > 0 ) -+ Folder parent = (Folder) requestPage.getParent(); -+ if (parent != null) - { -- PortletWindow window = requestContext.getActionWindow(); -- ContentFragment targetFragment = requestPage.getContentFragmentById(window.getId().toString()); -- -- if ( targetFragment == null ) -+ String path = parent.getPath(); -+ if (path.endsWith(Folder.PATH_SEPARATOR)) - { -- // ignore no longer consistent page definition -- return; -+ path = path + getEscapedName(jsPageName); - } -- -- if ( addLayout ) -+ else - { -- try -- { -- Fragment fragment = pageManager.newFragment(); -- fragment.setType(Fragment.LAYOUT); -- fragment.setName(layout); -- -- targetFragment.getFragments().add(fragment); -- pageManager.updatePage(requestPage); -- } -- catch (Exception e) -- { -- throw new PortletException("failed to add portlet " + layout + " to page: " + requestPage+": "+e.getMessage(), e); -- } -+ path = path + Folder.PATH_SEPARATOR + getEscapedName(jsPageName); - } -- else if ( !layout.equals(targetFragment.getName()) ) -+ Page page = pageManager.newPage(path); -+ String layout = requestPage.getRootFragment().getName(); -+ page.getRootFragment().setName(layout); -+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT); -+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET); -+ page.setTitle(jsPageTitle != null && !jsPageTitle.equals("") ? jsPageTitle : jsPageName); -+ page.setShortTitle(jsPageShortTitle != null && !jsPageShortTitle.equals("") ? jsPageShortTitle : jsPageName); -+ pageManager.updatePage(page); -+ -+ List orderList = parent.getDocumentOrder(); -+ if (orderList != null) - { -- try -+ String name = page.getName(); -+ if (orderList.indexOf(name) < 0) - { -- // layout portlet change -- targetFragment.setName(layout); -- pageManager.updatePage(requestPage); -- entityAccess.updatePortletEntity(window.getPortletEntity(), targetFragment); -- entityAccess.storePortletEntity(window.getPortletEntity()); -- -- windowAccess.createPortletWindow(window.getPortletEntity(), targetFragment.getId()); -- return; -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } -- catch (Exception e) -- { -- throw new PortletException("Unable to update page: "+e.getMessage(), e); -- } - } - } -- return; - } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access page for editing: " + e.getMessage(), e); -+ } -+ } - -- if ( request.getParameter("jsSubmitPage" ) != null ) -+ } -+ -+ protected void updatePage(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String jsPageTitle = request.getParameter("jsPageTitle"); -+ String jsPageShortTitle = request.getParameter("jsPageShortTitle"); -+ try -+ { -+ if (jsPageTitle != null && !jsPageTitle.equals("")) - { -- String jsPageName = request.getParameter("jsPageName"); -- String jsPageTitle = request.getParameter("jsPageTitle"); -- String jsPageShortTitle = request.getParameter("jsPageShortTitle"); -- if ( jsPageName != null && jsPageName.length() > 0 && jsPageName.indexOf(Folder.PATH_SEPARATOR) == -1 ) -- { -- try -- { -- Folder parent = (Folder)requestPage.getParent(); -- if (parent != null) -- { -- String path = parent.getPath(); -- if (path.endsWith(Folder.PATH_SEPARATOR)) -- { -- path = path + getEscapedName(jsPageName); -- } -- else -- { -- path = path + Folder.PATH_SEPARATOR -- + getEscapedName(jsPageName); -- } -- Page page = pageManager.newPage(path); -- if ( layout == null || layout.length() == 0 ) -- { -- layout = requestPage.getRootFragment().getName(); -- } -- page.getRootFragment().setName(layout); -- page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT); -- page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET); -- page.setTitle(jsPageTitle != null && !jsPageTitle.equals("") ? jsPageTitle : jsPageName); -- page.setShortTitle(jsPageShortTitle != null -- && !jsPageShortTitle.equals("") ? jsPageShortTitle -- : jsPageName); -- pageManager.updatePage(page); -- -- List orderList = parent.getDocumentOrder(); -- if (orderList != null) -- { -- String name = page.getName(); -- if (orderList.indexOf(name) < 0) -- { -- orderList.add(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } -- } -- } -- } -- catch (Exception e) -- { -- throw new PortletException("Unable to access page for editing: "+e.getMessage(), e); -- } -- } -- return; -+ requestPage.setTitle(jsPageTitle); - } -+ if (jsPageShortTitle != null && !jsPageShortTitle.equals("")) -+ { -+ requestPage.setShortTitle(jsPageShortTitle); -+ } -+ pageManager.updatePage(requestPage); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access page for editing: " + e.getMessage(), e); -+ } - -- if (request.getParameter("jsChangePageName") != null) -+ } -+ -+ protected void deletePage(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ try -+ { -+ Folder parent = (Folder) requestPage.getParent(); -+ if (parent != null) - { -- String jsPageTitle = request.getParameter("jsPageTitle"); -- String jsPageShortTitle = request -- .getParameter("jsPageShortTitle"); -- try -+ List orderList = parent.getDocumentOrder(); -+ if (orderList != null) - { -- if (jsPageTitle != null && !jsPageTitle.equals("")) -+ String name = requestPage.getName(); -+ if (orderList.indexOf(name) > -1) - { -- requestPage.setTitle(jsPageTitle); -+ orderList.remove(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } -- if (jsPageShortTitle != null -- && !jsPageShortTitle.equals("")) -- { -- requestPage.setShortTitle(jsPageShortTitle); -- } -- pageManager.updatePage(requestPage); - } -- catch (Exception e) -- { -- throw new PortletException( -- "Unable to access page for editing: " -- + e.getMessage(), e); -- } -- return; - } - -- if ( request.getParameter("jsDeletePage" ) != null ) -+ pageManager.removePage(requestPage); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access page for removing: " + e.getMessage(), e); -+ } -+ -+ } -+ -+ protected void movePageToLeft(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ try -+ { -+ Folder parent = (Folder) requestPage.getParent(); -+ if (parent != null) - { -- try -+ List orderList = parent.getDocumentOrder(); -+ String name = requestPage.getName(); -+ if (orderList != null) - { -- Folder parent = (Folder)requestPage.getParent(); -- if (parent != null) -+ int index = orderList.indexOf(name); -+ if (index > -1) - { -- List orderList = parent.getDocumentOrder(); -- if (orderList != null) -+ String type = requestPage.getType(); -+ int i = index - 1; -+ while (i >= 0) - { -- String name = requestPage.getName(); -- if (orderList.indexOf(name) > -1) -+ String value = (String) orderList.get(i); -+ if (value.endsWith(type)) - { -- orderList.remove(name); -+ orderList.remove(index); -+ orderList.add(i, name); - parent.setDocumentOrder(orderList); - pageManager.updateFolder(parent); -+ break; - } -+ i--; - } - } -- -- pageManager.removePage(requestPage); -+ else -+ { -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); -+ } - } -- catch (Exception e) -+ else - { -- throw new PortletException("Unable to access page for removing: "+e.getMessage(), e); -+ orderList = new ArrayList(4); -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } -- return; - } -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access page for changing the document order: " + e.getMessage(), e); -+ } - -- if (request.getParameter("jsMovePageLeft") != null) -+ } -+ -+ protected void movePageToRight(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ try -+ { -+ Folder parent = (Folder) requestPage.getParent(); -+ if (parent != null) - { -- try -+ List orderList = parent.getDocumentOrder(); -+ String name = requestPage.getName(); -+ if (orderList != null) - { -- Folder parent = (Folder) requestPage.getParent(); -- if (parent != null) -+ int index = orderList.indexOf(name); -+ if (index > -1) - { -- List orderList = parent.getDocumentOrder(); -- String name = requestPage.getName(); -- if (orderList != null) -+ String type = requestPage.getType(); -+ int i = index + 1; -+ while (i < orderList.size()) - { -- int index = orderList.indexOf(name); -- if (index > -1) -+ String value = (String) orderList.get(i); -+ if (value.endsWith(type)) - { -- String type = requestPage.getType(); -- int i = index - 1; -- while (i >= 0) -- { -- String value = (String) orderList.get(i); -- if (value.endsWith(type)) -- { -- orderList.remove(index); -- orderList.add(i, name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- break; -- } -- i--; -- } -- } -- else -- { -- orderList.add(name); -+ orderList.remove(index); -+ orderList.add(i, name); - parent.setDocumentOrder(orderList); - pageManager.updateFolder(parent); -+ break; - } -+ i++; - } -- else -- { -- orderList = new ArrayList(4); -- orderList.add(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } - } -+ else -+ { -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); -+ } - } -- catch (Exception e) -+ else - { -- throw new PortletException( -- "Unable to access page for changing the document order: " -- + e.getMessage(), e); -+ orderList = new ArrayList(4); -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } -- return; - } -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access page for changing the document order: " + e.getMessage(), e); -+ } - -- if (request.getParameter("jsMovePageRight") != null) -+ } -+ -+ protected void addFolder(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String jsFolderName = request.getParameter("jsNewFolderName"); -+ String jsFolderTitle = request.getParameter("jsNewFolderTitle"); -+ String jsFolderShortTitle = request.getParameter("jsNewFolderShortTitle"); -+ if (jsFolderName != null && jsFolderName.length() > 0 && jsFolderName.indexOf(Folder.PATH_SEPARATOR) == -1) -+ { -+ try - { -- try -+ Folder parent = (Folder) requestPage.getParent(); -+ if (parent != null) - { -- Folder parent = (Folder) requestPage.getParent(); -- if (parent != null) -+ String path = parent.getPath(); -+ if (path.endsWith(Folder.PATH_SEPARATOR)) - { -- List orderList = parent.getDocumentOrder(); -- String name = requestPage.getName(); -- if (orderList != null) -+ path = path + getEscapedName(jsFolderName); -+ } -+ else -+ { -+ path = path + Folder.PATH_SEPARATOR + getEscapedName(jsFolderName); -+ } -+ Folder folder = pageManager.newFolder(path); -+ String layout = requestPage.getRootFragment().getName(); -+ folder.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT); -+ folder.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET); -+ folder.setTitle(jsFolderTitle != null && !jsFolderTitle.equals("") ? jsFolderTitle : jsFolderName); -+ folder.setShortTitle(jsFolderShortTitle != null && !jsFolderShortTitle.equals("") ? jsFolderShortTitle -+ : jsFolderName); -+ pageManager.updateFolder(folder); -+ -+ List orderList = parent.getDocumentOrder(); -+ if (orderList != null) -+ { -+ String name = folder.getName(); -+ if (orderList.indexOf(name) < 0) - { -- int index = orderList.indexOf(name); -- if (index > -1) -- { -- String type = requestPage.getType(); -- int i = index + 1; -- while (i < orderList.size()) -- { -- String value = (String) orderList.get(i); -- if (value.endsWith(type)) -- { -- orderList.remove(index); -- orderList.add(i, name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- break; -- } -- i++; -- } -- } -- else -- { -- orderList.add(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } -- } -- else -- { -- orderList = new ArrayList(4); - orderList.add(name); - parent.setDocumentOrder(orderList); - pageManager.updateFolder(parent); - } - } -- } -- catch (Exception e) -- { -- throw new PortletException( -- "Unable to access page for changing the document order: " -- + e.getMessage(), e); -- } -- return; -- } - -- if (request.getParameter("jsSubmitFolder") != null) -- { -- String jsFolderName = request.getParameter("jsFolderName"); -- String jsFolderTitle = request.getParameter("jsFolderTitle"); -- String jsFolderShortTitle = request.getParameter("jsFolderShortTitle"); -- if (jsFolderName != null && jsFolderName.length() > 0 -- && jsFolderName.indexOf(Folder.PATH_SEPARATOR) == -1) -- { -- try -+ // add default page -+ path = folder.getPath(); -+ if (path.endsWith(Folder.PATH_SEPARATOR)) - { -- Folder parent = (Folder) requestPage.getParent(); -- if (parent != null) -+ path = path + getEscapedName("default-page"); -+ } -+ else -+ { -+ path = path + Folder.PATH_SEPARATOR + getEscapedName("default-page"); -+ } -+ Page page = pageManager.newPage(path); -+ if (layout == null || layout.length() == 0) -+ { -+ layout = requestPage.getRootFragment().getName(); -+ } -+ page.getRootFragment().setName(layout); -+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.LAYOUT), Fragment.LAYOUT); -+ page.setDefaultDecorator(requestPage.getDefaultDecorator(Fragment.PORTLET), Fragment.PORTLET); -+ page.setTitle(jsFolderName); -+ pageManager.updatePage(page); -+ -+ orderList = folder.getDocumentOrder(); -+ if (orderList != null) -+ { -+ String name = page.getName(); -+ if (orderList.indexOf(name) < 0) - { -- String path = parent.getPath(); -- if (path.endsWith(Folder.PATH_SEPARATOR)) -- { -- path = path + getEscapedName(jsFolderName); -- } -- else -- { -- path = path + Folder.PATH_SEPARATOR -- + getEscapedName(jsFolderName); -- } -- Folder folder = pageManager.newFolder(path); -- if (layout == null || layout.length() == 0) -- { -- layout = requestPage.getRootFragment() -- .getName(); -- } -- folder.setDefaultDecorator(requestPage -- .getDefaultDecorator(Fragment.LAYOUT), -- Fragment.LAYOUT); -- folder.setDefaultDecorator(requestPage -- .getDefaultDecorator(Fragment.PORTLET), -- Fragment.PORTLET); -- folder -- .setTitle(jsFolderTitle != null -- && !jsFolderTitle.equals("") ? jsFolderTitle -- : jsFolderName); -- folder -- .setShortTitle(jsFolderShortTitle != null -- && !jsFolderShortTitle.equals("") ? jsFolderShortTitle -- : jsFolderName); -+ orderList.add(name); -+ folder.setDocumentOrder(orderList); - pageManager.updateFolder(folder); -- -- List orderList = parent.getDocumentOrder(); -- if (orderList != null) -- { -- String name = folder.getName(); -- if (orderList.indexOf(name) < 0) -- { -- orderList.add(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } -- } -- -- // add default page -- path = folder.getPath(); -- if (path.endsWith(Folder.PATH_SEPARATOR)) -- { -- path = path + getEscapedName("default-page"); -- } -- else -- { -- path = path + Folder.PATH_SEPARATOR -- + getEscapedName("default-page"); -- } -- Page page = pageManager.newPage(path); -- if (layout == null || layout.length() == 0) -- { -- layout = requestPage.getRootFragment() -- .getName(); -- } -- page.getRootFragment().setName(layout); -- page.setDefaultDecorator(requestPage -- .getDefaultDecorator(Fragment.LAYOUT), -- Fragment.LAYOUT); -- page.setDefaultDecorator(requestPage -- .getDefaultDecorator(Fragment.PORTLET), -- Fragment.PORTLET); -- page.setTitle(jsFolderName); -- pageManager.updatePage(page); -- -- orderList = folder.getDocumentOrder(); -- if (orderList != null) -- { -- String name = page.getName(); -- if (orderList.indexOf(name) < 0) -- { -- orderList.add(name); -- folder.setDocumentOrder(orderList); -- pageManager.updateFolder(folder); -- } -- } - } - } -- catch (Exception e) -- { -- throw new PortletException( -- "Unable to access folder for editing: " -- + e.getMessage(), e); -- } - } -- return; - } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access folder for editing: " + e.getMessage(), e); -+ } -+ } - -- if (request.getParameter("jsChangeFolderName") != null) -+ } -+ -+ protected void updateFolder(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String jsFolderTitle = request.getParameter("jsFolderTitle"); -+ String jsFolderShortTitle = request.getParameter("jsFolderShortTitle"); -+ try -+ { -+ Folder parent = (Folder) requestPage.getParent(); -+ if (parent != null) - { -- String jsFolderTitle = request.getParameter("jsFolderTitle"); -- String jsFolderShortTitle = request -- .getParameter("jsFolderShortTitle"); -- try -+ if (jsFolderTitle != null && !jsFolderTitle.equals("")) - { -- Folder parent = (Folder) requestPage.getParent(); -- if (parent != null) -- { -- if (jsFolderTitle != null && !jsFolderTitle.equals("")) -- { -- parent.setTitle(jsFolderTitle); -- } -- if (jsFolderShortTitle != null -- && !jsFolderShortTitle.equals("")) -- { -- parent.setShortTitle(jsFolderShortTitle); -- } -- pageManager.updateFolder(parent); -- } -- -+ parent.setTitle(jsFolderTitle); - } -- catch (Exception e) -+ if (jsFolderShortTitle != null && !jsFolderShortTitle.equals("")) - { -- throw new PortletException( -- "Unable to access folder for editing: " -- + e.getMessage(), e); -+ parent.setShortTitle(jsFolderShortTitle); - } -- return; -+ pageManager.updateFolder(parent); - } -- -- if (request.getParameter("jsDeleteFolder") != null) -+ -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access folder for editing: " + e.getMessage(), e); -+ } -+ -+ } -+ -+ protected void deleteFolder(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ try -+ { -+ Folder targetFolder = (Folder) requestPage.getParent(); -+ Folder parent = (Folder) targetFolder.getParent(); -+ if (parent != null) - { -- try -+ List orderList = parent.getDocumentOrder(); -+ if (orderList != null) - { -- Folder targetFolder = (Folder) requestPage.getParent(); -- Folder parent = (Folder) targetFolder.getParent(); -- if (parent != null) -+ String name = targetFolder.getName(); -+ if (orderList.indexOf(name) > -1) - { -- List orderList = parent.getDocumentOrder(); -- if (orderList != null) -- { -- String name = targetFolder.getName(); -- if (orderList.indexOf(name) > -1) -- { -- orderList.remove(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } -- } -- -- // do not remove if the folder is root. -- pageManager.removeFolder(targetFolder); -+ orderList.remove(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } - } -- catch (Exception e) -- { -- throw new PortletException( -- "Unable to access folder for removing: " -- + e.getMessage(), e); -- } -- return; -+ -+ // do not remove if the folder is root. -+ pageManager.removeFolder(targetFolder); - } -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access folder for removing: " + e.getMessage(), e); -+ } - -- if (request.getParameter("jsMoveFolderLeft") != null) -+ } -+ -+ protected void moveFolderToLeft(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ try -+ { -+ Folder targetFolder = (Folder) requestPage.getParent(); -+ Folder parent = (Folder) targetFolder.getParent(); -+ if (parent != null) - { -- try -+ List orderList = parent.getDocumentOrder(); -+ String name = targetFolder.getName(); -+ if (orderList != null) - { -- Folder targetFolder = (Folder) requestPage.getParent(); -- Folder parent = (Folder) targetFolder.getParent(); -- if (parent != null) -+ int index = orderList.indexOf(name); -+ if (index > -1) - { -- List orderList = parent.getDocumentOrder(); -- String name = targetFolder.getName(); -- if (orderList != null) -+ int i = index - 1; -+ while (i >= 0) - { -- int index = orderList.indexOf(name); -- if (index > -1) -+ String value = (String) orderList.get(i); -+ if (!value.endsWith(".psml") && !value.endsWith(".link")) - { -- int i = index - 1; -- while (i >= 0) -- { -- String value = (String) orderList.get(i); -- if (!value.endsWith(".psml") -- && !value.endsWith(".link")) -- { -- orderList.remove(index); -- orderList.add(i, name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- break; -- } -- i--; -- } -- } -- else -- { -- orderList.add(name); -+ orderList.remove(index); -+ orderList.add(i, name); - parent.setDocumentOrder(orderList); - pageManager.updateFolder(parent); -+ break; - } -+ i--; - } -- else -- { -- orderList = new ArrayList(4); -- orderList.add(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } - } -+ else -+ { -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); -+ } - } -- catch (Exception e) -+ else - { -- throw new PortletException( -- "Unable to access folder for changing the document order: " -- + e.getMessage(), e); -+ orderList = new ArrayList(4); -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } -- return; - } -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access folder for changing the document order: " + e.getMessage(), e); -+ } - -- if (request.getParameter("jsMoveFolderRight") != null) -+ } -+ -+ protected void moveFolderToRight(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ try -+ { -+ Folder targetFolder = (Folder) requestPage.getParent(); -+ Folder parent = (Folder) targetFolder.getParent(); -+ if (parent != null) - { -- try -+ List orderList = parent.getDocumentOrder(); -+ String name = targetFolder.getName(); -+ if (orderList != null) - { -- Folder targetFolder = (Folder) requestPage.getParent(); -- Folder parent = (Folder) targetFolder.getParent(); -- if (parent != null) -+ int index = orderList.indexOf(name); -+ if (index > -1) - { -- List orderList = parent.getDocumentOrder(); -- String name = targetFolder.getName(); -- if (orderList != null) -+ int i = index + 1; -+ while (i < orderList.size()) - { -- int index = orderList.indexOf(name); -- if (index > -1) -+ String value = (String) orderList.get(i); -+ if (!value.endsWith(".psml") && !value.endsWith(".link")) - { -- int i = index + 1; -- while (i < orderList.size()) -- { -- String value = (String) orderList.get(i); -- if (!value.endsWith(".psml") -- && !value.endsWith(".link")) -- { -- orderList.remove(index); -- orderList.add(i, name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- break; -- } -- i++; -- } -- } -- else -- { -- orderList.add(name); -+ orderList.remove(index); -+ orderList.add(i, name); - parent.setDocumentOrder(orderList); - pageManager.updateFolder(parent); -+ break; - } -+ i++; - } -- else -- { -- orderList = new ArrayList(4); -- orderList.add(name); -- parent.setDocumentOrder(orderList); -- pageManager.updateFolder(parent); -- } - } -+ else -+ { -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); -+ } - } -- catch (Exception e) -+ else - { -- throw new PortletException( -- "Unable to access folder for changing the document order: " -- + e.getMessage(), e); -+ orderList = new ArrayList(4); -+ orderList.add(name); -+ parent.setDocumentOrder(orderList); -+ pageManager.updateFolder(parent); - } -+ } -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to access folder for changing the document order: " + e.getMessage(), e); -+ } -+ -+ } -+ -+ protected void updateDefaultLayoutDecorator(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String theme = request.getParameter("theme"); -+ -+ requestPage.setDefaultDecorator(theme, Fragment.LAYOUT); -+ try -+ { -+ pageManager.updatePage(requestPage); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to update page: " + e.getMessage(), e); -+ } -+ } -+ -+ protected void moveFragment(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String fragmentId = request.getParameter("fragment"); -+ String move = request.getParameter("move"); -+ -+ int moveCode = Integer.parseInt(move); -+ PortletWindow window = requestContext.getActionWindow(); -+ Fragment currentFragment = requestPage.getFragmentById(window.getId().toString()); -+ Fragment fragmentToMove = requestPage.getFragmentById(fragmentId); -+ -+ if (currentFragment == null || fragmentToMove == null) -+ { -+ // ignore no longer consistent page definition -+ return; -+ } -+ -+ ColumnLayout columnLayout; -+ try -+ { -+ columnLayout = new ColumnLayout(numColumns, layoutType, currentFragment.getFragments(), null); -+ columnLayout.addLayoutEventListener(new PageManagerLayoutEventListener(pageManager, requestPage, layoutType)); -+ } -+ catch (LayoutEventException e1) -+ { -+ throw new PortletException("Failed to build ColumnLayout " + e1.getMessage(), e1); -+ } -+ -+ try -+ { -+ switch (moveCode) -+ { -+ case LayoutEvent.MOVED_UP: -+ columnLayout.moveUp(fragmentToMove); -+ break; -+ case LayoutEvent.MOVED_DOWN: -+ columnLayout.moveDown(fragmentToMove); -+ break; -+ case LayoutEvent.MOVED_RIGHT: -+ columnLayout.moveRight(fragmentToMove); -+ break; -+ case LayoutEvent.MOVED_LEFT: -+ columnLayout.moveLeft(fragmentToMove); -+ break; -+ default: -+ throw new PortletException("Invalid movement code " + moveCode); -+ } -+ -+ } -+ catch (SecurityException se) -+ { -+ // ignore page security constraint violations, only -+ // permitted users can edit managed pages; page -+ // update will remain transient -+ log.info("Unable to update page " + requestPage.getId() + " layout due to security permission/constraint.", se); -+ } -+ catch (Exception e) -+ { -+ if (e instanceof PortletException) -+ { -+ throw (PortletException) e; -+ } -+ else -+ { -+ throw new PortletException("Unable to process layout for page " + requestPage.getId() + " layout: " + e.toString(), -+ e); -+ } -+ } -+ -+ } -+ -+ protected void removeFragment(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String fragmentId = request.getParameter("fragment"); -+ -+ Page page = null; -+ try -+ { -+ // TODO: for now retrieve the real Page instead of ContentPage -+ // because removing fragments isn't working through the ContentFragment wrapping -+ page = pageManager.getPage(requestPage.getPath()); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to retrieve page " + requestPage.getId(), e); -+ } -+ -+ PortletWindow window = requestContext.getActionWindow(); -+ Fragment currentFragment = page.getFragmentById(window.getId().toString()); -+ -+ if (currentFragment == null) -+ { -+ // ignore no longer consistent page definition -+ return; -+ } -+ -+ removeFragment(page, currentFragment, fragmentId); -+ -+ } -+ -+ protected void updateFragmentDecorator(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String fragmentId = request.getParameter("fragment"); -+ String decorator = request.getParameter("decorator"); -+ -+ Fragment fragment = requestPage.getFragmentById(fragmentId); -+ -+ if (fragment == null) -+ { -+ // ignore no longer consistent page definition -+ return; -+ } -+ -+ if (decorator.trim().length() == 0) -+ fragment.setDecorator(null); -+ else -+ fragment.setDecorator(decorator); -+ try -+ { -+ pageManager.updatePage(requestPage); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to update page for fragment decorator: " + e.getMessage(), e); -+ } -+ -+ } -+ -+ protected void updateFragmentDecorators(ActionRequest request, ActionResponse response) throws PortletException -+ { -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ ContentPage requestPage = requestContext.getPage(); -+ -+ String decorators = request.getParameter("decorators"); -+ -+ Iterator fragmentsIter = requestPage.getRootFragment().getFragments().iterator(); -+ while (fragmentsIter.hasNext()) -+ { -+ Fragment fragment = (Fragment) fragmentsIter.next(); -+ if (fragment == null) -+ { -+ // ignore no longer consistent page definition - return; - } - -- String theme = request.getParameter("theme"); -- if ( theme != null && theme.length() > 0 && !theme.equals(requestPage.getDefaultDecorator(Fragment.LAYOUT)) ) -+ if (decorators.trim().length() == 0) -+ fragment.setDecorator(null); -+ else -+ fragment.setDecorator(decorators); -+ } -+ try -+ { -+ pageManager.updatePage(requestPage); -+ } -+ catch (Exception e) -+ { -+ throw new PortletException("Unable to update page for fragment decorator: " + e.getMessage(), e); -+ } -+ -+ } -+ -+ protected void updatePreferenceWindowState(ActionRequest request, ActionResponse response) -+ { -+ String prefName = request.getParameter("preferenceName"); -+ if (prefName != null) -+ { -+ response.setRenderParameter("preferenceName", prefName); -+ } -+ String prefState = request.getParameter("preferenceState"); -+ if (prefState != null) -+ { -+ response.setRenderParameter("preferenceState", prefState); -+ } -+ } -+ -+ public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException -+ { -+ // pass preferenceName and preferenceState to render -+ updatePreferenceWindowState(request, response); -+ -+ RequestContext requestContext = (RequestContext) request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); -+ -+ ContentPage requestPage = requestContext.getPage(); -+ PageEditAccess pageEditAccess = (PageEditAccess) requestContext -+ .getAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE); -+ if (requestPage == null || pageEditAccess == null) -+ { -+ // Targetting this portlet with an ActionRequest REQUIRES that the ProfilerValve has been invoked! -+ throw new PortletException("Current request page or PageEditAccess not available."); -+ } -+ -+ String pageMode = request.getParameter("pageMode"); -+ if (pageMode != null) -+ { -+ if ("view".equals(pageMode)) - { -- requestPage.setDefaultDecorator(theme, Fragment.LAYOUT); -- try -+ pageEditAccess.setEditing(false); -+ } -+ else if ("edit".equals(pageMode) && pageEditAccess.isEditAllowed()) -+ { -+ if (this.editorType != null && this.editorType.equals("desktop")) - { -- pageManager.updatePage(requestPage); -+ String redirectUrl = this.desktop.getPortalUrl(requestContext, requestContext.getPath()); -+ redirectUrl += "?editPage=true&portal=true"; -+ response.sendRedirect(redirectUrl); - } -- catch (Exception e) -+ else - { -- throw new PortletException("Unable to update page: "+e.getMessage(), e); -+ pageEditAccess.setEditing(true); - } -+ } -+ return; -+ } -+ -+ if (pageEditAccess.isEditAllowed() && request.isPortletModeAllowed(PortletMode.EDIT)) -+ { -+ -+ // Add Layout -+ if (request.getParameter("jsAddLayout") != null) -+ { -+ addLayout(request, response); - return; - } -- -+ -+ // Change Layout -+ if (request.getParameter("jsChangeLayout") != null) -+ { -+ changeLayout(request, response); -+ return; -+ } -+ -+ // Add Page -+ if (request.getParameter("jsSubmitPage") != null) -+ { -+ addPage(request, response); -+ return; -+ } -+ -+ // Update Page -+ if (request.getParameter("jsChangePageName") != null) -+ { -+ updatePage(request, response); -+ return; -+ } -+ -+ // Delete Page -+ if (request.getParameter("jsDeletePage") != null) -+ { -+ deletePage(request, response); -+ return; -+ } -+ -+ // Move Page To Left -+ if (request.getParameter("jsMovePageLeft") != null) -+ { -+ movePageToLeft(request, response); -+ return; -+ } -+ -+ // Move Page To Right -+ if (request.getParameter("jsMovePageRight") != null) -+ { -+ movePageToRight(request, response); -+ return; -+ } -+ -+ // Add Folder -+ if (request.getParameter("jsSubmitFolder") != null) -+ { -+ addFolder(request, response); -+ return; -+ } -+ -+ // Update Folder -+ if (request.getParameter("jsChangeFolderName") != null) -+ { -+ updateFolder(request, response); -+ return; -+ } -+ -+ // Delete Folder -+ if (request.getParameter("jsDeleteFolder") != null) -+ { -+ deleteFolder(request, response); -+ return; -+ } -+ -+ // Move Folder To Left -+ if (request.getParameter("jsMoveFolderLeft") != null) -+ { -+ moveFolderToLeft(request, response); -+ return; -+ } -+ -+ // Move Folder To Right -+ if (request.getParameter("jsMoveFolderRight") != null) -+ { -+ moveFolderToRight(request, response); -+ return; -+ } -+ -+ // Update Default Layout Decorator -+ String theme = request.getParameter("theme"); -+ if (theme != null && theme.length() > 0 && !theme.equals(requestPage.getDefaultDecorator(Fragment.LAYOUT))) -+ { -+ updateDefaultLayoutDecorator(request, response); -+ return; -+ } -+ - String fragmentId = request.getParameter("fragment"); -- if ( fragmentId != null && fragmentId.length() > 0 ) -+ if (fragmentId != null && fragmentId.length() > 0) - { - String move = request.getParameter("move"); -- if ( move != null && move.length() > 0 ) -+ if (move != null && move.length() > 0) - { -- int moveCode = Integer.parseInt(move); -- PortletWindow window = requestContext.getActionWindow(); -- Fragment currentFragment = requestPage.getFragmentById(window.getId().toString()); -- Fragment fragmentToMove = requestPage.getFragmentById(fragmentId); -- -- if ( currentFragment == null || fragmentToMove == null ) -- { -- // ignore no longer consistent page definition -- return; -- } -- -- ColumnLayout columnLayout; -- try -- { -- columnLayout = new ColumnLayout(numColumns, layoutType, currentFragment.getFragments(), null); -- columnLayout.addLayoutEventListener(new PageManagerLayoutEventListener(pageManager, requestPage, layoutType)); -- } -- catch (LayoutEventException e1) -- { -- throw new PortletException("Failed to build ColumnLayout "+e1.getMessage(), e1); -- } -- -- try -- { -- switch (moveCode) -- { -- case LayoutEvent.MOVED_UP: -- columnLayout.moveUp(fragmentToMove); -- break; -- case LayoutEvent.MOVED_DOWN: -- columnLayout.moveDown(fragmentToMove); -- break; -- case LayoutEvent.MOVED_RIGHT: -- columnLayout.moveRight(fragmentToMove); -- break; -- case LayoutEvent.MOVED_LEFT: -- columnLayout.moveLeft(fragmentToMove); -- break; -- default: -- throw new PortletException("Invalid movement code " + moveCode); -- } -- -- } -- catch (SecurityException se) -- { -- // ignore page security constraint violations, only -- // permitted users can edit managed pages; page -- // update will remain transient -- log.info("Unable to update page " + requestPage.getId() + " layout due to security permission/constraint.", se); -- } -- catch (Exception e) -- { -- if (e instanceof PortletException) -- { -- throw (PortletException)e; -- } -- else -- { -- throw new PortletException("Unable to process layout for page " + requestPage.getId() + " layout: " + e.toString(), e); -- } -- } -+ // Move Fragment -+ moveFragment(request, response); - return; - } -- -+ - String remove = request.getParameter("remove"); -- if ( remove != null && remove.length() > 0 ) -+ if (remove != null && remove.length() > 0) - { -- Page page = null; -- try -- { -- // TODO: for now retrieve the real Page instead of ContentPage -- // because removing fragments isn't working through the ContentFragment wrapping -- page = pageManager.getPage(requestPage.getPath()); -- } -- catch (Exception e) -- { -- throw new PortletException("Unable to retrieve page "+requestPage.getId(),e); -- } -- -- PortletWindow window = requestContext.getActionWindow(); -- Fragment currentFragment = page.getFragmentById(window.getId().toString()); -- -- if ( currentFragment == null ) -- { -- // ignore no longer consistent page definition -- return; -- } -- -- removeFragment(page, currentFragment, fragmentId); -+ // Remove Fragment -+ removeFragment(request, response); - return; - } -- -+ - String decorator = request.getParameter("decorator"); -- if ( decorator != null ) -+ if (decorator != null) - { -- Fragment fragment = requestPage.getFragmentById(fragmentId); -- -- if ( fragment == null ) -- { -- // ignore no longer consistent page definition -- return; -- } -- -- if (decorator.trim().length() == 0) -- fragment.setDecorator(null); -- else -- fragment.setDecorator(decorator); -- try -- { -- pageManager.updatePage(requestPage); -- } -- catch (Exception e) -- { -- throw new PortletException("Unable to update page for fragment decorator: "+e.getMessage(), e); -- } -+ // Update Fragment Decorator -+ updateFragmentDecorator(request, response); - return; - } - // evlach - String decorators = request.getParameter("decorators"); -- if ( decorators != null ) -+ if (decorators != null) - { -- Iterator fragmentsIter = requestPage.getRootFragment().getFragments().iterator(); -- while(fragmentsIter.hasNext()) -- { -- Fragment fragment = (Fragment) fragmentsIter.next(); -- if ( fragment == null ) -- { -- // ignore no longer consistent page definition -- return; -- } -- -- if (decorators.trim().length() == 0) -- fragment.setDecorator(null); -- else -- fragment.setDecorator(decorators); -- } -- try -- { -- pageManager.updatePage(requestPage); -- } -- catch (Exception e) -- { -- throw new PortletException("Unable to update page for fragment decorator: "+e.getMessage(), e); -- } -+ updateFragmentDecorators(request, response); - return; -- } -+ } - //end evlach - } -- -+ - String portlets = request.getParameter("portlets"); -- if ( portlets != null && portlets.length() > 0 ) -+ if (portlets != null && portlets.length() > 0) - { - PortletWindow window = requestContext.getActionWindow(); - Fragment targetFragment = requestPage.getFragmentById(window.getId().toString()); - -- if ( targetFragment == null ) -+ if (targetFragment == null) - { - // ignore no longer consistent page definition - return; - } -- -- StringTokenizer tokenizer = new StringTokenizer(portlets, ","); -+ -+ StringTokenizer tokenizer = new StringTokenizer(portlets, ","); - while (tokenizer.hasMoreTokens()) - { - String portlet = tokenizer.nextToken(); - if (portlet.startsWith("box_")) - { -- portlet = portlet.substring("box_".length()); -+ portlet = portlet.substring("box_".length()); - addPortletToPage(requestPage, targetFragment, portlet); - } - } -@@ -971,11 +1170,11 @@ - } - } - } -- -+ - protected int getFragmentNestingLevel(Page page, String fragmentId) - { - Fragment root = page.getRootFragment(); -- if ( root.getId().equals(fragmentId) ) -+ if (root.getId().equals(fragmentId)) - { - return 0; - } -@@ -984,23 +1183,23 @@ - return getFragmentNestingLevel(root, 1, fragmentId); - } - } -- -+ - protected int getFragmentNestingLevel(Fragment parent, int level, String fragmentId) - { - Iterator iter = parent.getFragments().iterator(); - Fragment child; - int childLevel; -- while ( iter.hasNext() ) -+ while (iter.hasNext()) - { -- child = (Fragment)iter.next(); -+ child = (Fragment) iter.next(); - if (child.getId().equals(fragmentId)) - { - return level; - } - else - { -- childLevel = getFragmentNestingLevel(child, level+1, fragmentId); -- if ( childLevel != -1 ) -+ childLevel = getFragmentNestingLevel(child, level + 1, fragmentId); -+ if (childLevel != -1) - { - return childLevel; - } Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/portal-url-generation.xml 2008-04-30 01:29:49 UTC (rev 898) @@ -1,13 +0,0 @@ -Index: src/webapp/WEB-INF/assembly/portal-url-generation.xml -=================================================================== ---- src/webapp/WEB-INF/assembly/portal-url-generation.xml (リビジョン 554520) -+++ src/webapp/WEB-INF/assembly/portal-url-generation.xml (作業コピー) -@@ -27,7 +27,7 @@ - - - - Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/conf/Log4j.properties 2008-04-30 01:29:49 UTC (rev 898) @@ -1,64 +0,0 @@ -Index: src/webapp/WEB-INF/conf/Log4j.properties -=================================================================== ---- src/webapp/WEB-INF/conf/Log4j.properties (リビジョン 555425) -+++ src/webapp/WEB-INF/conf/Log4j.properties (作業コピー) -@@ -88,13 +88,13 @@ - # jetspeed.log - # - log4j.appender.jetspeed = org.apache.log4j.FileAppender --log4j.appender.jetspeed.file = ${applicationRoot}/logs/jetspeed.log -+log4j.appender.jetspeed.file = ${applicationRoot}/WEB-INF/logs/jetspeed.log - log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout - log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.jetspeed.append = false - - log4j.appender.digester = org.apache.log4j.FileAppender --log4j.appender.digester.file = ${applicationRoot}/logs/digester.log -+log4j.appender.digester.file = ${applicationRoot}/WEB-INF/logs/digester.log - log4j.appender.digester.layout = org.apache.log4j.PatternLayout - log4j.appender.digester.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.digester.append = false -@@ -103,7 +103,7 @@ - # pluto.log - # - log4j.appender.PLUTO = org.apache.log4j.FileAppender --log4j.appender.PLUTO.file = ${applicationRoot}/logs/pluto.log -+log4j.appender.PLUTO.file = ${applicationRoot}/WEB-INF/logs/pluto.log - log4j.appender.PLUTO.layout = org.apache.log4j.PatternLayout - log4j.appender.PLUTO.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.PLUTO.append = false -@@ -112,7 +112,7 @@ - # deployment.log - # - log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender --log4j.appender.DEPLOYMENT.file = ${applicationRoot}/logs/deployment.log -+log4j.appender.DEPLOYMENT.file = ${applicationRoot}/WEB-INF/logs/deployment.log - log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout - log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.DEPLOYMENT.append = false -@@ -121,7 +121,7 @@ - # Scheduler Output - # - log4j.appender.scheduler = org.apache.log4j.FileAppender --log4j.appender.scheduler.file = ${applicationRoot}/logs/scheduler.log -+log4j.appender.scheduler.file = ${applicationRoot}/WEB-INF/logs/scheduler.log - log4j.appender.scheduler.layout = org.apache.log4j.PatternLayout - log4j.appender.scheduler.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.scheduler.append = false -@@ -131,14 +131,14 @@ - # category. - # - log4j.appender.velocity = org.apache.log4j.FileAppender --log4j.appender.velocity.file = ${applicationRoot}/logs/velocity.log -+log4j.appender.velocity.file = ${applicationRoot}/WEB-INF/logs/velocity.log - log4j.appender.velocity.layout = org.apache.log4j.PatternLayout - log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.velocity.append = false - - - log4j.appender.ojb = org.apache.log4j.FileAppender --log4j.appender.ojb.file = ${applicationRoot}/logs/ojb.log -+log4j.appender.ojb.file = ${applicationRoot}/WEB-INF/logs/ojb.log - log4j.appender.ojb.layout = org.apache.log4j.PatternLayout - log4j.appender.ojb.layout.conversionPattern = %d [%t] %-5p %c - %m%n - log4j.appender.ojb.append = false Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm 2008-04-30 01:29:49 UTC (rev 898) @@ -1,9 +0,0 @@ -Index: src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm -=================================================================== ---- src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (リビジョン 519203) -+++ src/webapp/WEB-INF/templates/layout/html/maximized/layout.vm (作業コピー) -@@ -1,4 +1,3 @@ -- - #* - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm 2008-04-28 09:21:50 UTC (rev 897) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm 2008-04-30 01:29:49 UTC (rev 898) @@ -1,30 +0,0 @@ -Index: src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm -=================================================================== ---- src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (リビジョン 453273) -+++ src/webapp/WEB-INF/templates/layout/html/tcolumns/layout.vm (作業コピー) -@@ -1,4 +1,3 @@ -- - #* - Copyright 2004 The Apache Software Foundation - -@@ -90,6 +89,7 @@ -