Author: tucu
Date: Fri Oct 28 21:08:23 2011
New Revision: 1190573
URL: http://svn.apache.org/viewvc?rev=1190573&view=rev
Log:
Merge -r 1179893:1179894 from trunk to branch-0.23. Fixes: HDFS-2294
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/
(props changed)
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Propchange: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Oct 28 21:08:23 2011
@@ -8,3 +8,4 @@ logs
.project
.settings
target
+downloads
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1190573&r1=1190572&r2=1190573&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Oct 28 21:08:23 2011
@@ -747,6 +747,8 @@ Release 0.23.0 - Unreleased
HDFS-2493. Remove reference to FSNamesystem in blockmanagement classes.
(szetszwo)
+ HDFS-2294. Download of commons-daemon TAR should not be under target (tucu)
+
OPTIMIZATIONS
HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1190573&r1=1190572&r2=1190573&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
Fri Oct 28 21:08:23 2011
@@ -330,16 +330,15 @@
</condition>
<property name="commons.daemon.tar.name"
value="commons-daemon-${commons-daemon.version}-bin-${commons.daemon.os.name}-${commons.daemon.os.arch}.tar.gz"/>
-
- <property name="commons.daemon.download.dir"
-
value="${project.build.directory}/downloads/commons-daemon"/>
- <delete dir="${commons.daemon.download.dir}"/>
- <mkdir dir="${commons.daemon.download.dir}"/>
+
+ <mkdir dir="downloads"/>
<get
src="http://archive.apache.org/dist/commons/daemon/binaries/${commons-daemon.version}/${commons.daemon.os.name}/${commons.daemon.tar.name}";
-
dest="${commons.daemon.download.dir}/${commons.daemon.tar.name}" verbose="true"
skipexisting="true"/>
- <untar compression="gzip"
src="${commons.daemon.download.dir}/${commons.daemon.tar.name}"
- dest="${commons.daemon.download.dir}"/>
- <copy file="${commons.daemon.download.dir}/jsvc"
+ dest="downloads/${commons.daemon.tar.name}" verbose="true"
skipexisting="true"/>
+ <delete
dir="${project.build.directory}/commons-daemon.staging"/>
+ <mkdir
dir="${project.build.directory}/commons-daemon.staging"/>
+ <untar compression="gzip"
src="${basedir}/downloads/${commons.daemon.tar.name}"
+
dest="${project.build.directory}/commons-daemon.staging"/>
+ <copy
file="${project.build.directory}/commons-daemon.staging/jsvc"
todir="${project.build.directory}/${project.artifactId}-${project.version}/libexec"
verbose="true"/>
<chmod perm="ugo+x" type="file">
