Author: hansbak
Date: Wed Feb 29 02:01:29 2012
New Revision: 1294940
URL: http://svn.apache.org/viewvc?rev=1294940&view=rev
Log:
get default currency from entity and if not available from general.properties
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.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/valuelink/ValueLinkServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.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/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
Wed Feb 29 02:01:29 2012
@@ -43,6 +43,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityFindOptions;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.finaccount.FinAccountHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.product.store.ProductStoreWorker;
@@ -541,7 +542,7 @@ public class FinAccountPaymentServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyUom =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// validate the amount
@@ -634,7 +635,7 @@ public class FinAccountPaymentServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyUom =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
GenericValue finAccount;
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java
Wed Feb 29 02:01:29 2012
@@ -27,6 +27,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.base.util.*;
import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.order.order.OrderReadHelper;
@@ -110,7 +111,7 @@ public class FinAccountProductServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// get the product store
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=1294940&r1=1294939&r2=1294940&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
Wed Feb 29 02:01:29 2012
@@ -39,6 +39,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.finaccount.FinAccountHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.product.store.ProductStoreWorker;
@@ -74,7 +75,7 @@ public class GiftCertificateServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyUom =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
String cardNumber = null;
@@ -175,7 +176,7 @@ public class GiftCertificateServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyUom =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
String finAccountId = null;
@@ -263,7 +264,7 @@ public class GiftCertificateServices {
}
String currencyUom = (String) context.get("currency");
if (UtilValidate.isEmpty(currencyUom)) {
- currencyUom =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyUom =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// validate the amount
@@ -350,7 +351,7 @@ public class GiftCertificateServices {
}
// TODO: get the real currency from context
- //String currencyUom =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ //String currencyUom =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
// get the balance
BigDecimal balance = finAccount.get("availableBalance") == null ?
BigDecimal.ZERO : finAccount.getBigDecimal("availableBalance");
@@ -370,7 +371,7 @@ public class GiftCertificateServices {
String currency = (String) context.get("currency");
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// get the authorizations
@@ -469,7 +470,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// obtain the order information
@@ -647,7 +648,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
Map<String, Object> refundCtx = FastMap.newInstance();
@@ -714,7 +715,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// get the product store
@@ -971,7 +972,7 @@ public class GiftCertificateServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// get the product store
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=1294940&r1=1294939&r2=1294940&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
Wed Feb 29 02:01:29 2012
@@ -53,6 +53,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.util.EntityListIterator;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.order.OrderChangeHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.party.contact.ContactHelper;
@@ -3089,7 +3090,7 @@ public class PaymentGatewayServices {
// this record is not to be stored, just passed to the service for use
// get the default currency
- String currency =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ String currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
// prepare the auth context
Map<String, Object> authContext = FastMap.newInstance();
@@ -3254,7 +3255,7 @@ public class PaymentGatewayServices {
requestContext.put("billToParty", orh.getBillToParty());
requestContext.put("billToEmail", billToEmail);
requestContext.put("referenceCode", referenceCode);
- String currency =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ String currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
requestContext.put("currency", currency);
requestContext.put("creditAmount", context.get("amount"));
} else {
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=1294940&r1=1294939&r2=1294940&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
Wed Feb 29 02:01:29 2012
@@ -41,6 +41,7 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.product.store.ProductStoreWorker;
import org.ofbiz.service.DispatchContext;
@@ -816,6 +817,7 @@ public class ValueLinkServices {
// payment processing wrappers (process/release/refund)
public static Map<String, Object> giftCardProcessor(DispatchContext dctx,
Map<String, Object> context) {
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
@@ -828,7 +830,7 @@ public class ValueLinkServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
Map<String, Object> redeemCtx = FastMap.newInstance();
@@ -892,6 +894,7 @@ public class ValueLinkServices {
}
public static Map<String, Object> giftCardRelease(DispatchContext dctx,
Map<String, Object> context) {
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
@@ -920,7 +923,7 @@ public class ValueLinkServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
Map<String, Object> redeemCtx = FastMap.newInstance();
@@ -956,6 +959,7 @@ public class ValueLinkServices {
}
public static Map<String, Object> giftCardRefund(DispatchContext dctx,
Map<String, Object> context) {
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
@@ -984,7 +988,7 @@ public class ValueLinkServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
Map<String, Object> refundCtx = FastMap.newInstance();
@@ -1050,7 +1054,7 @@ public class ValueLinkServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// get the product store
@@ -1346,7 +1350,7 @@ public class ValueLinkServices {
// make sure we have a currency
if (currency == null) {
- currency = UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currency =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// get the product store
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
(original)
+++
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Wed Feb 29 02:01:29 2012
@@ -31,6 +31,7 @@ import org.ofbiz.entity.condition.Entity
import org.ofbiz.entity.condition.EntityExpr;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.order.finaccount.FinAccountHelper;
import org.ofbiz.order.order.OrderReadHelper;
import org.ofbiz.order.shoppingcart.product.ProductPromoWorker;
@@ -246,7 +247,7 @@ public class ShoppingCart implements Ite
this.productStoreId = productStoreId;
this.webSiteId = webSiteId;
this.locale = (locale != null) ? locale : Locale.getDefault();
- this.currencyUom = (currencyUom != null) ? currencyUom :
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ this.currencyUom = (currencyUom != null) ? currencyUom :
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
this.billToCustomerPartyId = billToCustomerPartyId;
this.billFromVendorPartyId = billFromVendorPartyId;
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
Wed Feb 29 02:01:29 2012
@@ -49,6 +49,7 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.party.party.PartyHelper;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
@@ -538,7 +539,7 @@ public class FedexServices {
} else if
(UtilValidate.isNotEmpty(shipmentRouteSegment.getString("currencyUomId"))) {
currencyCode = shipment.getString("currencyUomId");
} else {
- currencyCode =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyCode =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// Get and validate origin postal address
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
Wed Feb 29 02:01:29 2012
@@ -56,6 +56,7 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.party.contact.ContactMechWorker;
import org.ofbiz.product.store.ProductStoreWorker;
import org.ofbiz.service.DispatchContext;
@@ -304,7 +305,7 @@ public class UpsServices {
} else if
(UtilValidate.isNotEmpty(shipment.getString("currencyUomId"))) {
currencyCode = shipment.getString("currencyUomId");
} else {
- currencyCode =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ currencyCode =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
// Okay, start putting the XML together...
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
(original)
+++
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
Wed Feb 29 02:01:29 2012
@@ -44,6 +44,7 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
@@ -244,19 +245,19 @@ public class ProductsExportToEbay {
if (listingFormat.equals("FixedPriceItem")) {
Element startPriceElem =
UtilXml.addChildElementValue(itemElem, "StartPrice", startPrice, itemDocument);
if (UtilValidate.isEmpty(startPriceCurrencyUomId)) {
- startPriceCurrencyUomId =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ startPriceCurrencyUomId =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
startPriceElem.setAttribute("currencyID",
startPriceCurrencyUomId);
}else{
Element startPriceElem =
UtilXml.addChildElementValue(itemElem, "StartPrice", startPrice, itemDocument);
if (UtilValidate.isEmpty(startPriceCurrencyUomId)) {
- startPriceCurrencyUomId =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ startPriceCurrencyUomId =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
startPriceElem.setAttribute("currencyID",
startPriceCurrencyUomId);
if (UtilValidate.isNotEmpty(buyItNowPrice)) {
Element buyNowPriceElem =
UtilXml.addChildElementValue(itemElem, "BuyItNowPrice", buyItNowPrice,
itemDocument);
if (UtilValidate.isEmpty(buyItNowCurrencyUomId)) {
- buyItNowCurrencyUomId =
UtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD");
+ buyItNowCurrencyUomId =
EntityUtilProperties.getPropertyValue("general.properties",
"currency.uom.id.default", "USD", delegator);
}
buyNowPriceElem.setAttribute("currencyID",
buyItNowCurrencyUomId);
}
Modified:
ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1294940&r1=1294939&r2=1294940&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
(original)
+++
ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
Wed Feb 29 02:01:29 2012
@@ -49,6 +49,7 @@ import org.ofbiz.entity.GenericEntityExc
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
@@ -737,11 +738,11 @@ public class ProductsExportToGoogle {
buildGoogleBaseConfigContext.put("postItemsUrl",
googleBaseConfig.getString("postItemsUrl"));
}
} else {
- buildGoogleBaseConfigContext.put("developerKey",
UtilProperties.getPropertyValue(configString, "googleBaseExport.developerKey"));
- buildGoogleBaseConfigContext.put("authenticationUrl",
UtilProperties.getPropertyValue(configString,
"googleBaseExport.authenticationUrl"));
- buildGoogleBaseConfigContext.put("accountEmail",
UtilProperties.getPropertyValue(configString, "googleBaseExport.accountEmail"));
- buildGoogleBaseConfigContext.put("accountPassword",
UtilProperties.getPropertyValue(configString,
"googleBaseExport.accountPassword"));
- buildGoogleBaseConfigContext.put("postItemsUrl",
UtilProperties.getPropertyValue(configString, "googleBaseExport.postItemsUrl"));
+ buildGoogleBaseConfigContext.put("developerKey",
EntityUtilProperties.getPropertyValue(configString,
"googleBaseExport.developerKey", delegator));
+ buildGoogleBaseConfigContext.put("authenticationUrl",
EntityUtilProperties.getPropertyValue(configString,
"googleBaseExport.authenticationUrl", delegator));
+ buildGoogleBaseConfigContext.put("accountEmail",
EntityUtilProperties.getPropertyValue(configString,
"googleBaseExport.accountEmail", delegator));
+ buildGoogleBaseConfigContext.put("accountPassword",
EntityUtilProperties.getPropertyValue(configString,
"googleBaseExport.accountPassword", delegator));
+ buildGoogleBaseConfigContext.put("postItemsUrl",
EntityUtilProperties.getPropertyValue(configString,
"googleBaseExport.postItemsUrl", delegator));
}
return buildGoogleBaseConfigContext;
}
