Author: tucu
Date: Thu Oct 11 23:45:08 2012
New Revision: 1397375
URL: http://svn.apache.org/viewvc?rev=1397375&view=rev
Log:
OOZIE-986 Oozie client shell script should use consistent naming for java
options (stevenwillis via tucu)
Modified:
oozie/trunk/client/src/main/bin/oozie
oozie/trunk/release-log.txt
Modified: oozie/trunk/client/src/main/bin/oozie
URL:
http://svn.apache.org/viewvc/oozie/trunk/client/src/main/bin/oozie?rev=1397375&r1=1397374&r2=1397375&view=diff
==============================================================================
--- oozie/trunk/client/src/main/bin/oozie (original)
+++ oozie/trunk/client/src/main/bin/oozie Thu Oct 11 23:45:08 2012
@@ -46,8 +46,11 @@ else
JAVA_BIN=${JAVA_HOME}/bin/java
fi
+# Prime OOZIE_CLIENT_OPTS with JAVA_PROPERTIES for backwards compatibility
+OOZIE_CLIENT_OPTS="${JAVA_PROPERTIES} ${OOZIE_CLIENT_OPTS}"
+
while [[ ${1} =~ ^\-D ]]; do
- JAVA_PROPERTIES="${JAVA_PROPERTIES} ${1}"
+ OOZIE_CLIENT_OPTS="${OOZIE_CLIENT_OPTS} ${1}"
shift
done
-${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${OOZIECPPATH}
org.apache.oozie.cli.OozieCLI "${@}"
+${JAVA_BIN} ${OOZIE_CLIENT_OPTS} -cp ${OOZIECPPATH}
org.apache.oozie.cli.OozieCLI "${@}"
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1397375&r1=1397374&r2=1397375&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Oct 11 23:45:08 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-986 Oozie client shell script should use consistent naming for java
options (stevenwillis via tucu)
OOZIE-1018 Display coord job start time, end time, pause time, concurrency in
job -info (mona via tucu)
OOZIE-1016 Tests that use junit assert or fail in a new thread report success
when they are actually failing (rkanter via tucu)
OOZIE-1017 Add test to make sure old version of Xerces isn't being used
(rkanter via tucu)
