svn commit: r1640446 - /hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

[brock]

Author: brock
Date: Tue Nov 18 22:51:55 2014
New Revision: 1640446

URL: http://svn.apache.org/r1640446
Log:
HIVE-8904 - Hive should support multiple Key provider modes (Ferdinand Xu via 
Brock)

Modified:
    
hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java

Modified: 
hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: 
http://svn.apache.org/viewvc/hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1640446&r1=1640445&r2=1640446&view=diff
==============================================================================
--- 
hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
 (original)
+++ 
hive/branches/HIVE-8065/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
 Tue Nov 18 22:51:55 2014
@@ -36,7 +36,7 @@ import java.util.TreeMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.crypto.key.KeyProvider;
-import org.apache.hadoop.crypto.key.kms.KMSClientProvider;
+import org.apache.hadoop.crypto.key.KeyProviderFactory;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.DefaultFileAccess;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -955,7 +955,7 @@ public class Hadoop23Shims extends Hadoo
       try {
         String keyProviderPath = 
conf.get(ShimLoader.getHadoopShims().getHadoopConfNames().get("HADOOPSECURITYKEYPROVIDER"),
 null);
         if (keyProviderPath != null) {
-          keyProvider = new KMSClientProvider(new URI(keyProviderPath), conf);
+          keyProvider = KeyProviderFactory.get(new URI(keyProviderPath), conf);
         }
       } catch (URISyntaxException e) {
         throw new IOException("Invalid HDFS security key provider path", e);