svn commit: r1427165 - in /oozie/trunk: core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java release-log.txt

[ha...@apache.org]

Author: harsh
Date: Mon Dec 31 16:22:57 2012
New Revision: 1427165

URL: http://svn.apache.org/viewvc?rev=1427165&view=rev
Log:
OOZIE-1152. Unit test for JavaActionExecutor has a wrong action XML. Contributed by Jun Aoki. (harsh)

Modified:
    oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java?rev=1427165&r1=1427164&r2=1427165&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java Mon Dec 31 16:22:57 2012
@@ -648,7 +648,7 @@ public class TestJavaActionExecutor exte
         Path rootArchive = new Path(root, "rootArchive.tar");
         getFileSystem().create(rootArchive).close();
 
-        String actionXml = "<map-reduce xmlns='uri:oozie:workflow:0.1'>" +
+        String actionXml = "<java>" +
                 "      <job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
                 "      <name-node>" + getNameNodeUri() + "</name-node>" +
                 "      <main-class>CLASS</main-class>" +
@@ -662,7 +662,7 @@ public class TestJavaActionExecutor exte
                 "      <file>" + rootSo1.toString() + "</file>\n" +
                 "      <archive>" + archive.toString() + "</archive>\n" +
                 "      <archive>" + rootArchive.toString() + "</archive>\n" +
-                "</map-reduce>";
+                "</java>";
 
         Element eActionXml = XmlUtils.parseXml(actionXml);
 

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1427165&r1=1427164&r2=1427165&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Dec 31 16:22:57 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.4.0 release (trunk - unreleased)
 
+OOZIE-1152 Unit test for JavaActionExecutor has a wrong action XML (jaoki via harsh)
 OOZIE-1144 OOZIE-1137 breaks the sharelib (rkanter)
 OOZIE-1035 Improve forkjoin validation to allow same errorTo transitions (rkanter)
 OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya via rkanter)