You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2007/04/12 00:00:08 UTC
svn commit: r527696 - in /lucene/hadoop/trunk: CHANGES.txt bin/hadoop
conf/hadoop-env.sh.template
Author: cutting
Date: Wed Apr 11 15:00:07 2007
New Revision: 527696
URL: http://svn.apache.org/viewvc?view=rev&rev=527696
Log:
HADOOP-1114. Permit user to specify additional CLASSPATH elements with a HADOOP_CLASSPATH environment variable.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/bin/hadoop
lucene/hadoop/trunk/conf/hadoop-env.sh.template
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=527696&r1=527695&r2=527696
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Apr 11 15:00:07 2007
@@ -137,8 +137,8 @@
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
Modified: lucene/hadoop/trunk/bin/hadoop
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/bin/hadoop?view=diff&rev=527696&r1=527695&r2=527696
==============================================================================
--- lucene/hadoop/trunk/bin/hadoop (original)
+++ lucene/hadoop/trunk/bin/hadoop Wed Apr 11 15:00:07 2007
@@ -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 @@
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 @@
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
Modified: lucene/hadoop/trunk/conf/hadoop-env.sh.template
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/conf/hadoop-env.sh.template?view=diff&rev=527696&r1=527695&r2=527696
==============================================================================
--- lucene/hadoop/trunk/conf/hadoop-env.sh.template (original)
+++ lucene/hadoop/trunk/conf/hadoop-env.sh.template Wed Apr 11 15:00:07 2007
@@ -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