svn commit: r724851 - in /ofbiz/trunk: applications/accounting/config/payment.properties applications/product/config/catalog.properties framework/base/config/jsse.properties framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

[ad...@apache.org]

Author: adrianc
Date: Tue Dec  9 11:46:44 2008
New Revision: 724851

URL: http://svn.apache.org/viewvc?rev=724851&view=rev
Log:
Converted ${env...} expression syntax to ${sys:getProperty(String)}. The old syntax still works.

I didn't like how an expression starting with "env." was treated differently, especially since it wasn't documented anywhere.

Modified:
    ofbiz/trunk/applications/accounting/config/payment.properties
    ofbiz/trunk/applications/product/config/catalog.properties
    ofbiz/trunk/framework/base/config/jsse.properties
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java

Modified: ofbiz/trunk/applications/accounting/config/payment.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/payment.properties?rev=724851&r1=724850&r2=724851&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/payment.properties (original)
+++ ofbiz/trunk/applications/accounting/config/payment.properties Tue Dec  9 11:46:44 2008
@@ -75,7 +75,7 @@
 payment.cybersource.production=false
 
 # directory of the keys from CyberSource (Generate using online tools)
-payment.cybersource.keysDir=${env.ofbiz.home}/applications/accounting/icskeys
+payment.cybersource.keysDir=${sys:getProperty('ofbiz.home')}/applications/accounting/icskeys
 
 # name of the keystore (if different then <merchantID>.p12)
 #payment.cybersource.keysFile=
@@ -185,7 +185,7 @@
 ############################################
 
 # Path the the VeriSign Certificate
-payment.verisign.certsPath=${env.ofbiz.home}/applications/accounting/pfcerts
+payment.verisign.certsPath=${sys:getProperty('ofbiz.home')}/applications/accounting/pfcerts
 
 # Address and port of the payment processor
 payment.verisign.hostAddress=test-payflow.verisign.com

Modified: ofbiz/trunk/applications/product/config/catalog.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/catalog.properties?rev=724851&r1=724850&r2=724851&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/catalog.properties (original)
+++ ofbiz/trunk/applications/product/config/catalog.properties Tue Dec  9 11:46:44 2008
@@ -21,7 +21,7 @@
 
 
 # -- Image upload path on the server
-image.server.path=${env.ofbiz.home}/framework/images/webapp/images
+image.server.path=${sys:getProperty('ofbiz.home')}/framework/images/webapp/images
 
 # -- The prefix to put on auto-generated image urls (can be relative or absolute, whatever you want)
 image.url.prefix=/images

Modified: ofbiz/trunk/framework/base/config/jsse.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/jsse.properties?rev=724851&r1=724850&r2=724851&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/jsse.properties (original)
+++ ofbiz/trunk/framework/base/config/jsse.properties Tue Dec  9 11:46:44 2008
@@ -27,17 +27,17 @@
 #https.cipherSuites=
 
 # OFBiz TrustStore
-ofbiz.trustStore=${env.ofbiz.home}/framework/base/config/ofbiztrust.jks
+ofbiz.trustStore=${sys:getProperty('ofbiz.home')}/framework/base/config/ofbiztrust.jks
 ofbiz.trustStore.password=changeit
 ofbiz.trustStore.type=jks
 
 # OFBiz KeyStore - Client Certs
-ofbiz.client.keyStore=${env.ofbiz.home}/framework/base/config/ofbizcerts.jks
+ofbiz.client.keyStore=${sys:getProperty('ofbiz.home')}/framework/base/config/ofbizcerts.jks
 ofbiz.client.keyStore.password=changeit
 ofbiz.client.keyStore.type=jks
 
 # OFBiz KeyStore - RMI SSL Server Cert
-ofbiz.rmi.keyStore=${env.ofbiz.home}/framework/base/config/ofbizrmi.jks
+ofbiz.rmi.keyStore=${sys:getProperty('ofbiz.home')}/framework/base/config/ofbizrmi.jks
 ofbiz.rmi.keyStore.password=changeit
 ofbiz.rmi.keyStore.alias=rmissl
 ofbiz.rmi.keyStore.type=jks

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=724851&r1=724850&r2=724851&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Tue Dec  9 11:46:44 2008
@@ -376,6 +376,7 @@
             }
             if (obj == null) {
                 if (this.original.startsWith("env.")) {
+                    Debug.logWarning("${env...} expression syntax deprecated, use ${sys:getProperty(String)} instead", module);
                     obj = System.getProperty(this.original.substring(4));
                 }
             }