svn commit: r1589885 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java

[cn...@apache.org]

Author: cnauroth
Date: Thu Apr 24 21:26:09 2014
New Revision: 1589885

URL: http://svn.apache.org/r1589885
Log:
HADOOP-10539. Merging change r1589884 from trunk to branch-2.

Modified:
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1589885&r1=1589884&r2=1589885&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr 24 21:26:09 2014
@@ -84,6 +84,9 @@ Release 2.5.0 - UNRELEASED
     HADOOP-10531. hadoop-config.sh - bug in --hosts argument.
     (Sebastien Barrier via wang)
 
+    HADOOP-10539. Provide backward compatibility for ProxyUsers.authorize()
+    call. (Benoy Antony via cnauroth)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java?rev=1589885&r1=1589884&r2=1589885&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/ProxyUsers.java Thu Apr 24 21:26:09 2014
@@ -34,7 +34,7 @@ import org.apache.hadoop.util.StringUtil
 
 import com.google.common.annotations.VisibleForTesting;
 
-@InterfaceAudience.Private
+@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce", "HBase", "Hive"})
 public class ProxyUsers {
 
   private static final String CONF_HOSTS = ".hosts";
@@ -188,6 +188,20 @@ public class ProxyUsers {
           + superUser.getUserName() + " from IP " + remoteAddress);
     }
   }
+  
+  /**
+   * This function is kept to provide backward compatibility.
+   * @param user
+   * @param remoteAddress
+   * @param conf
+   * @throws AuthorizationException
+   * @deprecated use {@link #authorize(UserGroupInformation, String) instead. 
+   */
+  @Deprecated
+  public static synchronized void authorize(UserGroupInformation user, 
+      String remoteAddress, Configuration conf) throws AuthorizationException {
+    authorize(user,remoteAddress);
+  }
 
   /**
    * Return true if the configuration specifies the special configuration value