commit e15e84bc49147223e1af19cd4264192f83db5083 Author: Adam Heath Date: Sun Dec 5 18:32:01 2010 -0600 Deprecate GenericValue.getRelatedDummyPK(String). Still more api simplification. Fortunately, this is a very small change. It seems that this method is hardly used by anything. GenericValue.getRelatedDummyPK(String) is replaced by GenericValue.getRelatedDummyPK(String, Map). applications/product/src/org/ofbiz/product/product/ProductUtilServices.java | 4 ++-- framework/entity/src/org/ofbiz/entity/GenericValue.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) commit 36c89fef91d2435c43634a5f9b0fdd88b861b6a8 Author: Adam Heath Date: Sun Dec 5 16:30:03 2010 -0600 Deprecate all Delegator.getRelatedOne and Delegator.getRelatedOneCache, and GenericValue.getRelatedOne/GenericValue.getRelatedOneCache, and add a version that takes a cache parameter. Yet again, another simplication of the delegator api. This replaces all simple getRelatedOne type methods with a single version that takes all possible arguments. Delegator.getRelatedOne(String, GenericValue) is replaced by Delegator.getRelatedOne(String, boolean, GenericValue). Delegator.getRelatedOneCache(String, GenericValue) is replaced by Delegator.getRelatedOne(String, boolean, GenericValue). GenericValue.getRelatedOne(String) is replaced by GenericValue.getRelatedOne(String, boolean). GenericValue.getRelatedOneCache(String) is replaced by GenericValue.getRelatedOne(String, boolean). applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java | 30 +- applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java | 14 +- applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java | 4 +- applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java | 14 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java | 46 +-- applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java | 12 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java | 8 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java | 8 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java | 14 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java | 8 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java | 2 +- applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java | 14 +- applications/accounting/webapp/accounting/WEB-INF/actions/admin/ListInvoiceItemTypesGlAccount.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy | 4 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/PrintInvoices.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy | 12 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy | 2 +- .../accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy | 4 +- applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy | 2 +- applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl | 4 +- applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl | 4 +- applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl | 8 +- applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl | 2 +- applications/accounting/webapp/accounting/invoice/invoiceReportItems.fo.ftl | 8 +- applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl | 16 +- applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl | 8 +- applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResult.fo.ftl | 2 +- .../accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign | 2 +- applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl | 2 +- applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign | 2 +- applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign | 2 +- applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign | 8 +- applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign | 8 +- applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign | 2 +- applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl | 2 +- applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy | 2 +- applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy | 4 +- applications/commonext/webapp/ofbizsetup/organization/viewcontact.ftl | 6 +- applications/content/src/org/ofbiz/content/ContentManagementWorker.java | 2 +- applications/content/src/org/ofbiz/content/content/ContentMapFacade.java | 6 +- applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java | 4 +- applications/content/src/org/ofbiz/content/content/ContentWorker.java | 4 +- applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java | 2 +- applications/content/template/survey/genericsurvey.ftl | 4 +- applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy | 6 +- applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy | 16 +- applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy | 6 +- applications/content/webapp/content/survey/EditSurveyQuestions.ftl | 12 +- applications/content/webapp/content/survey/ViewSurveyResponses.ftl | 2 +- applications/content/webapp/content/website/WebSiteCMSContent.ftl | 10 +- applications/content/webapp/content/website/WebSiteCMSNav.ftl | 6 +- applications/humanres/webapp/humanres/humanres/findEmployee.ftl | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java | 4 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java | 6 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java | 34 +- applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java | 6 +- applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java | 14 +- .../manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy | 8 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy | 2 +- applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl | 10 +- applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl | 4 +- applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java | 6 +- applications/marketing/webapp/marketing/WEB-INF/actions/contact/GetContactListMarketingEmail.groovy | 2 +- applications/marketing/webapp/sfa/WEB-INF/action/CloneLead.groovy | 8 +- applications/marketing/webapp/sfa/WEB-INF/action/MergeContacts.groovy | 6 +- applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java | 4 +- applications/order/src/org/ofbiz/order/order/OrderEvents.java | 2 +- applications/order/src/org/ofbiz/order/order/OrderReadHelper.java | 76 ++--- applications/order/src/org/ofbiz/order/order/OrderReturnServices.java | 52 +-- applications/order/src/org/ofbiz/order/order/OrderServices.java | 34 +- applications/order/src/org/ofbiz/order/requirement/RequirementServices.java | 8 +- applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java | 2 +- applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java | 4 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java | 12 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java | 4 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java | 4 +- applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java | 8 +- applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java | 8 +- applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java | 2 +- applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy | 8 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy | 10 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy | 14 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy | 8 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy | 14 +- applications/order/webapp/ordermgr/WEB-INF/actions/quote/GetPartyAddress.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy | 4 +- applications/order/webapp/ordermgr/entry/addrsettings.ftl | 2 +- applications/order/webapp/ordermgr/entry/billsettings.ftl | 4 +- applications/order/webapp/ordermgr/entry/cart/promotioncategories.ftl | 6 +- applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl | 2 +- applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl | 4 +- applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl | 12 +- applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl | 2 +- applications/order/webapp/ordermgr/entry/checkoutoptions.ftl | 8 +- applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl | 2 +- applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl | 2 +- applications/order/webapp/ordermgr/entry/order/orderitems.ftl | 8 +- applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl | 2 +- applications/order/webapp/ordermgr/entry/shipsettings.ftl | 6 +- applications/order/webapp/ordermgr/order/OrderListByDate.ftl | 6 +- applications/order/webapp/ordermgr/order/editorderitems.ftl | 24 +- applications/order/webapp/ordermgr/order/findOrders.ftl | 8 +- applications/order/webapp/ordermgr/order/orderReportBody.fo.ftl | 4 +- applications/order/webapp/ordermgr/order/orderReportConditions.fo.ftl | 2 +- applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl | 8 +- applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl | 2 +- applications/order/webapp/ordermgr/order/ordercontactinfo.ftl | 4 +- applications/order/webapp/ordermgr/order/orderinfo.ftl | 8 +- applications/order/webapp/ordermgr/order/orderitems.ftl | 42 +-- applications/order/webapp/ordermgr/order/orderlist.ftl | 8 +- applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl | 28 +- applications/order/webapp/ordermgr/order/ordershippinginfo.ftl | 6 +- applications/order/webapp/ordermgr/order/orderterms.ftl | 2 +- applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl | 6 +- applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl | 6 +- applications/order/webapp/ordermgr/quote/quoteRoles.ftl | 4 +- applications/order/webapp/ordermgr/request/ViewRequestItemInfo.ftl | 2 +- applications/order/webapp/ordermgr/request/requestContactMech.ftl | 8 +- applications/order/webapp/ordermgr/return/quickReturn.ftl | 4 +- applications/order/webapp/ordermgr/return/returnHeader.ftl | 4 +- applications/order/webapp/ordermgr/return/returnItemInc.ftl | 6 +- applications/order/webapp/ordermgr/return/returnItems.ftl | 16 +- applications/order/webapp/ordermgr/return/returnList.ftl | 4 +- applications/order/webapp/ordermgr/return/returnReportBody.fo.ftl | 8 +- applications/order/webapp/ordermgr/task/ordertasklist.ftl | 2 +- applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java | 20 +- applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java | 60 ++-- applications/party/src/org/ofbiz/party/party/PartyServices.java | 2 +- applications/party/src/org/ofbiz/party/party/PartyTypeHelper.java | 2 +- applications/party/src/org/ofbiz/party/party/PartyWorker.java | 6 +- applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy | 10 +- applications/party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy | 2 +- applications/party/webapp/partymgr/party/editcontactmech.ftl | 2 +- applications/party/webapp/partymgr/party/editcreditcard.ftl | 4 +- applications/party/webapp/partymgr/party/editeftaccount.ftl | 4 +- applications/party/webapp/partymgr/party/findMatches.ftl | 4 +- applications/party/webapp/partymgr/party/findparty.ftl | 2 +- applications/party/webapp/partymgr/party/profileblocks/Contact.ftl | 2 +- applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl | 10 +- applications/party/webapp/partymgr/visit/visitdetail.ftl | 2 +- applications/product/src/org/ofbiz/product/category/CategoryWorker.java | 2 +- applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java | 8 +- applications/product/src/org/ofbiz/product/inventory/InventoryServices.java | 10 +- applications/product/src/org/ofbiz/product/price/PriceServices.java | 6 +- applications/product/src/org/ofbiz/product/product/ProductSearch.java | 4 +- applications/product/src/org/ofbiz/product/product/ProductServices.java | 8 +- applications/product/src/org/ofbiz/product/product/ProductWorker.java | 10 +- applications/product/src/org/ofbiz/shipment/packing/PackingSession.java | 6 +- applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java | 10 +- applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java | 4 +- applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java | 18 +- applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java | 22 +- applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java | 56 +-- applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java | 36 +- applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java | 2 +- applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy | 4 +- applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy | 2 +- applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy | 4 +- applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.groovy | 2 +- applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.groovy | 18 +- applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy | 8 +- applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl | 4 +- applications/product/webapp/catalog/category/EditCategoryParties.ftl | 2 +- applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl | 4 +- applications/product/webapp/catalog/category/EditCategoryProducts.ftl | 2 +- applications/product/webapp/catalog/category/EditCategoryRollup.ftl | 4 +- applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl | 2 +- applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl | 4 +- applications/product/webapp/catalog/find/FindProductById.ftl | 4 +- applications/product/webapp/catalog/find/miniproductlist.ftl | 2 +- applications/product/webapp/catalog/find/sidecatalogs.ftl | 2 +- applications/product/webapp/catalog/price/EditProductPriceRules.ftl | 6 +- applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl | 2 +- applications/product/webapp/catalog/product/EditProductAssoc.ftl | 10 +- applications/product/webapp/catalog/product/EditProductFeatures.ftl | 6 +- applications/product/webapp/catalog/product/EditProductInventoryItems.ftl | 8 +- applications/product/webapp/catalog/product/EditProductParties.ftl | 2 +- applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl | 4 +- applications/product/webapp/catalog/product/ViewProductOrders.ftl | 4 +- applications/product/webapp/catalog/promo/EditProductPromoRules.ftl | 36 +- applications/product/webapp/catalog/promo/EditProductPromoStores.ftl | 2 +- applications/product/webapp/catalog/reviews/pendingReviews.ftl | 12 +- applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl | 4 +- applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl | 2 +- applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/facility/ViewContactMechs.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/inventory/PhysicalInventoryVariance.groovy | 6 +- applications/product/webapp/facility/WEB-INF/actions/inventory/ReceiveInventory.groovy | 6 +- applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.groovy | 4 +- applications/product/webapp/facility/WEB-INF/actions/shipment/AddItemsFromOrder.groovy | 22 +- applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy | 10 +- applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentItems.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy | 10 +- applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.groovy | 30 +- applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.groovy | 8 +- applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy | 22 +- applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.groovy | 6 +- applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.groovy | 4 +- applications/product/webapp/facility/WEB-INF/actions/shipment/ViewShipment.groovy | 22 +- applications/product/webapp/facility/facility/EditContactMech.ftl | 2 +- applications/product/webapp/facility/facility/EditFacilityLocation.ftl | 4 +- applications/product/webapp/facility/facility/FindFacilityLocation.ftl | 2 +- applications/product/webapp/facility/facility/PickMoveStock.ftl | 8 +- applications/product/webapp/facility/facility/Picklist.fo.ftl | 2 +- applications/product/webapp/facility/facility/PicklistOptions.ftl | 6 +- applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl | 12 +- applications/product/webapp/facility/facility/ViewContactMechs.ftl | 2 +- applications/product/webapp/facility/inventory/TransferInventoryItem.ftl | 2 +- applications/product/webapp/facility/inventory/receiveInventory.ftl | 24 +- applications/product/webapp/facility/returns/receiveReturn.ftl | 12 +- applications/product/webapp/facility/shipment/FindShipment.ftl | 11 +- applications/product/webapp/facility/shipment/PackOrder.ftl | 6 +- applications/product/webapp/facility/shipment/PackingSlip.fo.ftl | 4 +- applications/product/webapp/facility/shipment/QuickShipOrder.ftl | 8 +- applications/product/webapp/facility/shipment/ShipmentManifest.fo.ftl | 8 +- applications/product/webapp/facility/shipment/VerifyPick.ftl | 10 +- applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java | 2 +- applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java | 4 +- applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java | 6 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java | 6 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java | 6 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java | 6 +- applications/workeffort/webapp/workeffort/calendar/upcoming.ftl | 2 +- applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl | 10 +- framework/common/src/org/ofbiz/common/geo/GeoWorker.java | 2 +- framework/entity/src/org/ofbiz/entity/Delegator.java | 12 + framework/entity/src/org/ofbiz/entity/GenericDelegator.java | 35 +- framework/entity/src/org/ofbiz/entity/GenericValue.java | 18 +- framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java | 2 +- framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java | 4 +- framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java | 2 +- framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java | 6 +- framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java | 2 +- framework/service/src/org/ofbiz/service/job/JobManager.java | 2 +- framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java | 2 +- framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java | 2 +- framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java | 6 +- framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java | 6 +- specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/actions/assetmaint/PrintFixedAssetMaint.groovy | 8 +- specialpurpose/assetmaint/webapp/assetmaint/assetmaint/printFixedAssetMaint.fo.ftl | 2 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java | 6 +- specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl | 4 +- specialpurpose/ecommerce/src/org/ofbiz/ecommerce/misc/ThirdPartyEvents.java | 4 +- specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl | 2 +- specialpurpose/ecommerce/templates/email/returnaccept.ftl | 4 +- specialpurpose/ecommerce/templates/survey/genericresult.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy | 10 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy | 8 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy | 10 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutShippingOptions.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy | 10 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy | 10 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy | 10 +- specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl | 18 +- specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl | 24 +- specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl | 6 +- specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl | 16 +- specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl | 24 +- specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl | 4 +- specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl | 10 +- specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java | 4 +- specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java | 4 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java | 2 +- specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl | 4 +- specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl | 2 +- specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java | 8 +- specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java | 2 +- specialpurpose/projectmgr/src/org/ofbiz/project/Various.java | 2 +- specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy | 2 +- specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy | 2 +- specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy | 2 +- specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy | 4 +- specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl | 2 +- specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java | 2 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java | 4 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java | 2 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java | 6 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java | 4 +- 332 files changed, 1193 insertions(+), 1179 deletions(-) commit dcc45e096eecd167f64937020463aa4b40c1593a Author: Adam Heath Date: Sun Jun 26 17:14:07 2011 -0500 Deprecate all Delegator.findByAnd and Delegator.findByAndCache; introduce a new Delegator.findByAnd variant that takes a boolean cache parameter. This change continues the simplication of the delegator api. There is no longer a version of a method with a 'Cache' suffix; instead, a single version now exists that takes a boolean cache parameter. Also, there has been a trend to remove several method variants that take different numbers and types of parameters, instead preferring to fully specify all parameters; this also continues that trend. Delegator.findByAnd(String, Map) is replaced with findByAnd(String, Map, List, boolean). Delegator.findByAnd(String, Map, List) is replaced with findByAnd(String, Map, List, boolean). Delegator.findByAnd(String, Object...) is replaced with findByAnd(String, Map, List, boolean). The object array is converted to a map by using UtilMisc.toMap(Object...). Delegator.findByAndCache(String, Map) is replaced with findByAnd(String, Map, List, boolean). Delegator.findByAndCache(String, Map, List) is replaced with findByAnd(String, Map, List, boolean). applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java | 16 +- applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java | 24 +- applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java | 8 +- applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java | 4 +- applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java | 7 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java | 14 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java | 8 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java | 4 +- applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java | 8 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java | 6 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java | 8 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy | 6 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetInvoiceItemTypes.groovy | 10 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/OrderListInvoiceItem.groovy | 8 +- applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy | 4 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/BillingAccounts.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy | 4 +- .../accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy | 4 +- applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl | 4 +- applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl | 2 +- applications/commonext/webapp/ofbizsetup/WEB-INF/actions/FindFacility.groovy | 4 +- applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy | 16 +- applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy | 4 +- applications/content/src/org/ofbiz/content/ContentManagementEvents.java | 6 +- applications/content/src/org/ofbiz/content/ContentManagementServices.java | 14 +- applications/content/src/org/ofbiz/content/ContentManagementWorker.java | 10 +- applications/content/src/org/ofbiz/content/ConvertTree.java | 18 +- applications/content/src/org/ofbiz/content/cms/CmsEvents.java | 22 +- applications/content/src/org/ofbiz/content/content/ContentMapFacade.java | 18 +- applications/content/src/org/ofbiz/content/content/ContentServices.java | 2 +- applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java | 2 +- applications/content/src/org/ofbiz/content/content/ContentWorker.java | 12 +- applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java | 2 +- applications/content/src/org/ofbiz/content/data/DataEvents.java | 2 +- applications/content/src/org/ofbiz/content/data/DataResourceWorker.java | 2 +- applications/content/src/org/ofbiz/content/data/DataServices.java | 2 +- applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java | 10 +- applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java | 10 +- applications/content/webapp/content/content/ContentNav.ftl | 2 +- applications/content/webapp/content/content/DisplayContentNav.ftl | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java | 12 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java | 18 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java | 12 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java | 4 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java | 6 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java | 48 +- applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java | 22 +- applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy | 4 +- .../manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunContent.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy | 6 +- .../manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy | 18 +- .../manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ViewProductionRun.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy | 10 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy | 8 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy | 8 +- applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl | 4 +- applications/order/src/org/ofbiz/order/OrderManagerEvents.java | 6 +- applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java | 4 +- applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java | 2 +- applications/order/src/org/ofbiz/order/order/OrderEvents.java | 2 +- applications/order/src/org/ofbiz/order/order/OrderReadHelper.java | 38 +- applications/order/src/org/ofbiz/order/order/OrderReturnServices.java | 18 +- applications/order/src/org/ofbiz/order/order/OrderServices.java | 43 +- applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java | 4 +- applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java | 4 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java | 6 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java | 2 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java | 6 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java | 2 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java | 12 +- applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java | 8 +- applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java | 34 +- applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java | 2 +- applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java | 2 +- applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderAgreements.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetAdditionalParty.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy | 8 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShoppingList.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy | 8 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy | 18 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderStats.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy | 16 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/request/RequestItemNotes.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/request/SetRequestQuote.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy | 10 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy | 10 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy | 12 +- applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy | 4 +- applications/order/webapp/ordermgr/order/editorderitems.ftl | 4 +- applications/order/webapp/ordermgr/order/orderitems.ftl | 6 +- applications/order/webapp/ordermgr/order/ordershippinginfo.ftl | 2 +- applications/order/webapp/ordermgr/reports/OrdersByChannel.rptdesign | 2 +- applications/order/webapp/ordermgr/return/returnLinks.ftl | 10 +- applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java | 12 +- applications/party/src/org/ofbiz/party/contact/ContactMechServices.java | 14 +- applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java | 26 +- applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java | 4 +- applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java | 2 +- applications/party/src/org/ofbiz/party/party/PartyServices.java | 6 +- applications/party/src/org/ofbiz/party/party/PartyWorker.java | 8 +- applications/party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy | 4 +- applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy | 4 +- applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy | 2 +- applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy | 2 +- applications/party/webapp/partymgr/WEB-INF/actions/party/SetRoleVars.groovy | 12 +- applications/party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy | 2 +- applications/party/webapp/partymgr/party/findparty.ftl | 2 +- applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java | 8 +- applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java | 2 +- applications/product/src/org/ofbiz/product/category/CategoryServices.java | 4 +- applications/product/src/org/ofbiz/product/category/CategoryWorker.java | 8 +- applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java | 2 +- applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java | 6 +- applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java | 6 +- applications/product/src/org/ofbiz/product/feature/ParametricSearch.java | 8 +- applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java | 6 +- applications/product/src/org/ofbiz/product/inventory/InventoryServices.java | 8 +- applications/product/src/org/ofbiz/product/price/PriceServices.java | 62 +- applications/product/src/org/ofbiz/product/product/KeywordIndex.java | 10 +- applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java | 2 +- applications/product/src/org/ofbiz/product/product/ProductEvents.java | 20 +- applications/product/src/org/ofbiz/product/product/ProductSearch.java | 2 +- applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java | 8 +- applications/product/src/org/ofbiz/product/product/ProductSearchSession.java | 2 +- applications/product/src/org/ofbiz/product/product/ProductServices.java | 14 +- applications/product/src/org/ofbiz/product/product/ProductUtilServices.java | 22 +- applications/product/src/org/ofbiz/product/product/ProductWorker.java | 44 +- applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java | 18 +- applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java | 8 +- applications/product/src/org/ofbiz/shipment/packing/PackingSession.java | 24 +- applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java | 2 +- applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java | 8 +- applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java | 2 +- applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java | 2 +- applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java | 18 +- applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java | 2 +- applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java | 12 +- applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.groovy | 2 +- applications/product/webapp/catalog/category/createProductInCategoryStart.ftl | 2 +- applications/product/webapp/catalog/product/ViewProductOrders.ftl | 2 +- applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy | 8 +- applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/shipment/PrintPickSheets.groovy | 4 +- applications/product/webapp/facility/WEB-INF/actions/shipment/ReviewOrdersNotPickedOrPacked.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy | 12 +- applications/product/webapp/facility/facility/PrintPickSheets.fo.ftl | 2 +- applications/product/webapp/facility/shipment/VerifyPick.ftl | 6 +- applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java | 4 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java | 4 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java | 6 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java | 2 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java | 6 +- applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl | 4 +- framework/bi/src/org/ofbiz/bi/util/DimensionServices.java | 4 +- framework/common/src/org/ofbiz/common/KeywordSearchUtil.java | 2 +- framework/common/src/org/ofbiz/common/geo/GeoWorker.java | 6 +- framework/common/src/org/ofbiz/common/login/LoginServices.java | 2 +- framework/common/src/org/ofbiz/common/olap/CommonDimensionServices.java | 2 +- framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java | 8 +- framework/common/src/org/ofbiz/common/status/StatusServices.java | 4 +- framework/common/src/org/ofbiz/common/status/StatusWorker.java | 8 +- framework/entity/src/org/ofbiz/entity/Delegator.java | 30 + framework/entity/src/org/ofbiz/entity/GenericDelegator.java | 23 +- framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java | 2 +- framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java | 2 +- framework/entity/src/org/ofbiz/entity/util/EntityUtil.java | 2 +- framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java | 2 +- framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java | 4 +- framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java | 6 +- framework/security/src/org/ofbiz/security/OFBizSecurity.java | 2 +- framework/security/src/org/ofbiz/security/authz/EntityAuthorization.java | 2 +- framework/service/src/org/ofbiz/service/job/JobManager.java | 2 +- framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java | 8 +- framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java | 216 +++++ framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy | 4 +- framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java | 2 +- specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java | 6 +- specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java | 2 +- specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java | 2 +- specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java | 2 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java | 2 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java | 6 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java | 10 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java | 30 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java | 14 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java | 16 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java | 2 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java | 4 +- specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java | 16 +- specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java | 8 +- specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilityServices.java | 4 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java | 8 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java | 2 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java | 30 +- specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java | 12 +- specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java | 4 +- specialpurpose/projectmgr/src/org/ofbiz/project/Various.java | 2 +- 231 files changed, 1109 insertions(+), 862 deletions(-) commit ae6db063a0d8852994742435761b4d36d3af4440 Author: Adam Heath Date: Sun Dec 5 21:51:51 2010 -0600 Deprecate Delegator.findByPrimaryKey and Delegator.findByPrimaryKeyCache. Ofbiz is moving towards simpler delegator apis; this means all 'fooCache' variants are removed(and their matching 'foo' method), and a new version of 'foo' added that takes a boolean cache parameter. Delegator.findByPrimaryKey(String, Map) is replaced with findOne(String, Map, false). Delegator.findByPrimaryKeyCache(String, Map) is replaced with findOne(String, Map, true). Delegator.findByPrimaryKey(String, Object...) is replaced with findOne(String, false, Object...). applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java | 16 +- applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java | 20 +- applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java | 45 +- applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java | 10 +- applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java | 6 +- applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java | 34 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java | 30 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java | 16 +- applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java | 16 +- applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java | 16 +- applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java | 6 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java | 2 +- applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java | 4 +- applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java | 6 +- applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedPayments.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy | 8 +- applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy | 4 +- applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy | 2 +- applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy | 4 +- applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy | 4 +- applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy | 2 +- applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign | 2 +- applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy | 2 +- applications/content/src/org/ofbiz/content/ContentManagementEvents.java | 4 +- applications/content/src/org/ofbiz/content/ContentManagementServices.java | 30 +- applications/content/src/org/ofbiz/content/ContentManagementWorker.java | 20 +- applications/content/src/org/ofbiz/content/ConvertTree.java | 2 +- applications/content/src/org/ofbiz/content/blog/BlogRssServices.java | 2 +- applications/content/src/org/ofbiz/content/cms/CmsEvents.java | 10 +- applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java | 2 +- applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java | 20 +- applications/content/src/org/ofbiz/content/content/ContentMapFacade.java | 12 +- applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java | 6 +- applications/content/src/org/ofbiz/content/content/ContentServices.java | 14 +- applications/content/src/org/ofbiz/content/content/ContentWorker.java | 36 +- applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java | 2 +- applications/content/src/org/ofbiz/content/data/DataEvents.java | 6 +- applications/content/src/org/ofbiz/content/data/DataResourceWorker.java | 2 +- applications/content/src/org/ofbiz/content/data/DataServices.java | 6 +- applications/content/src/org/ofbiz/content/layout/LayoutEvents.java | 12 +- applications/content/src/org/ofbiz/content/search/ContentDocument.java | 4 +- applications/content/src/org/ofbiz/content/search/DataResourceDocument.java | 2 +- applications/content/src/org/ofbiz/content/search/SearchWorker.java | 2 +- applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java | 20 +- applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java | 2 +- applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java | 6 +- applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java | 2 +- applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java | 2 +- applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java | 4 +- applications/content/webapp/content/cms/AdminSearch.ftl | 2 +- applications/content/webapp/content/content/ContentNav.ftl | 4 +- applications/content/webapp/content/content/EditContentTree.ftl | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java | 10 +- applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java | 18 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java | 4 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java | 46 +- applications/manufacturing/src/org/ofbiz/manufacturing/mrp/InventoryEventPlannedServices.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java | 8 +- applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java | 2 +- applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/bom/EditProductBom.groovy | 2 +- .../manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.groovy | 8 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsByFeature.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy | 6 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.groovy | 2 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy | 4 +- applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy | 2 +- applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl | 4 +- applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy | 4 +- applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl | 2 +- applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java | 4 +- applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java | 14 +- applications/order/src/org/ofbiz/order/OrderManagerEvents.java | 2 +- applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java | 4 +- applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java | 6 +- applications/order/src/org/ofbiz/order/order/OrderLookupServices.java | 4 +- applications/order/src/org/ofbiz/order/order/OrderReadHelper.java | 46 +- applications/order/src/org/ofbiz/order/order/OrderReturnServices.java | 48 +- applications/order/src/org/ofbiz/order/order/OrderServices.java | 100 ++--- applications/order/src/org/ofbiz/order/quote/QuoteServices.java | 4 +- applications/order/src/org/ofbiz/order/requirement/RequirementServices.java | 8 +- applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java | 4 +- applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java | 14 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java | 48 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java | 8 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java | 8 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java | 16 +- applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java | 10 +- applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java | 28 +- applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java | 6 +- applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java | 12 +- applications/order/src/org/ofbiz/order/task/TaskWorker.java | 2 +- applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java | 2 +- applications/order/src/org/ofbiz/order/test/SalesOrderTest.java | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/AdditionalPartyListing.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/BillSettings.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckInits.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutReview.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/OptionSettings.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/InlineProductDetail.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy | 20 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy | 12 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy | 12 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/order/ViewImage.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/QuickReturn.groovy | 6 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy | 4 +- applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy | 2 +- applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy | 4 +- applications/order/webapp/ordermgr/entry/SetItemShipGroups.ftl | 2 +- applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl | 2 +- applications/order/webapp/ordermgr/entry/catalog/advancedsearch.ftl | 2 +- applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl | 2 +- applications/order/webapp/ordermgr/entry/optionsettings.ftl | 2 +- applications/order/webapp/ordermgr/entry/order/shipGroupConfirmSummary.ftl | 2 +- applications/order/webapp/ordermgr/order/orderitems.ftl | 2 +- applications/order/webapp/ordermgr/order/ordershippinginfo.ftl | 2 +- applications/order/webapp/ordermgr/reports/CouponSalesReport.rptdesign | 2 +- applications/order/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign | 4 +- applications/order/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign | 2 +- applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java | 12 +- applications/party/src/org/ofbiz/party/contact/ContactMechServices.java | 12 +- applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java | 16 +- applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java | 6 +- applications/party/src/org/ofbiz/party/party/PartyHelper.java | 2 +- applications/party/src/org/ofbiz/party/party/PartyServices.java | 52 +-- applications/party/src/org/ofbiz/party/party/PartyWorker.java | 14 +- applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy | 4 +- applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy | 2 +- applications/party/webapp/partymgr/WEB-INF/actions/party/EditContactMech.groovy | 2 +- applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy | 6 +- applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy | 2 +- applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy | 2 +- applications/party/webapp/partymgr/WEB-INF/actions/party/PartyGeoLocation.groovy | 4 +- applications/party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy | 4 +- applications/party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy | 2 +- applications/party/webapp/partymgr/party/editcontactmech.ftl | 2 +- applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl | 14 +- applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java | 6 +- applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java | 2 +- applications/product/src/org/ofbiz/product/category/CategoryServices.java | 6 +- applications/product/src/org/ofbiz/product/category/CategoryWorker.java | 2 +- applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java | 2 +- applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java | 4 +- applications/product/src/org/ofbiz/product/feature/ParametricSearch.java | 2 +- applications/product/src/org/ofbiz/product/inventory/InventoryServices.java | 12 +- applications/product/src/org/ofbiz/product/price/PriceServices.java | 10 +- applications/product/src/org/ofbiz/product/product/ProductEvents.java | 30 +- applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java | 2 +- applications/product/src/org/ofbiz/product/product/ProductSearch.java | 12 +- applications/product/src/org/ofbiz/product/product/ProductServices.java | 26 +- applications/product/src/org/ofbiz/product/product/ProductUtilServices.java | 8 +- applications/product/src/org/ofbiz/product/product/ProductWorker.java | 32 +- applications/product/src/org/ofbiz/product/product/VariantEvents.java | 6 +- applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java | 4 +- applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java | 8 +- applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java | 6 +- applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java | 4 +- applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java | 4 +- applications/product/src/org/ofbiz/product/test/StockMovesTest.java | 2 +- applications/product/src/org/ofbiz/shipment/packing/PackingSession.java | 2 +- applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java | 2 +- applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java | 2 +- applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java | 36 +- applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java | 14 +- applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java | 20 +- applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java | 34 +- applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java | 42 +- applications/product/webapp/catalog/WEB-INF/actions/category/CreateProductInCategoryCheckExisting.groovy | 6 +- applications/product/webapp/catalog/category/createProductInCategoryStart.ftl | 2 +- applications/product/webapp/catalog/find/advancedsearch.ftl | 2 +- applications/product/webapp/catalog/find/keywordsearch.ftl | 2 +- applications/product/webapp/catalog/product/EditProductAssoc.ftl | 2 +- applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl | 2 +- applications/product/webapp/catalog/product/ProductInventorySummary.ftl | 2 +- applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy | 2 +- applications/product/webapp/facility/WEB-INF/actions/inventory/LookupInventoryItems.groovy | 2 +- applications/product/webapp/facility/inventory/TransferInventoryItem.ftl | 2 +- applications/product/webapp/facility/inventory/report/InventoryReport.rptdesign | 4 +- applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl | 2 +- applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java | 8 +- applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java | 6 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java | 10 +- applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java | 4 +- applications/workeffort/webapp/workeffort/WEB-INF/actions/content/WorkEffortContentWrapper.groovy | 2 +- applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl | 2 +- applications/workeffort/webapp/workeffort/task/mytasks.ftl | 14 +- framework/common/src/org/ofbiz/common/email/NotificationServices.java | 2 +- framework/common/src/org/ofbiz/common/geo/GeoWorker.java | 4 +- framework/common/src/org/ofbiz/common/login/LoginServices.java | 2 +- framework/common/webcommon/WEB-INF/actions/includes/GetParentPortalPageId.groovy | 2 +- framework/entity/src/org/ofbiz/entity/Delegator.java | 6 + framework/entity/src/org/ofbiz/entity/GenericDelegator.java | 6 + framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java | 2 +- framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaAction.java | 2 +- framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java | 18 +- framework/service/src/org/ofbiz/service/ServiceDispatcher.java | 2 +- framework/service/src/org/ofbiz/service/ServiceUtil.java | 2 +- framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java | 4 +- framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java | 2 +- framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityPerformanceTest.groovy | 16 +- framework/webtools/webapp/webtools/WEB-INF/actions/workflow/WorkflowMonitor.groovy | 2 +- framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java | 2 +- framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java | 6 +- framework/widget/src/org/ofbiz/widget/tree/ModelTree.java | 2 +- specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java | 8 +- specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java | 4 +- specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java | 8 +- specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl | 2 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java | 2 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java | 4 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java | 4 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java | 12 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java | 28 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java | 4 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java | 12 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java | 12 +- specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java | 12 +- specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy | 2 +- specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/ShowCart.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/CustomerSurvey.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditContactMech.groovy | 10 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ViewPrep.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/BillSettings.groovy | 6 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy | 6 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CustSettings.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OptionSettings.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderHistory.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/PaymentInformation.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonCustSettings.groovy | 6 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/QuickAnonOptionSettings.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipSettings.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy | 2 +- specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy | 4 +- specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/catalog/advancedsearch.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl | 2 +- specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl | 2 +- specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java | 4 +- specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl | 2 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java | 32 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java | 12 +- specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java | 36 +- specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java | 12 +- specialpurpose/pos/src/org/ofbiz/pos/adaptor/SyncCallbackAdaptor.java | 2 +- specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java | 2 +- specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java | 2 +- specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java | 2 +- specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy | 6 +- specialpurpose/shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/audit/DataEventAudit.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/audit/EventAudit.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/audit/StateEventAudit.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/AndJoinEntry.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/Deadline.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java | 2 +- specialpurpose/shark/src/org/ofbiz/shark/requester/AbstractRequester.java | 4 +- specialpurpose/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java | 8 +- specialpurpose/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java | 2 +- specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java | 6 +- specialpurpose/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java | 4 +- specialpurpose/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java | 10 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java | 8 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfAssignmentImpl.java | 2 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java | 8 +- specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java | 2 +- 330 files changed, 1174 insertions(+), 1171 deletions(-)