You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by aj...@apache.org on 2015/09/11 13:04:40 UTC
falcon git commit: Revert "FALCON-1250 Throw error when keys in
startup.properties do not start with "*." or domain+".". Contributed by
Narayan Periwal."
Repository: falcon
Updated Branches:
refs/heads/master 407bb8595 -> 5c142ef16
Revert "FALCON-1250 Throw error when keys in startup.properties do not start with "*." or domain+".". Contributed by Narayan Periwal."
This reverts commit 222cbbee81321059091f9e0a2415f5ff65467fdd.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/5c142ef1
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/5c142ef1
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/5c142ef1
Branch: refs/heads/master
Commit: 5c142ef1612aa593a7905800a37e430830f7fd12
Parents: 407bb85
Author: Ajay Yadava <aj...@gmail.com>
Authored: Fri Sep 11 16:32:22 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Fri Sep 11 16:33:39 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 --
.../org/apache/falcon/util/ApplicationProperties.java | 6 +-----
common/src/main/resources/startup.properties | 11 +++++++++++
3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/5c142ef1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 29e16d4..771a36b 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,8 +12,6 @@ Trunk (Unreleased)
FALCON-1414 Add all fields in filterBy to the entity list output.(Narayan Periwal via Ajay Yadava)
FALCON-1430 Exclude designer from source tarball(Ajay Yadava)
-
- FALCON-1250 Throw error when keys in startup.properties do not start with "*." or domain+"."(Narayan Periwal via Ajay Yadava)
FALCON-348 Add shutdown hook for Falcon (Sandeep Samudrala via Pallavi Rao)
http://git-wip-us.apache.org/repos/asf/falcon/blob/5c142ef1/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java b/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java
index 5607119..1d8cf49 100644
--- a/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java
+++ b/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java
@@ -154,14 +154,10 @@ public abstract class ApplicationProperties extends Properties {
}
}
- private Set<String> getKeys(Set<Object> keySet) throws FalconException {
+ private Set<String> getKeys(Set<Object> keySet) {
Set<String> keys = new HashSet<String>();
for (Object keyObj : keySet) {
String key = (String) keyObj;
- if (!key.startsWith("*.") && !key.startsWith(domain + ".")) {
- LOG.error("Key: " + key + " does not start with '*.' or '" + domain + ".'");
- throw new FalconException("Key: " + key + " does not start with '*.' or '" + domain + ".'");
- }
keys.add(key.substring(key.indexOf('.') + 1));
}
return keys;
http://git-wip-us.apache.org/repos/asf/falcon/blob/5c142ef1/common/src/main/resources/startup.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/startup.properties b/common/src/main/resources/startup.properties
index a22eca6..c48188c 100644
--- a/common/src/main/resources/startup.properties
+++ b/common/src/main/resources/startup.properties
@@ -75,6 +75,17 @@ debug.libext.feed.retention.paths=${falcon.libext}
debug.libext.feed.replication.paths=${falcon.libext}
debug.libext.process.paths=${falcon.libext}
+#Configurations used in ITs
+it.config.store.uri=file://${user.dir}/target/store
+it.config.oozie.conf.uri=${user.dir}/target/oozie
+it.system.lib.location=${system.lib.location}
+it.broker.url=tcp://localhost:61616
+it.retry.recorder.path=${user.dir}/target/retry
+it.libext.feed.retention.paths=${falcon.libext}
+it.libext.feed.replication.paths=${falcon.libext}
+it.libext.process.paths=${falcon.libext}
+it.workflow.execution.listeners=org.apache.falcon.catalog.CatalogPartitionHandler
+
*.falcon.cleanup.service.frequency=minutes(5)