svn commit: r1442226 - in /oozie/branches/branch-3.3: client/src/main/bin/oozie release-log.txt

[rk...@apache.org]

Author: rkanter
Date: Mon Feb  4 18:01:44 2013
New Revision: 1442226

URL: http://svn.apache.org/viewvc?rev=1442226&view=rev
Log:
OOZIE-986 Oozie client shell script should use consistent naming for java options (stevenwillis via tucu)

Modified:
    oozie/branches/branch-3.3/client/src/main/bin/oozie
    oozie/branches/branch-3.3/release-log.txt

Modified: oozie/branches/branch-3.3/client/src/main/bin/oozie
URL: http://svn.apache.org/viewvc/oozie/branches/branch-3.3/client/src/main/bin/oozie?rev=1442226&r1=1442225&r2=1442226&view=diff
==============================================================================
--- oozie/branches/branch-3.3/client/src/main/bin/oozie (original)
+++ oozie/branches/branch-3.3/client/src/main/bin/oozie Mon Feb  4 18:01:44 2013
@@ -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/branches/branch-3.3/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442226&r1=1442225&r2=1442226&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb  4 18:01:44 2013
@@ -1,5 +1,6 @@
 -- Oozie 3.3.2 (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)