From 9a6122141aa5b5ffb7f6f5afa58c533f0228cb63 Mon Sep 17 00:00:00 2001
From: Mahadev Konar <mahadev@apache.org>
Date: Fri, 19 Aug 2011 17:14:00 +0000
Subject: [PATCH] MAPREDUCE-2860. Fix log4j logging in the maven test cases.
 (mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1159687 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce/CHANGES.txt         | 3 ++-
 hadoop-mapreduce/hadoop-yarn/pom.xml | 1 +
 hadoop-mapreduce/pom.xml             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hadoop-mapreduce/CHANGES.txt b/hadoop-mapreduce/CHANGES.txt
index eacda94493..108dd482b5 100644
--- a/hadoop-mapreduce/CHANGES.txt
+++ b/hadoop-mapreduce/CHANGES.txt
@@ -1116,7 +1116,8 @@ Trunk (unreleased changes)
 
     MAPREDUCE-2727. Fix divide-by-zero error in SleepJob for sleepCount equals
     0. (Jeffrey Naisbitt via acmurthy)
-
+ 
+    MAPREDUCE-2860. Fix log4j logging in the maven test cases. (mahadev)
 
 Release 0.22.0 - Unreleased
 
diff --git a/hadoop-mapreduce/hadoop-yarn/pom.xml b/hadoop-mapreduce/hadoop-yarn/pom.xml
index b0e470653b..a8d9f7f6f2 100644
--- a/hadoop-mapreduce/hadoop-yarn/pom.xml
+++ b/hadoop-mapreduce/hadoop-yarn/pom.xml
@@ -258,6 +258,7 @@
             <systemPropertyVariables>
               <build.dir>${project.build.directory}</build.dir>
               <build.output.dir>${project.build.outputDirectory}</build.output.dir>
+              <log4j.configuration>file:///${yarn.basedir}/../src/test/log4j.properties</log4j.configuration>
             </systemPropertyVariables>
           </configuration>
         </plugin>
diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml
index f91ec01641..2d6421a032 100644
--- a/hadoop-mapreduce/pom.xml
+++ b/hadoop-mapreduce/pom.xml
@@ -210,7 +210,7 @@
             <systemPropertyVariables>
               <build.dir>${project.build.directory}</build.dir>
               <build.output.dir>${project.build.outputDirectory}</build.output.dir>
-              <log4j.configuration>file:/home/vinodkv/Workspace/eclipse-workspace/apache-git/hadoop-common/mapreduce/src/test/log4j.properties</log4j.configuration>  
+              <log4j.configuration>file:///${mr.basedir}/src/test/log4j.properties</log4j.configuration>  
             </systemPropertyVariables>
           </configuration>
         </plugin>