You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2011/06/06 20:14:42 UTC
svn commit: r1132714 - in /hadoop/hdfs/branches/branch-0.22: CHANGES.txt
bin/hdfs build.xml src/c++/libhdfs/tests/test-libhdfs.sh
src/contrib/hdfsproxy/bin/hdfsproxy src/contrib/hdfsproxy/bin/proxy-util
Author: todd
Date: Mon Jun 6 18:14:42 2011
New Revision: 1132714
URL: http://svn.apache.org/viewvc?rev=1132714&view=rev
Log:
HDFS-1980. Move build/webapps deeper in the build directory heirarchy to aid eclipse users. Contributed by Todd Lipcon.
Modified:
hadoop/hdfs/branches/branch-0.22/CHANGES.txt
hadoop/hdfs/branches/branch-0.22/bin/hdfs
hadoop/hdfs/branches/branch-0.22/build.xml
hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/tests/test-libhdfs.sh
hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/hdfsproxy
hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/proxy-util
Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1132714&r1=1132713&r2=1132714&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Mon Jun 6 18:14:42 2011
@@ -252,6 +252,9 @@ Release 0.22.0 - Unreleased
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)
Modified: hadoop/hdfs/branches/branch-0.22/bin/hdfs
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/bin/hdfs?rev=1132714&r1=1132713&r2=1132714&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/bin/hdfs (original)
+++ hadoop/hdfs/branches/branch-0.22/bin/hdfs Mon Jun 6 18:14:42 2011
@@ -101,8 +101,8 @@ fi
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
Modified: hadoop/hdfs/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/build.xml?rev=1132714&r1=1132713&r2=1132714&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.22/build.xml Mon Jun 6 18:14:42 2011
@@ -51,7 +51,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 -->
@@ -222,7 +223,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"/>
@@ -240,7 +241,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>
@@ -1499,6 +1500,7 @@
<output path="${build.dir.eclipse-main-classes}" />
<library pathref="ivy-common.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>
Modified: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/tests/test-libhdfs.sh
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/c%2B%2B/libhdfs/tests/test-libhdfs.sh?rev=1132714&r1=1132713&r2=1132714&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/tests/test-libhdfs.sh (original)
+++ hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/tests/test-libhdfs.sh Mon Jun 6 18:14:42 2011
@@ -104,8 +104,8 @@ CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/to
if [ -d "$HADOOP_HOME/build/classes" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_HOME/build/classes
fi
-if [ -d "$HADOOP_HOME/build/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HADOOP_HOME/build
+if [ -d "$HADOOP_HOME/build/web/webapps" ]; then
+ CLASSPATH=${CLASSPATH}:$HADOOP_HOME/build/web
fi
if [ -d "$HADOOP_HOME/build/test/classes" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_HOME/build/test/classes
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/hdfsproxy
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/hdfsproxy?rev=1132714&r1=1132713&r2=1132714&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/hdfsproxy (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/hdfsproxy Mon Jun 6 18:14:42 2011
@@ -84,8 +84,8 @@ CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/to
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
Modified: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/proxy-util
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/proxy-util?rev=1132714&r1=1132713&r2=1132714&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/proxy-util (original)
+++ hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/bin/proxy-util Mon Jun 6 18:14:42 2011
@@ -85,8 +85,8 @@ CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/to
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