Author: omalley
Date: Wed Nov 23 23:19:26 2011
New Revision: 1205655
URL: http://svn.apache.org/viewvc?rev=1205655&view=rev
Log:
HADOOP-7810. Add tools jar to the end of classpath. (John George via omalley)
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/bin/hadoop
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1205655&r1=1205654&r2=1205655&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Nov 23 23:19:26 2011
@@ -138,6 +138,8 @@ Release 0.20.205.1 - unreleased
HDFS-2552. Add Forrest doc for WebHDFS REST API. (szetszwo)
+ HADOOP-7810. Add tools jar to the end of classpath. (John George via omalley)
+
BUG FIXES
HADOOP-7827. jsp pages missing DOCTYPE. (Dave Vronay via mattf)
Modified: hadoop/common/branches/branch-0.20-security/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/bin/hadoop?rev=1205655&r1=1205654&r2=1205655&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security/bin/hadoop Wed Nov 23 23:19:26 2011
@@ -219,6 +219,9 @@ if [ "$HADOOP_USER_CLASSPATH_FIRST" = ""
CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
fi
+# adding TOOL_PATH to CLASSPATH. TOOL_PATH is added after HADOOP_CLASSPATH.
+CLASSPATH=${CLASSPATH}:${TOOL_PATH}
+
# default log directory & file
if [ "$HADOOP_LOG_DIR" = "" ]; then
HADOOP_LOG_DIR="$HADOOP_HOME/logs"
@@ -301,14 +304,12 @@ elif [ "$COMMAND" = "jar" ] ; then
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "distcp" ] ; then
CLASS=org.apache.hadoop.tools.DistCp
- CLASSPATH=${CLASSPATH}:${TOOL_PATH}
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "daemonlog" ] ; then
CLASS=org.apache.hadoop.log.LogLevel
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "archive" ] ; then
CLASS=org.apache.hadoop.tools.HadoopArchives
- CLASSPATH=${CLASSPATH}:${TOOL_PATH}
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "sampler" ] ; then
CLASS=org.apache.hadoop.mapred.lib.InputSampler
|