hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1132715 - in /hadoop/hdfs/trunk: CHANGES.txt bin/hdfs build.xml src/c++/libhdfs/tests/test-libhdfs.sh src/contrib/hdfsproxy/bin/hdfsproxy src/contrib/hdfsproxy/bin/proxy-util
Date Mon, 06 Jun 2011 18:14:50 GMT
Author: todd
Date: Mon Jun  6 18:14:49 2011
New Revision: 1132715

URL: http://svn.apache.org/viewvc?rev=1132715&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/trunk/CHANGES.txt
    hadoop/hdfs/trunk/bin/hdfs
    hadoop/hdfs/trunk/build.xml
    hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh
    hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
    hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1132715&r1=1132714&r2=1132715&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Mon Jun  6 18:14:49 2011
@@ -933,6 +933,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/trunk/bin/hdfs
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/bin/hdfs?rev=1132715&r1=1132714&r2=1132715&view=diff
==============================================================================
--- hadoop/hdfs/trunk/bin/hdfs (original)
+++ hadoop/hdfs/trunk/bin/hdfs Mon Jun  6 18:14:49 2011
@@ -115,8 +115,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/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1132715&r1=1132714&r2=1132715&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Mon Jun  6 18:14:49 2011
@@ -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>

Modified: hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/c%2B%2B/libhdfs/tests/test-libhdfs.sh?rev=1132715&r1=1132714&r2=1132715&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh (original)
+++ hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh Mon Jun  6 18:14:49 2011
@@ -104,8 +104,8 @@ CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/to
 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

Modified: hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy?rev=1132715&r1=1132714&r2=1132715&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/hdfsproxy Mon Jun  6 18:14:49 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/trunk/src/contrib/hdfsproxy/bin/proxy-util
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util?rev=1132715&r1=1132714&r2=1132715&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util (original)
+++ hadoop/hdfs/trunk/src/contrib/hdfsproxy/bin/proxy-util Mon Jun  6 18:14:49 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



Mime
View raw message