You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/08/01 19:31:03 UTC
git commit: FALCON-67 Remove ant dependency in oozie workflows.
Contributed by Shwetha G S
Updated Branches:
refs/heads/master 46dcea2f2 -> c050f06e1
FALCON-67 Remove ant dependency in oozie workflows. Contributed by Shwetha G S
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/c050f06e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/c050f06e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/c050f06e
Branch: refs/heads/master
Commit: c050f06e1de39f9292306c765ab1010ed8962355
Parents: 46dcea2
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Thu Aug 1 23:00:40 2013 +0530
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Thu Aug 1 23:00:40 2013 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../main/java/org/apache/falcon/util/ApplicationProperties.java | 2 +-
common/src/main/resources/startup.properties | 2 +-
feed/src/main/resources/config/workflow/replication-workflow.xml | 2 --
feed/src/main/resources/config/workflow/retention-workflow.xml | 1 -
.../main/resources/config/workflow/process-parent-workflow.xml | 2 --
6 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c050f06e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b19c015..a0087ce 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,9 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-67 Remove ant dependency in oozie workflows. (Shwetha GS via
+ Srikanth Sundarrajan)
+
FALCON-61 The identifier regex for oozie bundle,coordinator, workflow
pattern is incorrect. (Suhas V via Srikanth Sundarrajan)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c050f06e/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 5551bec..70ab86b 100644
--- a/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java
+++ b/common/src/main/java/org/apache/falcon/util/ApplicationProperties.java
@@ -102,7 +102,7 @@ public abstract class ApplicationProperties extends Properties {
InputStream resourceAsStream = null;
if (confDir != null) {
File fileToLoad = new File(confDir, propertyFileName);
- if (fileToLoad.exists()) {
+ if (fileToLoad.exists() && fileToLoad.isFile() && fileToLoad.canRead()) {
LOG.info("config.location is set, using: " + confDir + "/" + propertyFileName);
resourceAsStream = new FileInputStream(fileToLoad);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c050f06e/common/src/main/resources/startup.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/startup.properties b/common/src/main/resources/startup.properties
index 21c4f3f..d76eb9b 100644
--- a/common/src/main/resources/startup.properties
+++ b/common/src/main/resources/startup.properties
@@ -38,7 +38,7 @@
org.apache.falcon.group.FeedGroupMap,\
org.apache.falcon.service.SharedLibraryHostingService
*.broker.impl.class=org.apache.activemq.ActiveMQConnectionFactory
-*.shared.libs=activemq-core,ant,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms,s4fs-0.1.jar
+*.shared.libs=activemq-core,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms,s4fs-0.1.jar
######### Implementation classes #########
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c050f06e/feed/src/main/resources/config/workflow/replication-workflow.xml
----------------------------------------------------------------------
diff --git a/feed/src/main/resources/config/workflow/replication-workflow.xml b/feed/src/main/resources/config/workflow/replication-workflow.xml
index 7aab158..d141476 100644
--- a/feed/src/main/resources/config/workflow/replication-workflow.xml
+++ b/feed/src/main/resources/config/workflow/replication-workflow.xml
@@ -136,7 +136,6 @@
<arg>-logDir</arg>
<arg>${logDir}/job-${nominalTime}/${srcClusterName}/</arg>
<file>${wf:conf("falcon.libpath")}/activemq-core.jar</file>
- <file>${wf:conf("falcon.libpath")}/ant.jar</file>
<file>${wf:conf("falcon.libpath")}/geronimo-j2ee-management.jar</file>
<file>${wf:conf("falcon.libpath")}/jms.jar</file>
<file>${wf:conf("falcon.libpath")}/json-simple.jar</file>
@@ -202,7 +201,6 @@
<arg>-logDir</arg>
<arg>${logDir}/job-${nominalTime}/${srcClusterName}/</arg>
<file>${wf:conf("falcon.libpath")}/activemq-core.jar</file>
- <file>${wf:conf("falcon.libpath")}/ant.jar</file>
<file>${wf:conf("falcon.libpath")}/geronimo-j2ee-management.jar</file>
<file>${wf:conf("falcon.libpath")}/jms.jar</file>
<file>${wf:conf("falcon.libpath")}/json-simple.jar</file>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c050f06e/feed/src/main/resources/config/workflow/retention-workflow.xml
----------------------------------------------------------------------
diff --git a/feed/src/main/resources/config/workflow/retention-workflow.xml b/feed/src/main/resources/config/workflow/retention-workflow.xml
index 422209e..72e0133 100644
--- a/feed/src/main/resources/config/workflow/retention-workflow.xml
+++ b/feed/src/main/resources/config/workflow/retention-workflow.xml
@@ -97,7 +97,6 @@
<arg>-cluster</arg>
<arg>${cluster}</arg>
<file>${wf:conf("falcon.libpath")}/activemq-core.jar</file>
- <file>${wf:conf("falcon.libpath")}/ant.jar</file>
<file>${wf:conf("falcon.libpath")}/geronimo-j2ee-management.jar</file>
<file>${wf:conf("falcon.libpath")}/jms.jar</file>
<file>${wf:conf("falcon.libpath")}/json-simple.jar</file>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c050f06e/process/src/main/resources/config/workflow/process-parent-workflow.xml
----------------------------------------------------------------------
diff --git a/process/src/main/resources/config/workflow/process-parent-workflow.xml b/process/src/main/resources/config/workflow/process-parent-workflow.xml
index 4f6dd43..eeffdd5 100644
--- a/process/src/main/resources/config/workflow/process-parent-workflow.xml
+++ b/process/src/main/resources/config/workflow/process-parent-workflow.xml
@@ -149,7 +149,6 @@
<arg>-logDir</arg>
<arg>${logDir}/job-${nominalTime}/</arg>
<file>${wf:conf("falcon.libpath")}/activemq-core.jar</file>
- <file>${wf:conf("falcon.libpath")}/ant.jar</file>
<file>${wf:conf("falcon.libpath")}/geronimo-j2ee-management.jar</file>
<file>${wf:conf("falcon.libpath")}/jms.jar</file>
<file>${wf:conf("falcon.libpath")}/json-simple.jar</file>
@@ -217,7 +216,6 @@
<arg>-logDir</arg>
<arg>${logDir}/job-${nominalTime}/</arg>
<file>${wf:conf("falcon.libpath")}/activemq-core.jar</file>
- <file>${wf:conf("falcon.libpath")}/ant.jar</file>
<file>${wf:conf("falcon.libpath")}/geronimo-j2ee-management.jar</file>
<file>${wf:conf("falcon.libpath")}/jms.jar</file>
<file>${wf:conf("falcon.libpath")}/json-simple.jar</file>