falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rostafiyc...@apache.org
Subject git commit: FALCON-750 Method name fixed. Contributed by Paul Isaychuk
Date Fri, 26 Sep 2014 13:48:30 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 94eb546bf -> 62cf8b4aa


FALCON-750 Method name fixed. Contributed by Paul Isaychuk


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/62cf8b4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/62cf8b4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/62cf8b4a

Branch: refs/heads/master
Commit: 62cf8b4aa44d4eadac367c8680cd10cf9b70edc4
Parents: 94eb546
Author: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Authored: Fri Sep 26 16:46:37 2014 +0300
Committer: Ruslan Ostafiychuk <rostafiychuk@apache.org>
Committed: Fri Sep 26 16:46:37 2014 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                   |  1 +
 .../falcon/regression/core/util/XmlUtil.java    |  2 +-
 .../regression/FeedClusterUpdateTest.java       | 68 +++++++++---------
 .../regression/FeedInstanceStatusTest.java      |  8 +--
 .../falcon/regression/FeedReplicationTest.java  | 20 +++---
 .../falcon/regression/InstanceSummaryTest.java  |  8 +--
 .../ProcessInstanceColoMixedTest.java           | 18 ++---
 .../regression/hcat/HCatFeedOperationsTest.java |  4 +-
 .../regression/hcat/HCatReplicationTest.java    |  6 +-
 .../prism/FeedDelayParallelTimeoutTest.java     | 10 +--
 .../regression/prism/PrismFeedDeleteTest.java   | 18 ++---
 .../prism/PrismFeedLateReplicationTest.java     | 32 ++++-----
 .../PrismFeedReplicationPartitionExpTest.java   | 72 ++++++++++----------
 .../prism/PrismFeedReplicationUpdateTest.java   | 26 +++----
 .../regression/prism/PrismFeedSnSTest.java      |  6 +-
 .../regression/prism/PrismFeedUpdateTest.java   | 12 ++--
 .../prism/UpdateAtSpecificTimeTest.java         | 16 ++---
 17 files changed, 164 insertions(+), 163 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 84580d4..48a0792 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -9,6 +9,7 @@ Trunk (Unreleased)
    via Samarth Gupta)
 
   IMPROVEMENTS
+   FALCON-750 Method name fixed (Paul Isaychuk via Ruslan Ostafiychuk)
 
    FALCON-645 add test to falcon regression for change made in default behaviour 
    of instance request ( Karishma Via Samarth Gupta)

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/XmlUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/XmlUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/XmlUtil.java
index 25881b6..f0ea328 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/XmlUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/XmlUtil.java
@@ -46,7 +46,7 @@ public final class XmlUtil {
         return v;
     }
 
-    public static Retention createRtention(String limit, ActionType action) {
+    public static Retention createRetention(String limit, ActionType action) {
         Retention r = new Retention();
         r.setLimit(new Frequency(limit));
         r.setAction(action);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
index 3499a4b..229dccd 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
@@ -99,7 +99,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         startTime = TimeUtil.getTimeWrtSystemTime(-50);
     }
@@ -114,13 +114,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         //add one source and one target , schedule only on source
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feed, XmlUtil.createValidity(startTime,
                 TimeUtil.addMinsToTime(startTime, 65)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             null);
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feedOriginalSubmit,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
 
         logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
@@ -163,18 +163,18 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedUpdated = InstanceUtil.setFeedCluster(
             feed, XmlUtil.createValidity(startTime,
                 TimeUtil.addMinsToTime(startTime, 65)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "US/${cluster.colo}");
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -209,13 +209,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedOriginalSubmit = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 null);
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feedOriginalSubmit,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -259,18 +259,18 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedUpdated = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 "US/${cluster.colo}");
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -308,7 +308,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedOriginalSubmit = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 null);
 
@@ -352,18 +352,18 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedUpdated = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 "US/${cluster.colo}");
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -401,7 +401,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedOriginalSubmit = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 null);
 
@@ -445,18 +445,18 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         //prepare updated Feed
         feedUpdated = InstanceUtil.setFeedCluster(feed, XmlUtil.createValidity(startTime,
                 TimeUtil.addMinsToTime(startTime, 65)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, null);
 
         logger.info("Updated Feed: " + Util.prettyPrintXml(feedUpdated));
@@ -493,7 +493,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedOriginalSubmit = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 null);
 
@@ -537,18 +537,18 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedUpdated = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 "US/${cluster.colo}");
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -586,18 +586,18 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedOriginalSubmit = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 "US/${cluster.colo}");
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feedOriginalSubmit,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feedOriginalSubmit,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -642,13 +642,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
         feedUpdated = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 null);
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
 
         response = prism.getFeedHelper().update(feedUpdated, feedUpdated);
@@ -706,26 +706,26 @@ public class FeedClusterUpdateTest extends BaseTestClass {
 
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feedOriginalSubmit = InstanceUtil
             .setFeedCluster(feedOriginalSubmit, XmlUtil.createValidity(startTime,
                     TimeUtil.addMinsToTime(startTime, 65)),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)),
                 ClusterType.SOURCE,
                 "US/${cluster.colo}");
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feedOriginalSubmit,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)),
             ClusterType.TARGET, null);
         feedOriginalSubmit = InstanceUtil.setFeedCluster(feedOriginalSubmit,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)),
             ClusterType.SOURCE,
             "UK/${cluster.colo}");
@@ -770,13 +770,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
 
         feedUpdated = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feedUpdated = InstanceUtil.setFeedCluster(feedUpdated,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)),
             ClusterType.SOURCE,
             "UK/${cluster.colo}");

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
index 33a81d0..3b3ba71 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
@@ -106,24 +106,24 @@ public class FeedInstanceStatusTest extends BaseTestClass {
         String feedName = Util.readEntityName(feed);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         String startTime = TimeUtil.getTimeWrtSystemTime(-50);
 
         feed = InstanceUtil.setFeedCluster(feed, XmlUtil.createValidity(startTime,
             TimeUtil.addMinsToTime(startTime, 65)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "US/${cluster.colo}");
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 110)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
index 197c3c6..8399814 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
@@ -117,18 +117,18 @@ public class FeedReplicationTest extends BaseTestClass {
         //erase all clusters from feed definition
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         //set cluster1 as source
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)),
             ClusterType.SOURCE, null);
         //set cluster2 as target
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)),
             ClusterType.TARGET, null, targetDataLocation);
 
@@ -188,24 +188,24 @@ public class FeedReplicationTest extends BaseTestClass {
         //erase all clusters from feed definition
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         //set cluster1 as source
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)),
             ClusterType.SOURCE, null);
         //set cluster2 as target
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)),
             ClusterType.TARGET, null, targetDataLocation);
         //set cluster3 as target
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)),
             ClusterType.TARGET, null, targetDataLocation);
 
@@ -284,18 +284,18 @@ public class FeedReplicationTest extends BaseTestClass {
         //erase all clusters from feed definition
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         //set cluster1 as source
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)),
             ClusterType.SOURCE, null);
         //set cluster2 as target
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)),
             ClusterType.TARGET, null, targetDataLocation);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
index db600ff..b864d8d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
@@ -225,23 +225,23 @@ public class InstanceSummaryTest extends BaseTestClass {
         //cluster_1 is target, cluster_2 is source and cluster_3 is neutral
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(100000)", ActionType.DELETE),
                 Util.readEntityName(bundles[2].getClusters().get(0)), null, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(100000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
                 null, feedInputPath);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(100000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
                 null, feedInputPath);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
index cf5ba0f..a219d5a 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
@@ -115,17 +115,17 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
         feed01 = InstanceUtil
             .setFeedCluster(feed01,
                 XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
                 ClusterType.SOURCE, null);
         feed02 = InstanceUtil
             .setFeedCluster(feed02,
                 XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
                 ClusterType.SOURCE, null);
         outputFeed = InstanceUtil
             .setFeedCluster(outputFeed,
                 XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
                 ClusterType.SOURCE, null);
 
         //set new feed input data
@@ -149,31 +149,31 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
         //set clusters for feed01
         feed01 = InstanceUtil
             .setFeedCluster(feed01, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, null);
         feed01 = InstanceUtil
             .setFeedCluster(feed01, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null);
 
         //set clusters for feed02
         feed02 = InstanceUtil
             .setFeedCluster(feed02, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
         feed02 = InstanceUtil
             .setFeedCluster(feed02, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE, null);
 
         //set clusters for output feed
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(10000)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, null);
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(10000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null);
 
         //submit and schedule feeds

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
index 2214c6e..2ce36a4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
@@ -176,7 +176,7 @@ public class HCatFeedOperationsTest extends BaseTestClass {
         // set cluster 2 as the target.
         feed = InstanceUtil.setFeedClusterWithTable(feed,
                 XmlUtil.createValidity(startDate, endDate),
-                XmlUtil.createRtention("months(9000)", ActionType.DELETE),
+                XmlUtil.createRetention("months(9000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 tableUri);
 
@@ -204,7 +204,7 @@ public class HCatFeedOperationsTest extends BaseTestClass {
         // set cluster 2 as the target.
         feed = InstanceUtil.setFeedClusterWithTable(feed,
                 XmlUtil.createValidity(startDate, endDate),
-                XmlUtil.createRtention("months(9000)", ActionType.DELETE),
+                XmlUtil.createRetention("months(9000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 tableUri);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
index 50ccd8a..fce0bf5 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
@@ -178,7 +178,7 @@ public class HCatReplicationTest extends BaseTestClass {
         // set the cluster 2 as the target.
         feed = InstanceUtil.setFeedClusterWithTable(feed,
             XmlUtil.createValidity(startDate, endDate),
-            XmlUtil.createRtention("months(9000)", ActionType.DELETE),
+            XmlUtil.createRetention("months(9000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
             tableUri);
 
@@ -264,13 +264,13 @@ public class HCatReplicationTest extends BaseTestClass {
         // set the cluster 2 as the target.
         feed = InstanceUtil.setFeedClusterWithTable(feed,
             XmlUtil.createValidity(startDate, endDate),
-            XmlUtil.createRtention("months(9000)", ActionType.DELETE),
+            XmlUtil.createRetention("months(9000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
             tableUri);
         // set the cluster 3 as the target.
         feed = InstanceUtil.setFeedClusterWithTable(feed,
             XmlUtil.createValidity(startDate, endDate),
-            XmlUtil.createRtention("months(9000)", ActionType.DELETE),
+            XmlUtil.createRetention("months(9000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, null,
             tableUri);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
index 6298981..a0cd014 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
@@ -85,30 +85,30 @@ public class FeedDelayParallelTimeoutTest extends BaseTestClass {
         feedOutput01 = InstanceUtil
             .setFeedCluster(feedOutput01,
                 XmlUtil.createValidity("2010-10-01T12:00Z", "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
                 ClusterType.SOURCE, null);
 
         // uncomment below 2 line when falcon in sync with ivory
 
         //	feedOutput01 = instanceUtil.setFeedCluster(feedOutput01,
         // XmlUtil.createValidity("2013-04-21T00:00Z",
-        // "2099-10-01T12:10Z"),XmlUtil.createRtention("hours(15)",ActionType.DELETE),
+        // "2099-10-01T12:10Z"),XmlUtil.createRetention("hours(15)",ActionType.DELETE),
         // Util.readClusterName(bundles[1].getClusters().get(0)),ClusterType.SOURCE,"",delay,
         // feedInputPath);
         //	feedOutput01 = instanceUtil.setFeedCluster(feedOutput01,
         // XmlUtil.createValidity("2013-04-21T00:00Z",
-        // "2099-10-01T12:25Z"),XmlUtil.createRtention("hours(15)",ActionType.DELETE),
+        // "2099-10-01T12:25Z"),XmlUtil.createRetention("hours(15)",ActionType.DELETE),
         // Util.readClusterName(bundles[0].getClusters().get(0)),ClusterType.TARGET,"",delay,
         // feedOutputPath);
 
         //feedOutput01 = instanceUtil.setFeedCluster(feedOutput01,
         // XmlUtil.createValidity("2013-04-21T00:00Z",
-        // "2099-10-01T12:10Z"),XmlUtil.createRtention("hours(15)",ActionType.DELETE),
+        // "2099-10-01T12:10Z"),XmlUtil.createRetention("hours(15)",ActionType.DELETE),
         // Util.readClusterName(bundles[1].getClusters().get(0)),ClusterType.SOURCE,"",
         // feedInputPath);
         //feedOutput01 = instanceUtil.setFeedCluster(feedOutput01,
         // XmlUtil.createValidity("2013-04-21T00:00Z",
-        // "2099-10-01T12:25Z"),XmlUtil.createRtention("hours(15)",ActionType.DELETE),
+        // "2099-10-01T12:25Z"),XmlUtil.createRetention("hours(15)",ActionType.DELETE),
         // Util.readClusterName(bundles[0].getClusters().get(0)),ClusterType.TARGET,"",
         // feedOutputPath);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
index f67e2ce..3bbeca1 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
@@ -382,18 +382,18 @@ public class PrismFeedDeleteTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeServer1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE,
                 "${cluster.colo}", baseHDFSDir + "/localDC/rc/billing" + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeServer2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 baseHDFSDir + "/clusterPath/localDC/rc/billing" + MINUTE_DATE_PATTERN);
 
@@ -801,18 +801,18 @@ public class PrismFeedDeleteTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeServer1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE,
                 "${cluster.colo}", baseHDFSDir + "/localDC/rc/billing" + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeServer2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 baseHDFSDir + "/clusterPath/localDC/rc/billing" + MINUTE_DATE_PATTERN);
 
@@ -902,16 +902,16 @@ public class PrismFeedDeleteTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeServer1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE,
                 "${cluster.colo}", baseHDFSDir + "/localDC/rc/billing" + MINUTE_DATE_PATTERN);
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeServer2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 baseHDFSDir + "/clusterPath/localDC/rc/billing" + MINUTE_DATE_PATTERN);
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
index 9e0fbed..1cc558e 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
@@ -89,7 +89,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         String postFix = "/US/" + cluster2.getClusterHelper().getColoName();
@@ -107,19 +107,19 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "US/${cluster.colo}");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
             null);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -172,7 +172,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
 
@@ -180,19 +180,19 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "US/${cluster.colo}");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
             null);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -336,7 +336,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
 
@@ -344,19 +344,19 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "ua1/${cluster.colo}");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
             null);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "ua1/${cluster.colo}");
 
@@ -537,26 +537,26 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         String startTime = TimeUtil.getTimeWrtSystemTime(3);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "ua1/${cluster.colo}");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
             null);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "ua1/${cluster.colo}");
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
index 7a5a91e..e940b19 100755
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
@@ -207,24 +207,24 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2012-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, "",
                 testBaseDir1 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2012-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, "",
                 testBaseDir2 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE, "");
 
         logger.info("feed: " + Util.prettyPrintXml(feed));
@@ -255,23 +255,23 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(100000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), null, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(100000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 testBaseDir2 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(100000)", ActionType.DELETE),
                 Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
                 "${cluster.colo}", testBaseDir1 + MINUTE_DATE_PATTERN);
 
@@ -350,23 +350,23 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), null, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET,
                 "${cluster.colo}", testBaseDir2 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE, null,
             testBaseDir1 + MINUTE_DATE_PATTERN);
 
@@ -441,24 +441,24 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2012-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
                 "${cluster.colo}");
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2012-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET,
                 "${cluster.colo}");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE, null);
 
 
@@ -537,25 +537,25 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2012-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, null,
                 testBaseDir1 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2012-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET,
                 "${cluster.colo}",
                 testBaseDir2 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE, null);
 
         //clean target if old data exists
@@ -594,24 +594,24 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
             testBaseDir1 + MINUTE_DATE_PATTERN);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(10000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2012-10-01T12:11Z"),
-                XmlUtil.createRtention("days(10000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null,
                 testBaseDir1 + "/ua1" + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2012-10-01T12:26Z"),
-                XmlUtil.createRtention("days(10000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 testBaseDir1 + "/ua2" + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(10000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "${cluster.colo}");
 
@@ -694,25 +694,25 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE,
                 "${cluster.colo}",
                 testBaseDir_server1source + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
                 testBaseDir2 + "/replicated" + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "${cluster.colo}", testBaseDir1 + MINUTE_DATE_PATTERN);
 
@@ -777,24 +777,24 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         feed = InstanceUtil.setFeedFilePath(feed, testBaseDir1 + MINUTE_DATE_PATTERN);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
                 "${cluster.colo}", testBaseDir1 + "/ua1" + MINUTE_DATE_PATTERN + "/");
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET,
                 "${cluster.colo}", testBaseDir1 + "/ua2" + MINUTE_DATE_PATTERN + "/");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z")
-            , XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            , XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "${cluster.colo}", testBaseDir4 + MINUTE_DATE_PATTERN + "/");
 
@@ -866,24 +866,24 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2012-10-01T12:10Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, "",
                 testBaseDir1 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2012-10-01T12:25Z"),
-                XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
                 Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, "",
                 testBaseDir2 + MINUTE_DATE_PATTERN);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE, "");
 
         logger.info("feed: " + Util.prettyPrintXml(feed));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
index 56e0af9..35c0975 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
@@ -103,7 +103,7 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         // use the colo string here so that the test works in embedded and distributed mode.
@@ -122,20 +122,20 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
 
         feed = InstanceUtil.setFeedCluster(feed, XmlUtil.createValidity(startTime,
             TimeUtil.addMinsToTime(startTime, 85)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             "US/${cluster.colo}");
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 20),
                 TimeUtil.addMinsToTime(startTime, 105)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET, null);
 
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(TimeUtil.addMinsToTime(startTime, 40),
                 TimeUtil.addMinsToTime(startTime, 130)),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
             "UK/${cluster.colo}");
 
@@ -197,17 +197,17 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
         //set clusters to null;
         feed01 = InstanceUtil.setFeedCluster(feed01,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed02 = InstanceUtil.setFeedCluster(feed02,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         //set new feed input data
@@ -228,38 +228,38 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
         //set clusters for feed01
         feed01 = InstanceUtil
             .setFeedCluster(feed01, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE,
                 null);
 
         feed01 = InstanceUtil
             .setFeedCluster(feed01, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET,
                 null);
 
         //set clusters for feed02
         feed02 = InstanceUtil
             .setFeedCluster(feed02, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
                 null);
 
         feed02 = InstanceUtil
             .setFeedCluster(feed02, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.SOURCE,
                 null);
 
         //set clusters for output feed
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.SOURCE, null);
 
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, null);
 
         //submit and schedule feeds

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
index e97ac37..4784dec 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
@@ -387,17 +387,17 @@ public class PrismFeedSnSTest extends BaseTestClass {
         String feed = bundles[0].getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(10000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(10000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
 
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA1, "2099-10-01T12:10Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(clust1), ClusterType.SOURCE, "${cluster.colo}",
                 baseHDFSDir + "/localDC/rc/billing" + MINUTE_DATE_PATTERN);
         feed = InstanceUtil
             .setFeedCluster(feed, XmlUtil.createValidity(startTimeUA2, "2099-10-01T12:25Z"),
-                XmlUtil.createRtention("days(10000)", ActionType.DELETE),
+                XmlUtil.createRetention("days(10000)", ActionType.DELETE),
                 Util.readEntityName(clust2), ClusterType.TARGET, null, baseHDFSDir +
                     "/clusterPath/localDC/rc/billing" + MINUTE_DATE_PATTERN);
         logger.info("feed: " + Util.prettyPrintXml(feed));

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
index 7d6a90c..a07161d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
@@ -123,12 +123,12 @@ public class PrismFeedUpdateTest extends BaseTestClass {
         feed01 = InstanceUtil
             .setFeedCluster(feed01,
                 XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
                 ClusterType.SOURCE, null);
         outputFeed = InstanceUtil
             .setFeedCluster(outputFeed,
                 XmlUtil.createValidity("2009-02-01T00:00Z", "2012-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE), null,
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE), null,
                 ClusterType.SOURCE, null);
 
         //set new feed input data
@@ -144,21 +144,21 @@ public class PrismFeedUpdateTest extends BaseTestClass {
         //set clusters for feed01
         feed01 = InstanceUtil
             .setFeedCluster(feed01, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(cluster1Def), ClusterType.SOURCE, null);
         feed01 = InstanceUtil
             .setFeedCluster(feed01, XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-                XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+                XmlUtil.createRetention("hours(10)", ActionType.DELETE),
                 Util.readEntityName(cluster2Def), ClusterType.TARGET, null);
 
         //set clusters for output feed
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(cluster1Def), ClusterType.SOURCE, null);
         outputFeed = InstanceUtil.setFeedCluster(outputFeed,
             XmlUtil.createValidity(startTime, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("hours(10)", ActionType.DELETE),
+            XmlUtil.createRetention("hours(10)", ActionType.DELETE),
             Util.readEntityName(cluster2Def), ClusterType.TARGET, null);
 
         //submit and schedule feeds

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/62cf8b4a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
index 82aae47..e17d9f0 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
@@ -431,10 +431,10 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
         String feed = processBundle.getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         feed = InstanceUtil.setFeedCluster(feed, XmlUtil.createValidity(startTime, endTime),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE),
             Util.readEntityName(processBundle.getClusters().get(0)), ClusterType.SOURCE,
             null, baseTestDir + "/replication" + MINUTE_DATE_PATTERN);
 
@@ -575,11 +575,11 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
         String feed = b.getDataSets().get(0);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         feed = InstanceUtil.setFeedCluster(feed, XmlUtil.createValidity
                 ("2012-10-01T12:10Z", "2099-10-01T12:10Z"),
-            XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(1000000)", ActionType.DELETE),
             Util.readEntityName(b.getClusters().get(0)), ClusterType.SOURCE, "",
             "/someTestPath" + MINUTE_DATE_PATTERN);
         ServiceResponse r = prism.getClusterHelper().submitEntity(
@@ -601,20 +601,20 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
         //cluster1 is target, cluster2 is source and cluster3 is neutral
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity("2012-10-01T12:00Z", "2010-01-01T00:00Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE), null,
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE), null,
             ClusterType.SOURCE, null);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTimeCluster_source, "2099-10-01T12:10Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE),
             Util.readEntityName(bundles[2].getClusters().get(0)), null, null);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTimeCluster_target, "2099-10-01T12:25Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE),
             Util.readEntityName(bundles[0].getClusters().get(0)), ClusterType.TARGET,
             null, testDataDir + MINUTE_DATE_PATTERN);
         feed = InstanceUtil.setFeedCluster(feed,
             XmlUtil.createValidity(startTimeCluster_source, "2099-01-01T00:00Z"),
-            XmlUtil.createRtention("days(100000)", ActionType.DELETE),
+            XmlUtil.createRetention("days(100000)", ActionType.DELETE),
             Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.SOURCE,
             null, testDataDir + MINUTE_DATE_PATTERN);
 


Mime
View raw message