Author: tucu
Date: Wed Mar 14 16:42:16 2012
New Revision: 1300629
URL: http://svn.apache.org/viewvc?rev=1300629&view=rev
Log:
OOZIE-760 oozied.sh needs to be able to pick up CATALINA_HOME (rvs via tucu)
Modified:
incubator/oozie/trunk/distro/src/main/bin/oozied.sh
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/distro/src/main/bin/oozied.sh
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/distro/src/main/bin/oozied.sh?rev=1300629&r1=1300628&r2=1300629&view=diff
==============================================================================
--- incubator/oozie/trunk/distro/src/main/bin/oozied.sh (original)
+++ incubator/oozie/trunk/distro/src/main/bin/oozied.sh Wed Mar 14 16:42:16 2012
@@ -43,7 +43,7 @@ BASEDIR=`cd ${BASEDIR}/..;pwd`
source ${BASEDIR}/bin/oozie-sys.sh
-CATALINA=${BASEDIR}/oozie-server/bin/catalina.sh
+CATALINA=${OOZIE_CATALINA_HOME:-${BASEDIR}/oozie-server}/bin/catalina.sh
setup_catalina_opts() {
# The Java System property 'oozie.http.port' it is not used by Oozie,
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1300629&r1=1300628&r2=1300629&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Wed Mar 14 16:42:16 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-760 oozied.sh needs to be able to pick up CATALINA_HOME (rvs via tucu)
OOZIE-757 hive-contrib version should use ${hive.version} (abayer via tucu)
OOZIE-274 move callback HTTP endpoint outside of the versioned WS endpoints
(tucu)
OOZIE-755 remove hadoop.job.ugi and kerberos principal hardcoded injections
(tucu)
