Author: szetszwo
Date: Fri Jul 31 21:37:23 2009
New Revision: 799751
URL: http://svn.apache.org/viewvc?rev=799751&view=rev
Log:
HADOOP-6172. Fix jar file names in hadoop-config.sh and include ${build.src} as
a part of the source list in build.xml. Contributed by Hong Tang
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/bin/hadoop-config.sh
hadoop/common/trunk/build.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=799751&r1=799750&r2=799751&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Jul 31 21:37:23 2009
@@ -888,7 +888,7 @@
HADOOP-6137. Fix project specific test-patch requirements
(Giridharan Kesavan)
- HADOOP-6138. Eliminate the depracate warnings introduced by H-5438.
+ HADOOP-6138. Eliminate the deprecated warnings introduced by H-5438.
(He Yongqiang via szetszwo)
HADOOP-6132. RPC client create an extra connection because of incorrect
@@ -897,6 +897,9 @@
HADOOP-6123. Add missing classpaths in hadoop-config.sh. (Sharad Agarwal
via szetszwo)
+ HADOOP-6172. Fix jar file names in hadoop-config.sh and include
${build.src}
+ as a part of the source list in build.xml. (Hong Tang via szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/bin/hadoop-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-config.sh?rev=799751&r1=799750&r2=799751&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-config.sh (original)
+++ hadoop/common/trunk/bin/hadoop-config.sh Fri Jul 31 21:37:23 2009
@@ -126,7 +126,7 @@
if [ -d "$HADOOP_CORE_HOME/webapps" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_CORE_HOME
fi
-for f in $HADOOP_CORE_HOME/hadoop-*-core.jar; do
+for f in $HADOOP_CORE_HOME/hadoop-core-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
Modified: hadoop/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=799751&r1=799750&r2=799751&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Fri Jul 31 21:37:23 2009
@@ -294,7 +294,7 @@
<!-- Compile Java files (excluding JSPs) checking warnings -->
<javac
encoding="${build.encoding}"
- srcdir="${core.src.dir}"
+ srcdir="${core.src.dir};${build.src}"
includes="org/apache/hadoop/**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
