HADOOP-1114. Permit user to specify additional CLASSPATH elements with a HADOOP_CLASSPATH environment variable.

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

CHANGES.txt

@@ -137,8 +137,8 @@ Trunk (unreleased changes)
 42. HADOOP-1219.  Ignore progress report once a task has reported as 
     'done'.  (Devaraj Das via tomwhite)
 
-43. HADOOP-1114.  Respect user's classpath variable in hadoop script.  
-    (Michael Bieniosek via tomwhite)
+43. HADOOP-1114.  Permit user to specify additional CLASSPATH elements
+    with a HADOOP_CLASSPATH environment variable. (cutting)
 
 44. HADOOP-1198.  Remove ipc.client.timeout parameter override from 
     unit test configuration.  Using the default is more robust and

bin/hadoop

@@ -6,6 +6,8 @@
 #
 #   JAVA_HOME        The java implementation to use.  Overrides JAVA_HOME.
 #
+#   HADOOP_CLASSPATH Extra Java CLASSPATH entries.
+#
 #   HADOOP_HEAPSIZE  The maximum amount of heap to use, in MB. 
 #                    Default is 1000.
 #
@@ -79,8 +81,7 @@ if [ "$HADOOP_HEAPSIZE" != "" ]; then
 fi
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR
-# respect previously set CLASSPATH
-CLASSPATH="${CLASSPATH}:${HADOOP_CONF_DIR}"
+CLASSPATH="${HADOOP_CONF_DIR}"
 CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH
@@ -114,6 +115,10 @@ for f in $HADOOP_HOME/lib/jetty-ext/*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
 
+# add user-specified CLASSPATH last
+if [ "$HADOOP_CLASSPATH" != "" ]; then
+  CLASSPATH=${CLASSPATH}:${HADOOP_CLASSPATH}
+fi
 
 # default log directory & file
 if [ "$HADOOP_LOG_DIR" = "" ]; then

conf/hadoop-env.sh.template

@@ -8,6 +8,9 @@
 # The java implementation to use.  Required.
 # export JAVA_HOME=/usr/lib/j2sdk1.5-sun
 
+# Extra Java CLASSPATH elements.  Optional.
+# export HADOOP_CLASSPATH=
+
 # The maximum amount of heap to use, in MB. Default is 1000.
 # export HADOOP_HEAPSIZE=2000