svn commit: r1377573 - in /incubator/oozie/trunk: release-log.txt tools/src/main/bin/ooziedb.sh

[vi...@apache.org]

Author: virag
Date: Mon Aug 27 05:59:19 2012
New Revision: 1377573

URL: http://svn.apache.org/viewvc?rev=1377573&view=rev
Log:
OOZIE-968 source oozie environment from conf in oozie db setup script (svenkat via virag)

Modified:
    incubator/oozie/trunk/release-log.txt
    incubator/oozie/trunk/tools/src/main/bin/ooziedb.sh

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1377573&r1=1377572&r2=1377573&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Aug 27 05:59:19 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-968 source oozie environment from conf in oozie db setup script (svenkat via virag)
 OOZIE-944 Implement Workflow Generator UI Tool (egashira via virag)
 OOZIE-961 Load Hbase credentials in Oozie (virag)
 OOZIE-963 Add new EL function to replace all instances of a sub-string with another one (kamrul via virag)

Modified: incubator/oozie/trunk/tools/src/main/bin/ooziedb.sh
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/tools/src/main/bin/ooziedb.sh?rev=1377573&r1=1377572&r2=1377573&view=diff
==============================================================================
--- incubator/oozie/trunk/tools/src/main/bin/ooziedb.sh (original)
+++ incubator/oozie/trunk/tools/src/main/bin/ooziedb.sh Mon Aug 27 05:59:19 2012
@@ -51,6 +51,12 @@ then
   exit 1
 fi
 
+# if the configuration dir has a env file, source it
+if [ -f ${OOZIE_CONFIG}/oozie-env.sh ]
+then
+  source ${OOZIE_CONFIG}/oozie-env.sh
+fi
+
 OOZIEDB_OPTS="-Doozie.home.dir=${OOZIE_HOME}";
 OOZIEDB_OPTS="${OOZIEDB_OPTS} -Doozie.config.dir=${OOZIE_CONFIG}";
 OOZIEDB_OPTS="${OOZIEDB_OPTS} -Doozie.log.dir=${OOZIE_LOG}";