Author: ahart
Date: Tue May 1 18:39:06 2012
New Revision: 1332771
URL: http://svn.apache.org/viewvc?rev=1332771&view=rev
Log:
resolve OODT-445
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/balance/lib/pear/Core/Application.class.php
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1332771&r1=1332770&r2=1332771&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue May 1 18:39:06 2012
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.4: Current Development
--------------------------------------------
+* OODT-445 Extend env replace support introduced in OODT-343 (ahart)
+
* OODT-444 Utils class missing from Balance cas-browser module (ahart)
* OODT-448 added missing character (skhudiky)
Modified: oodt/trunk/balance/lib/pear/Core/Application.class.php
URL:
http://svn.apache.org/viewvc/oodt/trunk/balance/lib/pear/Core/Application.class.php?rev=1332771&r1=1332770&r2=1332771&view=diff
==============================================================================
--- oodt/trunk/balance/lib/pear/Core/Application.class.php (original)
+++ oodt/trunk/balance/lib/pear/Core/Application.class.php Tue May 1 18:39:06
2012
@@ -187,6 +187,10 @@ class Org_Apache_Oodt_Balance_Core_Appli
$ini = str_replace('[MODULE_PATH]',
$modClass->modulePath, $ini);
$ini = str_replace('[MODULE_ROOT]',
$modClass->moduleRoot, $ini);
$ini =
str_replace('[MODULE_STATIC]',$modClass->moduleStatic, $ini);
+
+ $ini = str_replace('[HOME]', HOME, $ini);
+ $ini = str_replace('[SITE_ROOT]', SITE_ROOT,
$ini);
+
// Parse the env-replaced content
$moduleSettings = parse_ini_string($ini);
// Append (union) with global settings. +=
ensures that
