Author: jleroux
Date: Mon Dec 15 09:10:03 2014
New Revision: 1645602
URL: http://svn.apache.org/r1645602
Log:
Keeps in sync with OFBiz trunk HEAD
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/sql/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/sql/
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/output/OutputServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/FindInventoryEventPlan.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/script/org/ofbiz/party/user/UserEvents.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/WEB-INF/actions/visit/ShowVisits.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/image/ScaleImage.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/KeywordIndex.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonWorkers.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/FindServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/component-load.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/rmi/RemoteDispatcherImpl.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/PopularTags.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ldap/src/org/ofbiz/ldap/commons/AbstractOFBizAuthenticationHandler.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/lucene/src/org/ofbiz/content/search/ProductDocument.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 09:10:03 2014
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1535158-1643777
+/ofbiz/trunk:1535158-1645598
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
Mon Dec 15 09:10:03 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;
@@ -59,13 +61,14 @@ public class CCPaymentServices {
public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String,
Object> context) {
String ccAction = (String) context.get("ccAction");
+ Delegator delegator = dctx.getDelegator();
if (ccAction == null) ccAction = "PreAuth";
Document authRequestDoc = buildPrimaryTxRequest(context, ccAction,
(BigDecimal) context.get("processAmount"),
(String) context.get("orderId"));
Document authResponseDoc = null;
try {
- authResponseDoc = sendRequest(authRequestDoc, (String)
context.get("paymentConfig"));
+ authResponseDoc = sendRequest(authRequestDoc, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -87,6 +90,7 @@ public class CCPaymentServices {
public static Map<String, Object> ccCredit(DispatchContext dctx,
Map<String, Object> context) {
String action = "Credit";
+ Delegator delegator = dctx.getDelegator();
if (context.get("pbOrder") != null) {
action = "Auth"; // required for periodic billing....
}
@@ -95,7 +99,7 @@ public class CCPaymentServices {
(String) context.get("referenceCode"));
Document creditResponseDoc = null;
try {
- creditResponseDoc = sendRequest(creditRequestDoc, (String)
context.get("paymentConfig"));
+ creditResponseDoc = sendRequest(creditRequestDoc, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -117,6 +121,7 @@ public class CCPaymentServices {
public static Map<String, Object> ccCapture(DispatchContext dctx,
Map<String, Object> context) {
Locale locale = (Locale) context.get("locale");
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
GenericValue authTransaction =
PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -125,11 +130,11 @@ public class CCPaymentServices {
}
Document captureRequestDoc = buildSecondaryTxRequest(context,
authTransaction.getString("referenceNum"),
- "PostAuth", (BigDecimal) context.get("captureAmount"));
+ "PostAuth", (BigDecimal) context.get("captureAmount"),
delegator);
Document captureResponseDoc = null;
try {
- captureResponseDoc = sendRequest(captureRequestDoc, (String)
context.get("paymentConfig"));
+ captureResponseDoc = sendRequest(captureRequestDoc, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -151,6 +156,7 @@ public class CCPaymentServices {
public static Map<String, Object> ccRelease(DispatchContext dctx,
Map<String, Object> context) {
Locale locale = (Locale) context.get("locale");
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
GenericValue authTransaction =
PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -158,11 +164,11 @@ public class CCPaymentServices {
"AccountingPaymentTransactionAuthorizationNotFoundCannotRelease", locale));
}
- Document releaseRequestDoc = buildSecondaryTxRequest(context,
authTransaction.getString("referenceNum"), "Void", null);
+ Document releaseRequestDoc = buildSecondaryTxRequest(context,
authTransaction.getString("referenceNum"), "Void", null, delegator);
Document releaseResponseDoc = null;
try {
- releaseResponseDoc = sendRequest(releaseRequestDoc, (String)
context.get("paymentConfig"));
+ releaseResponseDoc = sendRequest(releaseRequestDoc, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -204,6 +210,7 @@ public class CCPaymentServices {
public static Map<String, Object> ccRefund(DispatchContext dctx,
Map<String, Object> context) {
Locale locale = (Locale) context.get("locale");
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
GenericValue authTransaction =
PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -214,11 +221,11 @@ public class CCPaymentServices {
// Although refunds are applied to captured transactions, using the
auth reference number is ok here
// Related auth and capture transactions will always have the same
reference number
Document refundRequestDoc = buildSecondaryTxRequest(context,
authTransaction.getString("referenceNum"),
- "Credit", (BigDecimal) context.get("refundAmount"));
+ "Credit", (BigDecimal) context.get("refundAmount"), delegator);
Document refundResponseDoc = null;
try {
- refundResponseDoc = sendRequest(refundRequestDoc, (String)
context.get("paymentConfig"));
+ refundResponseDoc = sendRequest(refundRequestDoc, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -240,6 +247,7 @@ public class CCPaymentServices {
public static Map<String, Object> ccReAuth(DispatchContext dctx,
Map<String, Object> context) {
Locale locale = (Locale) context.get("locale");
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
GenericValue authTransaction =
PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -248,11 +256,11 @@ public class CCPaymentServices {
}
Document reauthRequestDoc = buildSecondaryTxRequest(context,
authTransaction.getString("referenceNum"),
- "RePreAuth", (BigDecimal) context.get("reauthAmount"));
+ "RePreAuth", (BigDecimal) context.get("reauthAmount"),
delegator);
Document reauthResponseDoc = null;
try {
- reauthResponseDoc = sendRequest(reauthRequestDoc, (String)
context.get("paymentConfig"));
+ reauthResponseDoc = sendRequest(reauthRequestDoc, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -275,7 +283,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 +307,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 +323,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 +356,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");
@@ -359,7 +367,7 @@ public class CCPaymentServices {
//Document reportResponseDoc = null;
try {
//reportResponseDoc =
- sendRequest(requestDocument, (String)
context.get("paymentConfig"));
+ sendRequest(requestDocument, (String)
context.get("paymentConfig"), delegator);
} catch (ClearCommerceException cce) {
return ServiceUtil.returnError(cce.getMessage());
}
@@ -649,8 +657,10 @@ public class CCPaymentServices {
if (UtilValidate.isEmpty(paymentConfig)) {
paymentConfig = "payment.properties";
}
-
- Document requestDocument = createRequestDocument(paymentConfig);
+ // payment mech
+ GenericValue creditCard = (GenericValue) context.get("creditCard");
+ Delegator delegator = creditCard.getDelegator();
+ Document requestDocument = createRequestDocument(paymentConfig,
delegator);
Element engineDocElement =
UtilXml.firstChildElement(requestDocument.getDocumentElement(), "EngineDoc");
Element orderFormDocElement =
UtilXml.firstChildElement(engineDocElement, "OrderFormDoc");
@@ -666,14 +676,11 @@ public class CCPaymentServices {
UtilXml.addChildElementValue(consumerElement, "Email",
billToEmail.getString("infoString"), requestDocument);
}
- // payment mech
- GenericValue creditCard = (GenericValue) context.get("creditCard");
-
- 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 +701,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);
@@ -723,21 +730,21 @@ public class CCPaymentServices {
return requestDocument;
}
- private static Document buildSecondaryTxRequest(Map<String, Object>
context, String id, String type, BigDecimal amount) {
+ private static Document buildSecondaryTxRequest(Map<String, Object>
context, String id, String type, BigDecimal amount, Delegator delegator) {
String paymentConfig = (String) context.get("paymentConfig");
if (UtilValidate.isEmpty(paymentConfig)) {
paymentConfig = "payment.properties";
}
- Document requestDocument = createRequestDocument(paymentConfig);
+ Document requestDocument = createRequestDocument(paymentConfig,
delegator);
Element engineDocElement =
UtilXml.firstChildElement(requestDocument.getDocumentElement(), "EngineDoc");
Element orderFormDocElement =
UtilXml.firstChildElement(engineDocElement, "OrderFormDoc");
UtilXml.addChildElementValue(orderFormDocElement, "Id", id,
requestDocument);
// 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);
appendTransactionNode(orderFormDocElement, type, amount, currencyCode);
@@ -819,7 +826,7 @@ public class CCPaymentServices {
}
}
- private static Document createRequestDocument(String paymentConfig) {
+ private static Document createRequestDocument(String paymentConfig,
Delegator delegator) {
// EngineDocList
Document requestDocument =
UtilXml.makeEmptyXmlDocument("EngineDocList");
@@ -830,12 +837,12 @@ public class CCPaymentServices {
Element engineDocElement =
UtilXml.addChildElement(engineDocListElement, "EngineDoc", requestDocument);
UtilXml.addChildElementValue(engineDocElement, "ContentType",
"OrderFormDoc", 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);
}
@@ -843,13 +850,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);
}
@@ -867,17 +874,17 @@ public class CCPaymentServices {
Element orderFormDocElement =
UtilXml.addChildElement(engineDocElement, "OrderFormDoc", requestDocument);
// default to "P" for Production Mode
- String mode = UtilProperties.getPropertyValue(paymentConfig,
"payment.clearcommerce.processMode", "P");
+ String mode = EntityUtilProperties.getPropertyValue(paymentConfig,
"payment.clearcommerce.processMode", "P", delegator);
UtilXml.addChildElementValue(orderFormDocElement, "Mode", mode,
requestDocument);
return requestDocument;
}
- private static Document sendRequest(Document requestDocument, String
paymentConfig) throws ClearCommerceException {
+ private static Document sendRequest(Document requestDocument, String
paymentConfig, Delegator delegator) throws ClearCommerceException {
if (UtilValidate.isEmpty(paymentConfig)) {
paymentConfig = "payment.properties";
}
- String serverURL = UtilProperties.getPropertyValue(paymentConfig,
"payment.clearcommerce.serverURL");
+ String serverURL =
EntityUtilProperties.getPropertyValue(paymentConfig,
"payment.clearcommerce.serverURL", delegator);
if (UtilValidate.isEmpty(serverURL)) {
throw new ClearCommerceException("Missing server URL; check your
ClearCommerce configuration");
}
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
Mon Dec 15 09:10:03 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;
@@ -90,7 +91,7 @@ public class IcsPaymentServices {
}
// process the reply
Map<String, Object> result = ServiceUtil.returnSuccess();
- processAuthResult(reply, result);
+ processAuthResult(reply, result, delegator);
return result;
}
@@ -534,9 +535,9 @@ public class IcsPaymentServices {
return processAmount.setScale(decimals, rounding).toPlainString();
}
- private static void processAuthResult(Map<String, Object> reply,
Map<String, Object> result) {
+ private static void processAuthResult(Map<String, Object> reply,
Map<String, Object> result, Delegator delegator) {
String decision = getDecision(reply);
- String checkModeStatus =
UtilProperties.getPropertyValue("payment.properties",
"payment.cybersource.ignoreStatus");
+ String checkModeStatus =
EntityUtilProperties.getPropertyValue("payment.properties",
"payment.cybersource.ignoreStatus", delegator);
if ("ACCEPT".equalsIgnoreCase(decision)) {
result.put("authCode", reply.get("ccAuthReply_authorizationCode"));
result.put("authResult", Boolean.TRUE);
@@ -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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/eway/EwayServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
Mon Dec 15 09:10:03 2014
@@ -33,7 +33,9 @@ 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.GenericValue;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.ServiceUtil;
@@ -47,7 +49,8 @@ public class PcChargeServices {
public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String,
? extends Object> context) {
Locale locale = (Locale) context.get("locale");
- Properties props = buildPccProperties(context);
+ Delegator delegator = dctx.getDelegator();
+ Properties props = buildPccProperties(context, delegator);
PcChargeApi api = getApi(props);
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -137,7 +140,7 @@ public class PcChargeServices {
public static Map<String, Object> ccCapture(DispatchContext dctx,
Map<String, ? extends Object> context) {
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
Locale locale = (Locale) context.get("locale");
-
+ Delegator delegator = dctx.getDelegator();
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
@@ -151,7 +154,7 @@ public class PcChargeServices {
}
// setup the PCCharge Interface
- Properties props = buildPccProperties(context);
+ Properties props = buildPccProperties(context, delegator);
PcChargeApi api = getApi(props);
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -196,7 +199,7 @@ public class PcChargeServices {
public static Map<String, Object> ccRelease(DispatchContext dctx,
Map<String, ? extends Object> context) {
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
-
+ Delegator delegator = dctx.getDelegator();
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
Locale locale = (Locale) context.get("locale");
@@ -211,7 +214,7 @@ public class PcChargeServices {
}
// setup the PCCharge Interface
- Properties props = buildPccProperties(context);
+ Properties props = buildPccProperties(context, delegator);
PcChargeApi api = getApi(props);
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -262,7 +265,7 @@ public class PcChargeServices {
public static Map<String, Object> ccRefund(DispatchContext dctx,
Map<String, ? extends Object> context) {
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
-
+ Delegator delegator = dctx.getDelegator();
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
Locale locale = (Locale) context.get("locale");
@@ -277,7 +280,7 @@ public class PcChargeServices {
}
// setup the PCCharge Interface
- Properties props = buildPccProperties(context);
+ Properties props = buildPccProperties(context, delegator);
PcChargeApi api = getApi(props);
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -403,18 +406,18 @@ public class PcChargeServices {
return api;
}
- private static Properties buildPccProperties(Map<String, ? extends Object>
context) {
+ private static Properties buildPccProperties(Map<String, ? extends Object>
context, Delegator delegator) {
String configString = (String) context.get("paymentConfig");
if (configString == null) {
configString = "payment.properties";
}
- String processorId = UtilProperties.getPropertyValue(configString,
"payment.pccharge.processorID");
- String merchantId = UtilProperties.getPropertyValue(configString,
"payment.pccharge.merchantID");
- String userId = UtilProperties.getPropertyValue(configString,
"payment.pccharge.userID");
- String host = UtilProperties.getPropertyValue(configString,
"payment.pccharge.host");
- String port = UtilProperties.getPropertyValue(configString,
"payment.pccharge.port");
- String autoBill = UtilProperties.getPropertyValue(configString,
"payment.pccharge.autoBill", "true");
+ String processorId =
EntityUtilProperties.getPropertyValue(configString,
"payment.pccharge.processorID", delegator);
+ String merchantId =
EntityUtilProperties.getPropertyValue(configString,
"payment.pccharge.merchantID", delegator);
+ String userId = EntityUtilProperties.getPropertyValue(configString,
"payment.pccharge.userID", delegator);
+ String host = EntityUtilProperties.getPropertyValue(configString,
"payment.pccharge.host", delegator);
+ String port = EntityUtilProperties.getPropertyValue(configString,
"payment.pccharge.port", delegator);
+ String autoBill = EntityUtilProperties.getPropertyValue(configString,
"payment.pccharge.autoBill", "true", delegator);
// some property checking
if (UtilValidate.isEmpty(processorId)) {
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
Mon Dec 15 09:10:03 2014
@@ -38,6 +38,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.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
@@ -54,7 +55,8 @@ public class RitaServices {
public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String,
? extends Object> context) {
Locale locale = (Locale) context.get("locale");
- Properties props = buildPccProperties(context);
+ Delegator delegator = dctx.getDelegator();
+ Properties props = buildPccProperties(context, delegator);
RitaApi api = getApi(props, "CREDIT");
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -142,7 +144,8 @@ public class RitaServices {
public static Map<String, Object> ccCapture(DispatchContext dctx,
Map<String, ? extends Object> context) {
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
Locale locale = (Locale) context.get("locale");
-
+ Delegator delegator = dctx.getDelegator();
+
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
@@ -156,7 +159,7 @@ public class RitaServices {
}
// setup the RiTA Interface
- Properties props = buildPccProperties(context);
+ Properties props = buildPccProperties(context, delegator);
RitaApi api = getApi(props, "CREDIT");
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -210,7 +213,8 @@ public class RitaServices {
private static Map<String, Object> ccVoid(DispatchContext dctx,
Map<String, ? extends Object> context, boolean isRefund) {
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
Locale locale = (Locale) context.get("locale");
-
+ Delegator delegator = dctx.getDelegator();
+
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
@@ -224,7 +228,7 @@ public class RitaServices {
}
// setup the RiTA Interface
- Properties props = buildPccProperties(context);
+ Properties props = buildPccProperties(context, delegator);
RitaApi api = getApi(props, "CREDIT");
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -277,7 +281,8 @@ public class RitaServices {
public static Map<String, Object> ccCreditRefund(DispatchContext dctx,
Map<String, ? extends Object> context) {
GenericValue orderPaymentPreference = (GenericValue)
context.get("orderPaymentPreference");
Locale locale = (Locale) context.get("locale");
-
+ Delegator delegator = dctx.getDelegator();
+
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
@@ -291,7 +296,7 @@ public class RitaServices {
}
// setup the RiTA Interface
- Properties props = buildPccProperties(context);
+ Properties props = buildPccProperties(context, delegator);
RitaApi api = getApi(props, "CREDIT");
if (api == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource,
@@ -503,20 +508,20 @@ public class RitaServices {
return api;
}
- private static Properties buildPccProperties(Map<String, ? extends Object>
context) {
+ private static Properties buildPccProperties(Map<String, ? extends Object>
context, Delegator delegator) {
String configString = (String) context.get("paymentConfig");
if (configString == null) {
configString = "payment.properties";
}
- String clientId = UtilProperties.getPropertyValue(configString,
"payment.rita.clientID");
- String userId = UtilProperties.getPropertyValue(configString,
"payment.rita.userID");
- String userPw = UtilProperties.getPropertyValue(configString,
"payment.rita.userPW");
- String host = UtilProperties.getPropertyValue(configString,
"payment.rita.host");
- String port = UtilProperties.getPropertyValue(configString,
"payment.rita.port");
- String ssl = UtilProperties.getPropertyValue(configString,
"payment.rita.ssl", "N");
- String autoBill = UtilProperties.getPropertyValue(configString,
"payment.rita.autoBill", "0");
- String forceTx = UtilProperties.getPropertyValue(configString,
"payment.rita.forceTx", "0");
+ String clientId = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.clientID", delegator);
+ String userId = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.userID", delegator);
+ String userPw = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.userPW", delegator);
+ String host = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.host", delegator);
+ String port = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.port", delegator);
+ String ssl = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.ssl", "N", delegator);
+ String autoBill = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.autoBill", "0", delegator);
+ String forceTx = EntityUtilProperties.getPropertyValue(configString,
"payment.rita.forceTx", "0", delegator);
// some property checking
if (UtilValidate.isEmpty(clientId)) {
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataEvents.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataEvents.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Mon Dec 15 09:10:03 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/openoffice/OpenOfficeServices.java
Mon Dec 15 09:10:03 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);
