You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by sh...@apache.org on 2015/04/27 10:49:20 UTC
oozie git commit: OOZIE-2129 fixed build failure
Repository: oozie
Updated Branches:
refs/heads/master 3e20533b0 -> 44af3a3cb
OOZIE-2129 fixed build failure
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/44af3a3c
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/44af3a3c
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/44af3a3c
Branch: refs/heads/master
Commit: 44af3a3cbeacd2d5cc602a39556c53c375f4747b
Parents: 3e20533
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Mon Apr 27 14:19:11 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Mon Apr 27 14:19:11 2015 +0530
----------------------------------------------------------------------
.../apache/oozie/action/hadoop/ShellMain.java | 28 --------------------
1 file changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/44af3a3c/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
----------------------------------------------------------------------
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
index e1c5a16..3f53915 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
@@ -290,32 +290,4 @@ public class ShellMain extends LauncherMain {
}
return exec;
}
-
- /**
- * Read action configuration passes through action xml file.
- *
- * @return action Configuration
- * @throws IOException
- */
- protected Configuration loadActionConf() throws IOException {
- System.out.println();
- System.out.println("Oozie Shell action configuration");
- System.out.println("=================================================================");
-
- // loading action conf prepared by Oozie
- Configuration actionConf = new Configuration(false);
-
- String actionXml = System.getProperty("oozie.action.conf.xml");
-
- if (actionXml == null) {
- throw new RuntimeException("Missing Java System Property [oozie.action.conf.xml]");
- }
- if (!new File(actionXml).exists()) {
- throw new RuntimeException("Action Configuration XML file [" + actionXml + "] does not exist");
- }
-
- actionConf.addResource(new Path("file:///", actionXml));
- logMasking("Shell configuration:", new HashSet<String>(), actionConf);
- return actionConf;
- }
}