Merge from trunk r:1355211 HADOOP-8438. hadoop-validate-setup.sh refers to examples jar file which doesn't exist. Contributed by Devaraj K.

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

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -105,6 +105,9 @@ Release 2.0.1-alpha - UNRELEASED
     HADOOP-8168. empty-string owners or groups causes {{MissingFormatWidthException}} 
     in o.a.h.fs.shell.Ls.ProcessPath() (ekoontz via tucu)
 
+    HADOOP-8438. hadoop-validate-setup.sh refers to examples jar file which doesn't exist
+    (Devaraj K via umamahesh)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active

hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh

@@ -94,12 +94,12 @@ HADOOP_CMD="${HADOOP_PREFIX}/bin/hadoop --config $HADOOP_CONF_DIR"
 HADOOP_EXAMPLES_JAR=''
 
 #find under HADOOP_PREFIX (tar ball install)
-HADOOP_EXAMPLES_JAR=`find ${HADOOP_PREFIX} -name 'hadoop-examples-*.jar' | head -n1`
+HADOOP_EXAMPLES_JAR=`find ${HADOOP_PREFIX} -name 'hadoop-mapreduce-examples-*.jar' | head -n1`
 
 #if its not found look under /usr/share/hadoop (rpm/deb installs)
 if [ "$HADOOP_EXAMPLES_JAR" == '' ]
 then
-  HADOOP_EXAMPLES_JAR=`find /usr/share/hadoop -name 'hadoop-examples-*.jar' | head -n1`
+  HADOOP_EXAMPLES_JAR=`find /usr/share/hadoop -name 'hadoop-mapreduce-examples-*.jar' | head -n1`
 fi
 
 #if it is still empty then dont run the tests