This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
from ab9b048 Improved: fixes a Javadoc issue
new ddb8f42 Improved: replaces module by MODULE everywhere
new b95fa36 Improved: follow checkstyle conventions in files committed
for CSRF token defense
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/ofbiz/accounting/GlEvents.java | 10 +-
.../accounting/agreement/AgreementServices.java | 4 +-
.../finaccount/FinAccountPaymentServices.java | 88 ++--
.../finaccount/FinAccountProductServices.java | 24 +-
.../accounting/finaccount/FinAccountServices.java | 16 +-
.../ofbiz/accounting/invoice/InvoiceServices.java | 198 ++++-----
.../ofbiz/accounting/invoice/InvoiceWorker.java | 52 +--
.../accounting/ledger/GeneralLedgerServices.java | 4 +-
.../accounting/payment/BillingAccountWorker.java | 6 +-
.../payment/GiftCertificateServices.java | 100 ++---
.../accounting/payment/PaymentGatewayServices.java | 322 +++++++--------
.../accounting/payment/PaymentMethodServices.java | 52 +--
.../ofbiz/accounting/payment/PaymentWorker.java | 18 +-
.../ofbiz/accounting/period/PeriodServices.java | 2 +-
.../ofbiz/accounting/tax/TaxAuthorityServices.java | 26 +-
.../authorizedotnet/AIMPaymentServices.java | 66 +--
.../clearcommerce/CCPaymentServices.java | 20 +-
.../thirdparty/clearcommerce/CCServicesTest.java | 26 +-
.../thirdparty/cybersource/IcsPaymentServices.java | 54 +--
.../accounting/thirdparty/eway/EwayServices.java | 8 +-
.../thirdparty/eway/GatewayConnector.java | 4 +-
.../accounting/thirdparty/eway/GatewayRequest.java | 4 +-
.../thirdparty/eway/GatewayResponse.java | 4 +-
.../thirdparty/gosoftware/PcChargeApi.java | 6 +-
.../thirdparty/gosoftware/PcChargeServices.java | 22 +-
.../accounting/thirdparty/gosoftware/RitaApi.java | 12 +-
.../thirdparty/gosoftware/RitaServices.java | 30 +-
.../thirdparty/orbital/OrbitalPaymentServices.java | 66 +--
.../accounting/thirdparty/paypal/PayPalEvents.java | 64 +--
.../thirdparty/paypal/PayPalServices.java | 80 ++--
.../thirdparty/sagepay/SagePayPaymentServices.java | 104 ++---
.../thirdparty/sagepay/SagePayServices.java | 60 +--
.../accounting/thirdparty/sagepay/SagePayUtil.java | 6 +-
.../securepay/SecurePayPaymentServices.java | 6 +-
.../thirdparty/securepay/SecurePayServiceTest.java | 34 +-
.../thirdparty/valuelink/ValueLinkApi.java | 122 +++---
.../thirdparty/valuelink/ValueLinkServices.java | 98 ++---
.../accounting/thirdparty/verisign/PayflowPro.java | 72 ++--
.../thirdparty/worldpay/WorldPayEvents.java | 56 +--
.../ofbiz/accounting/util/UtilAccounting.java | 2 +-
.../ofbiz/content/ContentManagementEvents.java | 22 +-
.../ofbiz/content/ContentManagementServices.java | 130 +++---
.../ofbiz/content/ContentManagementWorker.java | 8 +-
.../java/org/apache/ofbiz/content/ConvertTree.java | 8 +-
.../apache/ofbiz/content/blog/BlogRssServices.java | 10 +-
.../org/apache/ofbiz/content/cms/CmsEvents.java | 38 +-
.../ofbiz/content/compdoc/CompDocEvents.java | 16 +-
.../ofbiz/content/compdoc/CompDocServices.java | 26 +-
.../ofbiz/content/content/ContentEvents.java | 14 +-
.../ofbiz/content/content/ContentKeywordIndex.java | 8 +-
.../ofbiz/content/content/ContentMapFacade.java | 74 ++--
.../content/content/ContentPermissionServices.java | 4 +-
.../ofbiz/content/content/ContentSearch.java | 22 +-
.../ofbiz/content/content/ContentSearchEvents.java | 2 +-
.../content/content/ContentSearchSession.java | 8 +-
.../ofbiz/content/content/ContentServices.java | 24 +-
.../content/content/ContentServicesComplex.java | 4 +-
.../ofbiz/content/content/ContentUrlFilter.java | 8 +-
.../ofbiz/content/content/ContentWorker.java | 38 +-
.../ofbiz/content/content/PermissionRecorder.java | 4 +-
.../content/content/UploadContentAndImage.java | 50 +--
.../org/apache/ofbiz/content/data/DataEvents.java | 48 +--
.../ofbiz/content/data/DataResourceWorker.java | 22 +-
.../apache/ofbiz/content/data/DataServices.java | 72 ++--
.../org/apache/ofbiz/content/ftp/FtpServices.java | 14 +-
.../apache/ofbiz/content/ftp/SecureFtpClient.java | 2 +-
.../apache/ofbiz/content/ftp/SimpleFtpClient.java | 6 +-
.../org/apache/ofbiz/content/ftp/SshFtpClient.java | 2 +-
.../apache/ofbiz/content/layout/LayoutEvents.java | 30 +-
.../apache/ofbiz/content/layout/LayoutWorker.java | 2 +-
.../ofbiz/content/output/OutputServices.java | 14 +-
.../ofbiz/content/survey/PdfSurveyServices.java | 32 +-
.../apache/ofbiz/content/survey/SurveyEvents.java | 6 +-
.../apache/ofbiz/content/survey/SurveyWrapper.java | 34 +-
.../content/view/SimpleContentViewHandler.java | 20 +-
.../webapp/ftl/CheckPermissionTransform.java | 2 +-
.../ftl/EditRenderSubContentCacheTransform.java | 6 +-
.../webapp/ftl/EditRenderSubContentTransform.java | 6 +-
.../webapp/ftl/InjectNodeTrailCsvTransform.java | 12 +-
.../ftl/LimitedSubContentCacheTransform.java | 2 +-
.../webapp/ftl/LoopSubContentTransform.java | 4 +-
.../webapp/ftl/OfbizContentAltUrlTransforms.java | 4 +-
.../webapp/ftl/RenderContentAndSubContent.java | 10 +-
.../content/webapp/ftl/RenderContentAsText.java | 20 +-
.../content/webapp/ftl/RenderContentTransform.java | 4 +-
.../content/webapp/ftl/RenderSubContentAsText.java | 16 +-
.../webapp/ftl/RenderSubContentCacheTransform.java | 12 +-
.../webapp/ftl/RenderSubContentTransform.java | 4 +-
.../ftl/TraverseSubContentCacheTransform.java | 2 +-
.../webapp/ftl/TraverseSubContentTransform.java | 6 +-
.../webapp/ftl/WrapSubContentCacheTransform.java | 6 +-
.../org/apache/ofbiz/humanres/HumanResEvents.java | 12 +-
.../apache/ofbiz/manufacturing/bom/BOMHelper.java | 10 +-
.../apache/ofbiz/manufacturing/bom/BOMNode.java | 22 +-
.../ofbiz/manufacturing/bom/BOMServices.java | 10 +-
.../manufacturing/jobshopmgt/ProductionRun.java | 18 +-
.../jobshopmgt/ProductionRunEvents.java | 10 +-
.../jobshopmgt/ProductionRunHelper.java | 4 +-
.../jobshopmgt/ProductionRunServices.java | 182 ++++----
.../mrp/InventoryEventPlannedServices.java | 4 +-
.../ofbiz/manufacturing/mrp/MrpServices.java | 26 +-
.../ofbiz/manufacturing/mrp/ProposedOrder.java | 26 +-
.../manufacturing/routing/RoutingServices.java | 2 +-
.../manufacturing/techdata/TechDataServices.java | 22 +-
.../marketing/marketing/MarketingServices.java | 6 +-
.../ofbiz/marketing/report/ReportHelper.java | 2 +-
.../marketing/tracking/TrackingCodeEvents.java | 60 +--
.../java/org/apache/ofbiz/sfa/vcard/VCard.java | 8 +-
.../org/apache/ofbiz/order/OrderManagerEvents.java | 32 +-
.../ofbiz/order/finaccount/FinAccountHelper.java | 12 +-
.../ofbiz/order/order/OrderChangeHelper.java | 38 +-
.../ofbiz/order/order/OrderContentWrapper.java | 4 +-
.../org/apache/ofbiz/order/order/OrderEvents.java | 8 +-
.../apache/ofbiz/order/order/OrderListState.java | 4 +-
.../ofbiz/order/order/OrderLookupServices.java | 16 +-
.../apache/ofbiz/order/order/OrderReadHelper.java | 184 ++++-----
.../ofbiz/order/order/OrderReturnServices.java | 240 +++++------
.../apache/ofbiz/order/order/OrderServices.java | 458 ++++++++++-----------
.../apache/ofbiz/order/quote/QuoteServices.java | 12 +-
.../order/requirement/RequirementServices.java | 22 +-
.../order/shoppingcart/CartEventListener.java | 16 +-
.../ofbiz/order/shoppingcart/CheckOutEvents.java | 42 +-
.../ofbiz/order/shoppingcart/CheckOutHelper.java | 104 ++---
.../ofbiz/order/shoppingcart/ShoppingCart.java | 128 +++---
.../order/shoppingcart/ShoppingCartEvents.java | 102 ++---
.../order/shoppingcart/ShoppingCartHelper.java | 36 +-
.../ofbiz/order/shoppingcart/ShoppingCartItem.java | 82 ++--
.../order/shoppingcart/ShoppingCartServices.java | 78 ++--
.../shoppingcart/product/ProductDisplayWorker.java | 6 +-
.../shoppingcart/product/ProductPromoWorker.java | 86 ++--
.../product/ProductStoreCartAwareEvents.java | 4 +-
.../shipping/ShippingEstimateWrapper.java | 6 +-
.../shoppingcart/shipping/ShippingEvents.java | 20 +-
.../order/shoppinglist/ShoppingListEvents.java | 44 +-
.../order/shoppinglist/ShoppingListServices.java | 66 +--
.../org/apache/ofbiz/order/task/TaskEvents.java | 12 +-
.../org/apache/ofbiz/order/task/TaskWorker.java | 4 +-
.../apache/ofbiz/order/test/FinAccountTest.java | 4 +-
.../org/apache/ofbiz/order/test/OrderTest.java | 8 +-
.../apache/ofbiz/order/test/OrderTestServices.java | 20 +-
.../apache/ofbiz/order/test/PurchaseOrderTest.java | 4 +-
.../apache/ofbiz/order/test/SalesOrderTest.java | 4 +-
.../thirdparty/paypal/ExpressCheckoutEvents.java | 20 +-
.../order/thirdparty/taxware/TaxwareServices.java | 4 +-
.../ofbiz/order/thirdparty/taxware/TaxwareUTL.java | 30 +-
.../thirdparty/zipsales/ZipSalesServices.java | 34 +-
.../communication/CommunicationEventServices.java | 130 +++---
.../apache/ofbiz/party/contact/ContactHelper.java | 4 +-
.../ofbiz/party/contact/ContactMechServices.java | 48 +--
.../ofbiz/party/contact/ContactMechWorker.java | 76 ++--
.../ofbiz/party/content/PartyContentWrapper.java | 14 +-
.../org/apache/ofbiz/party/party/PartyHelper.java | 8 +-
.../ofbiz/party/party/PartyRelationshipHelper.java | 4 +-
.../party/party/PartyRelationshipServices.java | 10 +-
.../apache/ofbiz/party/party/PartyServices.java | 140 +++----
.../apache/ofbiz/party/party/PartyTypeHelper.java | 4 +-
.../org/apache/ofbiz/party/party/PartyWorker.java | 38 +-
.../apache/ofbiz/party/party/UpgradeServices.java | 4 +-
.../ofbiz/product/catalog/CatalogWorker.java | 18 +-
.../product/category/CatalogUrlDirective.java | 2 +-
.../ofbiz/product/category/CatalogUrlFilter.java | 16 +-
.../product/category/CatalogUrlSeoFilter.java | 2 +-
.../ofbiz/product/category/CatalogUrlServlet.java | 4 +-
.../product/category/CategoryContentWrapper.java | 6 +-
.../ofbiz/product/category/CategoryServices.java | 22 +-
.../ofbiz/product/category/CategoryWorker.java | 24 +-
.../ofbiz/product/category/ControlServlet.java | 2 +-
.../product/category/SeoCatalogUrlServlet.java | 4 +-
.../ofbiz/product/category/SeoConfigUtil.java | 62 +--
.../product/category/SeoContentUrlFilter.java | 6 +-
.../ofbiz/product/category/SeoControlServlet.java | 2 +-
.../category/ftl/CatalogAltUrlSeoTransform.java | 47 ++-
.../category/ftl/CatalogUrlSeoTransform.java | 117 ++++--
.../category/ftl/OfbizCatalogAltUrlTransform.java | 2 +-
.../category/ftl/OfbizCatalogUrlTransform.java | 2 +-
.../ofbiz/product/category/ftl/SeoTransform.java | 4 +-
.../product/category/ftl/UrlRegexpTransform.java | 34 +-
.../config/ProductConfigItemContentWrapper.java | 4 +-
.../ofbiz/product/config/ProductConfigWorker.java | 28 +-
.../ofbiz/product/config/ProductConfigWrapper.java | 4 +-
.../ofbiz/product/feature/ParametricSearch.java | 8 +-
.../product/feature/ProductFeatureServices.java | 16 +-
.../org/apache/ofbiz/product/image/ScaleImage.java | 32 +-
.../ofbiz/product/imagemanagement/CropImage.java | 14 +-
.../ofbiz/product/imagemanagement/FrameImage.java | 24 +-
.../imagemanagement/ImageManagementHelper.java | 4 +-
.../imagemanagement/ImageManagementServices.java | 92 ++---
.../product/imagemanagement/ImageUrlServlet.java | 6 +-
.../product/imagemanagement/ReplaceImage.java | 10 +-
.../ofbiz/product/imagemanagement/RotateImage.java | 14 +-
.../ofbiz/product/inventory/InventoryServices.java | 66 +--
.../ofbiz/product/inventory/InventoryWorker.java | 6 +-
.../ofbiz/product/migrate/MigrationServices.java | 6 +-
.../apache/ofbiz/product/price/PriceServices.java | 80 ++--
.../apache/ofbiz/product/product/KeywordIndex.java | 14 +-
.../product/product/ProductContentWrapper.java | 8 +-
.../ofbiz/product/product/ProductEvents.java | 60 +--
.../product/ProductPromoContentWrapper.java | 6 +-
.../ofbiz/product/product/ProductSearch.java | 38 +-
.../ofbiz/product/product/ProductSearchEvents.java | 30 +-
.../product/product/ProductSearchSession.java | 32 +-
.../ofbiz/product/product/ProductServices.java | 128 +++---
.../ofbiz/product/product/ProductUtilServices.java | 84 ++--
.../ofbiz/product/product/ProductWorker.java | 72 ++--
.../ofbiz/product/product/VariantEvents.java | 6 +-
.../apache/ofbiz/product/promo/PromoServices.java | 18 +-
.../spreadsheetimport/ImportProductHelper.java | 4 +-
.../spreadsheetimport/ImportProductServices.java | 10 +-
.../ofbiz/product/store/ProductStoreEvents.java | 4 +-
.../product/store/ProductStoreSurveyWrapper.java | 2 +-
.../ofbiz/product/store/ProductStoreWorker.java | 58 +--
.../product/subscription/SubscriptionServices.java | 26 +-
.../product/supplier/SupplierProductServices.java | 6 +-
.../ofbiz/shipment/packing/PackingServices.java | 14 +-
.../ofbiz/shipment/packing/PackingSession.java | 36 +-
.../ofbiz/shipment/packing/PackingSessionLine.java | 10 +-
.../ofbiz/shipment/picklist/PickListServices.java | 10 +-
.../ofbiz/shipment/shipment/ShipmentEvents.java | 8 +-
.../ofbiz/shipment/shipment/ShipmentServices.java | 68 +--
.../ofbiz/shipment/shipment/ShipmentWorker.java | 16 +-
.../ofbiz/shipment/thirdparty/dhl/DhlServices.java | 84 ++--
.../shipment/thirdparty/fedex/FedexServices.java | 66 +--
.../ofbiz/shipment/thirdparty/ups/UpsServices.java | 216 +++++-----
.../thirdparty/usps/UspsMockApiServlet.java | 10 +-
.../shipment/thirdparty/usps/UspsServices.java | 72 ++--
.../thirdparty/usps/UspsServicesTests.java | 46 +--
.../ofbiz/shipment/verify/VerifyPickSession.java | 6 +-
.../weightPackage/WeightPackageSession.java | 8 +-
.../securityext/cert/CertificateServices.java | 2 +-
.../ofbiz/securityext/login/LoginEvents.java | 14 +-
.../content/WorkEffortContentWrapper.java | 18 +-
.../ofbiz/workeffort/workeffort/ICalConverter.java | 38 +-
.../workeffort/workeffort/ICalHandlerFactory.java | 18 +-
.../ofbiz/workeffort/workeffort/ICalWorker.java | 26 +-
.../workeffort/WorkEffortKeywordIndex.java | 12 +-
.../WorkEffortPartyAssignmentServices.java | 20 +-
.../workeffort/workeffort/WorkEffortSearch.java | 28 +-
.../workeffort/WorkEffortSearchEvents.java | 2 +-
.../workeffort/WorkEffortSearchSession.java | 8 +-
.../workeffort/workeffort/WorkEffortServices.java | 54 +--
.../workeffort/workeffort/WorkEffortWorker.java | 4 +-
build.gradle | 8 +-
config/checkstyle/checkstyle.xml | 2 +-
.../ofbiz/base/component/ComponentConfig.java | 8 +-
.../base/component/ComponentLoaderConfig.java | 4 +-
.../base/component/ComponentResourceHandler.java | 4 +-
.../ofbiz/base/concurrent/ExecutionPool.java | 6 +-
.../apache/ofbiz/base/config/JNDIConfigUtil.java | 4 +-
.../ofbiz/base/config/MainResourceHandler.java | 4 +-
.../apache/ofbiz/base/config/ResourceLoader.java | 4 +-
.../ofbiz/base/container/ComponentContainer.java | 16 +-
.../ofbiz/base/container/ContainerLoader.java | 22 +-
.../base/container/NamingServiceContainer.java | 2 +-
.../apache/ofbiz/base/conversion/Converters.java | 12 +-
.../ofbiz/base/conversion/NetConverters.java | 2 +-
.../apache/ofbiz/base/crypto/BlowFishCrypt.java | 10 +-
.../org/apache/ofbiz/base/crypto/DesCrypt.java | 2 +-
.../org/apache/ofbiz/base/crypto/HashCrypt.java | 6 +-
.../java/org/apache/ofbiz/base/crypto/Main.java | 10 +-
.../base/location/ComponentLocationResolver.java | 4 +-
.../ofbiz/base/location/FlexibleLocation.java | 4 +-
.../apache/ofbiz/base/util/AliasKeyManager.java | 8 +-
.../java/org/apache/ofbiz/base/util/Debug.java | 182 ++++----
.../java/org/apache/ofbiz/base/util/FileUtil.java | 16 +-
.../org/apache/ofbiz/base/util/GroovyUtil.java | 14 +-
.../org/apache/ofbiz/base/util/HttpClient.java | 34 +-
.../ofbiz/base/util/HttpRequestFileUpload.java | 18 +-
.../apache/ofbiz/base/util/JNDIContextFactory.java | 4 +-
.../org/apache/ofbiz/base/util/KeyStoreUtil.java | 6 +-
.../org/apache/ofbiz/base/util/MessageString.java | 2 +-
.../apache/ofbiz/base/util/MultiTrustManager.java | 12 +-
.../org/apache/ofbiz/base/util/ObjectType.java | 28 +-
.../org/apache/ofbiz/base/util/PatternFactory.java | 4 +-
.../apache/ofbiz/base/util/ReferenceCleaner.java | 2 +-
.../java/org/apache/ofbiz/base/util/SSLUtil.java | 24 +-
.../org/apache/ofbiz/base/util/ScriptUtil.java | 44 +-
.../org/apache/ofbiz/base/util/StringUtil.java | 6 +-
.../org/apache/ofbiz/base/util/TimeDuration.java | 4 +-
.../org/apache/ofbiz/base/util/URLConnector.java | 6 +-
.../java/org/apache/ofbiz/base/util/UtilCodec.java | 18 +-
.../org/apache/ofbiz/base/util/UtilDateTime.java | 4 +-
.../org/apache/ofbiz/base/util/UtilFormatOut.java | 8 +-
.../org/apache/ofbiz/base/util/UtilGenerics.java | 2 +-
.../java/org/apache/ofbiz/base/util/UtilHttp.java | 46 +--
.../java/org/apache/ofbiz/base/util/UtilIO.java | 4 +-
.../org/apache/ofbiz/base/util/UtilJavaParse.java | 6 +-
.../java/org/apache/ofbiz/base/util/UtilMisc.java | 22 +-
.../org/apache/ofbiz/base/util/UtilNumber.java | 12 +-
.../org/apache/ofbiz/base/util/UtilObject.java | 6 +-
.../java/org/apache/ofbiz/base/util/UtilPlist.java | 2 +-
.../org/apache/ofbiz/base/util/UtilProperties.java | 38 +-
.../java/org/apache/ofbiz/base/util/UtilTimer.java | 22 +-
.../java/org/apache/ofbiz/base/util/UtilURL.java | 8 +-
.../org/apache/ofbiz/base/util/UtilValidate.java | 4 +-
.../java/org/apache/ofbiz/base/util/UtilXml.java | 48 +--
.../ofbiz/base/util/cache/CacheSoftReference.java | 4 +-
.../apache/ofbiz/base/util/cache/UtilCache.java | 14 +-
.../base/util/collections/FlexibleMapAccessor.java | 12 +-
.../ofbiz/base/util/collections/MapComparator.java | 4 +-
.../ofbiz/base/util/collections/MapContext.java | 2 +-
.../ofbiz/base/util/collections/MapStack.java | 4 +-
.../util/collections/MultivaluedMapContext.java | 2 +-
.../util/collections/ResourceBundleMapWrapper.java | 6 +-
.../base/util/string/FlexibleStringExpander.java | 22 +-
.../ofbiz/base/util/string/JuelConnector.java | 10 +-
.../ofbiz/base/util/string/NodeELResolver.java | 6 +-
.../ofbiz/base/util/string/UelFunctions.java | 24 +-
.../org/apache/ofbiz/base/util/string/UelUtil.java | 18 +-
.../ofbiz/base/util/template/XslTransform.java | 6 +-
.../catalina/container/CatalinaContainer.java | 26 +-
.../container/CrossSubdomainSessionValve.java | 8 +-
.../ofbiz/catalina/container/OFBizRealm.java | 4 +-
.../org/apache/ofbiz/common/CdyneServices.java | 6 +-
.../java/org/apache/ofbiz/common/CommonEvents.java | 71 ++--
.../org/apache/ofbiz/common/CommonServices.java | 52 +--
.../org/apache/ofbiz/common/CommonWorkers.java | 10 +-
.../java/org/apache/ofbiz/common/FindServices.java | 8 +-
.../java/org/apache/ofbiz/common/FtpServices.java | 42 +-
.../ofbiz/common/JsLanguageFileMappingCreator.java | 4 +-
.../org/apache/ofbiz/common/KeywordSearchUtil.java | 6 +-
.../org/apache/ofbiz/common/UrlServletHelper.java | 10 +-
.../ofbiz/common/authentication/AuthHelper.java | 6 +-
.../example/TestFailAuthenticator.java | 16 +-
.../example/TestPassAuthenticator.java | 4 +-
.../apache/ofbiz/common/email/EmailServices.java | 50 +--
.../ofbiz/common/email/NotificationServices.java | 16 +-
.../org/apache/ofbiz/common/geo/GeoWorker.java | 14 +-
.../apache/ofbiz/common/image/ImageTransform.java | 26 +-
.../common/login/LdapAuthenticationServices.java | 30 +-
.../apache/ofbiz/common/login/LoginServices.java | 70 ++--
.../apache/ofbiz/common/period/PeriodWorker.java | 2 +-
.../common/preferences/PreferenceServices.java | 14 +-
.../ofbiz/common/preferences/PreferenceWorker.java | 2 +-
.../apache/ofbiz/common/qrcode/QRCodeEvents.java | 14 +-
.../apache/ofbiz/common/qrcode/QRCodeServices.java | 8 +-
.../ofbiz/common/scripting/ContextHelper.java | 2 +-
.../ofbiz/common/scripting/ScriptHelperImpl.java | 22 +-
.../apache/ofbiz/common/status/StatusServices.java | 6 +-
.../apache/ofbiz/common/status/StatusWorker.java | 10 +-
.../ofbiz/common/telecom/TelecomServices.java | 10 +-
.../apache/ofbiz/common/test/PerformFindTests.java | 4 +-
.../org/apache/ofbiz/common/uom/UomWorker.java | 6 +-
.../java/org/apache/ofbiz/datafile/DataFile.java | 4 +-
.../apache/ofbiz/datafile/DataFile2EntityXml.java | 6 +-
.../apache/ofbiz/datafile/ModelDataFileReader.java | 18 +-
.../org/apache/ofbiz/datafile/RecordIterator.java | 2 +-
.../org/apache/ofbiz/entity/DelegatorFactory.java | 6 +-
.../apache/ofbiz/entity/DelegatorFactoryImpl.java | 6 +-
.../org/apache/ofbiz/entity/GenericDelegator.java | 106 ++---
.../org/apache/ofbiz/entity/GenericEntity.java | 28 +-
.../entity/cache/AbstractEntityConditionCache.java | 6 +-
.../java/org/apache/ofbiz/entity/cache/Cache.java | 6 +-
.../org/apache/ofbiz/entity/cache/EntityCache.java | 8 +-
.../apache/ofbiz/entity/cache/EntityListCache.java | 4 +-
.../ofbiz/entity/cache/EntityObjectCache.java | 2 +-
.../entity/condition/EntityComparisonOperator.java | 6 +-
.../entity/condition/EntityConditionBuilder.java | 2 +-
.../entity/condition/EntityConditionListBase.java | 2 +-
.../entity/condition/EntityConditionSubSelect.java | 4 +-
.../apache/ofbiz/entity/condition/EntityExpr.java | 18 +-
.../ofbiz/entity/condition/EntityFieldValue.java | 2 +-
.../apache/ofbiz/entity/condition/OrderByItem.java | 2 +-
.../ofbiz/entity/config/model/EntityConfig.java | 4 +-
.../entity/connection/DBCPConnectionFactory.java | 4 +-
.../entity/connection/DebugManagedDataSource.java | 6 +-
.../apache/ofbiz/entity/datasource/GenericDAO.java | 42 +-
.../ofbiz/entity/datasource/GenericHelperDAO.java | 6 +-
.../entity/datasource/GenericHelperFactory.java | 10 +-
.../ofbiz/entity/datasource/ReadOnlyHelperDAO.java | 2 +-
.../apache/ofbiz/entity/finder/ByAndFinder.java | 2 +-
.../ofbiz/entity/finder/ByConditionFinder.java | 2 +-
.../ofbiz/entity/finder/EntityFinderUtil.java | 18 +-
.../org/apache/ofbiz/entity/finder/ListFinder.java | 12 +-
.../ofbiz/entity/finder/PrimaryKeyFinder.java | 6 +-
.../ofbiz/entity/jdbc/ConnectionFactoryLoader.java | 8 +-
.../apache/ofbiz/entity/jdbc/CursorConnection.java | 6 +-
.../apache/ofbiz/entity/jdbc/CursorResultSet.java | 6 +-
.../apache/ofbiz/entity/jdbc/CursorStatement.java | 6 +-
.../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 430 +++++++++----------
.../apache/ofbiz/entity/jdbc/JdbcValueHandler.java | 8 +-
.../org/apache/ofbiz/entity/jdbc/SQLProcessor.java | 86 ++--
.../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java | 22 +-
.../ofbiz/entity/model/DynamicViewEntity.java | 2 +-
.../org/apache/ofbiz/entity/model/ModelEntity.java | 20 +-
.../ofbiz/entity/model/ModelEntityChecker.java | 6 +-
.../org/apache/ofbiz/entity/model/ModelField.java | 2 +-
.../apache/ofbiz/entity/model/ModelFieldType.java | 2 +-
.../ofbiz/entity/model/ModelFieldTypeReader.java | 8 +-
.../ofbiz/entity/model/ModelGroupReader.java | 14 +-
.../org/apache/ofbiz/entity/model/ModelReader.java | 30 +-
.../org/apache/ofbiz/entity/model/ModelUtil.java | 6 +-
.../apache/ofbiz/entity/model/ModelViewEntity.java | 44 +-
.../ofbiz/entity/serialize/XmlSerializer.java | 6 +-
.../apache/ofbiz/entity/test/EntityTestSuite.java | 58 +--
.../ofbiz/entity/test/EntityUtilTestSuite.java | 2 +-
.../ofbiz/entity/transaction/DebugXaResource.java | 10 +-
.../entity/transaction/DumbTransactionFactory.java | 4 +-
.../entity/transaction/GenericXaResource.java | 10 +-
.../transaction/GeronimoTransactionFactory.java | 6 +-
.../entity/transaction/JNDITransactionFactory.java | 30 +-
.../transaction/TransactionFactoryLoader.java | 8 +-
.../ofbiz/entity/transaction/TransactionUtil.java | 88 ++--
.../org/apache/ofbiz/entity/util/EntityCrypto.java | 8 +-
.../apache/ofbiz/entity/util/EntityDataAssert.java | 10 +-
.../apache/ofbiz/entity/util/EntityDataLoader.java | 24 +-
.../ofbiz/entity/util/EntityListIterator.java | 12 +-
.../org/apache/ofbiz/entity/util/EntityQuery.java | 4 +-
.../apache/ofbiz/entity/util/EntitySaxReader.java | 42 +-
.../apache/ofbiz/entity/util/EntityTypeUtil.java | 8 +-
.../org/apache/ofbiz/entity/util/EntityUtil.java | 4 +-
.../ofbiz/entity/util/EntityUtilProperties.java | 20 +-
.../org/apache/ofbiz/entity/util/SequenceUtil.java | 26 +-
.../apache/ofbiz/entityext/EntityGroupUtil.java | 4 +-
.../ofbiz/entityext/EntityServiceFactory.java | 2 +-
.../ofbiz/entityext/EntityWatchServices.java | 12 +-
.../ofbiz/entityext/cache/EntityCacheServices.java | 58 +--
.../entityext/data/EntityDataLoadContainer.java | 46 +--
.../ofbiz/entityext/data/EntityDataServices.java | 76 ++--
.../ofbiz/entityext/data/UpgradeServices.java | 8 +-
.../ofbiz/entityext/eca/DelegatorEcaHandler.java | 8 +-
.../ofbiz/entityext/eca/EntityEcaAction.java | 10 +-
.../ofbiz/entityext/eca/EntityEcaCondition.java | 10 +-
.../apache/ofbiz/entityext/eca/EntityEcaRule.java | 14 +-
.../ofbiz/entityext/eca/EntityEcaSetField.java | 4 +-
.../apache/ofbiz/entityext/eca/EntityEcaUtil.java | 18 +-
.../permission/EntityPermissionChecker.java | 38 +-
.../synchronization/EntitySyncContext.java | 56 +--
.../synchronization/EntitySyncServices.java | 54 +--
.../org/apache/ofbiz/minilang/MiniLangElement.java | 4 +-
.../org/apache/ofbiz/minilang/MiniLangUtil.java | 8 +-
.../apache/ofbiz/minilang/MiniLangValidate.java | 4 +-
.../org/apache/ofbiz/minilang/SimpleMethod.java | 10 +-
.../minilang/method/callops/CallClassMethod.java | 2 +-
.../minilang/method/callops/CallObjectMethod.java | 2 +-
.../ofbiz/minilang/method/callops/CallScript.java | 2 +-
.../minilang/method/callops/CallServiceAsynch.java | 4 +-
.../minilang/method/callops/CallSimpleMethod.java | 10 +-
.../minilang/method/callops/SetServiceFields.java | 4 +-
.../method/conditional/ConditionalFactory.java | 4 +-
.../method/conditional/EmptyCondition.java | 2 +-
.../method/conditional/RegexpCondition.java | 8 +-
.../conditional/ValidateMethodCondition.java | 2 +-
.../minilang/method/entityops/CreateValue.java | 6 +-
.../ofbiz/minilang/method/entityops/EntityAnd.java | 4 +-
.../minilang/method/entityops/EntityCondition.java | 4 +-
.../minilang/method/entityops/EntityData.java | 6 +-
.../ofbiz/minilang/method/entityops/EntityOne.java | 4 +-
.../ofbiz/minilang/method/entityops/FindByAnd.java | 4 +-
.../method/entityops/FindByPrimaryKey.java | 4 +-
.../minilang/method/entityops/GetRelated.java | 4 +-
.../minilang/method/entityops/GetRelatedOne.java | 4 +-
.../minilang/method/entityops/MakeNextSeqId.java | 2 +-
.../minilang/method/entityops/RefreshValue.java | 4 +-
.../minilang/method/entityops/RemoveByAnd.java | 4 +-
.../minilang/method/entityops/RemoveList.java | 4 +-
.../minilang/method/entityops/RemoveRelated.java | 4 +-
.../minilang/method/entityops/RemoveValue.java | 4 +-
.../ofbiz/minilang/method/entityops/StoreList.java | 4 +-
.../minilang/method/entityops/StoreValue.java | 4 +-
.../method/entityops/TransactionBegin.java | 4 +-
.../method/entityops/TransactionCommit.java | 4 +-
.../method/entityops/TransactionRollback.java | 4 +-
.../ofbiz/minilang/method/envops/Assert.java | 2 +-
.../ofbiz/minilang/method/envops/CheckId.java | 2 +-
.../ofbiz/minilang/method/envops/CreateObject.java | 4 +-
.../ofbiz/minilang/method/envops/Iterate.java | 10 +-
.../ofbiz/minilang/method/envops/IterateMap.java | 10 +-
.../apache/ofbiz/minilang/method/envops/Loop.java | 2 +-
.../ofbiz/minilang/method/envops/SetCalendar.java | 4 +-
.../ofbiz/minilang/method/envops/SetOperation.java | 14 +-
.../ofbiz/minilang/method/otherops/Calculate.java | 2 +-
.../ofbiz/minilang/method/otherops/Trace.java | 2 +-
.../minilang/method/serviceops/FieldToResult.java | 2 +-
.../apache/ofbiz/minilang/operation/Convert.java | 8 +-
.../org/apache/ofbiz/minilang/operation/Copy.java | 4 +-
.../ofbiz/minilang/operation/InFieldOper.java | 6 +-
.../ofbiz/minilang/operation/MakeInString.java | 4 +-
.../ofbiz/minilang/operation/PropertyOper.java | 4 +-
.../apache/ofbiz/minilang/operation/Regexp.java | 4 +-
.../minilang/operation/SimpleMapOperation.java | 6 +-
.../ofbiz/minilang/operation/SimpleMapProcess.java | 4 +-
.../ofbiz/minilang/operation/ValidateMethod.java | 8 +-
.../apache/ofbiz/minilang/test/MiniLangTests.java | 4 +-
.../apache/ofbiz/security/CsrfDefenseStrategy.java | 22 +-
.../java/org/apache/ofbiz/security/CsrfUtil.java | 153 ++++---
.../ofbiz/security/ICsrfDefenseStrategy.java | 5 +-
.../ofbiz/security/NoCsrfDefenseStrategy.java | 4 +-
.../org/apache/ofbiz/security/SecurityFactory.java | 10 +-
.../org/apache/ofbiz/security/SecurityUtil.java | 8 +-
.../org/apache/ofbiz/security/CsrfUtilTests.java | 8 +-
.../org/apache/ofbiz/service/DispatchContext.java | 6 +-
.../ofbiz/service/GeneralServiceException.java | 4 +-
.../ofbiz/service/GenericAbstractDispatcher.java | 26 +-
.../ofbiz/service/GenericDispatcherFactory.java | 2 +-
.../apache/ofbiz/service/GenericResultWaiter.java | 10 +-
.../apache/ofbiz/service/ModelNotification.java | 12 +-
.../java/org/apache/ofbiz/service/ModelParam.java | 6 +-
.../org/apache/ofbiz/service/ModelPermGroup.java | 2 +-
.../org/apache/ofbiz/service/ModelPermission.java | 22 +-
.../org/apache/ofbiz/service/ModelService.java | 36 +-
.../apache/ofbiz/service/ModelServiceReader.java | 42 +-
.../org/apache/ofbiz/service/ServiceContainer.java | 8 +-
.../apache/ofbiz/service/ServiceDispatcher.java | 94 ++---
.../java/org/apache/ofbiz/service/ServiceUtil.java | 10 +-
.../org/apache/ofbiz/service/ServiceXaWrapper.java | 42 +-
.../ofbiz/service/calendar/RecurrenceInfo.java | 8 +-
.../ofbiz/service/calendar/RecurrenceRule.java | 22 +-
.../service/calendar/TemporalExpressionWorker.java | 4 +-
.../service/calendar/TemporalExpressions.java | 72 ++--
.../ofbiz/service/config/ServiceConfigUtil.java | 4 +-
.../ofbiz/service/config/model/ThreadPool.java | 14 +-
.../apache/ofbiz/service/eca/ServiceEcaAction.java | 4 +-
.../ofbiz/service/eca/ServiceEcaCondition.java | 20 +-
.../apache/ofbiz/service/eca/ServiceEcaRule.java | 14 +-
.../ofbiz/service/eca/ServiceEcaSetField.java | 6 +-
.../apache/ofbiz/service/eca/ServiceEcaUtil.java | 14 +-
.../ofbiz/service/engine/AbstractEngine.java | 6 +-
.../ofbiz/service/engine/EntityAutoEngine.java | 10 +-
.../ofbiz/service/engine/GenericAsyncEngine.java | 4 +-
.../apache/ofbiz/service/engine/GroovyEngine.java | 2 +-
.../apache/ofbiz/service/engine/HttpEngine.java | 16 +-
.../ofbiz/service/engine/SOAPClientEngine.java | 10 +-
.../apache/ofbiz/service/engine/ScriptEngine.java | 4 +-
.../ofbiz/service/engine/SoapSerializer.java | 4 +-
.../ofbiz/service/engine/StandardJavaEngine.java | 8 +-
.../ofbiz/service/engine/XMLRPCClientEngine.java | 6 +-
.../org/apache/ofbiz/service/group/GroupModel.java | 16 +-
.../ofbiz/service/group/GroupServiceModel.java | 6 +-
.../ofbiz/service/group/ServiceGroupReader.java | 12 +-
.../ofbiz/service/jms/AbstractJmsListener.java | 26 +-
.../ofbiz/service/jms/JmsListenerFactory.java | 18 +-
.../apache/ofbiz/service/jms/JmsQueueListener.java | 4 +-
.../apache/ofbiz/service/jms/JmsSerializer.java | 4 +-
.../apache/ofbiz/service/jms/JmsServiceEngine.java | 10 +-
.../apache/ofbiz/service/jms/JmsTopicListener.java | 4 +-
.../org/apache/ofbiz/service/job/AbstractJob.java | 10 +-
.../ofbiz/service/job/GenericServiceJob.java | 10 +-
.../org/apache/ofbiz/service/job/JobManager.java | 34 +-
.../org/apache/ofbiz/service/job/JobPoller.java | 26 +-
.../org/apache/ofbiz/service/job/JobServices.java | 14 +-
.../java/org/apache/ofbiz/service/job/JobUtil.java | 10 +-
.../ofbiz/service/job/PersistedServiceJob.java | 46 +--
.../org/apache/ofbiz/service/job/PurgeJob.java | 2 +-
.../ofbiz/service/mail/JavaMailContainer.java | 36 +-
.../ofbiz/service/mail/MimeMessageWrapper.java | 62 +--
.../ofbiz/service/mail/ServiceMcaAction.java | 6 +-
.../ofbiz/service/mail/ServiceMcaCondition.java | 14 +-
.../apache/ofbiz/service/mail/ServiceMcaRule.java | 4 +-
.../apache/ofbiz/service/mail/ServiceMcaUtil.java | 8 +-
.../ofbiz/service/rmi/ExampleRemoteClient.java | 4 +-
.../ofbiz/service/rmi/RemoteDispatcherImpl.java | 4 +-
.../ofbiz/service/rmi/RmiServiceContainer.java | 2 +-
.../rmi/socket/ssl/SSLClientSocketFactory.java | 4 +-
.../rmi/socket/ssl/SSLServerSocketFactory.java | 6 +-
.../ofbiz/service/test/AbstractXmlRpcTestCase.java | 2 +-
.../test/ServiceEngineTestPermissionServices.java | 2 +-
.../service/test/ServiceEngineTestServices.java | 64 +--
.../ofbiz/service/test/ServiceSOAPTests.java | 2 +-
.../org/apache/ofbiz/service/test/XmlRpcTests.java | 2 +-
.../apache/ofbiz/service/xmlrpc/XmlRpcClient.java | 4 +-
.../ofbiz/base/start/StartupControlPanel.java | 2 +-
.../ofbiz/testtools/EntityXmlAssertTest.java | 4 +-
.../apache/ofbiz/testtools/JunitSuiteWrapper.java | 4 +-
.../org/apache/ofbiz/testtools/ModelTestSuite.java | 10 +-
.../org/apache/ofbiz/testtools/ServiceTest.java | 2 +-
.../apache/ofbiz/testtools/SimpleMethodTest.java | 2 +-
.../apache/ofbiz/testtools/TestRunContainer.java | 28 +-
.../org/apache/ofbiz/webapp/OfbizUrlBuilder.java | 2 +-
.../java/org/apache/ofbiz/webapp/WebAppUtil.java | 18 +-
.../ofbiz/webapp/control/ConfigXMLReader.java | 104 +++--
.../apache/ofbiz/webapp/control/ContextFilter.java | 6 +-
.../control/ControlActivationEventListener.java | 8 +-
.../ofbiz/webapp/control/ControlEventListener.java | 76 ++--
.../apache/ofbiz/webapp/control/ControlFilter.java | 10 +-
.../webapp/control/ExternalLoginKeysManager.java | 4 +-
.../apache/ofbiz/webapp/control/JWTManager.java | 26 +-
.../ofbiz/webapp/control/LoginEventListener.java | 4 +-
.../apache/ofbiz/webapp/control/LoginWorker.java | 92 ++---
.../ofbiz/webapp/control/ProtectViewWorker.java | 6 +-
.../ofbiz/webapp/control/RequestHandler.java | 118 +++---
.../apache/ofbiz/webapp/control/TokenFilter.java | 4 +-
.../org/apache/ofbiz/webapp/event/CoreEvents.java | 12 +-
.../apache/ofbiz/webapp/event/EventFactory.java | 4 +-
.../webapp/event/FileUploadProgressListener.java | 2 +-
.../ofbiz/webapp/event/GroovyEventHandler.java | 6 +-
.../ofbiz/webapp/event/JavaEventHandler.java | 18 +-
.../ofbiz/webapp/event/RomeEventHandler.java | 2 +-
.../ofbiz/webapp/event/SOAPEventHandler.java | 26 +-
.../ofbiz/webapp/event/ScriptEventHandler.java | 4 +-
.../ofbiz/webapp/event/ServiceEventHandler.java | 14 +-
.../webapp/event/ServiceMultiEventHandler.java | 20 +-
.../ofbiz/webapp/event/SimpleEventHandler.java | 14 +-
.../org/apache/ofbiz/webapp/event/TestEvent.java | 8 +-
.../ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java | 3 +-
.../webapp/ftl/CsrfTokenPairNonAjaxTransform.java | 4 +-
.../ofbiz/webapp/ftl/FreeMarkerViewHandler.java | 2 +-
.../ofbiz/webapp/ftl/OfbizAmountTransform.java | 2 +-
.../ofbiz/webapp/ftl/OfbizContentTransform.java | 6 +-
.../ofbiz/webapp/ftl/OfbizCurrencyTransform.java | 14 +-
.../ofbiz/webapp/ftl/OfbizNumberTransform.java | 10 +-
.../apache/ofbiz/webapp/ftl/OfbizUrlTransform.java | 8 +-
.../webapp/ftl/RenderWrappedTextTransform.java | 4 +-
.../ofbiz/webapp/ftl/SetContextFieldTransform.java | 2 +-
.../webapp/ftl/SetRequestAttributeMethod.java | 2 +-
.../apache/ofbiz/webapp/stats/ServerHitBin.java | 16 +-
.../apache/ofbiz/webapp/stats/VisitHandler.java | 34 +-
.../apache/ofbiz/webapp/taglib/ContentUrlTag.java | 4 +-
.../apache/ofbiz/webapp/view/ApacheFopWorker.java | 10 +-
.../apache/ofbiz/webapp/view/HttpViewHandler.java | 4 +-
.../apache/ofbiz/webapp/view/JspViewHandler.java | 10 +-
.../org/apache/ofbiz/webapp/view/ViewFactory.java | 4 +-
.../apache/ofbiz/webapp/webdav/ResponseHelper.java | 4 +-
.../apache/ofbiz/webapp/webdav/WebDavServlet.java | 6 +-
.../org/apache/ofbiz/webapp/webdav/WebDavUtil.java | 4 +-
.../apache/ofbiz/webapp/website/WebSiteWorker.java | 4 +-
.../org/apache/ofbiz/webtools/GenericWebEvent.java | 42 +-
.../org/apache/ofbiz/webtools/UtilCacheEvents.java | 6 +-
.../apache/ofbiz/webtools/WebToolsServices.java | 28 +-
.../webtools/artifactinfo/ArtifactInfoFactory.java | 36 +-
.../ControllerRequestArtifactInfo.java | 6 +-
.../artifactinfo/ControllerViewArtifactInfo.java | 2 +-
.../artifactinfo/FormWidgetArtifactInfo.java | 8 +-
.../ofbiz/webtools/artifactinfo/RunTestEvents.java | 2 +-
.../artifactinfo/ScreenWidgetArtifactInfo.java | 8 +-
.../webtools/artifactinfo/ServiceArtifactInfo.java | 24 +-
.../ofbiz/webtools/labelmanager/LabelFile.java | 2 +-
.../ofbiz/webtools/labelmanager/LabelInfo.java | 4 +-
.../webtools/labelmanager/LabelManagerFactory.java | 6 +-
.../webtools/labelmanager/LabelReferences.java | 4 +-
.../ofbiz/webtools/labelmanager/LabelValue.java | 2 +-
.../webtools/labelmanager/SaveLabelsToXmlFile.java | 10 +-
.../ofbiz/webtools/print/FoPrintServerEvents.java | 8 +-
.../org/apache/ofbiz/widget/WidgetFactory.java | 14 +-
.../java/org/apache/ofbiz/widget/WidgetWorker.java | 6 +-
.../ofbiz/widget/cache/GenericWidgetOutput.java | 2 +-
.../org/apache/ofbiz/widget/cache/ScreenCache.java | 6 +-
.../ofbiz/widget/cache/WidgetContextCacheKey.java | 10 +-
.../ofbiz/widget/content/WidgetContentWorker.java | 4 +-
.../widget/content/WidgetDataResourceWorker.java | 4 +-
.../ofbiz/widget/model/AbstractModelAction.java | 50 +--
.../ofbiz/widget/model/AbstractModelCondition.java | 28 +-
.../ofbiz/widget/model/CommonWidgetModels.java | 12 +-
.../org/apache/ofbiz/widget/model/FieldInfo.java | 4 +-
.../org/apache/ofbiz/widget/model/FormFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/GridFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/HtmlWidget.java | 4 +-
.../ofbiz/widget/model/IterateSectionWidget.java | 10 +-
.../org/apache/ofbiz/widget/model/MenuFactory.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelForm.java | 22 +-
.../apache/ofbiz/widget/model/ModelFormAction.java | 4 +-
.../apache/ofbiz/widget/model/ModelFormField.java | 54 +--
.../ofbiz/widget/model/ModelFormFieldBuilder.java | 6 +-
.../org/apache/ofbiz/widget/model/ModelGrid.java | 8 +-
.../org/apache/ofbiz/widget/model/ModelMenu.java | 6 +-
.../apache/ofbiz/widget/model/ModelMenuAction.java | 16 +-
.../ofbiz/widget/model/ModelMenuCondition.java | 2 +-
.../apache/ofbiz/widget/model/ModelMenuItem.java | 4 +-
.../org/apache/ofbiz/widget/model/ModelScreen.java | 12 +-
.../ofbiz/widget/model/ModelScreenCondition.java | 2 +-
.../ofbiz/widget/model/ModelScreenWidget.java | 60 +--
.../apache/ofbiz/widget/model/ModelSingleForm.java | 8 +-
.../org/apache/ofbiz/widget/model/ModelTheme.java | 10 +-
.../org/apache/ofbiz/widget/model/ModelTree.java | 16 +-
.../apache/ofbiz/widget/model/ModelTreeAction.java | 12 +-
.../ofbiz/widget/model/ModelTreeCondition.java | 2 +-
.../org/apache/ofbiz/widget/model/ModelWidget.java | 4 +-
.../ofbiz/widget/model/ModelWidgetCondition.java | 26 +-
.../apache/ofbiz/widget/model/ScreenFactory.java | 6 +-
.../apache/ofbiz/widget/model/ThemeFactory.java | 10 +-
.../org/apache/ofbiz/widget/model/TreeFactory.java | 2 +-
.../ofbiz/widget/model/XmlWidgetActionVisitor.java | 2 +-
.../ofbiz/widget/portal/PortalPageWorker.java | 6 +-
.../apache/ofbiz/widget/renderer/FormRenderer.java | 14 +-
.../ofbiz/widget/renderer/MenuWrapTransform.java | 6 +-
.../apache/ofbiz/widget/renderer/Paginator.java | 14 +-
.../ofbiz/widget/renderer/ScreenRenderer.java | 4 +-
.../apache/ofbiz/widget/renderer/UtilHelpText.java | 14 +-
.../apache/ofbiz/widget/renderer/VisualTheme.java | 2 +-
.../ofbiz/widget/renderer/fo/FoFormRenderer.java | 2 +-
.../widget/renderer/fo/ScreenFopViewHandler.java | 10 +-
.../widget/renderer/html/HtmlMenuRenderer.java | 2 +-
.../renderer/html/HtmlMenuRendererImage.java | 2 +-
.../widget/renderer/html/HtmlMenuWrapper.java | 2 +-
.../widget/renderer/html/HtmlMenuWrapperImage.java | 2 +-
.../widget/renderer/html/HtmlTreeRenderer.java | 4 +-
.../widget/renderer/html/HtmlWidgetRenderer.java | 2 +-
.../widget/renderer/macro/MacroFormRenderer.java | 26 +-
.../widget/renderer/macro/MacroMenuRenderer.java | 4 +-
.../widget/renderer/macro/MacroScreenRenderer.java | 40 +-
.../renderer/macro/MacroScreenViewHandler.java | 4 +-
.../widget/renderer/macro/MacroTreeRenderer.java | 4 +-
691 files changed, 7363 insertions(+), 7247 deletions(-)
