svn commit: r1485086 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/ hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/

[vinodkv]

Author: vinodkv
Date: Wed May 22 06:37:01 2013
New Revision: 1485086

URL: http://svn.apache.org/r1485086
Log:
MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x 
examples jar on top of YARN. This change breaks 0.23.x direct usages of 
ProgramDriver. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1485085 ../../trunk/

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
    
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/ExampleDriver.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1485086&r1=1485085&r2=1485086&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed 
May 22 06:37:01 2013
@@ -11,6 +11,10 @@ Release 2.0.5-beta - UNRELEASED
     compatibility with mapred in 1.x but incompatible with 0.23.x. (Mayank 
Bansal
     via vinodkv)
 
+    MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run
+    1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of
+    ProgramDriver. (Zhijie Shen via vinodkv)
+
   NEW FEATURES
 
   IMPROVEMENTS

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java?rev=1485086&r1=1485085&r2=1485086&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/test/MapredTestDriver.java
 Wed May 22 06:37:01 2013
@@ -112,7 +112,7 @@ public class MapredTestDriver {
   public void run(String argv[]) {
     int exitCode = -1;
     try {
-      exitCode = pgd.driver(argv);
+      exitCode = pgd.run(argv);
     } catch(Throwable e) {
       e.printStackTrace();
     }

Modified: 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/ExampleDriver.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/ExampleDriver.java?rev=1485086&r1=1485085&r2=1485086&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/ExampleDriver.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/ExampleDriver.java
 Wed May 22 06:37:01 2013
@@ -71,7 +71,7 @@ public class ExampleDriver {
       pgd.addClass("teragen", TeraGen.class, "Generate data for the terasort");
       pgd.addClass("terasort", TeraSort.class, "Run the terasort");
       pgd.addClass("teravalidate", TeraValidate.class, "Checking results of 
terasort");
-      exitCode = pgd.driver(argv);
+      exitCode = pgd.run(argv);
     }
     catch(Throwable e){
       e.printStackTrace();