Author: cos
Date: Tue Oct 12 00:40:15 2010
New Revision: 1021554
URL: http://svn.apache.org/viewvc?rev=1021554&view=rev
Log:
HDFS-1452. ant compile-contrib is broken. Contributed by Konstantin Boudnik
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/contrib/build-contrib.xml
hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util
hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1021554&r1=1021553&r2=1021554&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Oct 12 00:40:15 2010
@@ -312,6 +312,8 @@ Release 0.21.1 - Unreleased
HDFS-1343. Instrumented build should be concentrated in one build area
(cos)
+ HDFS-1452. ant compile-contrib is broken (cos)
+
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
Modified: hadoop/hdfs/trunk/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/build-contrib.xml?rev=1021554&r1=1021553&r2=1021554&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/build-contrib.xml (original)
+++ hadoop/hdfs/trunk/src/contrib/build-contrib.xml Tue Oct 12 00:40:15 2010
@@ -95,7 +95,6 @@
<!-- the unit test classpath -->
<path id="test.classpath">
<pathelement location="${build.test}" />
- <pathelement location="${hadoop.root}/build/test/classes"/>
<pathelement location="${hadoop.root}/build/test/core/classes"/>
<pathelement location="${hadoop.root}/build/test/hdfs/classes"/>
<pathelement location="${hadoop.root}/build/test/mapred/classes"/>
Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy?rev=1021554&r1=1021553&r2=1021554&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy Tue Oct 12 00:40:15
2010
@@ -87,8 +87,8 @@ fi
if [ -d "$HDFSPROXY_HOME/build/webapps" ]; then
CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build
fi
-if [ -d "$HDFSPROXY_HOME/build/test/classes" ]; then
- CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/test/classes
+if [ -d "$HDFSPROXY_HOME/build/test/hdfs/classes" ]; then
+ CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/test/hdfs/classes
fi
# so that filenames w/ spaces are handled correctly in loops below
Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util?rev=1021554&r1=1021553&r2=1021554&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util Tue Oct 12 00:40:15
2010
@@ -88,8 +88,8 @@ fi
if [ -d "$HDFSPROXY_HOME/build/webapps" ]; then
CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build
fi
-if [ -d "$HDFSPROXY_HOME/build/test/classes" ]; then
- CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/test/classes
+if [ -d "$HDFSPROXY_HOME/build/test/hdfs/classes" ]; then
+ CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/test/hdfs/classes
fi
# so that filenames w/ spaces are handled correctly in loops below
Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml?rev=1021554&r1=1021553&r2=1021554&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/build.xml Tue Oct 12 00:40:15 2010
@@ -474,7 +474,7 @@
<path id="test.classpath">
<pathelement location="${proxy.conf.test}" />
<pathelement location="${test.build.dir}" />
- <pathelement location="${hadoop.root}/build/test/classes"/>
+ <pathelement location="${hadoop.root}/build/test/hdfs/classes"/>
<!--<pathelement location="${hadoop.root}/src/contrib/test"/>-->
<pathelement location="${hadoop.root}/conf"/>
<pathelement location="${hadoop.root}/build"/>
