svn commit: r1344791 - /mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java

[gsingers]

Author: gsingers
Date: Thu May 31 16:04:06 2012
New Revision: 1344791

URL: http://svn.apache.org/viewvc?rev=1344791&view=rev
Log:
MAHOUT-848: add in oozie config option

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java?rev=1344791&r1=1344790&r2=1344791&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java 
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java 
Thu May 31 16:04:06 2012
@@ -601,4 +601,22 @@ public abstract class AbstractJob extend
     }
     return analyzerClass;
   }
+  
+  /**
+   * Overrides the base implementation to install the Oozie action 
configuration resource
+   * into the provided Configuration object; note that ToolRunner calls 
setConf on the Tool
+   * before it invokes run.
+   */
+  @Override
+  public void setConf(Configuration conf) {
+    super.setConf(conf);
+      
+    // If running in an Oozie workflow as a Java action, need to add the
+    // Configuration resource provided by Oozie to this job's config.
+    String oozieActionConfXml = System.getProperty("oozie.action.conf.xml");
+    if (oozieActionConfXml != null) {
+      conf.addResource(new Path("file:///", oozieActionConfXml));
+      log.info("Added Oozie action Configuration resource {0} to the Hadoop 
Configuration", oozieActionConfXml);
+    }      
+  }
 }