HADOOP-7374. Don't add tools.jar to the classpath when running Hadoop. Contributed by Eli Collins

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1134861 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -209,6 +209,9 @@ Trunk (unreleased changes)
     HADOOP-7383. HDFS needs to export protobuf library dependency in pom.
     (todd via eli)
 
+    HADOOP-7374. Don't add tools.jar to the classpath when running Hadoop.
+    (eli)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole

bin/hadoop-config.sh

@@ -130,7 +130,6 @@ fi
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR
 CLASSPATH="${HADOOP_CONF_DIR}"
-CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH
 if [ -d "$HADOOP_PREFIX/build/classes" ]; then

bin/rcc

@@ -52,7 +52,6 @@ JAVA_HEAP_MAX=-Xmx1000m
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR
 CLASSPATH="${HADOOP_CONF_DIR}"
-CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH
 if [ -d "$HADOOP_PREFIX/build/classes" ]; then