From 040013af9eafa53c343e0054cbdeca33d8783f4b Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Fri, 28 Oct 2011 21:19:21 +0000
Subject: [PATCH] Merge -r 1180093:1180094 from trunk to branch. FIXES:
 HDFS-2322

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190582 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  3 +++
 hadoop-hdfs-project/hadoop-hdfs/pom.xml     | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e1e24f99609..08a78a07e6a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -749,6 +749,9 @@ Release 0.23.0 - Unreleased
 
     HDFS-2294. Download of commons-daemon TAR should not be under target (tucu)
 
+    HDFS-2322. the build fails in Windows because commons-daemon TAR cannot be
+    fetched. (tucu)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 563a1a4fab3..c7d2f633c83 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -311,7 +311,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <target>
+              <target unless="windows.build">
                 <condition property="commons.daemon.os.name" value="darwin">
                     <os name="Mac OS X"/>
                 </condition>
@@ -353,6 +353,18 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>windows</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <windows.build>true</windows.build>
+      </properties>
+    </profile>
     <profile>
       <id>native</id>
       <activation>