Merged r1174326 from branch-0.20-security for HADOOP-7649.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-205@1174328 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -169,6 +169,9 @@ Release 0.20.205.0 - 2011.09.12
     HADOOP-7661. FileSystem.getCanonicalServiceName throws NPE for any 
     file system uri that doesn't have an authority. (jitendra)
 
+    HADOOP-7649. TestMapredGroupMappingServiceRefresh and 
+    TestRefreshUserMappings fail after HADOOP-7625. (jitendra)
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java

@@ -246,9 +246,8 @@ public class TestMapredGroupMappingServiceRefresh {
   private void addNewConfigResource(String rsrcName, String keyGroup,
       String groups, String keyHosts, String hosts)  throws FileNotFoundException {
     // location for temp resource should be in CLASSPATH
-    URL url = config.getResource("mapred-default.xml");
-    Path p = new Path(url.getPath());
-    Path dir = p.getParent();
+    String dir = System.getProperty("test.build.extraconf", 
+        "build/test/extraconf");
     tempResource = dir.toString() + "/" + rsrcName;
 
 

src/test/org/apache/hadoop/security/TestRefreshUserMappings.java

@@ -227,10 +227,8 @@ public class TestRefreshUserMappings {
   private void addNewConfigResource(String rsrcName, String keyGroup,
       String groups, String keyHosts, String hosts)  throws FileNotFoundException {
     // location for temp resource should be in CLASSPATH
-    Configuration conf = new Configuration();
-    URL url = conf.getResource("hdfs-default.xml");
-    Path p = new Path(url.getPath());
-    Path dir = p.getParent();
+    String dir = System.getProperty("test.build.extraconf", 
+        "build/test/extraconf");
     tempResource = dir.toString() + "/" + rsrcName;