falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rag...@apache.org
Subject incubator-falcon git commit: FALCON-906 Add license header where it is needed, remove deprecated inmobi references. Contributed by Paul Isaychuk
Date Wed, 19 Nov 2014 22:14:50 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 41b93a1ba -> 40c413180


FALCON-906 Add license header where it is needed, remove deprecated inmobi references. 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/40c41318
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/40c41318
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/40c41318

Branch: refs/heads/master
Commit: 40c413180cccc701a00d7b7900d4fa904859932e
Parents: 41b93a1
Author: Raghav Kumar Gautam <raghav@apache.org>
Authored: Wed Nov 19 14:14:35 2014 -0800
Committer: Raghav Kumar Gautam <raghav@apache.org>
Committed: Wed Nov 19 14:14:35 2014 -0800

----------------------------------------------------------------------
 .../prism/PrismProcessDeleteTest.java           |   5 +--
 .../merlin/src/test/java/testng.xml             |  31 -------------------
 .../valid/bundle1/cluster-0.1.xml               |  10 +++---
 .../src/test/resources/ELbundle/cluster-0.1.xml |  10 +++---
 .../EmptyInputTagProcess/cluster-0.1.xml        |  10 +++---
 .../EmptyOutputTagProcess/cluster-0.1.xml       |  10 +++---
 .../FeedReplicaltionBundles/cluster-0.1.xml     |  10 +++---
 .../valid1/bundle1/cluster-0.1.xml              |  10 +++---
 .../normalInput/log_01.txt                      |  24 +++++++-------
 .../ReplicationResources/cluster-0.1.xml        |  10 +++---
 .../ReplicationResources/feed-s4Replication.xml |   2 +-
 .../valid/bundle1/cluster-0.1.xml               |  10 +++---
 .../RetryTests/valid1/bundle1/cluster-0.1.xml   |  10 +++---
 .../src/test/resources/availabilityFlag.txt     |   1 -
 .../src/test/resources/feed-s4Replication.xml   |   2 +-
 .../src/test/resources/hcat/cluster-0.1.xml     |  10 +++---
 .../src/test/resources/hcat_2/cluster-0.1.xml   |  10 +++---
 .../merlin/src/test/resources/log_01.txt        |  31 ++++++++++---------
 .../src/test/resources/thriftRRMar0602.gz       | Bin 2416795 -> 0 bytes
 .../test/resources/updateBundle/cluster-0.1.xml |  10 +++---
 20 files changed, 92 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
index 1bc61b3..05b5276 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
@@ -74,10 +74,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
     }
 
 	/* NOTE: All test cases assume that there are two entities scheduled in each colo
-        com.inmobi.qa.airavatqa.prism.PrismProcessDeleteTest
-        .testUA1ProcessDeleteAlreadyDeletedProcess */
-
-
+        PrismProcessDeleteTest.testUA1ProcessDeleteAlreadyDeletedProcess */
     @Test(groups = {"prism", "0.2"})
     public void testUA1ProcessDeleteInBothColos() throws Exception {
         //now submit the thing to prism

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/java/testng.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/testng.xml b/falcon-regression/merlin/src/test/java/testng.xml
deleted file mode 100644
index 0e442c0..0000000
--- a/falcon-regression/merlin/src/test/java/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--~
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Suite1" verbose="1">
-    <test name="com.inmobi.qa.airavatqa">
-        <classes>
-            <class name="com.inmobi.qa.airavatqa.FeedValidations"/>
-            <methods>
-                <include name="test"/>
-            </methods>
-
-        </classes>
-    </test>
-</suite>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/cluster-0.1.xml
index 3546de6..3c30e92 100644
--- a/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="gs" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="hftp://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="hftp://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/ELbundle/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/ELbundle/cluster-0.1.xml b/falcon-regression/merlin/src/test/resources/ELbundle/cluster-0.1.xml
index cdb14ae..64028fe 100644
--- a/falcon-regression/merlin/src/test/resources/ELbundle/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/ELbundle/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/cluster-0.1.xml
index cdb14ae..64028fe 100644
--- a/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/cluster-0.1.xml
index cdb14ae..64028fe 100644
--- a/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/FeedReplicaltionBundles/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/FeedReplicaltionBundles/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/FeedReplicaltionBundles/cluster-0.1.xml
index 7d1b089..d1e262a 100755
--- a/falcon-regression/merlin/src/test/resources/FeedReplicaltionBundles/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/FeedReplicaltionBundles/cluster-0.1.xml
@@ -19,11 +19,11 @@
 
 <cluster name="ivory2-stg4" description="" colo="stg" xmlns="uri:falcon:cluster:0.1">
     <interfaces>
-        <interface type="readonly" endpoint="hftp://stg-nn.blue.ua2.inmobi.com:50070"
version="0.20.2-cdh3u0"/>
-        <interface type="execute" endpoint="stg-jt.blue.ua2.inmobi.com:54311" version="0.20.2-cdh3u0"/>
-        <interface type="write" endpoint="hdfs://stg-nn.blue.ua2.inmobi.com:54310" version="0.20.2-cdh3u0"/>
-        <interface type="messaging" endpoint="tcp://gs1134.blue.ua2.inmobi.com:61618?daemon=true"
version="5.1.6"/>
-        <interface type="workflow" endpoint="http://gs1134.blue.ua2.inmobi.com:11002/oozie/"
version="3.1.4"/>
+        <interface type="readonly" endpoint="hftp://host:50070" version="0.20.2-cdh3u0"/>
+        <interface type="execute" endpoint="host:54311" version="0.20.2-cdh3u0"/>
+        <interface type="write" endpoint="hdfs://host:54310" version="0.20.2-cdh3u0"/>
+        <interface type="messaging" endpoint="tcp://host:61618?daemon=true" version="5.1.6"/>
+        <interface type="workflow" endpoint="http://host:11002/oozie/" version="3.1.4"/>
     </interfaces>
     <locations>
         <location name="staging" path="/projects/ivory2/stg/staging"/>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/cluster-0.1.xml
index 6a00752..e36f18f 100644
--- a/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="gs" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="hftp://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="hftp://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/OozieExampleInputData/normalInput/log_01.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/OozieExampleInputData/normalInput/log_01.txt
b/falcon-regression/merlin/src/test/resources/OozieExampleInputData/normalInput/log_01.txt
index 79b343f..64434fb 100644
--- a/falcon-regression/merlin/src/test/resources/OozieExampleInputData/normalInput/log_01.txt
+++ b/falcon-regression/merlin/src/test/resources/OozieExampleInputData/normalInput/log_01.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-package com.inmobi.qa.airavatqa.prism;
+package com.prism;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -25,17 +25,17 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.inmobi.qa.airavatqa.core.Bundle;
-import com.inmobi.qa.airavatqa.core.ColoHelper;
-import com.inmobi.qa.airavatqa.core.PrismHelper;
-import com.inmobi.qa.airavatqa.core.ServiceResponse;
-import com.inmobi.qa.airavatqa.core.Util;
-import com.inmobi.qa.airavatqa.core.Util.URLS;
-import com.inmobi.qa.airavatqa.core.instanceUtil;
-import com.inmobi.qa.airavatqa.core.xmlUtil;
-import com.inmobi.qa.airavatqa.generated.feed.ActionType;
-import com.inmobi.qa.airavatqa.generated.feed.ClusterType;
-import com.inmobi.qa.airavatqa.generated.feed.TimezoneType;
+import com.core.Bundle;
+import com.core.ColoHelper;
+import com.core.PrismHelper;
+import com.core.ServiceResponse;
+import com.core.Util;
+import com.core.Util.URLS;
+import com.core.instanceUtil;
+import com.core.xmlUtil;
+import com.generated.feed.ActionType;
+import com.generated.feed.ClusterType;
+import com.generated.feed.TimezoneType;
 
 public class PrismFeedLateReplicationTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/ReplicationResources/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/ReplicationResources/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/ReplicationResources/cluster-0.1.xml
index cdb14ae..64028fe 100644
--- a/falcon-regression/merlin/src/test/resources/ReplicationResources/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/ReplicationResources/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/ReplicationResources/feed-s4Replication.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/ReplicationResources/feed-s4Replication.xml
b/falcon-regression/merlin/src/test/resources/ReplicationResources/feed-s4Replication.xml
index 96fa910..bbda0c5 100644
--- a/falcon-regression/merlin/src/test/resources/ReplicationResources/feed-s4Replication.xml
+++ b/falcon-regression/merlin/src/test/resources/ReplicationResources/feed-s4Replication.xml
@@ -26,7 +26,7 @@
             <validity start="2012-12-26T05:00Z" end="2034-12-20T08:00Z"/>
             <retention limit="months(36)" action="delete"/>
             <locations>
-                <location type="data" path="s4://inmobi-iat-data/userplatform/${YEAR}/${MONTH}/${DAY}/${HOUR}"/>
+                <location type="data" path="s4://data/userplatform/${YEAR}/${MONTH}/${DAY}/${HOUR}"/>
             </locations>
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/cluster-0.1.xml
index 6a00752..e36f18f 100644
--- a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="gs" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="hftp://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="hftp://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/cluster-0.1.xml
b/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/cluster-0.1.xml
index 6a00752..e36f18f 100644
--- a/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="gs" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="hftp://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="hftp://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/availabilityFlag.txt b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
index 8b13789..e69de29 100644
--- a/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
+++ b/falcon-regression/merlin/src/test/resources/availabilityFlag.txt
@@ -1 +0,0 @@
-

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/feed-s4Replication.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/feed-s4Replication.xml b/falcon-regression/merlin/src/test/resources/feed-s4Replication.xml
index 4e7d4c3..719c684 100644
--- a/falcon-regression/merlin/src/test/resources/feed-s4Replication.xml
+++ b/falcon-regression/merlin/src/test/resources/feed-s4Replication.xml
@@ -26,7 +26,7 @@
             <validity start="2012-12-26T05:00Z" end="2034-12-20T08:00Z"/>
             <retention limit="months(36)" action="delete"/>
             <locations>
-                <location type="data" path="s4://inmobi-iat-data/userplatform/${YEAR}/${MONTH}/${DAY}/${HOUR}"/>
+                <location type="data" path="s4://data/userplatform/${YEAR}/${MONTH}/${DAY}/${HOUR}"/>
             </locations>
         </cluster>
         <cluster name="prod-global" type="target">

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/hcat/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/hcat/cluster-0.1.xml b/falcon-regression/merlin/src/test/resources/hcat/cluster-0.1.xml
index 5396835..9951490 100644
--- a/falcon-regression/merlin/src/test/resources/hcat/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/hcat/cluster-0.1.xml
@@ -20,16 +20,16 @@
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311"
+		<interface type="execute" endpoint="hdfs://host:54311"
 			version="0.20.2" />
 		<interface type="workflow"
-			endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/" version="3.1" />
+			endpoint="http://host:11000/oozie/" version="3.1" />
 		<interface type="messaging"
-			endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+			endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 		<interface type="registry" endpoint="thrift://10.14.118.32:14003"
 			version="0.11.0" />

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/hcat_2/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/hcat_2/cluster-0.1.xml b/falcon-regression/merlin/src/test/resources/hcat_2/cluster-0.1.xml
index 9be1b2c..31ea831 100644
--- a/falcon-regression/merlin/src/test/resources/hcat_2/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/hcat_2/cluster-0.1.xml
@@ -20,16 +20,16 @@
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:8041"
+		<interface type="write" endpoint="hdfs://host:8041"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:8032"
+		<interface type="execute" endpoint="hdfs://host:8032"
 			version="0.20.2" />
 		<interface type="workflow"
-			endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/" version="3.1" />
+			endpoint="http://host:11000/oozie/" version="3.1" />
 		<interface type="messaging"
-			endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+			endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 		<interface type="registry" endpoint="thrift://10.14.118.32:14003"
 			version="0.11.0" />

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/log_01.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/log_01.txt b/falcon-regression/merlin/src/test/resources/log_01.txt
index 6dbf683..29a116d 100644
--- a/falcon-regression/merlin/src/test/resources/log_01.txt
+++ b/falcon-regression/merlin/src/test/resources/log_01.txt
@@ -1,15 +1,18 @@
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 [01] LOG!!!!!!

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/thriftRRMar0602.gz
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/thriftRRMar0602.gz b/falcon-regression/merlin/src/test/resources/thriftRRMar0602.gz
deleted file mode 100644
index 6aae2ac..0000000
Binary files a/falcon-regression/merlin/src/test/resources/thriftRRMar0602.gz and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/40c41318/falcon-regression/merlin/src/test/resources/updateBundle/cluster-0.1.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/updateBundle/cluster-0.1.xml b/falcon-regression/merlin/src/test/resources/updateBundle/cluster-0.1.xml
index cdb14ae..64028fe 100644
--- a/falcon-regression/merlin/src/test/resources/updateBundle/cluster-0.1.xml
+++ b/falcon-regression/merlin/src/test/resources/updateBundle/cluster-0.1.xml
@@ -19,14 +19,14 @@
 
 <cluster colo="ua1" description="" name="corp" xmlns="uri:falcon:cluster:0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<interfaces>
-		<interface type="readonly" endpoint="http://gs1001.grid.corp.inmobi.com:50070"
+		<interface type="readonly" endpoint="http://host:50070"
 			version="0.20.2" />
-		<interface type="write" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54310"
+		<interface type="write" endpoint="hdfs://host:54310"
 			version="0.20.2" />
-		<interface type="execute" endpoint="hdfs://gs1001.grid.corp.inmobi.com:54311" version="0.20.2"
/>
-		<interface type="workflow" endpoint="http://gs1001.grid.corp.inmobi.com:11000/oozie/"
+		<interface type="execute" endpoint="hdfs://host:54311" version="0.20.2" />
+		<interface type="workflow" endpoint="http://host:11000/oozie/"
 			version="3.1" />
-		<interface type="messaging" endpoint="tcp://gs1001.grid.corp.inmobi.com:61616?daemon=true"
+		<interface type="messaging" endpoint="tcp://host:61616?daemon=true"
 			version="5.1.6" />
 	</interfaces>
 	<locations>


Mime
View raw message