HIVE-8979 : Merge shims/common-secure into shims/common (Ashutosh Cha…

…uhan via Thejas Nair) git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1642270 13f79535-47bb-0310-9956-ffa450edef68
gautamboddeda · Nov 28, 2014 · 4000cbd · 4000cbd
1 parent 184d388
commit 4000cbd
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 104 deletions.
diff --git a/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/Security.java b/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/Security.java
@@ -29,6 +29,7 @@
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.shims.ShimLoader;
+import org.apache.hadoop.hive.thrift.DelegationTokenSelector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.JobContext;
@@ -37,7 +38,6 @@
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenSelector;
-import org.apache.hadoop.security.token.delegation.DelegationTokenSelector;
 import org.apache.hive.hcatalog.common.HCatConstants;
 import org.apache.hive.hcatalog.common.HCatUtil;
 import org.apache.thrift.TException;

diff --git a/shims/aggregator/pom.xml b/shims/aggregator/pom.xml
@@ -39,12 +39,6 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hive.shims</groupId>
-      <artifactId>hive-shims-common-secure</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.hive.shims</groupId>
       <artifactId>hive-shims-0.20S</artifactId>

diff --git a/shims/common-secure/pom.xml b/shims/common-secure/pom.xml
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
@@ -66,6 +66,11 @@
       <artifactId>libthrift</artifactId>
       <version>${libthrift.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+       <version>${curator.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>

diff --git a/.../hadoop/hive/shims/HadoopShimsSecure.java → .../hadoop/hive/shims/HadoopShimsSecure.java b/.../hadoop/hive/shims/HadoopShimsSecure.java → .../hadoop/hive/shims/HadoopShimsSecure.java
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/shims/Utils.java b/shims/common/src/main/java/org/apache/hadoop/hive/shims/Utils.java
@@ -28,14 +28,14 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.thrift.DelegationTokenIdentifier;
+import org.apache.hadoop.hive.thrift.DelegationTokenSelector;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.util.KerberosUtil;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.TokenIdentifier;
 import org.apache.hadoop.security.token.TokenSelector;
-import org.apache.hadoop.security.token.delegation.DelegationTokenSelector;
 import org.apache.zookeeper.client.ZooKeeperSaslClient;
 
 public class Utils {

diff --git a/...ache/hadoop/hive/thrift/DBTokenStore.java → ...ache/hadoop/hive/thrift/DBTokenStore.java b/...ache/hadoop/hive/thrift/DBTokenStore.java → ...ache/hadoop/hive/thrift/DBTokenStore.java
diff --git a/...n/delegation/DelegationTokenSelector.java → .../hive/thrift/DelegationTokenSelector.java b/...n/delegation/DelegationTokenSelector.java → .../hive/thrift/DelegationTokenSelector.java
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.security.token.delegation;
+package org.apache.hadoop.hive.thrift;
 
-import org.apache.hadoop.hive.thrift.DelegationTokenIdentifier;
 import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSelector;
 
 /**

diff --git a/...doop/hive/thrift/ZooKeeperTokenStore.java → ...doop/hive/thrift/ZooKeeperTokenStore.java b/...doop/hive/thrift/ZooKeeperTokenStore.java → ...doop/hive/thrift/ZooKeeperTokenStore.java
diff --git a/shims/pom.xml b/shims/pom.xml
@@ -33,7 +33,6 @@
 
   <modules>
     <module>common</module>
-    <module>common-secure</module>
     <module>0.20S</module>
     <module>0.23</module>
     <module>scheduler</module>