svn commit: r721508 - in /ofbiz/trunk/applications: accounting/src/org/ofbiz/accounting/thirdparty/cybersource/ product/src/org/ofbiz/product/product/ product/webapp/catalog/WEB-INF/actions/category/ product/webapp/catalog/WEB-INF/actions/config/ produ...

[adrianc]

Author: adrianc
Date: Fri Nov 28 06:39:50 2008
New Revision: 721508

URL: http://svn.apache.org/viewvc?rev=721508&view=rev
Log:
Fixed bug where properties using the ${} syntax weren't being expanded, reported by Mridul Pathak - https://issues.apache.org/jira/browse/OFBIZ-2066.

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=721508&r1=721507&r2=721508&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Fri Nov 28 06:39:50 2008
@@ -35,6 +35,7 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.base.util.string.FlexibleStringExpander;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.service.DispatchContext;
@@ -236,7 +237,7 @@
         String logFile = UtilProperties.getPropertyValue(configString, "payment.cybersource.log.file");
         String logDir = UtilProperties.getPropertyValue(configString, "payment.cybersource.log.dir");
 
-        String keysPath = UtilProperties.getPropertyValue(configString, "payment.cybersource.keysDir");
+        String keysPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue(configString, "payment.cybersource.keysDir"), context);
         String keysFile = UtilProperties.getPropertyValue(configString, "payment.cybersource.keysFile");
 
         // some property checking

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=721508&r1=721507&r2=721508&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Fri Nov 28 06:39:50 2008
@@ -913,7 +913,7 @@
         
         if (UtilValidate.isNotEmpty((String) context.get("_uploadedFile_fileName"))) {
             String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
-            String imageServerPath = UtilProperties.getPropertyValue("catalog", "image.server.path");
+            String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
             String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
             
             FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy?rev=721508&r1=721507&r2=721508&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy Fri Nov 28 06:39:50 2008
@@ -36,7 +36,7 @@
 
 // make the image file formats
 imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
-imageServerPath = UtilProperties.getPropertyValue("catalog", "image.server.path");
+imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
 imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=721508&r1=721507&r2=721508&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Fri Nov 28 06:39:50 2008
@@ -24,7 +24,7 @@
 
 // make the image file formats
 imageFilenameFormat = "configitems/${configItemId}";
-imageServerPath = UtilProperties.getPropertyValue("catalog", "image.server.path");
+imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
 imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix");
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy?rev=721508&r1=721507&r2=721508&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy Fri Nov 28 06:39:50 2008
@@ -25,7 +25,7 @@
 
 // make the image file formats
 imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format');
-imageServerPath = UtilProperties.getPropertyValue('catalog', 'image.server.path');
+imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context);
 imageUrlPrefix = UtilProperties.getPropertyValue('catalog', 'image.url.prefix');
 context.imageFilenameFormat = imageFilenameFormat;
 context.imageServerPath = imageServerPath;