svn commit: r1303189 - in /incubator/oozie/trunk: distro/src/main/bin/oozied.sh release-log.txt

[tu...@apache.org]

Author: tucu
Date: Tue Mar 20 22:55:46 2012
New Revision: 1303189

URL: http://svn.apache.org/viewvc?rev=1303189&view=rev
Log:
OOZIE-771 oozied.sh should exec catalina.sh instead of forking it off (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=1303189&r1=1303188&r2=1303189&view=diff
==============================================================================
--- incubator/oozie/trunk/distro/src/main/bin/oozied.sh (original)
+++ incubator/oozie/trunk/distro/src/main/bin/oozied.sh Tue Mar 20 22:55:46 2012
@@ -86,26 +86,13 @@ case $actionCmd in
   (start|run)
     setup_catalina_opts
     setup_oozie 
-    $CATALINA $actionCmd "$@"
     ;;
   (stop)
     setup_catalina_opts
 
     # A bug in catalina.sh script does not use CATALINA_OPTS for stopping the server
     export JAVA_OPTS=${CATALINA_OPTS}
-
-    $CATALINA $actionCmd "$@"
     ;;
 esac
 
-if [ "$?" = "0" ]; then
-  echo
-  echo "Oozie $actionCmd succeeded"
-  echo
-  exit 0
-else
-  echo
-  echo "ERROR: Oozie $actionCmd aborted"
-  echo
-  exit 1
-fi
+exec $CATALINA $actionCmd "$@"

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1303189&r1=1303188&r2=1303189&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Mar 20 22:55:46 2012
@@ -1,6 +1,7 @@
 -- Oozie 3.2.0 release
 
-OOZIE-767: TestCoordRerun and Testrerun shoudl be deleted.(virag via Mohammad)
+OOZIE-771 oozied.sh should exec catalina.sh instead of forking it off (rvs via tucu)
+OOZIE-767 TestCoordRerun and Testrerun shoudl be deleted.(virag via Mohammad)
 OOZIE-768 latest Hadoop 0.23.3 minicluster is not creating /tmp in HDFS (tucu)
 OOZIE-763 Add findbugs and clover plugin for CI (virag via tucu)
 OOZIE-646 Doc changes: Drilldown and PigStats (params via tucu)