Author: kamrul
Date: Tue Mar 27 23:22:39 2012
New Revision: 1306051
URL: http://svn.apache.org/viewvc?rev=1306051&view=rev
Log:
OOZIE-785 No JsonToBean mapping for coord pausetime(shwetha via Mohammad)
Modified:
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
incubator/oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java?rev=1306051&r1=1306050&r2=1306051&view=diff
==============================================================================
---
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
(original)
+++
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
Tue Mar 27 23:22:39 2012
@@ -141,6 +141,7 @@ public class JsonToBean {
new
Property(JsonTags.COORDINATOR_JOB_NEXT_MATERIALIZED_TIME, Date.class));
COORD_JOB.put("getStartTime", new
Property(JsonTags.COORDINATOR_JOB_START_TIME, Date.class));
COORD_JOB.put("getEndTime", new
Property(JsonTags.COORDINATOR_JOB_END_TIME, Date.class));
+ COORD_JOB.put("getPauseTime", new
Property(JsonTags.COORDINATOR_JOB_PAUSE_TIME, Date.class));
COORD_JOB.put("getUser", new Property(JsonTags.COORDINATOR_JOB_USER,
String.class));
COORD_JOB.put("getGroup", new Property(JsonTags.COORDINATOR_JOB_GROUP,
String.class));
COORD_JOB.put("getAcl", new Property(JsonTags.COORDINATOR_JOB_ACL,
String.class));
Modified:
incubator/oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java?rev=1306051&r1=1306050&r2=1306051&view=diff
==============================================================================
---
incubator/oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
(original)
+++
incubator/oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
Tue Mar 27 23:22:39 2012
@@ -32,6 +32,7 @@ public class TestJsonToBean extends Test
static String CREATED_TIME = "Thu, 01 Jan 2009 00:00:00 GMT";
static String START_TIME = "Thu, 01 Jan 2009 00:00:00 GMT";
static String END_TIME = "Fri, 02 Jan 2009 00:00:00 GMT";
+ static String PAUSE_TIME = "Fri, 02 Jan 2009 00:00:00 GMT";
static String NOMINAL_TIME = "Fri, 02 Jan 2009 01:00:00 GMT";
static String LAST_MODIFIED = "Fri, 02 Jan 2009 02:00:00 GMT";
static String LAST_ACTION = "Fri, 02 Jan 2009 03:00:00 GMT";
@@ -250,6 +251,7 @@ public class TestJsonToBean extends Test
json.put(JsonTags.COORDINATOR_JOB_LAST_ACTION_TIME, LAST_ACTION);
json.put(JsonTags.COORDINATOR_JOB_NEXT_MATERIALIZED_TIME,
NEXT_MATERIALIZED);
json.put(JsonTags.COORDINATOR_JOB_START_TIME, START_TIME);
+ json.put(JsonTags.COORDINATOR_JOB_PAUSE_TIME, PAUSE_TIME);
json.put(JsonTags.COORDINATOR_JOB_END_TIME, END_TIME);
json.put(JsonTags.COORDINATOR_JOB_USER, "f");
json.put(JsonTags.COORDINATOR_JOB_GROUP, "g");
@@ -289,6 +291,7 @@ public class TestJsonToBean extends Test
assertEquals(JsonUtils.parseDateRfc822(NEXT_MATERIALIZED),
job.getNextMaterializedTime());
assertEquals(JsonUtils.parseDateRfc822(START_TIME),
job.getStartTime());
assertEquals(JsonUtils.parseDateRfc822(END_TIME), job.getEndTime());
+ assertEquals(JsonUtils.parseDateRfc822(PAUSE_TIME),
job.getPauseTime());
assertEquals("f", job.getUser());
assertEquals("g", job.getGroup());
assertEquals("h", job.getConsoleUrl());
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1306051&r1=1306050&r2=1306051&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Mar 27 23:22:39 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-785 No JsonToBean mapping for coord pausetime(shwetha via Mohammad)
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)
