You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2012/12/07 19:08:48 UTC
svn commit: r1418416 [2/2] - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/action/hadoop/
core/src/main/java/org/apache/oozie/command/
core/src/main/java/org/apache/oozie/command/bundle/ core/src/main/java...
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -54,7 +54,7 @@ public class CoordJobGetActionsJPAExecut
return Integer.valueOf(count.intValue());
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsNotCompletedJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -61,7 +61,7 @@ public class CoordJobGetActionsNotComple
return actionBeansList;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsRunningJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -62,7 +62,7 @@ public class CoordJobGetActionsRunningJP
return actionBeansList;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsStatusJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -58,7 +58,7 @@ public class CoordJobGetActionsStatusJPA
return coordStatus;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -87,7 +87,7 @@ public class CoordJobGetActionsSubsetJPA
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return actionList;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSuspendedJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -63,7 +63,7 @@ public class CoordJobGetActionsSuspended
return actionBeansList;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -59,7 +59,7 @@ public class CoordJobGetJPAExecutor impl
cjBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
CoordinatorJobBean bean = null;
if (cjBeans != null && cjBeans.size() > 0) {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetPendingActionsCountJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetPendingActionsCountJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetPendingActionsCountJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetPendingActionsCountJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -49,7 +49,7 @@ public class CoordJobGetPendingActionsCo
return Integer.valueOf(count.intValue());
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetReadyActionsJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -83,7 +83,7 @@ public class CoordJobGetReadyActionsJPAE
return actionBeans;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetRunningActionsCountJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -50,7 +50,7 @@ public class CoordJobGetRunningActionsCo
return Integer.valueOf(count.intValue());
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobUpdateJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobUpdateJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobUpdateJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobUpdateJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -50,7 +50,7 @@ public class CoordJobUpdateJPAExecutor i
return null;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetForPurgeJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetForPurgeJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetForPurgeJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetForPurgeJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -57,7 +57,7 @@ public class CoordJobsGetForPurgeJPAExec
coordJobs = jobQ.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return coordJobs;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPausedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPausedJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPausedJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPausedJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -57,7 +57,7 @@ public class CoordJobsGetPausedJPAExecut
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPendingJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPendingJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPendingJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetPendingJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -63,7 +63,7 @@ public class CoordJobsGetPendingJPAExecu
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetUnpausedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetUnpausedJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetUnpausedJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetUnpausedJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -57,7 +57,7 @@ public class CoordJobsGetUnpausedJPAExec
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return jobList;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionGetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -59,7 +59,7 @@ public class WorkflowActionGetJPAExecuto
waBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
WorkflowActionBean bean = null;
if (waBeans != null && waBeans.size() > 0) {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionSubsetGetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -74,7 +74,7 @@ public class WorkflowActionSubsetGetJPAE
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0605, e);
+ throw new JPAExecutorException(ErrorCode.E0605, "null", e);
}
return actionList;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionUpdateJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionUpdateJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionUpdateJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionUpdateJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -48,7 +48,7 @@ public class WorkflowActionUpdateJPAExec
return null;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsRunningGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsRunningGetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsRunningGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionsRunningGetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -57,7 +57,7 @@ public class WorkflowActionsRunningGetJP
}
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0605, e);
+ throw new JPAExecutorException(ErrorCode.E0605, "null", e);
}
return actionList;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowInfoWithActionsSubsetGetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -73,7 +73,7 @@ public class WorkflowInfoWithActionsSubs
throw (JPAExecutorException) ex;
}
else {
- throw new JPAExecutorException(ErrorCode.E0603, ex);
+ throw new JPAExecutorException(ErrorCode.E0603, ex.getMessage(), ex);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobGetJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -59,7 +59,7 @@ public class WorkflowJobGetJPAExecutor i
wjBeans = q.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
WorkflowJobBean bean = null;
if (wjBeans != null && wjBeans.size() > 0) {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobUpdateJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobUpdateJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobUpdateJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobUpdateJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -56,7 +56,7 @@ public class WorkflowJobUpdateJPAExecuto
return null;
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobsGetForPurgeJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobsGetForPurgeJPAExecutor.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobsGetForPurgeJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobsGetForPurgeJPAExecutor.java Fri Dec 7 18:08:24 2012
@@ -63,7 +63,7 @@ public class WorkflowJobsGetForPurgeJPAE
workflows = jobQ.getResultList();
}
catch (Exception e) {
- throw new JPAExecutorException(ErrorCode.E0603, e);
+ throw new JPAExecutorException(ErrorCode.E0603, e.getMessage(), e);
}
return workflows;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionService.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/ActionService.java Fri Dec 7 18:08:24 2012
@@ -86,8 +86,7 @@ public class ActionService implements Se
ActionExecutor executor = (ActionExecutor) ReflectionUtils.newInstance(klass, services.getConf());
log.trace("Registering action type [{0}] class [{1}]", executor.getType(), klass);
if (executors.containsKey(executor.getType())) {
- throw new ServiceException(ErrorCode.E0150, XLog.format(
- "Action executor for action type [{0}] already registered", executor.getType()));
+ throw new ServiceException(ErrorCode.E0150, executor.getType());
}
ActionExecutor.enableInit();
executor.initActionType();
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java Fri Dec 7 18:08:24 2012
@@ -177,7 +177,7 @@ public class AuthorizationService implem
}
}
catch (FileNotFoundException ex) {
- throw new ServiceException(ErrorCode.E0160, ex);
+ throw new ServiceException(ErrorCode.E0160, file.getAbsolutePath(), ex);
}
}
else {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java Fri Dec 7 18:08:24 2012
@@ -367,10 +367,10 @@ public class HadoopAccessorService imple
return jobClient;
}
catch (InterruptedException ex) {
- throw new HadoopAccessorException(ErrorCode.E0902, ex);
+ throw new HadoopAccessorException(ErrorCode.E0902, ex.getMessage(), ex);
}
catch (IOException ex) {
- throw new HadoopAccessorException(ErrorCode.E0902, ex);
+ throw new HadoopAccessorException(ErrorCode.E0902, ex.getMessage(), ex);
}
}
@@ -400,7 +400,7 @@ public class HadoopAccessorService imple
nameNode = new URI(nameNode).getAuthority();
}
catch (URISyntaxException ex) {
- throw new HadoopAccessorException(ErrorCode.E0902, ex);
+ throw new HadoopAccessorException(ErrorCode.E0902, ex.getMessage(), ex);
}
}
}
@@ -415,10 +415,10 @@ public class HadoopAccessorService imple
});
}
catch (InterruptedException ex) {
- throw new HadoopAccessorException(ErrorCode.E0902, ex);
+ throw new HadoopAccessorException(ErrorCode.E0902, ex.getMessage(), ex);
}
catch (IOException ex) {
- throw new HadoopAccessorException(ErrorCode.E0902, ex);
+ throw new HadoopAccessorException(ErrorCode.E0902, ex.getMessage(), ex);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/Services.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/Services.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/Services.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/Services.java Fri Dec 7 18:08:24 2012
@@ -136,7 +136,7 @@ public class Services {
return file.getAbsolutePath();
}
catch (IOException ex) {
- ServiceException sex = new ServiceException(ErrorCode.E0001, ex);
+ ServiceException sex = new ServiceException(ErrorCode.E0001, "", ex);
XLog.getLog(getClass()).fatal(ex);
throw sex;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/StoreService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/StoreService.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/StoreService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/StoreService.java Fri Dec 7 18:08:24 2012
@@ -53,7 +53,7 @@ public class StoreService implements Ser
}
}
// to do add checks for other stores - coordinator and SLA stores
- throw new StoreException(ErrorCode.E0607, " can not get store StoreService.getStore(Class)");
+ throw new StoreException(ErrorCode.E0607, " can not get store StoreService.getStore(Class)", "");
}
/**
@@ -76,7 +76,7 @@ public class StoreService implements Ser
}
}
}
- throw new StoreException(ErrorCode.E0607, " StoreService.getStore(Class, store)");
+ throw new StoreException(ErrorCode.E0607, " StoreService.getStore(Class, store)", "");
}
/**
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServletUtilities.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServletUtilities.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServletUtilities.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/ServletUtilities.java Fri Dec 7 18:08:24 2012
@@ -33,11 +33,13 @@ public class ServletUtilities {
*/
protected static void ValidateAppPath(String wfPath, String coordPath) throws XServletException {
if (wfPath != null && coordPath != null) {
- throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0301, wfPath, coordPath);
+ throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0302,
+ "multiple app paths specified, only one is allowed");
}
else {
if (wfPath == null && coordPath == null) {
- throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0302);
+ throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0302,
+ "a workflow or coordinator app path is required");
}
}
}
@@ -84,7 +86,7 @@ public class ServletUtilities {
*/
protected static void ValidateLibPath(String libPath) throws XServletException {
if (libPath == null) {
- throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0302);
+ throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0302, "a lib path is required");
}
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0AdminServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0AdminServlet.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0AdminServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V0AdminServlet.java Fri Dec 7 18:08:24 2012
@@ -107,6 +107,6 @@ public class V0AdminServlet extends Base
*/
@Override
protected void getQueueDump(JSONObject json) throws XServletException {
- throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0301);
+ throw new XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0301, "cannot get queue dump");
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java Fri Dec 7 18:08:24 2012
@@ -284,7 +284,7 @@ public class V1JobServlet extends BaseJo
sK).write(response.getOutputStream());
}
catch (Exception e) {
- throw new XServletException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ErrorCode.E0307, e);
+ throw new XServletException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ErrorCode.E0307, e.getMessage(), e);
}
}
else {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java Fri Dec 7 18:08:24 2012
@@ -437,7 +437,7 @@ public class CoordinatorStore extends St
throw ex;
}
catch (SQLException ex) {
- throw new StoreException(ErrorCode.E0603, name, ex.getMessage(), ex);
+ throw new StoreException(ErrorCode.E0611, name, ex.getMessage(), ex);
}
catch (Exception e) {
throw new StoreException(ErrorCode.E0607, name, e.getMessage(), e);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/store/SLAStore.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/store/SLAStore.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/store/SLAStore.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/store/SLAStore.java Fri Dec 7 18:08:24 2012
@@ -153,7 +153,7 @@ public class SLAStore extends Store {
throw ex;
}
catch (SQLException ex) {
- throw new StoreException(ErrorCode.E0603, name, ex.getMessage(), ex);
+ throw new StoreException(ErrorCode.E0611, name, ex.getMessage(), ex);
}
catch (Exception e) {
throw new StoreException(ErrorCode.E0607, name, e.getMessage(), e);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/store/WorkflowStore.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/store/WorkflowStore.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/store/WorkflowStore.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/store/WorkflowStore.java Fri Dec 7 18:08:24 2012
@@ -818,7 +818,7 @@ public class WorkflowStore extends Store
throw ex;
}
catch (SQLException ex) {
- throw new StoreException(ErrorCode.E0603, name, ex.getMessage(), ex);
+ throw new StoreException(ErrorCode.E0611, name, ex.getMessage(), ex);
}
catch (Exception e) {
throw new StoreException(ErrorCode.E0607, name, e.getMessage(), e);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/util/ParamChecker.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/util/ParamChecker.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/util/ParamChecker.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/util/ParamChecker.java Fri Dec 7 18:08:24 2012
@@ -182,7 +182,7 @@ public class ParamChecker {
}
catch (NumberFormatException nex) {
throw new IllegalArgumentException(XLog.format(
- "parameter [{0}] = [{1}] must be an integer. Parsing error {2}", name, val, nex));
+ "parameter [{0}] = [{1}] must be an integer. Parsing error {2}", name, val, nex.getMessage(), nex));
}
return ret;
}
@@ -223,7 +223,7 @@ public class ParamChecker {
}
catch (Exception ex) {
throw new IllegalArgumentException(XLog.format("parameter [{0}] = [{1}] must be a valid TZ."
- + " Parsing error {2}", name, tzStr, ex));
+ + " Parsing error {2}", name, tzStr, ex.getMessage(), ex));
}
return tz;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbOperations.java Fri Dec 7 18:08:24 2012
@@ -220,7 +220,7 @@ public class SLADbOperations {
return createSlaStatusEvent(id, stat, store, appType);
}
catch (Exception e) {
- throw new CommandException(ErrorCode.E1007, " id " + id, e);
+ throw new CommandException(ErrorCode.E1007, " id " + id, e.getMessage(), e);
}
}
@@ -233,7 +233,7 @@ public class SLADbOperations {
return createSlaStatusEvent(id, stat, appType, log);
}
catch (Exception e) {
- throw new CommandException(ErrorCode.E1007, " id " + id, e);
+ throw new CommandException(ErrorCode.E1007, " id " + id, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/util/db/SLADbXOperations.java Fri Dec 7 18:08:24 2012
@@ -146,7 +146,7 @@ public class SLADbXOperations {
return createSlaStatusEvent(id, stat, appType);
}
catch (Exception e) {
- throw new CommandException(ErrorCode.E1007, " id " + id, e);
+ throw new CommandException(ErrorCode.E1007, " id " + id, e.getMessage(), e);
}
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowApp.java Fri Dec 7 18:08:24 2012
@@ -62,16 +62,13 @@ public class LiteWorkflowApp implements
public LiteWorkflowApp addNode(NodeDef node) throws WorkflowException {
ParamChecker.notNull(node, "node");
if (complete) {
- throw new WorkflowException(ErrorCode.E0704,
- XLog.format("Definition [{0}] already complete", name));
+ throw new WorkflowException(ErrorCode.E0704, name);
}
if (nodesMap.containsKey(node.getName())) {
- throw new WorkflowException(ErrorCode.E0705,
- XLog.format("Node [{0}] already defined", node.getName()));
+ throw new WorkflowException(ErrorCode.E0705, node.getName());
}
if (node.getTransitions().contains(node.getName())) {
- throw new WorkflowException(ErrorCode.E0706,
- XLog.format("Node [{0}] cannot transition to itself", node.getName()));
+ throw new WorkflowException(ErrorCode.E0706, node.getName());
}
nodesMap.put(node.getName(), node);
if (node instanceof EndNodeDef) {
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java Fri Dec 7 18:08:24 2012
@@ -521,7 +521,7 @@ public class LiteWorkflowAppParser {
else {
ActionExecutor ae = Services.get().get(ActionService.class).getExecutor(eActionConf.getName());
if (ae == null) {
- throw new WorkflowException(ErrorCode.E0723, "Unsupported action type");
+ throw new WorkflowException(ErrorCode.E0723, eActionConf.getName(), ActionService.class.getName());
}
if (ae.requiresNNJT) {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java Fri Dec 7 18:08:24 2012
@@ -178,7 +178,7 @@ public class TestCallableQueueService ex
Thread.sleep(this.wait);
}
catch (InterruptedException exp) {
- throw new CommandException(ErrorCode.ETEST);
+ throw new CommandException(ErrorCode.ETEST, "invalid_id");
}
executed = System.currentTimeMillis();
;
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java Fri Dec 7 18:08:24 2012
@@ -136,7 +136,7 @@ public class MockCoordinatorEngineServic
@Override
public void reRun(String jobId, Configuration conf) throws BaseEngineException {
- throw new BaseEngineException(new XException(ErrorCode.E0301));
+ throw new BaseEngineException(new XException(ErrorCode.E0301, "invalid use of rerun"));
}
@Override
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1418416&r1=1418415&r2=1418416&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Dec 7 18:08:24 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1101 Fix log messages that contain {0} or similar (rkanter)
OOZIE-1073 Optimize latest and future EL resolution in case of start-instance and end-instance (rohini via virag)
OOZIE-816 Add Support for Hadoop 1.1.1 (zhujinwei and harsh via harsh)
OOZIE-1103 Create example using AltKerberosAuthenticationHandler (rkanter)