Re: svn commit: r1644015 [1/4] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1644015 [1/4] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/...

Adrian Crum-3
It is unfortunate that so much effort is being wasted on the bad
EntityUtilProperties implementation.

If someone would invest a few hours creating a specialized class loader
that finds resources in the entity engine, then all of this client code
would not need to be modified - standard UtilProperties method calls
would still work.


Adrian Crum
Sandglass Software
www.sandglass-software.com

On 12/9/2014 10:09 AM, [hidden email] wrote:

> Author: ashish
> Date: Tue Dec  9 10:09:22 2014
> New Revision: 1644015
>
> URL: http://svn.apache.org/r1644015
> Log:
> Applied patch from jira issue - OFBIZ-5902. Thanks so much Arun for this important contribution.
>
> Modified:
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
>      ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
>      ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
>      ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java
>      ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
>      ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>      ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
>      ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java
>      ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
>      ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
>      ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java
>      ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
>      ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
>      ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
>      ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
>      ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
>      ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
>      ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
>      ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java
>      ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
>      ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy
>      ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy
>      ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
>      ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy
>      ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy
>      ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
>      ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy
>      ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy
>      ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
>      ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
>      ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java
>      ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
>      ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
>      ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
>      ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
>      ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
>      ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java
>      ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java
>      ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java
>      ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
>      ofbiz/trunk/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy
>      ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RemoteDispatcherImpl.java
>      ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
>      ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
>      ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
>      ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
>      ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java
>      ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
>      ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
>      ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
>      ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy
>      ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
>      ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
>      ofbiz/trunk/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java
>      ofbiz/trunk/specialpurpose/lucene/src/org/ofbiz/content/search/ProductDocument.java
>      ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
>      ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
>      ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
>      ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Tue Dec  9 10:09:22 2014
> @@ -57,6 +57,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.product.product.ProductWorker;
>   import org.ofbiz.service.DispatchContext;
> @@ -1098,7 +1099,7 @@ public class InvoiceServices {
>           // Either no orderShipment exists, or there's a null invoicePerShipment in the OrderHeader.
>           // In either case, use the default value from the properties
>           if (invoicePerShipment == null) {
> -            invoicePerShipment = UtilProperties.getPropertyValue("AccountingConfig","create.invoice.per.shipment");
> +            invoicePerShipment = EntityUtilProperties.getPropertyValue("AccountingConfig","create.invoice.per.shipment", delegator);
>           }
>
>           if ("Y".equals(invoicePerShipment)) {
> @@ -2426,7 +2427,7 @@ public class InvoiceServices {
>               context.put("useHighestAmount","Y");
>           }
>
> -        String defaultInvoiceProcessing = UtilProperties.getPropertyValue("AccountingConfig","invoiceProcessing");
> +        String defaultInvoiceProcessing = EntityUtilProperties.getPropertyValue("AccountingConfig","invoiceProcessing", delegator);
>
>           boolean debug = true; // show processing messages in the log..or not....
>
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Tue Dec  9 10:09:22 2014
> @@ -33,7 +33,6 @@ import org.ofbiz.base.util.Debug;
>   import org.ofbiz.base.util.UtilDateTime;
>   import org.ofbiz.base.util.UtilMisc;
>   import org.ofbiz.base.util.UtilNumber;
> -import org.ofbiz.base.util.UtilProperties;
>   import org.ofbiz.base.util.UtilValidate;
>   import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
> @@ -44,6 +43,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>
>   /**
>    * InvoiceWorker - Worker methods of invoices
> @@ -505,7 +505,7 @@ public class InvoiceWorker {
>               if (UtilValidate.isNotEmpty(party) && party.getString("baseCurrencyUomId") != null) {
>                   otherCurrencyUomId = party.getString("baseCurrencyUomId");
>               } else {
> -                otherCurrencyUomId = UtilProperties.getPropertyValue("general", "currency.uom.id.default");
> +                otherCurrencyUomId = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", delegator);
>               }
>               if (otherCurrencyUomId == null) {
>                   otherCurrencyUomId = "USD"; // final default
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Tue Dec  9 10:09:22 2014
> @@ -1005,7 +1005,7 @@ public class GiftCertificateServices {
>           BigDecimal amount = orderItem.getBigDecimal("unitPrice");
>
>           // survey information
> -        String surveyId = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.surveyId");
> +        String surveyId = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.surveyId", delegator);
>
>           // get the survey response
>           GenericValue surveyResponse = null;
> @@ -1050,8 +1050,8 @@ public class GiftCertificateServices {
>               }
>           }
>
> -        String cardNumberKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.cardNumber");
> -        String pinNumberKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.pinNumber");
> +        String cardNumberKey = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.cardNumber", delegator);
> +        String pinNumberKey = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.pinNumber", delegator);
>           String cardNumber = (String) answerMap.get(cardNumberKey);
>           String pinNumber = (String) answerMap.get(pinNumberKey);
>
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Tue Dec  9 10:09:22 2014
> @@ -2838,6 +2838,7 @@ public class PaymentGatewayServices {
>       }
>
>       public static boolean checkAuthValidity(GenericValue orderPaymentPreference, String paymentConfig) {
> +     Delegator delegator = orderPaymentPreference.getDelegator();
>           Timestamp authTime = PaymentGatewayServices.getAuthTime(orderPaymentPreference);
>           if (authTime == null) {
>               return false;
> @@ -2863,20 +2864,20 @@ public class PaymentGatewayServices {
>                   String cardType = creditCard.getString("cardType");
>                   // add more types as necessary -- maybe we should create seed data for credit card types??
>                   if ("CCT_DISCOVER".equals(cardType)) {
> -                    reauthDays = UtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.disc.days", "90");
> +                    reauthDays = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.disc.days", "90", delegator);
>                   } else if ("CCT_AMERICANEXPRESS".equals(cardType)) {
> -                    reauthDays = UtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.amex.days", "30");
> +                    reauthDays = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.amex.days", "30", delegator);
>                   } else if ("CCT_MASTERCARD".equals(cardType)) {
> -                    reauthDays = UtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.mc.days", "30");
> +                    reauthDays = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.mc.days", "30", delegator);
>                   } else if ("CCT_VISA".equals(cardType)) {
> -                    reauthDays = UtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.visa.days", "7");
> +                    reauthDays = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.visa.days", "7", delegator);
>                   } else {
> -                    reauthDays = UtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.other.days", "7");
> +                    reauthDays = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.other.days", "7", delegator);
>                   }
>
>               }
>           } else if (paymentMethod != null && "EXT_PAYPAL".equals(paymentMethod.get("paymentMethodTypeId"))) {
> -            reauthDays = UtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.paypal.days", "3");
> +            reauthDays = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.general.reauth.paypal.days", "3", delegator);
>           }
>
>           if (reauthDays != null) {
> @@ -3316,9 +3317,9 @@ public class PaymentGatewayServices {
>
>           String amount = null;
>           if (mode.equalsIgnoreCase("CREATE")) {
> -            amount = UtilProperties.getPropertyValue(productStorePaymentProperties, "payment.general.cc_create.auth");
> +            amount = EntityUtilProperties.getPropertyValue(productStorePaymentProperties, "payment.general.cc_create.auth", delegator);
>           } else if (mode.equalsIgnoreCase("UPDATE")) {
> -            amount = UtilProperties.getPropertyValue(productStorePaymentProperties, "payment.general.cc_update.auth");
> +            amount = EntityUtilProperties.getPropertyValue(productStorePaymentProperties, "payment.general.cc_update.auth", delegator);
>           }
>           if (Debug.infoOn()) Debug.logInfo("Running credit card verification [" + paymentMethodId + "] (" + amount + ") : " + productStorePaymentProperties + " : " + mode, module);
>
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Tue Dec  9 10:09:22 2014
> @@ -41,6 +41,7 @@ import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ModelService;
>   import org.ofbiz.service.ServiceUtil;
> @@ -802,7 +803,7 @@ public class AIMPaymentServices {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Tue Dec  9 10:09:22 2014
> @@ -39,8 +39,10 @@ import org.ofbiz.base.util.UtilNumber;
>   import org.ofbiz.base.util.UtilProperties;
>   import org.ofbiz.base.util.UtilValidate;
>   import org.ofbiz.base.util.UtilXml;
> +import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
>   import org.w3c.dom.Document;
> @@ -275,7 +277,7 @@ public class CCPaymentServices {
>
>       public static Map<String, Object> ccReport(DispatchContext dctx, Map<String, Object> context) {
>           Locale locale = (Locale) context.get("locale");
> -
> +        Delegator delegator = dctx.getDelegator();
>           // configuration file
>           String paymentConfig = (String) context.get("paymentConfig");
>           if (UtilValidate.isEmpty(paymentConfig)) {
> @@ -299,12 +301,12 @@ public class CCPaymentServices {
>           Element engineDocElement = UtilXml.addChildElement(engineDocListElement, "EngineDoc", requestDocument);
>           UtilXml.addChildElementValue(engineDocElement, "ContentType", "ReportDoc", requestDocument);
>
> -        String sourceId = UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.sourceId");
> +        String sourceId = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.sourceId", delegator);
>           if (UtilValidate.isNotEmpty(sourceId)) {
>               UtilXml.addChildElementValue(engineDocElement, "SourceId", sourceId, requestDocument);
>           }
>
> -        String groupId = UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.groupId");
> +        String groupId = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.groupId", delegator);
>           if (UtilValidate.isNotEmpty(groupId)) {
>               UtilXml.addChildElementValue(engineDocElement, "GroupId", groupId, requestDocument);
>           }
> @@ -315,13 +317,13 @@ public class CCPaymentServices {
>           // EngineDocList.EngineDoc.User
>           Element userElement = UtilXml.addChildElement(engineDocElement, "User", requestDocument);
>           UtilXml.addChildElementValue(userElement, "Name",
> -                UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.username", ""), requestDocument);
> +                EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.username", "", delegator), requestDocument);
>           UtilXml.addChildElementValue(userElement, "Password",
> -                UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.password", ""), requestDocument);
> +                EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.password", "", delegator), requestDocument);
>           UtilXml.addChildElementValue(userElement, "Alias",
> -                UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.alias", ""), requestDocument);
> +                EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.alias", "", delegator), requestDocument);
>
> -        String effectiveAlias = UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.effectiveAlias");
> +        String effectiveAlias = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.effectiveAlias", delegator);
>           if (UtilValidate.isNotEmpty(effectiveAlias)) {
>               UtilXml.addChildElementValue(userElement, "EffectiveAlias", effectiveAlias, requestDocument);
>           }
> @@ -348,7 +350,7 @@ public class CCPaymentServices {
>           // EngineDocList.EngineDoc.ReportDoc.ReportActionList.ReportAction.ValueList
>           Element valueList = UtilXml.addChildElement(action, "ValueList",requestDocument);
>           Element value = UtilXml.addChildElement(valueList, "Value",requestDocument);
> -        String clientIdConfig = UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.clientId");
> +        String clientIdConfig = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.clientId", delegator);
>           if (UtilValidate.isNotEmpty(clientIdConfig)) {
>               Element clientId = UtilXml.addChildElementValue(value,"ClientId", clientIdConfig, requestDocument);
>               clientId.setAttribute("DataType", "S32");
> @@ -668,12 +670,13 @@ public class CCPaymentServices {
>
>           // payment mech
>           GenericValue creditCard = (GenericValue) context.get("creditCard");
> +        Delegator delegator = creditCard.getDelegator();
>
> -        boolean enableCVM = UtilProperties.propertyValueEqualsIgnoreCase(paymentConfig, "payment.clearcommerce.enableCVM", "Y");
> +        boolean enableCVM = EntityUtilProperties.propertyValueEqualsIgnoreCase(paymentConfig, "payment.clearcommerce.enableCVM", "Y", delegator);
>           String cardSecurityCode = enableCVM ? (String) context.get("cardSecurityCode") : null;
>
>           // Default to locale code 840 (United States)
> -        String localCode = UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.localeCode", "840");
> +        String localCode = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.localeCode", "840", delegator);
>
>           appendPaymentMechNode(consumerElement, creditCard, cardSecurityCode, localCode);
>
> @@ -694,7 +697,7 @@ public class CCPaymentServices {
>           }
>
>           // Default to currency code 840 (USD)
> -        String currencyCode = UtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.currencyCode", "840");
> +        String currencyCode = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.clearcommerce.currencyCode", "840", delegator);
>
>           // transaction
>           appendTransactionNode(orderFormDocElement, type, amount, currencyCode);
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Tue Dec  9 10:09:22 2014
> @@ -39,6 +39,7 @@ import org.ofbiz.base.util.string.Flexib
>   import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
>
> @@ -684,7 +685,7 @@ public class IcsPaymentServices {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java Tue Dec  9 10:09:22 2014
> @@ -31,6 +31,7 @@ import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
>
> @@ -280,7 +281,7 @@ public class EwayServices {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, resParamName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, resParamName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java Tue Dec  9 10:09:22 2014
> @@ -49,6 +49,7 @@ import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.transaction.GenericTransactionException;
>   import org.ofbiz.entity.transaction.TransactionUtil;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderChangeHelper;
>   import org.ofbiz.product.store.ProductStoreWorker;
>   import org.ofbiz.service.GenericServiceException;
> @@ -417,7 +418,7 @@ public class IdealEvents {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Tue Dec  9 10:09:22 2014
> @@ -49,6 +49,7 @@ import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.transaction.GenericTransactionException;
>   import org.ofbiz.entity.transaction.TransactionUtil;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderChangeHelper;
>   import org.ofbiz.product.store.ProductStoreWorker;
>   import org.ofbiz.service.GenericServiceException;
> @@ -520,7 +521,7 @@ public class PayPalEvents {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java Tue Dec  9 10:09:22 2014
> @@ -33,6 +33,7 @@ import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
>
> @@ -491,7 +492,7 @@ public class SecurePayPaymentServices {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Tue Dec  9 10:09:22 2014
> @@ -1122,7 +1122,7 @@ public class ValueLinkServices {
>           }
>
>           // survey information
> -        String surveyId = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.surveyId");
> +        String surveyId = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.surveyId", delegator);
>
>           // get the survey response
>           GenericValue surveyResponse = null;
> @@ -1169,11 +1169,11 @@ public class ValueLinkServices {
>           }
>
>           // get the send to email address - key defined in properties file
> -        String sendToKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.sendToEmail");
> +        String sendToKey = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.sendToEmail", delegator);
>           String sendToEmail = (String) answerMap.get(sendToKey);
>           // get the copyMe flag and set the order email address
>           String orderEmails = orh.getOrderEmailString();
> -        String copyMeField = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.copyMe");
> +        String copyMeField = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.purchase.survey.copyMe", delegator);
>           String copyMeResp = copyMeField != null ? (String) answerMap.get(copyMeField) : null;
>           boolean copyMe = (UtilValidate.isNotEmpty(copyMeField)
>                   && UtilValidate.isNotEmpty(copyMeResp) && "true".equalsIgnoreCase(copyMeResp)) ? true : false;
> @@ -1217,7 +1217,7 @@ public class ValueLinkServices {
>               // create the fulfillment record
>               Map<String, Object> vlFulFill = FastMap.newInstance();
>               vlFulFill.put("typeEnumId", "GC_ACTIVATE");
> -            vlFulFill.put("merchantId", UtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId"));
> +            vlFulFill.put("merchantId", EntityUtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId", delegator));
>               vlFulFill.put("partyId", partyId);
>               vlFulFill.put("orderId", orderId);
>               vlFulFill.put("orderItemSeqId", orderItem.get("orderItemSeqId"));
> @@ -1367,7 +1367,7 @@ public class ValueLinkServices {
>           BigDecimal amount = orderItem.getBigDecimal("unitPrice");
>
>           // survey information
> -        String surveyId = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.surveyId");
> +        String surveyId = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.surveyId", delegator);
>
>           // get the survey response
>           GenericValue surveyResponse = null;
> @@ -1413,8 +1413,8 @@ public class ValueLinkServices {
>               }
>           }
>
> -        String cardNumberKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.cardNumber");
> -        String pinNumberKey = UtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.pinNumber");
> +        String cardNumberKey = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.cardNumber", delegator);
> +        String pinNumberKey = EntityUtilProperties.getPropertyValue(paymentConfig, "payment.giftcert.reload.survey.pinNumber", delegator);
>           String cardNumber = (String) answerMap.get(cardNumberKey);
>           String pinNumber = (String) answerMap.get(pinNumberKey);
>
> @@ -1441,7 +1441,7 @@ public class ValueLinkServices {
>           // create the fulfillment record
>           Map<String, Object> vlFulFill = FastMap.newInstance();
>           vlFulFill.put("typeEnumId", "GC_RELOAD");
> -        vlFulFill.put("merchantId", UtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId"));
> +        vlFulFill.put("merchantId", EntityUtilProperties.getPropertyValue(paymentConfig, "payment.valuelink.merchantId", delegator));
>           vlFulFill.put("partyId", partyId);
>           vlFulFill.put("orderId", orderId);
>           vlFulFill.put("orderItemSeqId", orderItem.get("orderItemSeqId"));
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Tue Dec  9 10:09:22 2014
> @@ -40,6 +40,7 @@ import org.ofbiz.base.util.string.Flexib
>   import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.order.shoppingcart.ShoppingCart;
>   import org.ofbiz.order.shoppingcart.ShoppingCartItem;
> @@ -932,7 +933,7 @@ public class PayflowPro {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Tue Dec  9 10:09:22 2014
> @@ -43,6 +43,7 @@ import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.transaction.GenericTransactionException;
>   import org.ofbiz.entity.transaction.TransactionUtil;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderChangeHelper;
>   import org.ofbiz.product.store.ProductStoreWorker;
>   import org.ofbiz.service.GenericServiceException;
> @@ -507,7 +508,7 @@ public class WorldPayEvents {
>                   Debug.logError(e, module);
>               }
>           } else {
> -            String value = UtilProperties.getPropertyValue(resource, parameterName);
> +            String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
>               if (value != null) {
>                   returnValue = value.trim();
>               }
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Tue Dec  9 10:09:22 2014
> @@ -35,7 +35,6 @@ import org.ofbiz.base.util.Debug;
>   import org.ofbiz.base.util.GeneralException;
>   import org.ofbiz.base.util.GeneralRuntimeException;
>   import org.ofbiz.base.util.UtilHttp;
> -import org.ofbiz.base.util.UtilProperties;
>   import org.ofbiz.base.util.UtilValidate;
>   import org.ofbiz.base.util.collections.MapStack;
>   import org.ofbiz.content.content.ContentWorker;
> @@ -44,6 +43,7 @@ import org.ofbiz.entity.GenericEntityExc
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.LocalDispatcher;
>   import org.ofbiz.webapp.control.RequestHandler;
>   import org.ofbiz.webapp.website.WebSiteWorker;
> @@ -266,7 +266,7 @@ public class CmsEvents {
>                   try {
>                       Writer writer = response.getWriter();
>                       // TODO: replace "screen" to support dynamic rendering of different output
> -                    FormStringRenderer formStringRenderer = new MacroFormRenderer(UtilProperties.getPropertyValue("widget", "screen.formrenderer"), request, response);
> +                    FormStringRenderer formStringRenderer = new MacroFormRenderer(EntityUtilProperties.getPropertyValue("widget", "screen.formrenderer", delegator), request, response);
>                       templateMap.put("formStringRenderer", formStringRenderer);
>
>                       // if use web analytics
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java Tue Dec  9 10:09:22 2014
> @@ -37,6 +37,7 @@ import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>
>   /**
>    *  Does indexing in preparation for a keyword search.
> @@ -199,7 +200,7 @@ public class ContentKeywordIndex {
>           }
>
>           List<GenericValue> toBeStored = FastList.newInstance();
> -        int keywordMaxLength = Integer.parseInt(UtilProperties.getPropertyValue("contentsearch", "content.keyword.max.length"));
> +        int keywordMaxLength = Integer.parseInt(EntityUtilProperties.getPropertyValue("contentsearch", "content.keyword.max.length", delegator));
>           for (Map.Entry<String, Long> entry: keywords.entrySet()) {
>               if (entry.getKey().length() <= keywordMaxLength) {
>                   GenericValue contentKeyword = delegator.makeValue("ContentKeyword", UtilMisc.toMap("contentId", content.getString("contentId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue()));
> @@ -209,7 +210,7 @@ public class ContentKeywordIndex {
>           if (toBeStored.size() > 0) {
>               if (Debug.verboseOn()) Debug.logVerbose("[ContentKeywordIndex.indexKeywords] Storing " + toBeStored.size() + " keywords for contentId " + content.getString("contentId"), module);
>
> -            if ("true".equals(UtilProperties.getPropertyValue("contentsearch", "index.delete.on_index", "false"))) {
> +            if ("true".equals(EntityUtilProperties.getPropertyValue("contentsearch", "index.delete.on_index", "false", delegator))) {
>                   // delete all keywords if the properties file says to
>                   delegator.removeByAnd("ContentKeyword", UtilMisc.toMap("contentId", content.getString("contentId")));
>               }
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java Tue Dec  9 10:09:22 2014
> @@ -39,6 +39,7 @@ import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericEntityException;
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.GenericServiceException;
>   import org.ofbiz.service.LocalDispatcher;
>   import org.ofbiz.service.ServiceUtil;
> @@ -76,7 +77,7 @@ public class DataEvents {
>           }
>
>           // get the permission service required for streaming data; default is always the genericContentPermission
> -        String permissionService = UtilProperties.getPropertyValue("content.properties", "stream.permission.service", "genericContentPermission");
> +        String permissionService = EntityUtilProperties.getPropertyValue("content.properties", "stream.permission.service", "genericContentPermission", delegator);
>
>           // get the content record
>           GenericValue content;
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Tue Dec  9 10:09:22 2014
> @@ -623,7 +623,7 @@ public class DataResourceWorker  impleme
>
>           // check for a cached template
>           if (cache) {
> -            String disableCache = UtilProperties.getPropertyValue("content", "disable.ftl.template.cache");
> +            String disableCache = EntityUtilProperties.getPropertyValue("content", "disable.ftl.template.cache", delegator);
>               if (disableCache == null || !disableCache.equalsIgnoreCase("true")) {
>                   try {
>                       Template cachedTemplate = FreeMarkerWorker.getTemplate("DataResource:" + dataResourceId);
> @@ -743,7 +743,7 @@ public class DataResourceWorker  impleme
>                       ScreenRenderer screens = (ScreenRenderer) context.get("screens");
>                       if (screens == null) {
>                        // TODO: replace "screen" to support dynamic rendering of different output
> -                        ScreenStringRenderer screenStringRenderer = new MacroScreenRenderer(UtilProperties.getPropertyValue("widget", "screen.name"), UtilProperties.getPropertyValue("widget", "screen.screenrenderer"));
> +                        ScreenStringRenderer screenStringRenderer = new MacroScreenRenderer(EntityUtilProperties.getPropertyValue("widget", "screen.name", delegator), EntityUtilProperties.getPropertyValue("widget", "screen.screenrenderer", delegator));
>                           screens = new ScreenRenderer(out, context, screenStringRenderer);
>                           screens.getContext().put("screens", screens);
>                       }
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java Tue Dec  9 10:09:22 2014
> @@ -37,6 +37,7 @@ import org.ofbiz.base.util.UtilValidate;
>   import org.ofbiz.base.util.UtilDateTime;
>   import org.ofbiz.base.util.UtilProperties;
>   import org.ofbiz.entity.Delegator;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
>
> @@ -99,7 +100,7 @@ public class OpenOfficeServices {
>                //OpenOfficeByteArrayOutputStream baos = OpenOfficeWorker.convertOODocByteStreamToByteStream(xmulticomponentfactory, oobais, inputMimeType, outputMimeType);
>
>
> -            String tempDir = UtilProperties.getPropertyValue("content", "content.temp.dir");
> +            String tempDir = EntityUtilProperties.getPropertyValue("content", "content.temp.dir", delegator);
>               fileIn = new File(tempDir + fileInName);
>               FileOutputStream fos = new FileOutputStream(fileIn);
>               fos.write(inByteArray);
>
> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java (original)
> +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java Tue Dec  9 10:09:22 2014
> @@ -58,6 +58,8 @@ import org.ofbiz.base.util.UtilMisc;
>   import org.ofbiz.base.util.UtilProperties;
>   import org.ofbiz.base.util.UtilValidate;
>   import org.ofbiz.base.util.collections.MapStack;
> +import org.ofbiz.entity.Delegator;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
>   import org.ofbiz.webapp.view.ApacheFopWorker;
> @@ -190,6 +192,7 @@ public class OutputServices {
>
>       public static Map<String, Object> createFileFromScreen(DispatchContext dctx, Map<String, ? extends Object> serviceContext) {
>           Locale locale = (Locale) serviceContext.get("locale");
> +        Delegator delegator = dctx.getDelegator();
>           String screenLocation = (String) serviceContext.remove("screenLocation");
>           Map<String, Object> screenContext = UtilGenerics.checkMap(serviceContext.remove("screenContext"));
>           String contentType = (String) serviceContext.remove("contentType");
> @@ -237,7 +240,7 @@ public class OutputServices {
>                   fileName += ".txt";
>               }
>               if (UtilValidate.isEmpty(filePath)) {
> -                filePath = UtilProperties.getPropertyValue("content.properties", "content.output.path", "/output");
> +                filePath = EntityUtilProperties.getPropertyValue("content.properties", "content.output.path", "/output", delegator);
>               }
>               File file = new File(filePath, fileName);
>
>
> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy (original)
> +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy Tue Dec  9 10:09:22 2014
> @@ -20,7 +20,7 @@
>   import org.ofbiz.base.util.ObjectType;
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.condition.EntityCondition;
> -import org.ofbiz.base.util.UtilProperties ;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>
>   productId = parameters.productId;
>
> @@ -69,7 +69,7 @@ context.paramList = paramList;
>
>   // set the page parameters
>   viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0);
> -viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20"));
> +viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator));
>   listSize = 0;
>   if (inventoryList)
>       listSize = inventoryList.size();
>
> Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original)
> +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Tue Dec  9 10:09:22 2014
> @@ -220,7 +220,7 @@ public class TrackingCodeEvents {
>           }
>
>           if (cookieDomain == null) {
> -            cookieDomain = UtilProperties.getPropertyValue("url", "cookie.domain", "");
> +            cookieDomain = EntityUtilProperties.getPropertyValue("url", "cookie.domain", "", delegator);
>           }
>
>           // if trackingCode.trackableLifetime not null and is > 0 write a trackable cookie with name in the form: TKCDT_{trackingCode.trackingCodeTypeId} and timeout will be trackingCode.trackableLifetime
>
> Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java (original)
> +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java Tue Dec  9 10:09:22 2014
> @@ -60,6 +60,7 @@ import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.condition.EntityCondition;
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.util.EntityQuery;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.party.party.PartyHelper;
>   import org.ofbiz.party.party.PartyWorker;
>   import org.ofbiz.service.DispatchContext;
> @@ -263,7 +264,7 @@ public class VCard {
>               }
>               ContactIOFactory ciof = Pim.getContactIOFactory();
>               ContactMarshaller marshaller = ciof.createContactMarshaller();
> -            String saveToDirectory = UtilProperties.getPropertyValue("sfa.properties", "save.outgoing.directory", "");
> +            String saveToDirectory = EntityUtilProperties.getPropertyValue("sfa.properties", "save.outgoing.directory", "", delegator);
>               if (UtilValidate.isEmpty(saveToDirectory)) {
>                   saveToDirectory = System.getProperty("ofbiz.home");
>               }
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Tue Dec  9 10:09:22 2014
> @@ -50,6 +50,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.thirdparty.paypal.ExpressCheckoutEvents;
>   import org.ofbiz.product.product.ProductContentWrapper;
>   import org.ofbiz.product.product.ProductWorker;
> @@ -334,7 +335,7 @@ public class OrderReturnServices {
>           for (GenericValue returnHeader : returnHeaders) {
>               String returnId = returnHeader.getString("returnId");
>               Timestamp entryDate = returnHeader.getTimestamp("entryDate");
> -            String daysTillCancelStr = UtilProperties.getPropertyValue("order.properties", "daysTillCancelReplacementOrder", "30");
> +            String daysTillCancelStr = EntityUtilProperties.getPropertyValue("order.properties", "daysTillCancelReplacementOrder", "30", delegator);
>               int daysTillCancel = 0;
>               try {
>                   daysTillCancel = Integer.parseInt(daysTillCancelStr);
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Dec  9 10:09:22 2014
> @@ -64,6 +64,7 @@ import org.ofbiz.entity.util.EntityListI
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityTypeUtil;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.shoppingcart.CartItemModifyException;
>   import org.ofbiz.order.shoppingcart.CheckOutHelper;
>   import org.ofbiz.order.shoppingcart.ItemNotFoundException;
> @@ -546,7 +547,7 @@ public class OrderServices {
>               orderHeader.set("createdBy", userLogin.getString("userLoginId"));
>           }
>
> -        String invoicePerShipment = UtilProperties.getPropertyValue("AccountingConfig","create.invoice.per.shipment");
> +        String invoicePerShipment = EntityUtilProperties.getPropertyValue("AccountingConfig","create.invoice.per.shipment", delegator);
>           if (UtilValidate.isNotEmpty(invoicePerShipment)) {
>               orderHeader.set("invoicePerShipment", invoicePerShipment);
>           }
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Tue Dec  9 10:09:22 2014
> @@ -49,6 +49,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityTypeUtil;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.finaccount.FinAccountHelper;
>   import org.ofbiz.order.order.OrderChangeHelper;
>   import org.ofbiz.order.order.OrderReadHelper;
> @@ -1608,7 +1609,7 @@ public class CheckOutHelper {
>
>           // get the payment config
>           String paymentConfig = ProductStoreWorker.getProductStorePaymentProperties(delegator, cart.getProductStoreId(), "GIFT_CARD", null, true);
> -        String giftCardType = UtilProperties.getPropertyValue(paymentConfig, "", "ofbiz");
> +        String giftCardType = EntityUtilProperties.getPropertyValue(paymentConfig, "", "ofbiz", delegator);
>           String balanceField = null;
>
>           // get the gift card objects to check
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Tue Dec  9 10:09:22 2014
> @@ -47,6 +47,7 @@ import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityTypeUtil;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.order.shoppingcart.product.ProductPromoWorker;
>   import org.ofbiz.product.config.ProductConfigWorker;
> @@ -231,7 +232,7 @@ public class ShoppingCartHelper {
>
>           // get order item attributes
>           Map<String, String> orderItemAttributes = FastMap.newInstance();
> -        String orderItemAttributePrefix = UtilProperties.getPropertyValue("order.properties", "order.item.attr.prefix");
> +        String orderItemAttributePrefix = EntityUtilProperties.getPropertyValue("order.properties", "order.item.attr.prefix", delegator);
>           for (Entry<String, ? extends Object> entry : context.entrySet()) {
>               if (entry.getKey().toString().contains(orderItemAttributePrefix) && UtilValidate.isNotEmpty(entry.getValue())) {
>                   orderItemAttributes.put(entry.getKey().replaceAll(orderItemAttributePrefix, ""), entry.getValue().toString());
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Tue Dec  9 10:09:22 2014
> @@ -54,6 +54,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.order.shoppingcart.product.ProductPromoWorker;
>   import org.ofbiz.order.shoppinglist.ShoppingListEvents;
> @@ -1188,7 +1189,7 @@ public class ShoppingCartItem implements
>                               }
>                           }
>                       }
> -                    if ("true".equals(UtilProperties.getPropertyValue("catalog.properties", "convertProductPriceCurrency"))){
> +                    if ("true".equals(EntityUtilProperties.getPropertyValue("catalog.properties", "convertProductPriceCurrency", delegator))){
>                           priceContext.put("currencyUomIdTo", cart.getCurrency());
>                       } else {
>                           priceContext.put("currencyUomId", cart.getCurrency());
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Tue Dec  9 10:09:22 2014
> @@ -46,6 +46,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityTypeUtil;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.order.shoppingcart.ShoppingCart.CartShipInfo;
>   import org.ofbiz.order.shoppingcart.ShoppingCart.CartShipInfo.CartShipItemInfo;
> @@ -988,7 +989,7 @@ public class ShoppingCartServices {
>           }
>           // If we still have no currency, use the default from general.properties.  Failing that, use USD
>           if (currency == null) {
> -                currency = UtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD");
> +                currency = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator);
>           }
>
>           // create the cart
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Tue Dec  9 10:09:22 2014
> @@ -41,6 +41,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.condition.EntityOperator;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.order.shoppingcart.ShoppingCart;
>   import org.ofbiz.order.shoppingcart.product.ProductPromoWorker;
> @@ -292,6 +293,7 @@ public class ShippingEvents {
>
>       public static BigDecimal getExternalShipEstimate(LocalDispatcher dispatcher, GenericValue storeShipMeth, Map<String, Object> context) throws GeneralException {
>           String shipmentCustomMethodId = storeShipMeth.getString("shipmentCustomMethodId");
> +        Delegator delegator = dispatcher.getDelegator();
>           String serviceName = "";
>           if (UtilValidate.isNotEmpty(shipmentCustomMethodId)) {
>               serviceName = getShipmentCustomMethod(dispatcher.getDelegator(), shipmentCustomMethodId);
> @@ -302,10 +304,10 @@ public class ShippingEvents {
>           // invoke the external shipping estimate service
>           BigDecimal externalShipAmt = null;
>           if (serviceName != null) {
> -            String doEstimates = UtilProperties.getPropertyValue("shipment.properties", "shipment.doratecheck", "true");
> +            String doEstimates = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.doratecheck", "true", delegator);
>               //If all estimates are not turned off, check for the individual one
>               if ("true".equals(doEstimates)) {
> -                String dothisEstimate = UtilProperties.getPropertyValue("shipment.properties", "shipment.doratecheck." + serviceName, "true");
> +                String dothisEstimate = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.doratecheck." + serviceName, "true", delegator);
>                   if ("false".equals(dothisEstimate))
>                    serviceName = null;
>               } else {
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Tue Dec  9 10:09:22 2014
> @@ -41,6 +41,7 @@ import org.ofbiz.entity.util.EntityListI
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityTypeUtil;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.order.order.OrderReadHelper;
>   import org.ofbiz.order.shoppingcart.CartItemModifyException;
>   import org.ofbiz.order.shoppingcart.CheckOutHelper;
> @@ -588,7 +589,7 @@ public class ShoppingListServices {
>           } catch (GenericEntityException e) {
>               Debug.logError(e.getMessage(), module);
>           }
> -        String maxDaysStr = UtilProperties.getPropertyValue("order.properties", "autosave.max.age", "30");
> +        String maxDaysStr = EntityUtilProperties.getPropertyValue("order.properties", "autosave.max.age", "30", delegator);
>           int maxDays = 0;
>           try {
>               maxDays = Integer.parseInt(maxDaysStr);
>
> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original)
> +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Tue Dec  9 10:09:22 2014
> @@ -46,6 +46,7 @@ import org.ofbiz.entity.GenericEntityExc
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.security.Security;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ServiceUtil;
> @@ -229,7 +230,7 @@ public class ZipSalesServices {
>           List<List<GenericValue>> itemAdjustments = FastList.newInstance();
>
>           // check for a valid state/province geo
> -        String validStates = UtilProperties.getPropertyValue("zipsales.properties", "zipsales.valid.states");
> +        String validStates = EntityUtilProperties.getPropertyValue("zipsales.properties", "zipsales.valid.states", delegator);
>           if (UtilValidate.isNotEmpty(validStates)) {
>               List<String> stateSplit = StringUtil.split(validStates, "|");
>               if (!stateSplit.contains(stateProvince)) {
>
> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy (original)
> +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy Tue Dec  9 10:09:22 2014
> @@ -150,7 +150,7 @@ viewIndex = request.getParameter("viewIn
>   context.viewIndex = viewIndex;
>
>   viewSize = request.getParameter("viewSize") ? Integer.valueOf(request.getParameter("viewSize")) :
> -                                                                UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20");
> +                                                                EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator);
>   context.viewSize = viewSize;
>
>   // get the lookup flag
>
> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml (original)
> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/user/UserEvents.xml Tue Dec  9 10:09:22 2014
> @@ -311,8 +311,9 @@ under the License.
>
>           <if-not-empty field="newUserLogin">
>               <!-- If password encryption is enabled, encrpyt it now -->
> +            <set field="delegator" from-field="parameters.delegator" type="Object"/>
>               <call-bsh><![CDATA[
> -                boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security", "password.encrypt"));
> +                boolean useEncryption = "true".equals(org.ofbiz.entity.util.EntityUtilProperties.getPropertyValue("security", "password.encrypt", delegator));
>                   if (useEncryption) { newUserLogin.set("currentPassword", org.ofbiz.base.crypto.HashCrypt.getDigestHash((String) newUserLogin.get("currentPassword"))); }
>               ]]></call-bsh>
>
> @@ -322,7 +323,6 @@ under the License.
>               <set-current-user-login value-field="newUserLogin"/>
>
>               <!-- On successful user creation, create password history record if configured -->
> -            <set field="delegator" from-field="parameters.delegator" type="Object"/>
>               <call-class-method method-name="getPropertyValue" class-name="org.ofbiz.base.util.UtilProperties" ret-field="autoPasswordChangeEnabled">
>                   <string value="security"/>
>                   <string value="user.auto.change.password.enable"/>
>
> Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original)
> +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Tue Dec  9 10:09:22 2014
> @@ -62,6 +62,7 @@ import org.ofbiz.entity.condition.Entity
>   import org.ofbiz.entity.util.EntityListIterator;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.GenericServiceException;
>   import org.ofbiz.service.LocalDispatcher;
> @@ -715,8 +716,8 @@ public class CommunicationEventServices
>               if (Debug.verboseOn()) Debug.logVerbose("Processing Incoming Email " + aboutThisEmail, module);
>
>               // ignore the message when the spam status = yes
> -            String spamHeaderName = UtilProperties.getPropertyValue("general.properties", "mail.spam.name", "N");
> -            String configHeaderValue = UtilProperties.getPropertyValue("general.properties", "mail.spam.value");
> +            String spamHeaderName = EntityUtilProperties.getPropertyValue("general.properties", "mail.spam.name", "N", delegator);
> +            String configHeaderValue = EntityUtilProperties.getPropertyValue("general.properties", "mail.spam.value", delegator);
>               //          only execute when config file has been set && header variable found
>               if (!spamHeaderName.equals("N") && wrapper.getHeader(spamHeaderName) != null && wrapper.getHeader(spamHeaderName).length > 0) {
>                   String msgHeaderValue = wrapper.getHeader(spamHeaderName)[0];
> @@ -1120,8 +1121,9 @@ public class CommunicationEventServices
>       private static List<Map<String, Object>> buildListOfWorkEffortInfoFromEmailAddresses(Address [] addresses, GenericValue userLogin, LocalDispatcher dispatcher) throws GenericServiceException {
>           InternetAddress emailAddress = null;
>           Map<String, Object> result = null;
> +        Delegator delegator = dispatcher.getDelegator();
>           List<Map<String, Object>> tempResults = new LinkedList<Map<String,Object>>();
> -        String caseInsensitiveEmail = org.ofbiz.base.util.UtilProperties.getPropertyValue("general.properties", "mail.address.caseInsensitive", "N");
> +        String caseInsensitiveEmail = EntityUtilProperties.getPropertyValue("general.properties", "mail.address.caseInsensitive", "N", delegator);
>
>           if (addresses != null) {
>               for (Address addr: addresses) {
>
> Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original)
> +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Tue Dec  9 10:09:22 2014
> @@ -43,6 +43,7 @@ import org.ofbiz.entity.GenericEntityExc
>   import org.ofbiz.entity.GenericValue;
>   import org.ofbiz.entity.util.EntityQuery;
>   import org.ofbiz.entity.util.EntityUtil;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.security.Security;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.ModelService;
> @@ -1050,7 +1051,7 @@ public class ContactMechServices {
>           String emailAddress = (String) context.get("emailAddress");
>           String verifyHash = null;
>
> -        String expireTime = UtilProperties.getPropertyValue("security", "email_verification.expire.hours");
> +        String expireTime = EntityUtilProperties.getPropertyValue("security", "email_verification.expire.hours", delegator);
>           Integer expTime = Integer.valueOf(expireTime);
>           Calendar calendar = Calendar.getInstance();
>           calendar.add(Calendar.HOUR, expTime.intValue());
>
> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy (original)
> +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy Tue Dec  9 10:09:22 2014
> @@ -21,7 +21,7 @@ import org.ofbiz.entity.util.EntityUtil;
>   import org.ofbiz.base.util.UtilHttp;
>   import org.ofbiz.product.catalog.CatalogWorker;
>   import org.ofbiz.webapp.website.WebSiteWorker;
> -import org.ofbiz.base.util.UtilProperties ;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>
>
>   prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
> @@ -105,7 +105,7 @@ if (shoppingListId) {
>               context.shoppingListItemDatas = shoppingListItemDatas;
>               // pagination for the shopping list
>               viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 0);
> -            viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20"));
> +            viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator));
>               listSize = shoppingListItemDatas ? shoppingListItemDatas.size() : 0;
>
>               lowIndex = (viewIndex * viewSize) + 1;
>
> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy (original)
> +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy Tue Dec  9 10:09:22 2014
> @@ -21,6 +21,7 @@ import org.ofbiz.entity.util.EntityFindO
>   import org.ofbiz.entity.condition.*;
>   import org.ofbiz.entity.transaction.TransactionUtil;
>   import org.ofbiz.base.util.*
> +import org.ofbiz.entity.util.EntityUtilProperties;
>
>   module = "showvisits.groovy";
>
> @@ -42,7 +43,7 @@ try {
>       beganTransaction = TransactionUtil.begin();
>
>       viewIndex = Integer.valueOf(parameters.VIEW_INDEX  ?: 1);
> -    viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20"));
> +    viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator));
>       context.viewIndex = viewIndex;
>       context.viewSize = viewSize;
>
>
> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original)
> +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java Tue Dec  9 10:09:22 2014
> @@ -114,12 +114,12 @@ public class ScaleImage {
>           String type = null;
>           String id = null;
>           if (viewType.toLowerCase().contains("main")) {
> -            String filenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
> +            String filenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", (Delegator) context.get("delegator"));
>               filenameExpander = FlexibleStringExpander.getInstance(filenameFormat);
>               id = (String) context.get("productId");
>               fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "id", id, "type", "original"));
>           } else if (viewType.toLowerCase().contains("additional") && viewNumber != null && !viewNumber.equals("0")) {
> -            String filenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format");
> +            String filenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format", (Delegator) context.get("delegator"));
>               filenameExpander = FlexibleStringExpander.getInstance(filenameFormat);
>               id = (String) context.get("productId");
>               if (filenameFormat.endsWith("${id}")) {
> @@ -282,7 +282,7 @@ public class ScaleImage {
>           String imgName = filenameToUse.substring(0, index - 1);
>           String imgExtension = filenameToUse.substring(index + 1);
>           // paths
> -        String mainFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
> +        String mainFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", (Delegator) context.get("delegator"));
>           String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), context);
>           String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",(Delegator)context.get("delegator"));
>
> @@ -328,7 +328,7 @@ public class ScaleImage {
>               // new Filename Format
>               FlexibleStringExpander addFilenameExpander = mainFilenameExpander;
>               if (viewType.toLowerCase().contains("additional")) {
> -                String addFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format");
> +                String addFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format", (Delegator) context.get("delegator"));
>                   addFilenameExpander = FlexibleStringExpander.getInstance(addFilenameFormat);
>               }
>
>
> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java?rev=1644015&r1=1644014&r2=1644015&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java (original)
> +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java Tue Dec  9 10:09:22 2014
> @@ -34,7 +34,9 @@ import org.ofbiz.base.util.UtilDateTime;
>   import org.ofbiz.base.util.UtilProperties;
>   import org.ofbiz.base.util.UtilValidate;
>   import org.ofbiz.base.util.string.FlexibleStringExpander;
> +import org.ofbiz.entity.Delegator;
>   import org.ofbiz.entity.GenericValue;
> +import org.ofbiz.entity.util.EntityUtilProperties;
>   import org.ofbiz.service.DispatchContext;
>   import org.ofbiz.service.GenericServiceException;
>   import org.ofbiz.service.LocalDispatcher;
> @@ -49,8 +51,9 @@ public class CropImage {
>       public static Map<String, Object> imageCrop(DispatchContext dctx, Map<String, ? extends Object> context)
>       throws IOException, JDOMException {
>           LocalDispatcher dispatcher = dctx.getDispatcher();
> +        Delegator delegator = dispatcher.getDelegator();
>           GenericValue userLogin = (GenericValue) context.get("userLogin");
> -        String nameOfThumb = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.management.nameofthumbnail"), context);
> +        String nameOfThumb = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.nameofthumbnail", delegator), context);
>
>           String productId = (String) context.get("productId");
>           String imageName = (String) context.get("imageName");
> @@ -87,8 +90,8 @@ public class CropImage {
>               String filenameToUse = (String) contentResult.get("contentId") + ".jpg";
>               String filenameTouseThumb = (String) contentResult.get("contentId") + nameOfThumb + ".jpg";
>
> -            String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.management.path"), context);
> -            String imageServerUrl = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.management.url"), context);
> +            String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.path", delegator), context);
> +            String imageServerUrl = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.url", delegator), context);
>               BufferedImage bufImg = ImageIO.read(new File(imageServerPath + "/" + productId + "/" + imageName));
>
>               int x = Integer.parseInt(imageX);
>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1644015 [1/4] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/...

Jacopo Cappellato-4
I agree that it would be worth of the effort to design a more transparent solution for the retrieval of properties (from file system, database, memory).
However even if this is a big commit, its approach is rather conservative by leveraging the existing tools in order to fix the system to work nicely in multi tenant/multi configuration mode.
I consider it an intermediary step in the right direction. When we will have a better mechanism to retrieve tenant specific configuration we should definitely migrate this code to it, and I am sure that Ashish will offer his help to convert the code modified in this commit.

Jacopo

On Dec 9, 2014, at 5:10 PM, Adrian Crum <[hidden email]> wrote:

> It is unfortunate that so much effort is being wasted on the bad EntityUtilProperties implementation.
>
> If someone would invest a few hours creating a specialized class loader that finds resources in the entity engine, then all of this client code would not need to be modified - standard UtilProperties method calls would still work.
>
>
> Adrian Crum
> Sandglass Software
> www.sandglass-software.com
>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1644015 [1/4] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/...

Ashish Vijaywargiya
Yes exactly - these are the thoughts that was running in my mind. I am here
for any kind of help. Thanks Jacopo! Thanks Adrian for your comment.

--
Kind Regards,
Ashish Vijaywargiya

On Wed, Dec 10, 2014 at 2:58 PM, Jacopo Cappellato <
[hidden email]> wrote:

> I agree that it would be worth of the effort to design a more transparent
> solution for the retrieval of properties (from file system, database,
> memory).
> However even if this is a big commit, its approach is rather conservative
> by leveraging the existing tools in order to fix the system to work nicely
> in multi tenant/multi configuration mode.
> I consider it an intermediary step in the right direction. When we will
> have a better mechanism to retrieve tenant specific configuration we should
> definitely migrate this code to it, and I am sure that Ashish will offer
> his help to convert the code modified in this commit.
>
> Jacopo
>
> On Dec 9, 2014, at 5:10 PM, Adrian Crum <
> [hidden email]> wrote:
>
> > It is unfortunate that so much effort is being wasted on the bad
> EntityUtilProperties implementation.
> >
> > If someone would invest a few hours creating a specialized class loader
> that finds resources in the entity engine, then all of this client code
> would not need to be modified - standard UtilProperties method calls would
> still work.
> >
> >
> > Adrian Crum
> > Sandglass Software
> > www.sandglass-software.com
> >
>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1644015 [1/4] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/...

Adrian Crum-3
In reply to this post by Adrian Crum-3
I added the specialized class loader in rev 1649620.

It is only a start. Some of the details around multi-tenancy will need
to be worked out (UtilProperties caching being one of them).

Adrian Crum
Sandglass Software
www.sandglass-software.com

On 12/9/2014 8:10 AM, Adrian Crum wrote:

> It is unfortunate that so much effort is being wasted on the bad
> EntityUtilProperties implementation.
>
> If someone would invest a few hours creating a specialized class loader
> that finds resources in the entity engine, then all of this client code
> would not need to be modified - standard UtilProperties method calls
> would still work.
>
>
> Adrian Crum
> Sandglass Software
> www.sandglass-software.com
>
> On 12/9/2014 10:09 AM, [hidden email] wrote:
>> Author: ashish
>> Date: Tue Dec  9 10:09:22 2014
>> New Revision: 1644015
>>
>> URL: http://svn.apache.org/r1644015
>> Log:
>> Applied patch from jira issue - OFBIZ-5902. Thanks so much Arun for
>> this important contribution.