Author: rkanter
Date: Mon Feb 4 18:01:50 2013
New Revision: 1442229
URL: http://svn.apache.org/viewvc?rev=1442229&view=rev
Log:
OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and
OOZIE_DATA if previously set (rkanter via tucu)
Modified:
oozie/branches/branch-3.3/release-log.txt
oozie/branches/branch-3.3/tools/src/main/bin/ooziedb.sh
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442229&r1=1442228&r2=1442229&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb 4 18:01:50 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1024 ooziedb.sh script should keep OOZIE_CONFIG, OOZIE_LOG, and
OOZIE_DATA if previously set (rkanter via tucu)
OOZIE-1023 Docs list OOZIE_CONF instead of OOZIE_CONFIG env var (rkanter via
tucu)
OOZIE-1012 Sqoop jobs are unable to utilize Hadoop Counters (jarcec via virag)
OOZIE-986 Oozie client shell script should use consistent naming for java
options (stevenwillis via tucu)
Modified: oozie/branches/branch-3.3/tools/src/main/bin/ooziedb.sh
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/tools/src/main/bin/ooziedb.sh?rev=1442229&r1=1442228&r2=1442229&view=diff
==============================================================================
--- oozie/branches/branch-3.3/tools/src/main/bin/ooziedb.sh (original)
+++ oozie/branches/branch-3.3/tools/src/main/bin/ooziedb.sh Mon Feb 4 18:01:50
2013
@@ -33,29 +33,7 @@ done
BASEDIR=`dirname ${PRG}`
BASEDIR=`cd ${BASEDIR}/..;pwd`
-OOZIE_HOME=${BASEDIR}
-OOZIE_CONFIG=${OOZIE_HOME}/conf
-OOZIE_LOG=${OOZIE_HOME}/logs
-OOZIE_DATA=${OOZIE_HOME}/data
-
-if [ -f ${OOZIE_HOME}/bin/oozie-env.sh ]
-then
- source ${OOZIE_HOME}/bin/oozie-env.sh
-fi
-
-if [ ! -d ${OOZIE_CONFIG} ]
-then
- echo
- echo "ERROR: Oozie configuration directory could not be found at
${OOZIE_CONFIG}"
- echo
- 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
+source ${BASEDIR}/bin/oozie-sys.sh -silent
OOZIEDB_OPTS="-Doozie.home.dir=${OOZIE_HOME}";
OOZIEDB_OPTS="${OOZIEDB_OPTS} -Doozie.config.dir=${OOZIE_CONFIG}";
