svn commit: r1306008 - in /incubator/oozie/trunk: core/src/main/java/org/apache/oozie/servlet/ServicesLoader.java release-log.txt

[tu...@apache.org]

Author: tucu
Date: Tue Mar 27 20:34:59 2012
New Revision: 1306008

URL: http://svn.apache.org/viewvc?rev=1306008&view=rev
Log:
OOZIE-786 tomcat should stop if oozie does not start correctly (tucu)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServicesLoader.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServicesLoader.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServicesLoader.java?rev=1306008&r1=1306007&r2=1306008&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServicesLoader.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServicesLoader.java Tue Mar 27 20:34:59 2012
@@ -17,7 +17,6 @@
  */
 package org.apache.oozie.servlet;
 
-import org.apache.oozie.service.ServiceException;
 import org.apache.oozie.service.Services;
 
 import javax.servlet.ServletContextListener;
@@ -39,8 +38,18 @@ public class ServicesLoader implements S
             services = new Services();
             services.init();
         }
-        catch (ServiceException ex) {
-            throw new RuntimeException(ex);
+        catch (Throwable ex) {
+            System.out.println();
+            System.out.println("ERROR: Oozie could not be started");
+            System.out.println();
+            System.out.println("REASON: " + ex.toString());
+            System.out.println();
+            System.out.println("Stacktrace:");
+            System.out.println("-----------------------------------------------------------------");
+            ex.printStackTrace(System.out);
+            System.out.println("-----------------------------------------------------------------");
+            System.out.println();
+            System.exit(1);
         }
     }
 

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1306008&r1=1306007&r2=1306008&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Mar 27 20:34:59 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.2.0 release
 
+OOZIE-786 tomcat should stop if oozie does not start correctly (tucu)
 OOZIE-779 Oozie cannot submit jobs to hadoop 0.23 if running in non-default host:port (tucu)
 OOZIE-774 Implement a coord:conf EL function to access configuration properties from Oozie coordinator XML files (Maxime via Mohammad)
 OOZIE-777 Hadoop 0.23 removed org.apache.hadoop.mapred.Task$Counter group name breaking EL counters() (tucu)