svn commit: r1645602 [3/4] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1645602 [3/4] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java Mon Dec 15 09:10:03 2014 @@ -28,10 +28,11 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +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.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -161,8 +162,9 @@ public class ShipmentWorker { public static BigDecimal calcPackageWeight(DispatchContext dctx, Map<String, BigDecimal> packageMap, List<Map<String, Object>> shippableItemInfo, BigDecimal additionalWeight) { LocalDispatcher dispatcher = dctx.getDispatcher(); + Delegator delegator = dctx.getDelegator(); BigDecimal totalWeight = BigDecimal.ZERO; - String defaultWeightUomId = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom"); + String defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", delegator); for (Map.Entry<String, BigDecimal> entry: packageMap.entrySet()) { String productId = entry.getKey(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java Mon Dec 15 09:10:03 2014 @@ -46,6 +46,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; @@ -212,7 +213,7 @@ public class DhlServices { } if ((shippableWeight == null) || (shippableWeight.compareTo(BigDecimal.ZERO) <= 0)) { - String tmpValue = UtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.value"); + String tmpValue = EntityUtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.value", delegator); if (tmpValue != null) { try { shippableWeight = new BigDecimal(tmpValue); @@ -678,7 +679,7 @@ public class DhlServices { } else { // use default weight if available try { - packageWeight = new BigDecimal(UtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.value")); + packageWeight = new BigDecimal(EntityUtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.value", delegator)); } catch (NumberFormatException ne) { Debug.logWarning("Default shippable weight not configured (shipment.default.weight.value)", module); packageWeight = BigDecimal.ONE; @@ -970,7 +971,7 @@ public class DhlServices { 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/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Mon Dec 15 09:10:03 2014 @@ -432,7 +432,7 @@ public class FedexServices { } // Get the weight units to be used in the request - String weightUomId = UtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.uom"); + String weightUomId = EntityUtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.uom", delegator); if (UtilValidate.isEmpty(weightUomId)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentDefaultWeightUomIdNotFound", locale)); @@ -442,7 +442,7 @@ public class FedexServices { } // Get the dimension units to be used in the request - String dimensionsUomId = UtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.dimension.uom"); + String dimensionsUomId = EntityUtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.dimension.uom", delegator); if (UtilValidate.isEmpty(dimensionsUomId)) { return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "FacilityShipmentDefaultDimensionUomIdNotFound", locale)); @@ -875,7 +875,7 @@ public class FedexServices { // Use default weight if available try { - packageWeight = new BigDecimal(UtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.value")); + packageWeight = new BigDecimal(EntityUtilProperties.getPropertyValue(shipmentPropertiesFile, "shipment.default.weight.value", delegator)); } catch (NumberFormatException ne) { Debug.logWarning("Default shippable weight not configured (shipment.default.weight.value), assuming 1.0" + weightUomId , module); packageWeight = BigDecimal.ONE; @@ -1076,7 +1076,7 @@ public class FedexServices { 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/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Mon Dec 15 09:10:03 2014 @@ -2618,7 +2618,7 @@ public class UpsServices { Element packageWeightElement = UtilXml.addChildElement(packageElement, "PackageWeight", shipmentConfirmRequestDoc); Element packageWeightUnitOfMeasurementElement = UtilXml.addChildElement(packageElement, "UnitOfMeasurement", shipmentConfirmRequestDoc); UtilXml.addChildElementValue(packageWeightUnitOfMeasurementElement, "Code", "LBS", shipmentConfirmRequestDoc); - UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilProperties.getPropertyValue("shipment", "shipment.default.weight.value"), shipmentConfirmRequestDoc); + UtilXml.addChildElementValue(packageWeightElement, "Weight", EntityUtilProperties.getPropertyValue("shipment", "shipment.default.weight.value", delegator), shipmentConfirmRequestDoc); String shipmentConfirmRequestString = null; try { @@ -2912,7 +2912,7 @@ public class UpsServices { UtilXml.addChildElementValue(shipperElement, "Name", UtilValidate.isNotEmpty(originPostalAddress.getString("toName")) ? originPostalAddress.getString("toName") : "", rateRequestDoc); UtilXml.addChildElementValue(shipperElement, "AttentionName", UtilValidate.isNotEmpty(originPostalAddress.getString("attnName")) ? originPostalAddress.getString("attnName") : "", rateRequestDoc); UtilXml.addChildElementValue(shipperElement, "PhoneNumber", originPhoneNumber, rateRequestDoc); - UtilXml.addChildElementValue(shipperElement, "ShipperNumber", UtilProperties.getPropertyValue("shipment", "shipment.ups.shipper.number"), rateRequestDoc); + UtilXml.addChildElementValue(shipperElement, "ShipperNumber", EntityUtilProperties.getPropertyValue("shipment", "shipment.ups.shipper.number", delegator), rateRequestDoc); Element shipperAddressElement = UtilXml.addChildElement(shipperElement, "Address", rateRequestDoc); UtilXml.addChildElementValue(shipperAddressElement, "AddressLine1", originPostalAddress.getString("address1"), rateRequestDoc); @@ -3198,7 +3198,7 @@ public class UpsServices { 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/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Mon Dec 15 09:10:03 2014 @@ -55,6 +55,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.party.contact.ContactMechWorker; import org.ofbiz.product.product.ProductWorker; import org.ofbiz.product.store.ProductStoreWorker; @@ -1787,7 +1788,7 @@ public class UspsServices { 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/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java Mon Dec 15 09:10:03 2014 @@ -32,6 +32,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; 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; @@ -130,6 +131,7 @@ public class WeightPackageServices { WeightPackageSession weightPackageSession = (WeightPackageSession) context.get("weightPackageSession"); Locale locale = (Locale) context.get("locale"); + Delegator delegator = dctx.getDelegator(); String orderId = (String) context.get("orderId"); String shipmentId = (String) context.get("shipmentId"); String invoiceId = (String) context.get("invoiceId"); @@ -151,7 +153,7 @@ public class WeightPackageServices { Map<String, Object> response = FastMap.newInstance(); try { - String getActualShippingQuoteFromUps = UtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N"); + String getActualShippingQuoteFromUps = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N", delegator); String result = weightPackageSession.complete(orderId, locale, getActualShippingQuoteFromUps); if ("showWarningForm".equals(result)) { response.put("showWarningForm", true); @@ -168,6 +170,7 @@ public class WeightPackageServices { public static Map<String, Object> completeShipment(DispatchContext dctx, Map<String, ? extends Object> context) { Locale locale = (Locale) context.get("locale"); + Delegator delegator = dctx.getDelegator(); WeightPackageSession weightPackageSession = (WeightPackageSession) context.get("weightPackageSession"); String shipmentId = (String) context.get("shipmentId"); @@ -175,7 +178,7 @@ public class WeightPackageServices { Map<String, Object> response = FastMap.newInstance(); try { - String getActualShippingQuoteFromUps = UtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N"); + String getActualShippingQuoteFromUps = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N", delegator); if (weightPackageSession.completeShipment(orderId, getActualShippingQuoteFromUps)) { response.put("shipmentId", shipmentId); } else { @@ -189,11 +192,12 @@ public class WeightPackageServices { public static Map<String, Object> savePackagesInfo(DispatchContext dctx, Map<String, ? extends Object> context) { Locale locale = (Locale) context.get("locale"); + Delegator delegator = dctx.getDelegator(); WeightPackageSession weightPackageSession = (WeightPackageSession) context.get("weightPackageSession"); String orderId = (String) context.get("orderId"); - String getActualShippingQuoteFromUps = UtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N"); + String getActualShippingQuoteFromUps = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N", delegator); try { weightPackageSession.savePackagesInfo(orderId, getActualShippingQuoteFromUps); } catch (GeneralException e) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy Mon Dec 15 09:10:03 2014 @@ -36,7 +36,7 @@ context.primaryParentCategory = primaryP // make the image file formats -imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); +imageFilenameFormat = EntityUtilProperties.getPropertyValue("catalog", "image.filename.format", delegator); imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator); context.imageFilenameFormat = imageFilenameFormat; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/find/sidedeepcategory.groovy Mon Dec 15 09:10:03 2014 @@ -20,6 +20,7 @@ import org.ofbiz.base.util.* import org.ofbiz.entity.* import org.ofbiz.product.category.* +import org.ofbiz.entity.util.EntityUtilProperties; state = request.getParameter("BrowseCategoriesState"); isOpen = true; @@ -35,7 +36,7 @@ if (state) { context.isOpen = isOpen; requestParameters = UtilHttp.getParameterMap(request); -defaultTopCategoryId = requestParameters.TOP_CATEGORY ? requestParameters.TOP_CATEGORY : UtilProperties.getPropertyValue("catalog", "top.category.default"); +defaultTopCategoryId = requestParameters.TOP_CATEGORY ? requestParameters.TOP_CATEGORY : EntityUtilProperties.getPropertyValue("catalog", "top.category.default", delegator); currentTopCategoryId = CategoryWorker.getCatalogTopCategory(request, defaultTopCategoryId); currentTopCategory = null; if (isOpen) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy Mon Dec 15 09:10:03 2014 @@ -27,7 +27,7 @@ import org.ofbiz.entity.condition.* context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); // make the image file formats -imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format'); +imageFilenameFormat = EntityUtilProperties.getPropertyValue('catalog', 'image.filename.format', delegator); imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator); context.imageFilenameFormat = imageFilenameFormat; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy Mon Dec 15 09:10:03 2014 @@ -33,7 +33,7 @@ import org.ofbiz.product.image.ScaleImag context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); -imageManagementPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.management.path"), context); +imageManagementPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.management.path", delegator), context); String fileType = "original"; String productId = request.getParameter("productId"); @@ -44,7 +44,7 @@ if (productContentList) { } // make the image file formats -imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format'); +imageFilenameFormat = EntityUtilProperties.getPropertyValue('catalog', 'image.filename.format', delegator); imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator); context.imageFilenameFormat = imageFilenameFormat; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy Mon Dec 15 09:10:03 2014 @@ -26,7 +26,7 @@ import org.ofbiz.product.image.ScaleImag context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); // make the image file formats -imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format'); +imageFilenameFormat = EntityUtilProperties.getPropertyValue('catalog', 'image.filename.format', delegator); imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator); context.imageFilenameFormat = imageFilenameFormat; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.groovy Mon Dec 15 09:10:03 2014 @@ -22,6 +22,7 @@ import org.ofbiz.entity.* import org.ofbiz.entity.condition.* import org.ofbiz.entity.util.* import org.ofbiz.product.product.* +import org.ofbiz.entity.util.EntityUtilProperties; context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); @@ -303,7 +304,7 @@ context.featureThruDate = featureThruDat context.selFeatureDesc = selFeatureDesc; // get "all" category id -String allCategoryId = UtilProperties.getPropertyValue("catalog", "all.product.category"); +String allCategoryId = EntityUtilProperties.getPropertyValue("catalog", "all.product.category", delegator); context.allCategoryId = allCategoryId; // show the publish or unpublish section Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.groovy Mon Dec 15 09:10:03 2014 @@ -40,7 +40,7 @@ maxDate = parameters.maxDate; // set the page parameters viewIndex = Integer.valueOf(parameters.VIEW_INDEX ?: 0); -viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: UtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20")); +viewSize = Integer.valueOf(parameters.VIEW_SIZE ?: EntityUtilProperties.getPropertyValue("widget", "widget.form.defaultViewSize", "20", delegator)); context.viewIndex = viewIndex; context.viewSize = viewSize; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy Mon Dec 15 09:10:03 2014 @@ -20,6 +20,7 @@ import org.ofbiz.base.util.*; import org.ofbiz.order.order.*; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.entity.condition.EntityCondition; @@ -179,6 +180,6 @@ if (facility) { defaultWeightUomId = facility.defaultWeightUomId; } if (!defaultWeightUomId) { - defaultWeightUomId = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg"); + defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg", delegator); } context.defaultWeightUomId = defaultWeightUomId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/QuickShipOrder.groovy Mon Dec 15 09:10:03 2014 @@ -19,6 +19,7 @@ import org.ofbiz.base.util.* import org.ofbiz.order.order.* +import org.ofbiz.entity.util.EntityUtilProperties; facilityId = parameters.facilityId; if (facilityId) { @@ -65,7 +66,7 @@ if (shipmentId) { context.shipmentId = shipmentId; weightUoms = delegator.findList("Uom", EntityCondition.makeCondition(['uomTypeId' : 'WEIGHT_MEASURE']), null, ['description'], null, false); - defaultWeightUom = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom"); + defaultWeightUom = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", delegator); if (defaultWeightUom) { defaultWeight = delegator.findOne("Uom", [uomId : defaultWeightUom], false); if (defaultWeight) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/WeightPackage.groovy Mon Dec 15 09:10:03 2014 @@ -21,6 +21,7 @@ import org.ofbiz.base.util.UtilPropertie import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.condition.EntityCondition; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.order.order.OrderReadHelper; import org.ofbiz.shipment.weightPackage.WeightPackageSession; @@ -189,7 +190,7 @@ if (facility) { defaultDimensionUomId = facility.defaultDimensionUomId; } if (!defaultDimensionUomId) { - defaultDimensionUomId = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.dimension.uom", "LEN_in"); + defaultDimensionUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.dimension.uom", "LEN_in", delegator); } context.defaultDimensionUomId = defaultDimensionUomId; @@ -198,6 +199,6 @@ if (facility) { defaultWeightUomId = facility.defaultWeightUomId; } if (!defaultWeightUomId) { - defaultWeightUomId = UtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg"); + defaultWeightUomId = EntityUtilProperties.getPropertyValue("shipment.properties", "shipment.default.weight.uom", "WT_kg", delegator); } context.defaultWeightUomId = defaultWeightUomId; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Mon Dec 15 09:10:03 2014 @@ -72,6 +72,7 @@ public class LoginEvents { public static String saveEntryParams(HttpServletRequest request, HttpServletResponse response) { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); HttpSession session = request.getSession(); + Delegator delegator = (Delegator) request.getAttribute("delegator"); // save entry login parameters if we don't have a valid login object if (userLogin == null) { @@ -79,10 +80,10 @@ public class LoginEvents { String username = request.getParameter("USERNAME"); String password = request.getParameter("PASSWORD"); - if ((username != null) && ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "username.lowercase")))) { + if ((username != null) && ("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security.properties", "username.lowercase", delegator)))) { username = username.toLowerCase(); } - if ((password != null) && ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "password.lowercase")))) { + if ((password != null) && ("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security.properties", "password.lowercase", delegator)))) { password = password.toLowerCase(); } @@ -128,7 +129,7 @@ public class LoginEvents { String userLoginId = request.getParameter("USERNAME"); String errMsg = null; - if ((userLoginId != null) && ("true".equals(UtilProperties.getPropertyValue("security.properties", "username.lowercase")))) { + if ((userLoginId != null) && ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "username.lowercase", delegator)))) { userLoginId = userLoginId.toLowerCase(); } @@ -184,11 +185,11 @@ public class LoginEvents { String errMsg = null; - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); String userLoginId = request.getParameter("USERNAME"); - if ((userLoginId != null) && ("true".equals(UtilProperties.getPropertyValue("security.properties", "username.lowercase")))) { + if ((userLoginId != null) && ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "username.lowercase", delegator)))) { userLoginId = userLoginId.toLowerCase(); } @@ -212,13 +213,13 @@ public class LoginEvents { } if (useEncryption) { // password encrypted, can't send, generate new password and email to user - passwordToSend = RandomStringUtils.randomAlphanumeric(Integer.parseInt(UtilProperties.getPropertyValue("security", "password.length.min", "5"))); - if ("true".equals(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))){ + passwordToSend = RandomStringUtils.randomAlphanumeric(Integer.parseInt(EntityUtilProperties.getPropertyValue("security", "password.length.min", "5", delegator))); + if ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.lowercase", delegator))){ passwordToSend=passwordToSend.toLowerCase(); } supposedUserLogin.set("currentPassword", HashCrypt.cryptUTF8(LoginServices.getHashType(), null, passwordToSend)); supposedUserLogin.set("passwordHint", "Auto-Generated Password"); - if ("true".equals(UtilProperties.getPropertyValue("security.properties", "password.email_password.require_password_change"))){ + if ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.email_password.require_password_change", delegator))){ supposedUserLogin.set("requirePasswordChange", "Y"); } } else { @@ -386,7 +387,8 @@ public class LoginEvents { public static void setUsername(HttpServletRequest request, HttpServletResponse response) { HttpSession session = request.getSession(); - String domain = UtilProperties.getPropertyValue("url.properties", "cookie.domain"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); + String domain = EntityUtilProperties.getPropertyValue("url.properties", "cookie.domain", delegator); // first try to get the username from the cookie synchronized (session) { if (UtilValidate.isEmpty(getUsername(request))) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java Mon Dec 15 09:10:03 2014 @@ -33,8 +33,10 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.party.contact.ContactHelper; public class TruitionCoReg { @@ -43,6 +45,7 @@ public class TruitionCoReg { public static final String logPrefix = "Truition Cookie Info: "; public static String truitionReg(HttpServletRequest req, HttpServletResponse resp) { + Delegator delegator = (Delegator) req.getAttribute("delegator"); HttpSession session = req.getSession(); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); StringBuffer cookieNameB = new StringBuffer(); @@ -57,9 +60,9 @@ public class TruitionCoReg { } // locate the domain/cookie name setting - String domainName = UtilProperties.getPropertyValue("truition.properties", "truition.domain.name"); - String cookiePath = UtilProperties.getPropertyValue("truition.properties", "truition.cookie.path"); - String cookieName = UtilProperties.getPropertyValue("truition.properties", "truition.cookie.name"); + String domainName = EntityUtilProperties.getPropertyValue("truition.properties", "truition.domain.name", delegator); + String cookiePath = EntityUtilProperties.getPropertyValue("truition.properties", "truition.cookie.path", delegator); + String cookieName = EntityUtilProperties.getPropertyValue("truition.properties", "truition.cookie.name", delegator); int time = (int) UtilProperties.getPropertyNumber("truition.properties", "truition.cookie.time"); if (UtilValidate.isEmpty(domainName)) { Debug.logError("Truition is not properly configured; domainName missing; see truition.properties", module); @@ -101,9 +104,10 @@ public class TruitionCoReg { } public static String truitionLogoff(HttpServletRequest req, HttpServletResponse resp) { + Delegator delegator = (Delegator) req.getAttribute("delegator"); // locate the domain/cookie name setting - String domainName = UtilProperties.getPropertyValue("truition.properties", "truition.domain.name"); - String cookieName = UtilProperties.getPropertyValue("truition.properties", "truition.cookie.name"); + String domainName = EntityUtilProperties.getPropertyValue("truition.properties", "truition.domain.name", delegator); + String cookieName = EntityUtilProperties.getPropertyValue("truition.properties", "truition.cookie.name", delegator); if (UtilValidate.isEmpty(domainName)) { Debug.logError("Truition is not properly configured; domainName missing; see truition.properties", module); return "error"; @@ -128,8 +132,9 @@ public class TruitionCoReg { } public static String truitionRedirect(HttpServletRequest req, HttpServletResponse resp) { + Delegator delegator = (Delegator) req.getAttribute("delegator"); // redirect URL form field - String redirectUrlName = UtilProperties.getPropertyValue("truition.properties", "truition.redirect.urlName"); + String redirectUrlName = EntityUtilProperties.getPropertyValue("truition.properties", "truition.redirect.urlName", delegator); String redirectUrl = req.getParameter(redirectUrlName); Debug.logInfo("Redirect to : " + redirectUrl, module); if (truitionEnabled() && redirectUrl != null) { @@ -148,8 +153,9 @@ public class TruitionCoReg { } public static boolean makeTruitionCookie(GenericValue userLogin, StringBuffer cookieName, StringBuffer cookieValue) { - String domainName = UtilProperties.getPropertyValue("truition.properties", "truition.domain.name"); - String siteId = UtilProperties.getPropertyValue("truition.properties", "truition.siteId"); + Delegator delegator = userLogin.getDelegator(); + String domainName = EntityUtilProperties.getPropertyValue("truition.properties", "truition.domain.name", delegator); + String siteId = EntityUtilProperties.getPropertyValue("truition.properties", "truition.siteId", delegator); if (UtilValidate.isEmpty(domainName)) { Debug.logError("Truition is not properly configured; domainName missing; see truition.properties!", module); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Mon Dec 15 09:10:03 2014 @@ -39,6 +39,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; public class WorkEffortKeywordIndex { public static final String module = WorkEffortKeywordIndex.class.getName(); @@ -58,7 +59,7 @@ public class WorkEffortKeywordIndex { List<String> strings = FastList.newInstance(); int widWeight = 1; try { - widWeight = Integer.parseInt(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffort.workEffortId", "1")); + widWeight = Integer.parseInt(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffort.workEffortId", "1", delegator)); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } @@ -68,15 +69,15 @@ public class WorkEffortKeywordIndex { addWeightedKeywordSourceString(workEffort, "workEffortTypeId", strings); addWeightedKeywordSourceString(workEffort, "currentStatusId", strings); - if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1"))) { + if (!"0".equals(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1", delegator))) { List<GenericValue> workEffortNotes = EntityQuery.use(delegator).from("WorkEffortNoteAndData").where("workEffortId", workEffortId).queryList(); for (GenericValue workEffortNote : workEffortNotes) { addWeightedKeywordSourceString(workEffortNote, "noteInfo", strings); } } //WorkEffortAttribute - if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortAttribute.attrName", "1")) || - !"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortAttribute.attrValue", "1"))) { + if (!"0".equals(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortAttribute.attrName", "1", delegator)) || + !"0".equals(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortAttribute.attrValue", "1", delegator))) { List<GenericValue> workEffortAttributes = EntityQuery.use(delegator).from("WorkEffortAttribute").where("workEffortId", workEffortId).queryList(); for (GenericValue workEffortAttribute : workEffortAttributes) { addWeightedKeywordSourceString(workEffortAttribute, "attrName", strings); @@ -84,11 +85,11 @@ public class WorkEffortKeywordIndex { } } - String workEffortContentTypes = UtilProperties.getPropertyValue("workeffortsearch", "index.include.WorkEffortContentTypes"); + String workEffortContentTypes = EntityUtilProperties.getPropertyValue("workeffortsearch", "index.include.WorkEffortContentTypes", delegator); for (String workEffortContentTypeId: workEffortContentTypes.split(",")) { int weight = 1; try { - weight = Integer.parseInt(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortContent." + workEffortContentTypeId, "1")); + weight = Integer.parseInt(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortContent." + workEffortContentTypeId, "1", delegator)); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } @@ -136,11 +137,12 @@ public class WorkEffortKeywordIndex { } } public static void addWeightedKeywordSourceString(GenericValue value, String fieldName, List<String> strings) { + Delegator delegator = value.getDelegator(); if (value.getString(fieldName) != null) { int weight = 1; try { - weight = Integer.parseInt(UtilProperties.getPropertyValue("workeffortsearch", "index.weight." + value.getEntityName() + "." + fieldName, "1")); + weight = Integer.parseInt(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight." + value.getEntityName() + "." + fieldName, "1", delegator)); } catch (Exception e) { Debug.logWarning("Could not parse weight number: " + e.toString(), module); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Mon Dec 15 09:10:03 2014 @@ -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.EntityQuery; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.security.Security; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; @@ -1049,8 +1050,8 @@ public class WorkEffortServices { } } else { // TODO: Remove this block after the next release 2010-11-29 - String screenLocation = UtilProperties.getPropertyValue("EventReminders", "eventReminders.emailScreenWidgetLocation"); - String fromAddress = UtilProperties.getPropertyValue("EventReminders", "eventReminders.emailFromAddress"); + String screenLocation = EntityUtilProperties.getPropertyValue("EventReminders", "eventReminders.emailScreenWidgetLocation", delegator); + String fromAddress = EntityUtilProperties.getPropertyValue("EventReminders", "eventReminders.emailFromAddress", delegator); String subject = UtilProperties.getMessage("WorkEffortUiLabels", "WorkEffortEventReminder", (Locale) parameters.get("locale")); Map<String, Object> emailCtx = UtilMisc.toMap("sendFrom", fromAddress, "sendTo", toAddress, "subject", subject, "bodyParameters", parameters, "bodyScreenUri", screenLocation); try { @@ -1069,10 +1070,11 @@ public class WorkEffortServices { @Deprecated protected static void processEventReminder(DispatchContext ctx, GenericValue reminder, Map<String, Object> parameters) throws GenericEntityException { LocalDispatcher dispatcher = ctx.getDispatcher(); + Delegator delegator = ctx.getDelegator(); GenericValue contactMech = reminder.getRelatedOne("ContactMech", false); if (contactMech != null && "EMAIL_ADDRESS".equals(contactMech.get("contactMechTypeId"))) { - String screenLocation = UtilProperties.getPropertyValue("EventReminders", "eventReminders.emailScreenWidgetLocation"); - String fromAddress = UtilProperties.getPropertyValue("EventReminders", "eventReminders.emailFromAddress"); + String screenLocation = EntityUtilProperties.getPropertyValue("EventReminders", "eventReminders.emailScreenWidgetLocation", delegator); + String fromAddress = EntityUtilProperties.getPropertyValue("EventReminders", "eventReminders.emailFromAddress", delegator); String toAddress = contactMech.getString("infoString"); String subject = UtilProperties.getMessage("WorkEffortUiLabels", "WorkEffortEventReminder", (Locale) parameters.get("locale")); Map<String, Object> emailCtx = UtilMisc.toMap("sendFrom", fromAddress, "sendTo", toAddress, "subject", subject, "bodyParameters", parameters, "bodyScreenUri", screenLocation); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Mon Dec 15 09:10:03 2014 @@ -1312,7 +1312,7 @@ under the License. <property name="sonar.sources" value="specialpurpose/appserver/src, framework/base/src, framework/bi/src, framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src, framework/example/src, framework/geronimo/src, framework/jetty/src, - framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src, + framework/minilang/src, framework/security/src, framework/service/src, framework/start/src, framework/testtools/src, framework/webapp/src, framework/webtools/src, framework/widget/src, applications/accounting/src, applications/commonext/src, applications/content/src, applications/humanres/src, applications/manufacturing/src, applications/marketing/src, applications/order/src, applications/party/src, @@ -1321,7 +1321,7 @@ under the License. specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src, specialpurpose/scrum/src, specialpurpose/birt/src" /> <property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test, - framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test, + framework/service/src/org/ofbiz/service/test, applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test, applications/product/src/org/ofbiz/product/test, applications/product/src/org/ofbiz/shipment/test, applications/securityext/src/org/ofbiz/securityext/test" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/build.xml?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/build.xml Mon Dec 15 09:10:03 2014 @@ -20,7 +20,7 @@ under the License. <project name="OFBiz Framework Build" default="build" basedir="."> <filelist id="framework-builds" dir="framework" - files="start/build.xml,base/build.xml,sql/build.xml, + files="start/build.xml,base/build.xml, entity/build.xml,geronimo/build.xml, catalina/build.xml, security/build.xml,service/build.xml,entityext/build.xml, @@ -30,5 +30,5 @@ under the License. testtools/build.xml, webtools/build.xml"/> - <filelist id="test-builds" dir="framework" files="base/build.xml,sql/build.xml,entity/build.xml"/> + <filelist id="test-builds" dir="framework" files="base/build.xml,entity/build.xml"/> </project> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Mon Dec 15 09:10:03 2014 @@ -33,6 +33,8 @@ import org.apache.tomcat.util.http.Serve import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.util.EntityUtilProperties; public class CrossSubdomainSessionValve extends ValveBase { @@ -63,9 +65,10 @@ public class CrossSubdomainSessionValve protected void replaceCookie(Request request, Response response, Cookie cookie) { + Delegator delegator = (Delegator) request.getAttribute("delegator"); // copy the existing session cookie, but use a different domain (only if domain is valid) String cookieDomain = null; - cookieDomain = UtilProperties.getPropertyValue("url", "cookie.domain", ""); + cookieDomain = EntityUtilProperties.getPropertyValue("url", "cookie.domain", "", delegator); if (UtilValidate.isEmpty(cookieDomain)) { String serverName = request.getServerName(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Dec 15 09:10:03 2014 @@ -57,6 +57,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.security.Security; /** @@ -392,8 +393,9 @@ public class CommonEvents { public static String getCaptcha(HttpServletRequest request, HttpServletResponse response) { try { + Delegator delegator = (Delegator) request.getAttribute("delegator"); final String captchaSizeConfigName = StringUtils.defaultIfEmpty(request.getParameter("captchaSize"), "default"); - final String captchaSizeConfig = UtilProperties.getPropertyValue("captcha.properties", "captcha." + captchaSizeConfigName); + final String captchaSizeConfig = EntityUtilProperties.getPropertyValue("captcha.properties", "captcha." + captchaSizeConfigName, delegator); final String[] captchaSizeConfigs = captchaSizeConfig.split("\\|"); final String captchaCodeId = StringUtils.defaultIfEmpty(request.getParameter("captchaCodeId"), ""); // this is used to uniquely identify in the user session the attribute where the captcha code for the last captcha for the form is stored @@ -401,7 +403,7 @@ public class CommonEvents { final int height = Integer.parseInt(captchaSizeConfigs[1]); final int width = Integer.parseInt(captchaSizeConfigs[2]); final int charsToPrint = UtilProperties.getPropertyAsInteger("captcha.properties", "captcha.code_length", 6); - final char[] availableChars = UtilProperties.getPropertyValue("captcha.properties", "captcha.characters").toCharArray(); + final char[] availableChars = EntityUtilProperties.getPropertyValue("captcha.properties", "captcha.characters", delegator).toCharArray(); //It is possible to pass the font size, image width and height with the request as well Color backgroundColor = Color.gray; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonWorkers.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonWorkers.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/CommonWorkers.java Mon Dec 15 09:10:03 2014 @@ -57,7 +57,7 @@ public class CommonWorkers { } List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("geoTypeId", EntityOperator.EQUALS, "COUNTRY")); - List<String> countriesAvailable = StringUtil.split(UtilProperties.getPropertyValue("general.properties", "countries.geo.id.available"), ","); + List<String> countriesAvailable = StringUtil.split(EntityUtilProperties.getPropertyValue("general.properties", "countries.geo.id.available", delegator), ","); if (UtilValidate.isNotEmpty(countriesAvailable)) { // only available countries (we don't verify the list of geoId in countries.geo.id.available) exprs.add(EntityCondition.makeCondition("geoId", EntityOperator.IN, countriesAvailable)); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/FindServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/FindServices.java Mon Dec 15 09:10:03 2014 @@ -54,6 +54,7 @@ import org.ofbiz.entity.model.ModelField import org.ofbiz.entity.util.EntityFindOptions; import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -462,13 +463,14 @@ public class FindServices { List<String> fieldList = UtilGenerics.<String>checkList(context.get("fieldList")); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); + Delegator delegator = dctx.getDelegator(); if (UtilValidate.isEmpty(noConditionFind)) { // try finding in inputFields Map noConditionFind = (String) inputFields.get("noConditionFind"); } if (UtilValidate.isEmpty(noConditionFind)) { // Use configured default - noConditionFind = UtilProperties.getPropertyValue("widget", "widget.defaultNoConditionFind"); + noConditionFind = EntityUtilProperties.getPropertyValue("widget", "widget.defaultNoConditionFind", delegator); } String filterByDate = (String) context.get("filterByDate"); if (UtilValidate.isEmpty(filterByDate)) { @@ -529,6 +531,7 @@ public class FindServices { */ public static Map<String, Object> prepareFind(DispatchContext dctx, Map<String, ?> context) { String entityName = (String) context.get("entityName"); + Delegator delegator = dctx.getDelegator(); String orderBy = (String) context.get("orderBy"); Map<String, ?> inputFields = checkMap(context.get("inputFields"), String.class, Object.class); // Input String noConditionFind = (String) context.get("noConditionFind"); @@ -538,7 +541,7 @@ public class FindServices { } if (UtilValidate.isEmpty(noConditionFind)) { // Use configured default - noConditionFind = UtilProperties.getPropertyValue("widget", "widget.defaultNoConditionFind"); + noConditionFind = EntityUtilProperties.getPropertyValue("widget", "widget.defaultNoConditionFind", delegator); } String filterByDate = (String) context.get("filterByDate"); if (UtilValidate.isEmpty(filterByDate)) { @@ -548,7 +551,6 @@ public class FindServices { Timestamp filterByDateValue = (Timestamp) context.get("filterByDateValue"); Map<String, Object> queryStringMap = new LinkedHashMap<String, Object>(); - Delegator delegator = dctx.getDelegator(); ModelEntity modelEntity = delegator.getModelEntity(entityName); List<EntityCondition> tmpList = createConditionList(inputFields, modelEntity.getFieldsUnmodifiable(), queryStringMap, delegator, context); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java Mon Dec 15 09:10:03 2014 @@ -135,7 +135,7 @@ public class EmailServices { String sendBcc = (String) context.get("sendBcc"); // check to see if we should redirect all mail for testing - String redirectAddress = UtilProperties.getPropertyValue("general.properties", "mail.notifications.redirectTo"); + String redirectAddress = EntityUtilProperties.getPropertyValue("general.properties", "mail.notifications.redirectTo", delegator); if (UtilValidate.isNotEmpty(redirectAddress)) { String originalRecipients = " [To: " + sendTo + ", Cc: " + sendCc + ", Bcc: " + sendBcc + "]"; subject += originalRecipients; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LdapAuthenticationServices.java Mon Dec 15 09:10:03 2014 @@ -37,6 +37,7 @@ import org.ofbiz.entity.GenericEntityExc import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.transaction.GenericTransactionException; import org.ofbiz.entity.transaction.TransactionUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.service.DispatchContext; /** LDAP Authentication Services. @@ -93,7 +94,7 @@ public class LdapAuthenticationServices } // Synchronize user's OFBiz password with user's LDAP password if (userLogin != null) { - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); String currentPassword = userLogin.getString("currentPassword"); boolean samePassword; if (useEncryption) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/login/LoginServices.java Mon Dec 15 09:10:03 2014 @@ -50,6 +50,7 @@ import org.ofbiz.entity.transaction.Tran import org.ofbiz.entity.util.EntityFindOptions; import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.entity.util.EntityQuery; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.security.Security; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.LocalDispatcher; @@ -71,6 +72,7 @@ public class LoginServices { public static Map<String, Object> userLogin(DispatchContext ctx, Map<String, ?> context) { LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); + Delegator delegator = ctx.getDelegator(); // load the external auth modules -- note: this will only run once and cache the objects if (!AuthHelper.authenticatorsLoaded()) { @@ -79,10 +81,10 @@ public class LoginServices { // Authenticate to LDAP if configured to do so // TODO: this should be moved to using the NEW Authenticator API - if ("true".equals(UtilProperties.getPropertyValue("security", "security.ldap.enable"))) { + if ("true".equals(EntityUtilProperties.getPropertyValue("security", "security.ldap.enable", delegator))) { if (!LdapAuthenticationServices.userLogin(ctx, context)) { String errMsg = UtilProperties.getMessage(resource, "loginservices.ldap_authentication_failed", locale); - if ("true".equals(UtilProperties.getPropertyValue("security", "security.ldap.fail.login"))) { + if ("true".equals(EntityUtilProperties.getPropertyValue("security", "security.ldap.fail.login", delegator))) { return ServiceUtil.returnError(errMsg); } else { Debug.logInfo(errMsg, module); @@ -91,8 +93,7 @@ public class LoginServices { } Map<String, Object> result = new LinkedHashMap<String, Object>(); - Delegator delegator = ctx.getDelegator(); - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); // if isServiceAuth is not specified, default to not a service auth boolean isServiceAuth = context.get("isServiceAuth") != null && ((Boolean) context.get("isServiceAuth")).booleanValue(); @@ -112,10 +113,10 @@ public class LoginServices { errMsg = UtilProperties.getMessage(resource,"loginservices.password_missing", locale); } else { - if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "username.lowercase"))) { + if ("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security.properties", "username.lowercase", delegator))) { username = username.toLowerCase(); } - if ("true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))) { + if ("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security.properties", "password.lowercase", delegator))) { password = password.toLowerCase(); } @@ -155,7 +156,7 @@ public class LoginServices { } if (userLogin != null) { - String ldmStr = UtilProperties.getPropertyValue("security.properties", "login.disable.minutes"); + String ldmStr = EntityUtilProperties.getPropertyValue("security.properties", "login.disable.minutes", delegator); long loginDisableMinutes = 30; try { @@ -265,7 +266,7 @@ public class LoginServices { userLogin.set("successiveFailedLogins", currentFailedLogins); // if failed logins over amount in properties file, disable account - String mflStr = UtilProperties.getPropertyValue("security.properties", "max.failed.logins"); + String mflStr = EntityUtilProperties.getPropertyValue("security.properties", "max.failed.logins", delegator); long maxFailedLogins = 3; try { maxFailedLogins = Long.parseLong(mflStr); @@ -302,11 +303,11 @@ public class LoginServices { userLogin.store(); } - if ("true".equals(UtilProperties.getPropertyValue("security.properties", "store.login.history"))) { + if ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "store.login.history", delegator))) { boolean createHistory = true; // only save info on service auth if option set to true to do so - if (isServiceAuth && !"true".equals(UtilProperties.getPropertyValue("security.properties", "store.login.history.on.service.auth"))) { + if (isServiceAuth && !"true".equals(EntityUtilProperties.getPropertyValue("security.properties", "store.login.history.on.service.auth", delegator))) { createHistory = false; } @@ -320,7 +321,7 @@ public class LoginServices { } // ONLY save the password if it was incorrect - if ("N".equals(successfulLogin) && !"false".equals(UtilProperties.getPropertyValue("security.properties", "store.login.history.incorrect.password"))) { + if ("N".equals(successfulLogin) && !"false".equals(EntityUtilProperties.getPropertyValue("security.properties", "store.login.history.incorrect.password", delegator))) { ulhCreateMap.put("passwordUsed", password); } @@ -425,7 +426,7 @@ public class LoginServices { public static void createUserLoginPasswordHistory(Delegator delegator,String userLoginId, String currentPassword) throws GenericEntityException{ int passwordChangeHistoryLimit = 0; try { - passwordChangeHistoryLimit = Integer.parseInt(UtilProperties.getPropertyValue("security.properties", "password.change.history.limit", "0")); + passwordChangeHistoryLimit = Integer.parseInt(EntityUtilProperties.getPropertyValue("security.properties", "password.change.history.limit", "0", delegator)); } catch (NumberFormatException nfe) { //No valid value is found so don't bother to save any password history passwordChangeHistoryLimit = 0; @@ -457,7 +458,7 @@ public class LoginServices { // save this password in history GenericValue userLoginPwdHistToCreate = delegator.makeValue("UserLoginPasswordHistory", UtilMisc.toMap("userLoginId", userLoginId,"fromDate", nowTimestamp)); - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); userLoginPwdHistToCreate.set("currentPassword", useEncryption ? HashCrypt.cryptUTF8(getHashType(), null, currentPassword) : currentPassword); userLoginPwdHistToCreate.create(); } @@ -475,7 +476,7 @@ public class LoginServices { List<String> errorMessageList = new LinkedList<String>(); Locale locale = (Locale) context.get("locale"); - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); String userLoginId = (String) context.get("userLoginId"); String partyId = (String) context.get("partyId"); @@ -515,9 +516,8 @@ public class LoginServices { } } - checkNewPassword(null, null, currentPassword, currentPasswordVerify, passwordHint, errorMessageList, true, locale); - GenericValue userLoginToCreate = delegator.makeValue("UserLogin", UtilMisc.toMap("userLoginId", userLoginId)); + checkNewPassword(userLoginToCreate, null, currentPassword, currentPasswordVerify, passwordHint, errorMessageList, true, locale); userLoginToCreate.set("externalAuthId", externalAuthId); userLoginToCreate.set("passwordHint", passwordHint); userLoginToCreate.set("enabled", enabled); @@ -579,7 +579,7 @@ public class LoginServices { AuthHelper.loadAuthenticators(ctx.getDispatcher()); } - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); boolean adminUser = false; String userLoginId = (String) context.get("userLoginId"); @@ -646,7 +646,7 @@ public class LoginServices { } } - if ("true".equals(UtilProperties.getPropertyValue("security.properties", "password.lowercase"))) { + if ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.lowercase", delegator))) { currentPassword = currentPassword.toLowerCase(); newPassword = newPassword.toLowerCase(); newPasswordVerify = newPasswordVerify.toLowerCase(); @@ -711,7 +711,7 @@ public class LoginServices { String userLoginId = (String) context.get("userLoginId"); String errMsg = null; - if ((userLoginId != null) && ("true".equals(UtilProperties.getPropertyValue("security.properties", "username.lowercase")))) { + if ((userLoginId != null) && ("true".equals(EntityUtilProperties.getPropertyValue("security.properties", "username.lowercase", delegator)))) { userLoginId = userLoginId.toLowerCase(); } @@ -886,7 +886,8 @@ public class LoginServices { } public static void checkNewPassword(GenericValue userLogin, String currentPassword, String newPassword, String newPasswordVerify, String passwordHint, List<String> errorMessageList, boolean ignoreCurrentPassword, Locale locale) { - boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); + Delegator delegator = userLogin.getDelegator(); + boolean useEncryption = "true".equals(EntityUtilProperties.getPropertyValue("security.properties", "password.encrypt", delegator)); String errMsg = null; @@ -915,7 +916,7 @@ public class LoginServices { int passwordChangeHistoryLimit = 0; try { - passwordChangeHistoryLimit = Integer.parseInt(UtilProperties.getPropertyValue("security.properties", "password.change.history.limit", "0")); + passwordChangeHistoryLimit = Integer.parseInt(EntityUtilProperties.getPropertyValue("security.properties", "password.change.history.limit", "0", delegator)); } catch (NumberFormatException nfe) { //No valid value is found so don't bother to save any password history passwordChangeHistoryLimit = 0; @@ -923,7 +924,6 @@ public class LoginServices { Debug.logInfo(" password.change.history.limit is set to " + passwordChangeHistoryLimit, module); if (passwordChangeHistoryLimit > 0 && userLogin != null) { Debug.logInfo(" checkNewPassword Checking if user is tyring to use old password " + passwordChangeHistoryLimit, module); - Delegator delegator = userLogin.getDelegator(); try { List<GenericValue> pwdHistList = delegator.findByAnd("UserLoginPasswordHistory", UtilMisc.toMap("userLoginId",userLogin.getString("userLoginId")), UtilMisc.toList("-fromDate"), false); for (GenericValue pwdHistValue : pwdHistList) { @@ -945,14 +945,14 @@ public class LoginServices { int minPasswordLength = 0; try { - minPasswordLength = Integer.parseInt(UtilProperties.getPropertyValue("security.properties", "password.length.min", "0")); + minPasswordLength = Integer.parseInt(EntityUtilProperties.getPropertyValue("security.properties", "password.length.min", "0", delegator)); } catch (NumberFormatException nfe) { minPasswordLength = 0; } if (newPassword != null) { // Matching password with pattern - String passwordPattern = UtilProperties.getPropertyValue("security.properties", "security.login.password.pattern", "^.*(?=.{5,}).*$"); + String passwordPattern = EntityUtilProperties.getPropertyValue("security.properties", "security.login.password.pattern", "^.*(?=.{5,}).*$", delegator); boolean usePasswordPattern = UtilProperties.getPropertyAsBoolean("security.properties", "security.login.password.pattern.enable", true); if (usePasswordPattern) { Pattern pattern = Pattern.compile(passwordPattern); @@ -961,8 +961,8 @@ public class LoginServices { if (!matched) { // This is a mix to handle the OOTB pattern which is only a fixed length Map<String, String> messageMap = UtilMisc.toMap("minPasswordLength", Integer.toString(minPasswordLength)); - String passwordPatternMessage = UtilProperties.getPropertyValue("security.properties", - "security.login.password.pattern.description", "loginservices.password_must_be_least_characters_long"); + String passwordPatternMessage = EntityUtilProperties.getPropertyValue("security.properties", + "security.login.password.pattern.description", "loginservices.password_must_be_least_characters_long", delegator); errMsg = UtilProperties.getMessage(resource, passwordPatternMessage, messageMap, locale); messageMap = UtilMisc.toMap("passwordPatternMessage", errMsg); errMsg = UtilProperties.getMessage(resource,"loginservices.password.pattern.errmsg", messageMap, locale); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy Mon Dec 15 09:10:03 2014 @@ -19,7 +19,6 @@ import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.UtilProperties; import org.ofbiz.entity.util.EntityFindOptions; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityConditionList; @@ -27,6 +26,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityFieldValue; import org.ofbiz.entity.condition.EntityFunction; import org.ofbiz.entity.condition.EntityOperator; +import org.ofbiz.entity.util.EntityUtilProperties; def mainAndConds = []; def orExprs = []; @@ -107,7 +107,7 @@ if (orExprs && entityName && displayFiel String viewSizeStr = context.autocompleterViewSize; if (viewSizeStr == null) { - viewSizeStr = UtilProperties.getPropertyValue("widget", "widget.autocompleter.defaultViewSize"); + viewSizeStr = EntityUtilProperties.getPropertyValue("widget", "widget.autocompleter.defaultViewSize", delegator); } Integer autocompleterViewSize = Integer.valueOf(viewSizeStr ?: 10); EntityFindOptions findOptions = new EntityFindOptions(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/component-load.xml?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/component-load.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/component-load.xml Mon Dec 15 09:10:03 2014 @@ -22,7 +22,6 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd"> <load-component component-location="base"/> <load-component component-location="geronimo"/> - <load-component component-location="sql"/> <load-component component-location="entity"/> <load-component component-location="security"/> <load-component component-location="datafile"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/build.xml?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/build.xml Mon Dec 15 09:10:03 2014 @@ -37,7 +37,6 @@ under the License. <fileset dir="../base/lib/j2eespecs" includes="*.jar"/> <fileset dir="../base/lib/scripting" includes="*.jar"/> <fileset dir="../base/build/lib" includes="*.jar"/> - <fileset dir="../sql/build/lib" includes="*.jar"/> </path> <patternset id="src.exc.set"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd?rev=1645602&r1=1645601&r2=1645602&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd Mon Dec 15 09:10:03 2014 @@ -39,6 +39,9 @@ under the License. <xs:enumeration value="count-distinct"/> <xs:enumeration value="upper"/> <xs:enumeration value="lower"/> + <xs:enumeration value="extract-year"/> + <xs:enumeration value="extract-month"/> + <xs:enumeration value="extract-day"/> </xs:restriction> </xs:simpleType> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |