Repository: incubator-falcon Updated Branches: refs/heads/master 9520370a2 -> dcc282389
FALCON-930 Delete old project name (ivory) from code and xmls. Contributed by Ruslan Ostafiychuk Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/dcc28238 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/dcc28238 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/dcc28238 Branch: refs/heads/master Commit: dcc2823890d226c1ce06b919c8b3cf999cd323ad Parents: 9520370 Author: Raghav Kumar Gautam <rag...@apache.org> Authored: Wed Dec 3 17:07:04 2014 -0800 Committer: Raghav Kumar Gautam <rag...@apache.org> Committed: Wed Dec 3 17:07:04 2014 -0800 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ falcon-regression/README.md | 4 ++-- .../core/helpers/entity/AbstractEntityHelper.java | 5 +---- .../core/supportClasses/JmsMessageConsumer.java | 2 +- .../apache/falcon/regression/core/util/BundleUtil.java | 10 +++------- .../java/org/apache/falcon/regression/core/util/Util.java | 4 ++-- .../regression/prism/FeedDelayParallelTimeoutTest.java | 2 +- .../AvailabilityBundle/valid/bundle1/cluster-0.1.xml | 4 ++-- .../AvailabilityBundle/valid/bundle1/feed-template1.xml | 6 +++--- .../AvailabilityBundle/valid/bundle1/feed-template2.xml | 4 ++-- .../merlin/src/test/resources/ELbundle/cluster-0.1.xml | 4 ++-- .../merlin/src/test/resources/ELbundle/feed-template1.xml | 8 ++++---- .../merlin/src/test/resources/ELbundle/feed-template2.xml | 6 +++--- .../test/resources/EmptyInputTagProcess/cluster-0.1.xml | 4 ++-- .../resources/EmptyInputTagProcess/feed-template1.xml | 6 +++--- .../resources/EmptyInputTagProcess/feed-template2.xml | 4 ++-- .../test/resources/EmptyOutputTagProcess/cluster-0.1.xml | 4 ++-- .../resources/EmptyOutputTagProcess/feed-template1.xml | 6 +++--- .../resources/EmptyOutputTagProcess/feed-template2.xml | 4 ++-- .../resources/FeedReplicaltionBundles/cluster-0.1.xml | 6 +++--- .../LateDataBundles/valid1/bundle1/cluster-0.1.xml | 6 +++--- .../LateDataBundles/valid1/bundle1/feed-template1.xml | 4 ++-- .../LateDataBundles/valid1/bundle1/feed-template2.xml | 4 ++-- .../test/resources/ReplicationResources/cluster-0.1.xml | 4 ++-- .../RetentionBundles/valid/bundle1/cluster-0.1.xml | 6 +++--- .../RetentionBundles/valid/bundle1/feed-hdfsoutputdir.xml | 6 +++--- .../RetentionBundles/valid/bundle1/feed-inpath.xml | 6 +++--- .../RetentionBundles/valid/bundle1/feed-interpath.xml | 4 ++-- .../resources/RetryTests/valid1/bundle1/cluster-0.1.xml | 6 +++--- .../RetryTests/valid1/bundle1/feed-template1.xml | 4 ++-- .../RetryTests/valid1/bundle1/feed-template2.xml | 4 ++-- .../merlin/src/test/resources/hcat/cluster-0.1.xml | 4 ++-- .../merlin/src/test/resources/hcat_2/cluster-0.1.xml | 4 ++-- .../src/test/resources/updateBundle/cluster-0.1.xml | 4 ++-- .../src/test/resources/updateBundle/feed-template1.xml | 8 ++++---- .../src/test/resources/updateBundle/feed-template2.xml | 6 +++--- 36 files changed, 86 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 52d4388..6a1df5c 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -33,6 +33,9 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-930 Delete old project name (ivory) from code and xmls (Ruslan Ostafiychuk via Raghav + Kumar Gautam) + FALCON-927 Refactoring of entity helpers in falcon-regression (Ruslan Ostafiychuk) FALCON-928 Use falcon's checkstyle for falcon regression code (Raghav Kumar Gautam) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/README.md ---------------------------------------------------------------------- diff --git a/falcon-regression/README.md b/falcon-regression/README.md index abfa689..eca1ca0 100644 --- a/falcon-regression/README.md +++ b/falcon-regression/README.md @@ -51,7 +51,7 @@ Populate it with prism related properties: prism.service_user = falcon prism.hadoop_url = node-1.example.com:8020 prism.hadoop_location = /usr/lib/hadoop/bin/hadoop - prism.ivory_hostname = http://node-1.example.com:15000 + prism.hostname = http://node-1.example.com:15000 prism.storeLocation = hdfs://node-1.example.com:8020/apps/falcon Specify the clusters that you would be using for testing: @@ -68,7 +68,7 @@ For each cluster specify properties: cluster1.password = rgautam cluster1.hadoop_url = node-1.example.com:8020 cluster1.hadoop_location = /usr/lib/hadoop/bin/hadoop - cluster1.ivory_hostname = http://node-1.example.com:15000 + cluster1.hostname = http://node-1.example.com:15000 cluster1.cluster_readonly = webhdfs://node-1.example.com:50070 cluster1.cluster_execute = node-1.example.com:8032 cluster1.cluster_write = hdfs://node-1.example.com:8020 http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java index d5dec6e..797554b 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/entity/AbstractEntityHelper.java @@ -137,7 +137,6 @@ public abstract class AbstractEntityHelper { private String oozieURL = ""; protected String activeMQ = ""; protected String storeLocation = ""; - protected String hadoopGetCommand = ""; protected String colo; protected String allColo; protected String coloName; @@ -214,7 +213,7 @@ public abstract class AbstractEntityHelper { prefix += "."; } this.qaHost = Config.getProperty(prefix + "qa_host"); - this.hostname = Config.getProperty(prefix + "ivory_hostname"); + this.hostname = Config.getProperty(prefix + "hostname"); this.username = Config.getProperty(prefix + "username", System.getProperty("user.name")); this.password = Config.getProperty(prefix + "password", ""); this.hadoopLocation = Config.getProperty(prefix + "hadoop_location"); @@ -225,8 +224,6 @@ public abstract class AbstractEntityHelper { this.oozieURL = Config.getProperty(prefix + "oozie_url"); this.activeMQ = Config.getProperty(prefix + "activemq_url"); this.storeLocation = Config.getProperty(prefix + "storeLocation"); - this.hadoopGetCommand = hadoopLocation + " fs -cat hdfs://" + hadoopURL - + "/projects/ivory/staging/ivory/workflows/process"; this.allColo = "?colo=" + Config.getProperty(prefix + "colo", "*"); this.colo = (!Config.getProperty(prefix + "colo", "").isEmpty()) ? "?colo=" + Config .getProperty(prefix + "colo") : ""; http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java index 1ded57c..89a31b5 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/JmsMessageConsumer.java @@ -37,7 +37,7 @@ public class JmsMessageConsumer extends Thread { brokerURL = "tcp://host:61616?daemon=true"; ActiveMQConnection.DEFAULT_BROKER_URL; Name of the queue we will receive messages from - String subject = "IVORY.TOPIC";*/ + String subject = "FALCON.TOPIC";*/ private static final Logger LOGGER = Logger.getLogger(JmsMessageConsumer.class); private static final int MAX_MESSAGE_COUNT = 1000; http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java index 7ead733..f70b8f5 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java @@ -102,7 +102,7 @@ public final class BundleUtil { LOGGER.info("Loading data from path: " + file.getAbsolutePath()); final String data = IOUtils.toString(file.toURI()); - if (data.contains("uri:ivory:cluster:0.1") || data.contains("uri:falcon:cluster:0.1")) { + if (data.contains("uri:falcon:cluster:0.1")) { LOGGER.info("data been added to cluster"); ClusterMerlin clusterMerlin = new ClusterMerlin(data); //set ACL @@ -128,17 +128,13 @@ public final class BundleUtil { clusterMerlin.getProperties().getProperties().add(property); } clusterData = clusterMerlin.toString(); - } else if (data.contains("uri:ivory:feed:0.1") - || - data.contains("uri:falcon:feed:0.1")) { + } else if (data.contains("uri:falcon:feed:0.1")) { LOGGER.info("data been added to feed"); FeedMerlin feedMerlin = new FeedMerlin(data); feedMerlin.setACL(MerlinConstants.CURRENT_USER_NAME, MerlinConstants.CURRENT_USER_GROUP, "*"); dataSets.add(feedMerlin.toString()); - } else if (data.contains("uri:ivory:process:0.1") - || - data.contains("uri:falcon:process:0.1")) { + } else if (data.contains("uri:falcon:process:0.1")) { LOGGER.info("data been added to process"); ProcessMerlin processMerlin = new ProcessMerlin(data); processMerlin.setACL(MerlinConstants.CURRENT_USER_NAME, http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java index 0c12410..6f3fb93 100644 --- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java +++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java @@ -354,7 +354,7 @@ public final class Util { List<String> raw = ExecUtil.runRemoteScriptAsSudo(coloHelper.getProcessHelper() .getQaHost(), coloHelper.getProcessHelper().getUsername(), coloHelper.getProcessHelper().getPassword(), - "cat /var/log/ivory/application.* | grep \"" + workflowId + "\" | grep " + "cat /var/log/falcon/application.* | grep \"" + workflowId + "\" | grep " + "\"Received\" | awk '{print $2}'", coloHelper.getProcessHelper().getUsername(), coloHelper.getProcessHelper().getIdentityFile() @@ -371,7 +371,7 @@ public final class Util { List<String> raw = ExecUtil.runRemoteScriptAsSudo(coloHelper.getProcessHelper() .getQaHost(), coloHelper.getProcessHelper().getUsername(), coloHelper.getProcessHelper().getPassword(), - "cat /var/log/ivory/application.* | grep \"" + workflowId + "\" | grep " + "cat /var/log/falcon/application.* | grep \"" + workflowId + "\" | grep " + "\"Retrying attempt\" | awk '{print $2}'", coloHelper.getProcessHelper().getUsername(), http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 f751119..a915d24 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 @@ -84,7 +84,7 @@ public class FeedDelayParallelTimeoutTest extends BaseTestClass { feedOutput01 = FeedMerlin.fromString(feedOutput01).clearFeedClusters().toString(); - // uncomment below 2 line when falcon in sync with ivory + // uncomment below 2 line when falcon in sync with falcon // feedOutput01 = instanceUtil.setFeedCluster(feedOutput01, // XmlUtil.createValidity("2013-04-21T00:00Z", http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 3c30e92..3c17962 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 @@ -30,9 +30,9 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projects/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template1.xml b/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template1.xml index 2a1d9f7..b601ffd 100644 --- a/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template1.xml @@ -36,9 +36,9 @@ </clusters> <locations> - <location type="data" path="/samarth/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="data" path="/test/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template2.xml b/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template2.xml index 89ad45e..730f624 100644 --- a/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/AvailabilityBundle/valid/bundle1/feed-template2.xml @@ -37,8 +37,8 @@ <locations> <location type="data" path="/examples/output-data/aggregator/aggregatedLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 64028fe..6478384 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 @@ -30,9 +30,9 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/ELbundle/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/ELbundle/feed-template1.xml b/falcon-regression/merlin/src/test/resources/ELbundle/feed-template1.xml index 2114bb9..52e8463 100644 --- a/falcon-regression/merlin/src/test/resources/ELbundle/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/ELbundle/feed-template1.xml @@ -37,9 +37,9 @@ </clusters> <locations> - <location type="data" path="/samarth/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="data" path="/test/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> @@ -49,4 +49,4 @@ <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</feed> \ No newline at end of file +</feed> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/ELbundle/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/ELbundle/feed-template2.xml b/falcon-regression/merlin/src/test/resources/ELbundle/feed-template2.xml index 08c5f5d..94dbe52 100644 --- a/falcon-regression/merlin/src/test/resources/ELbundle/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/ELbundle/feed-template2.xml @@ -38,8 +38,8 @@ <locations> <location type="data" path="/examples/output-data/aggregator/aggregatedLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> @@ -49,4 +49,4 @@ <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</feed> \ No newline at end of file +</feed> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 64028fe..6478384 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 @@ -30,9 +30,9 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template1.xml b/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template1.xml index 2da8e1c..52e8463 100644 --- a/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template1.xml @@ -37,9 +37,9 @@ </clusters> <locations> - <location type="data" path="/samarth/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="data" path="/test/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template2.xml b/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template2.xml index 1ddac37..94dbe52 100644 --- a/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/EmptyInputTagProcess/feed-template2.xml @@ -38,8 +38,8 @@ <locations> <location type="data" path="/examples/output-data/aggregator/aggregatedLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 64028fe..6478384 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 @@ -30,9 +30,9 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template1.xml b/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template1.xml index 2da8e1c..52e8463 100644 --- a/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template1.xml @@ -37,9 +37,9 @@ </clusters> <locations> - <location type="data" path="/samarth/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="data" path="/test/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template2.xml b/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template2.xml index 1ddac37..94dbe52 100644 --- a/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/EmptyOutputTagProcess/feed-template2.xml @@ -38,8 +38,8 @@ <locations> <location type="data" path="/examples/output-data/aggregator/aggregatedLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 d1e262a..0ae5489 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 @@ -17,7 +17,7 @@ limitations under the License. --> -<cluster name="ivory2-stg4" description="" colo="stg" xmlns="uri:falcon:cluster:0.1"> +<cluster name="falcon2-stg4" description="" colo="stg" xmlns="uri:falcon:cluster:0.1"> <interfaces> <interface type="readonly" endpoint="hftp://host:50070"; version="0.20.2-cdh3u0"/> <interface type="execute" endpoint="host:54311" version="0.20.2-cdh3u0"/> @@ -26,9 +26,9 @@ <interface type="workflow" endpoint="http://host:11002/oozie/"; version="3.1.4"/> </interfaces> <locations> - <location name="staging" path="/projects/ivory2/stg/staging"/> + <location name="staging" path="/projects/falcon/stg/staging"/> <location name="temp" path="/tmp"/> - <location name="working" path="/projects/ivory2/stg/working"/> + <location name="working" path="/projects/falcon/stg/working"/> </locations> <properties> <property name="colo.name" value="ua1"/> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 e36f18f..3c17962 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 @@ -30,12 +30,12 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projects/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</cluster> \ No newline at end of file +</cluster> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template1.xml b/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template1.xml index 5350d0a..cad2f19 100644 --- a/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template1.xml @@ -37,8 +37,8 @@ <locations> <location type="data" path="/lateDataTest/testFolders/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template2.xml b/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template2.xml index d9e4e32..2bc4db9 100644 --- a/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/LateDataBundles/valid1/bundle1/feed-template2.xml @@ -37,8 +37,8 @@ <locations> <location type="data" path="/lateDataTest/testFolders/output-data/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 64028fe..6478384 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 @@ -30,9 +30,9 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 e36f18f..3c17962 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 @@ -30,12 +30,12 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projects/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</cluster> \ No newline at end of file +</cluster> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-hdfsoutputdir.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-hdfsoutputdir.xml b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-hdfsoutputdir.xml index d14a280..2246053 100644 --- a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-hdfsoutputdir.xml +++ b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-hdfsoutputdir.xml @@ -30,11 +30,11 @@ </cluster> </clusters> <locations> - <location type="meta" path="/projects/ivory/clicksMetaData"/> - <location type="stats" path="/projects/ivory/clicksStats"/> + <location type="meta" path="/projects/falcon/clicksMetaData"/> + <location type="stats" path="/projects/falcon/clicksStats"/> <location type="data" path="/projects/bi/rmc/daily/AdvInteractionSummary/${YEAR}-${MONTH}-${DAY}"/> </locations> <ACL owner="testuser" group="group" permission="0x755"/> <schema location="/schema/clicks" provider="protobuf"/> <properties/> -</feed> \ No newline at end of file +</feed> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-inpath.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-inpath.xml b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-inpath.xml index 326830b..e41fa3c 100644 --- a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-inpath.xml +++ b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-inpath.xml @@ -47,8 +47,8 @@ <locations> <location type="data" path="/retention/testFolders/${YEAR}-${MONTH}-${DAY}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> @@ -56,4 +56,4 @@ <properties> </properties> -</feed> \ No newline at end of file +</feed> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-interpath.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-interpath.xml b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-interpath.xml index d3c0326..c2d8d6d 100644 --- a/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-interpath.xml +++ b/falcon-regression/merlin/src/test/resources/RetentionBundles/valid/bundle1/feed-interpath.xml @@ -30,8 +30,8 @@ </cluster> </clusters> <locations> - <location type="meta" path="/projects/ivory/clicksMetaData"/> - <location type="stats" path="/projects/ivory/clicksStats"/> + <location type="meta" path="/projects/falcon/clicksMetaData"/> + <location type="stats" path="/projects/falcon/clicksStats"/> <location type="data" path="/projects/bi/ioout/interactions/${YEAR}-${MONTH}-${DAY}"/> </locations> <ACL owner="testuser" group="group" permission="0x755"/> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 e36f18f..3c17962 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 @@ -30,12 +30,12 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projects/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</cluster> \ No newline at end of file +</cluster> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template1.xml b/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template1.xml index e317d41..7035e48 100644 --- a/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template1.xml @@ -36,8 +36,8 @@ <locations> <location type="data" path="/lateDataTest/testFolders/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template2.xml b/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template2.xml index f2df5e6..9abb5b5 100644 --- a/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/RetryTests/valid1/bundle1/feed-template2.xml @@ -37,8 +37,8 @@ <locations> <location type="data" path="/lateDataTest/testFolders/output-data/megaPhail" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 9951490..ecda160 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 @@ -36,9 +36,9 @@ </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="hive.metastore.client.socket.timeout" value="120"/> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 31ea831..7f658e9 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 @@ -36,9 +36,9 @@ </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="hive.metastore.client.socket.timeout" value="120"/> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/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 64028fe..6478384 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 @@ -30,9 +30,9 @@ version="5.1.6" /> </interfaces> <locations> - <location name="staging" path="/projects/ivory/staging" /> + <location name="staging" path="/projects/falcon/staging" /> <location name="temp" path="/tmp" /> - <location name="working" path="/projectsTest/ivory/working" /> + <location name="working" path="/projects/falcon/working" /> </locations> <properties> <property name="field1" value="value1" /> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/updateBundle/feed-template1.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/updateBundle/feed-template1.xml b/falcon-regression/merlin/src/test/resources/updateBundle/feed-template1.xml index 4558cac..c10241c 100644 --- a/falcon-regression/merlin/src/test/resources/updateBundle/feed-template1.xml +++ b/falcon-regression/merlin/src/test/resources/updateBundle/feed-template1.xml @@ -37,9 +37,9 @@ </clusters> <locations> - <location type="data" path="/samarth/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="data" path="/test/input-data/rawLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> @@ -49,4 +49,4 @@ <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</feed> \ No newline at end of file +</feed> http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dcc28238/falcon-regression/merlin/src/test/resources/updateBundle/feed-template2.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/resources/updateBundle/feed-template2.xml b/falcon-regression/merlin/src/test/resources/updateBundle/feed-template2.xml index b6c175e..5c67f5f 100644 --- a/falcon-regression/merlin/src/test/resources/updateBundle/feed-template2.xml +++ b/falcon-regression/merlin/src/test/resources/updateBundle/feed-template2.xml @@ -38,8 +38,8 @@ <locations> <location type="data" path="/examples/output-data/aggregator/aggregatedLogs/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}" /> - <location type="stats" path="/projects/ivory/clicksStats" /> - <location type="meta" path="/projects/ivory/clicksMetaData" /> + <location type="stats" path="/projects/falcon/clicksStats" /> + <location type="meta" path="/projects/falcon/clicksMetaData" /> </locations> <ACL owner="testuser" group="group" permission="0x755" /> @@ -49,4 +49,4 @@ <property name="field1" value="value1" /> <property name="field2" value="value2" /> </properties> -</feed> \ No newline at end of file +</feed>
