MAPREDUCE-5349. Merging change r from branch-2 to branch-2.1-beta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1498145 13f79535-47bb-0310-9956-ffa450edef68

Author: cnauroth

hadoop-mapreduce-project/CHANGES.txt

@@ -433,6 +433,9 @@ Release 2.1.0-beta - 2013-07-02
     MAPREDUCE-5177. Use common utils FileUtil#setReadable/Writable/Executable & 
     FileUtil#canRead/Write/Execute. (Ivan Mitic via suresh)
 
+    MAPREDUCE-5349. TestClusterMapReduceTestCase and TestJobName fail on Windows
+    in branch-2. (Chuan Liu via cnauroth)
+
     MAPREDUCE-5291. Change MR App to use updated property names in
     container-log4j.properties. (Zhijie Shen via sseth)
 

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRClientClusterFactory.java

@@ -38,12 +38,11 @@ public class MiniMRClientClusterFactory {
 
   public static MiniMRClientCluster create(Class<?> caller, int noOfNMs,
       Configuration conf) throws IOException {
-    return create(caller, caller.getName(), noOfNMs, conf);
+    return create(caller, caller.getSimpleName(), noOfNMs, conf);
   }
-  
+
   public static MiniMRClientCluster create(Class<?> caller, String identifier,
-      int noOfNMs,
-      Configuration conf) throws IOException {
+      int noOfNMs, Configuration conf) throws IOException {
 
     if (conf == null) {
       conf = new Configuration();
@@ -71,8 +70,8 @@ public static MiniMRClientCluster create(Class<?> caller, String identifier,
     fs.setPermission(remoteCallerJar, new FsPermission("744"));
     job.addFileToClassPath(remoteCallerJar);
 
-    MiniMRYarnCluster miniMRYarnCluster =
-        new MiniMRYarnCluster(identifier, noOfNMs);
+    MiniMRYarnCluster miniMRYarnCluster = new MiniMRYarnCluster(identifier,
+        noOfNMs);
     job.getConfiguration().set("minimrclientcluster.caller.name",
         identifier);
     job.getConfiguration().setInt("minimrclientcluster.nodemanagers.number",

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MiniMRCluster.java

@@ -178,7 +178,7 @@ public MiniMRCluster(int jobTrackerPort, int taskTrackerPort,
       int numTrackerToExclude, Clock clock) throws IOException {
     if (conf == null) conf = new JobConf();
     FileSystem.setDefaultUri(conf, namenode);
-    String identifier = this.getClass().getName() + "_"
+    String identifier = this.getClass().getSimpleName() + "_"
         + Integer.toString(new Random().nextInt(Integer.MAX_VALUE));
     mrClientCluster = MiniMRClientClusterFactory.create(this.getClass(),
         identifier, numTaskTrackers, conf);