Author: mona
Date: Mon Aug 5 19:59:37 2013
New Revision: 1510693
URL: http://svn.apache.org/r1510693
Log:
OOZIE-1480 Web-console Workflow Job Info popup should display parent-id field
and no empty Nominal time field (mona)
Modified:
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java
oozie/branches/branch-4.0/release-log.txt
oozie/branches/branch-4.0/webapp/src/main/webapp/oozie-console.js
Modified:
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/cli/OozieCLI.java?rev=1510693&r1=1510692&r2=1510693&view=diff
==============================================================================
---
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
(original)
+++
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
Mon Aug 5 19:59:37 2013
@@ -1119,7 +1119,7 @@ public class OozieCLI {
private static final String WORKFLOW_JOBS_FORMATTER =
"%-41s%-13s%-10s%-10s%-10s%-24s%-24s";
private static final String COORD_JOBS_FORMATTER =
"%-41s%-15s%-10s%-5s%-13s%-24s%-24s";
private static final String BUNDLE_JOBS_FORMATTER =
"%-41s%-15s%-10s%-20s%-20s%-13s%-13s";
- private static final String BUNDLE_COORD_JOBS_FORMATTER =
"%-41s%-10s%-5s%-13s%-24s%-24s";
+ private static final String BUNDLE_COORD_JOBS_FORMATTER =
"%-41s%-15s%-5s%-13s%-24s%-24s";
private static final String WORKFLOW_ACTION_FORMATTER =
"%-78s%-10s%-23s%-11s%-10s";
private static final String COORD_ACTION_FORMATTER =
"%-43s%-10s%-37s%-10s%-21s%-21s";
Modified:
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java?rev=1510693&r1=1510692&r2=1510693&view=diff
==============================================================================
---
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java
(original)
+++
oozie/branches/branch-4.0/client/src/main/java/org/apache/oozie/client/rest/JsonTags.java
Mon Aug 5 19:59:37 2013
@@ -113,6 +113,7 @@ public interface JsonTags {
public static final String COORDINATOR_ACTION_NUMBER = "actionNumber";
public static final String COORDINATOR_ACTION_CREATED_TIME = "createdTime";
public static final String COORDINATOR_ACTION_EXTERNALID = "externalId";
+ public static final String COORDINATOR_JOB_BUNDLE_ID = "bundleId";
public static final String COORDINATOR_ACTION_LAST_MODIFIED_TIME =
"lastModifiedTime";
public static final String COORDINATOR_ACTION_NOMINAL_TIME = "nominalTime";
public static final String COORDINATOR_ACTION_STATUS = "status";
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java?rev=1510693&r1=1510692&r2=1510693&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java
Mon Aug 5 19:59:37 2013
@@ -149,6 +149,7 @@ public class JsonCoordinatorJob implemen
json.put(JsonTags.COORDINATOR_JOB_NAME, getAppName());
json.put(JsonTags.COORDINATOR_JOB_ID, getId());
json.put(JsonTags.COORDINATOR_JOB_EXTERNAL_ID, getExternalId());
+ json.put(JsonTags.COORDINATOR_JOB_BUNDLE_ID, getBundleId());
json.put(JsonTags.COORDINATOR_JOB_CONF, getConf());
json.put(JsonTags.COORDINATOR_JOB_STATUS, getStatus().toString());
json.put(JsonTags.COORDINATOR_JOB_EXECUTIONPOLICY,
getExecutionOrder().toString());
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1510693&r1=1510692&r2=1510693&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Mon Aug 5 19:59:37 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 release
+OOZIE-1480 Web-console Workflow Job Info popup should display parent-id field
and no empty Nominal time field (mona)
OOZIE-1484 Error in DB upgrade when error message exceeds 4K characters (ryota)
OOZIE-1482 4.0 client does not work with 3.x server for coord jobs (rohini)
OOZIE-1479 Duplicate end_miss events introduced by OOZIE-1472 (rohini)
Modified: oozie/branches/branch-4.0/webapp/src/main/webapp/oozie-console.js
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/webapp/src/main/webapp/oozie-console.js?rev=1510693&r1=1510692&r2=1510693&view=diff
==============================================================================
--- oozie/branches/branch-4.0/webapp/src/main/webapp/oozie-console.js (original)
+++ oozie/branches/branch-4.0/webapp/src/main/webapp/oozie-console.js Mon Aug
5 19:59:37 2013
@@ -302,18 +302,17 @@ function jobDetailsPopup(response, reque
width: 400,
value: jobDetails["group"]
}, {
- fieldLabel: 'Create Time',
+ fieldLabel: 'Parent Coord',
editable: false,
- name: 'createdTime',
+ name: 'parentId',
width: 400,
- value: jobDetails["createdTime"]
+ value: jobDetails["parentId"]
}, {
- fieldLabel: 'Nominal Time',
+ fieldLabel: 'Create Time',
editable: false,
- name: 'nominalTime',
+ name: 'createdTime',
width: 400,
- value: jobDetails["nominalTime"]
-
+ value: jobDetails["createdTime"]
}, {
fieldLabel: 'Start Time',
editable: false,
@@ -838,6 +837,12 @@ function coordJobDetailsPopup(response,
width: 400,
value: jobDetails["timeUnit"]
}, {
+ fieldLabel: 'Parent Bundle',
+ editable: false,
+ name: 'bundleId',
+ width: 400,
+ value: jobDetails["bundleId"]
+ }, {
fieldLabel: 'Start Time',
editable: false,
name: 'startTime',
@@ -1191,7 +1196,7 @@ function bundleJobDetailsPopup(response,
width: 170,
value: jobDetails["user"]
}, {
- fieldLabel: 'group',
+ fieldLabel: 'Group',
editable: false,
name: 'group',
width: 170,
