Author: cos
Date: Wed Oct 14 19:58:47 2009
New Revision: 825248
URL: http://svn.apache.org/viewvc?rev=825248&view=rev
Log:
HDFS-704. Merge -c 825229 from trunk to branch.0.21 (cos)
Modified:
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/build.xml (contents, props changed)
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=825248&r1=825247&r2=825248&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Wed Oct 14 19:58:47 2009
@@ -258,6 +258,9 @@
HDFS-680. Add new access method to a copy of a block's replica. (shv)
+ HDFS-703. Unify build property names to facilitate cross-projects
+ modifications (cos)
+
BUG FIXES
HDFS-76. Better error message to users when commands fail because of
Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=825248&r1=825247&r2=825248&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Wed Oct 14 19:58:47 2009
@@ -37,7 +37,7 @@
<property name="year" value="2009"/>
<property name="src.dir" value="${basedir}/src"/>
- <property name="hdfs.src.dir" value="${src.dir}/java"/>
+ <property name="java.src.dir" value="${src.dir}/java"/>
<property name="anttasks.dir" value="${basedir}/src/ant"/>
<property name="lib.dir" value="${basedir}/lib"/>
<property name="conf.dir" value="${basedir}/conf"/>
@@ -300,7 +300,7 @@
<!-- Compile Java files (excluding JSPs) checking warnings -->
<javac
encoding="${build.encoding}"
- srcdir="${hdfs.src.dir};${build.src}"
+ srcdir="${java.src.dir};${build.src}"
includes="org/apache/hadoop/**/*.java"
destdir="${build.classes}"
debug="${javac.debug}"
@@ -313,8 +313,8 @@
</javac>
<copy todir="${build.classes}">
- <fileset dir="${hdfs.src.dir}" includes="**/*.properties"/>
- <fileset dir="${hdfs.src.dir}" includes="hdfs-default.xml"/>
+ <fileset dir="${java.src.dir}" includes="**/*.properties"/>
+ <fileset dir="${java.src.dir}" includes="hdfs-default.xml"/>
</copy>
</target>
@@ -335,7 +335,7 @@
<echo message="Start weaving aspects in place"/>
<iajc
encoding="${build.encoding}"
- srcdir="${hdfs.src.dir};${build.src};${test.src.dir}/aop"
+ srcdir="${java.src.dir};${build.src};${test.src.dir}/aop"
includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj"
destDir="${build.classes}"
debug="${javac.debug}"
@@ -751,7 +751,7 @@
<checkstyle config="${test.src.dir}/checkstyle.xml"
failOnViolation="false">
- <fileset dir="${hdfs.src.dir}" includes="**/*.java"
excludes="**/generated/**"/>
+ <fileset dir="${java.src.dir}" includes="**/*.java"
excludes="**/generated/**"/>
<formatter type="xml" toFile="${test.build.dir}/checkstyle-errors.xml"/>
</checkstyle>
@@ -788,7 +788,7 @@
<include name="**/*.jar"/>
</fileset>
</auxClasspath>
- <sourcePath path="${hdfs.src.dir}"/>
+ <sourcePath path="${java.src.dir}"/>
<class location="${basedir}/build/${final.name}.jar" />
</findbugs>
@@ -816,7 +816,7 @@
<fileset dir="${docs.src}/build/site/" />
</copy>
<copy file="${docs.src}/releasenotes.html" todir="${build.docs}"/>
- <style basedir="${hdfs.src.dir}" destdir="${build.docs}"
+ <style basedir="${java.src.dir}" destdir="${build.docs}"
includes="hdfs-default.xml" style="conf/configuration.xsl"/>
<antcall target="changes-to-html"/>
</target>
@@ -832,7 +832,7 @@
<target name="javadoc-dev" depends="compile, ivy-retrieve-javadoc"
description="Generate javadoc for hadoop developers">
<mkdir dir="${build.javadoc.dev}"/>
<javadoc
- overview="${hdfs.src.dir}/overview.html"
+ overview="${java.src.dir}/overview.html"
packagenames="org.apache.hadoop.*"
destdir="${build.javadoc.dev}"
author="true"
@@ -842,7 +842,7 @@
doctitle="${Name} ${version} Developer API"
bottom="Copyright &copy; ${year} The Apache Software Foundation"
maxmemory="${javadoc.maxmemory}">
- <packageset dir="${hdfs.src.dir}"/>
+ <packageset dir="${java.src.dir}"/>
<link href="${javadoc.link.java}"/>
<classpath >
<path refid="classpath" />
@@ -867,7 +867,7 @@
unless="javadoc.is.uptodate">
<mkdir dir="${build.javadoc}"/>
<javadoc
- overview="${hdfs.src.dir}/overview.html"
+ overview="${java.src.dir}/overview.html"
packagenames="org.apache.hadoop.*"
destdir="${build.javadoc}"
author="true"
@@ -878,7 +878,7 @@
bottom="Copyright &copy; ${year} The Apache Software Foundation"
maxmemory="${javadoc.maxmemory}">
- <packageset dir="${hdfs.src.dir}"/>
+ <packageset dir="${java.src.dir}"/>
<link href="${javadoc.link.java}"/>
<classpath >
<path refid="classpath" />
Propchange: hadoop/hdfs/branches/branch-0.21/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 14 19:58:47 2009
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs/build.xml:713112
/hadoop/core/trunk/build.xml:779102
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
-/hadoop/hdfs/trunk/build.xml:818294-818298,824552,824944
+/hadoop/hdfs/trunk/build.xml:818294-818298,824552,824944,825229
