HDFS-1980. Move build/webapps deeper in the build directory heirarchy to aid eclipse users. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@1132715 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 54a1a5a..0a50227 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -933,6 +933,9 @@
HDFS-1454. Update the documentation to reflect that clients don't write
blocks to local disk before copying to HDFS. (Harsh J Chouraria via todd)
+ HDFS-1980. Move build/webapps deeper in the build directory heirarchy
+ to aid eclipse users. (todd)
+
OPTIMIZATIONS
HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)
diff --git a/bin/hdfs b/bin/hdfs
index e3cf1ae..1b856eb 100755
--- a/bin/hdfs
+++ b/bin/hdfs
@@ -115,8 +115,8 @@
if [ -d "$HADOOP_HDFS_HOME/build/classes" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME/build/classes
fi
-if [ -d "$HADOOP_HDFS_HOME/build/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME/build
+if [ -d "$HADOOP_HDFS_HOME/build/web/webapps" ]; then
+ CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME/build/web
fi
if [ -d "$HADOOP_HDFS_HOME/build/test/classes" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME/build/test/classes
diff --git a/build.xml b/build.xml
index 806adeb..af0d0f9 100644
--- a/build.xml
+++ b/build.xml
@@ -53,7 +53,8 @@
<property name="build-fi.dir" value="${basedir}/build-fi"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.src" value="${build.dir}/src"/>
- <property name="build.webapps" value="${build.dir}/webapps"/>
+ <property name="build.webapps.root.dir" value="${build.dir}/web"/>
+ <property name="build.webapps" value="${build.webapps.root.dir}/webapps"/>
<property name="build.anttasks" value="${build.dir}/ant"/>
<!-- convert spaces to _ so that mac os doesn't break things -->
@@ -238,7 +239,7 @@
<pathelement location="${test.build.extraconf}"/>
<pathelement location="${test.hdfs.build.classes}" />
<pathelement location="${test.src.dir}"/>
- <pathelement location="${build.dir}"/>
+ <pathelement location="${build.webapps.root.dir}"/>
<pathelement location="${build.tools}"/>
<pathelement path="${clover.jar}"/>
<path refid="ivy-test.classpath"/>
@@ -257,7 +258,7 @@
<path refid="classpath"/>
<pathelement location="${test.hdfs.build.classes}" />
<pathelement location="${test.src.dir}"/>
- <pathelement location="${build.dir}"/>
+ <pathelement location="${build.webapps.root.dir}"/>
</path>
@@ -1661,6 +1662,7 @@
<library pathref="ivy-common.classpath" exported="true" />
<library pathref="ivy-hdfs.classpath" exported="true" />
<library pathref="ivy-test.classpath" exported="false" />
+ <library path="${build.webapps.root.dir}" exported="false" />
<library path="${conf.dir}" exported="false" />
</classpath>
</eclipse>
diff --git a/src/c++/libhdfs/tests/test-libhdfs.sh b/src/c++/libhdfs/tests/test-libhdfs.sh
index 82afe71..be7aa5b 100755
--- a/src/c++/libhdfs/tests/test-libhdfs.sh
+++ b/src/c++/libhdfs/tests/test-libhdfs.sh
@@ -104,8 +104,8 @@
if [ -d "$HADOOP_PREFIX/build/classes" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_PREFIX/build/classes
fi
-if [ -d "$HADOOP_PREFIX/build/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HADOOP_PREFIX/build
+if [ -d "$HADOOP_PREFIX/build/web/webapps" ]; then
+ CLASSPATH=${CLASSPATH}:$HADOOP_PREFIX/build/web
fi
if [ -d "$HADOOP_PREFIX/build/test/classes" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_PREFIX/build/test/classes
diff --git a/src/contrib/hdfsproxy/bin/hdfsproxy b/src/contrib/hdfsproxy/bin/hdfsproxy
index 779c65b..18be9d4 100755
--- a/src/contrib/hdfsproxy/bin/hdfsproxy
+++ b/src/contrib/hdfsproxy/bin/hdfsproxy
@@ -84,8 +84,8 @@
if [ -d "$HDFSPROXY_HOME/build/classes" ]; then
CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/classes
fi
-if [ -d "$HDFSPROXY_HOME/build/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build
+if [ -d "$HDFSPROXY_HOME/build/web/webapps" ]; then
+ CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/web
fi
if [ -d "$HDFSPROXY_HOME/build/test/hdfs/classes" ]; then
CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/test/hdfs/classes
diff --git a/src/contrib/hdfsproxy/bin/proxy-util b/src/contrib/hdfsproxy/bin/proxy-util
index 987afcb..22094e0 100644
--- a/src/contrib/hdfsproxy/bin/proxy-util
+++ b/src/contrib/hdfsproxy/bin/proxy-util
@@ -85,8 +85,8 @@
if [ -d "$HDFSPROXY_HOME/build/classes" ]; then
CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/classes
fi
-if [ -d "$HDFSPROXY_HOME/build/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build
+if [ -d "$HDFSPROXY_HOME/build/web/webapps" ]; then
+ CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/web
fi
if [ -d "$HDFSPROXY_HOME/build/test/hdfs/classes" ]; then
CLASSPATH=${CLASSPATH}:$HDFSPROXY_HOME/build/test/hdfs/classes
