[06/50] [abbrv] hadoop git commit: HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. Contributed by Gao Zhong Liang.

2014-12-15 Thread kasha 
HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. 
Contributed by Gao Zhong Liang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d08fc9ac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d08fc9ac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d08fc9ac

Branch: refs/heads/YARN-2139
Commit: d08fc9aca807af5a240f5e1904d9c0ba027196b8
Parents: d8352b9
Author: Haohui Mai whe...@apache.org
Authored: Tue Dec 9 10:57:32 2014 -0800
Committer: Haohui Mai whe...@apache.org
Committed: Tue Dec 9 10:58:34 2014 -0800

--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 .../org/apache/hadoop/minikdc/TestMiniKdc.java  | 22 +---
 2 files changed, 17 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d08fc9ac/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4b23471..b030bf7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -545,6 +545,9 @@ Release 2.7.0 - UNRELEASED
 HADOOP-11372. Fix new findbugs warnings in mapreduce-examples.
 (Li Lu via wheat9)
 
+HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM
+JDK. (Gao Zhong Liang via wheat9)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d08fc9ac/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
--
diff --git 
a/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
 
b/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
index c052bb1..fac7f0f 100644
--- 
a/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
+++ 
b/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
@@ -37,7 +37,8 @@ import java.util.HashMap;
 import java.util.Arrays;
 
 public class TestMiniKdc extends KerberosSecurityTestcase {
-
+  private static final boolean IBM_JAVA = System.getProperty(java.vendor)
+  .contains(IBM);
   @Test
   public void testMiniKdcStart() {
 MiniKdc kdc = getKdc();
@@ -94,15 +95,20 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
 @Override
 public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
   MapString, String options = new HashMapString, String();
-  options.put(keyTab, keytab);
   options.put(principal, principal);
-  options.put(useKeyTab, true);
-  options.put(storeKey, true);
-  options.put(doNotPrompt, true);
-  options.put(useTicketCache, true);
-  options.put(renewTGT, true);
   options.put(refreshKrb5Config, true);
-  options.put(isInitiator, Boolean.toString(isInitiator));
+  if (IBM_JAVA) {
+options.put(useKeytab, keytab);
+options.put(credsType, both);
+  } else {
+options.put(keyTab, keytab);
+options.put(useKeyTab, true);
+options.put(storeKey, true);
+options.put(doNotPrompt, true);
+options.put(useTicketCache, true);
+options.put(renewTGT, true);
+options.put(isInitiator, Boolean.toString(isInitiator));
+  }
   String ticketCache = System.getenv(KRB5CCNAME);
   if (ticketCache != null) {
 options.put(ticketCache, ticketCache);

hadoop git commit: HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. Contributed by Gao Zhong Liang.

2014-12-09 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 49aacee2c - fa9ca2501


HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. 
Contributed by Gao Zhong Liang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa9ca250
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa9ca250
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa9ca250

Branch: refs/heads/branch-2
Commit: fa9ca25019b931ce1de09dc5429b3268a9e01b6c
Parents: 49aacee
Author: Haohui Mai whe...@apache.org
Authored: Tue Dec 9 10:57:32 2014 -0800
Committer: Haohui Mai whe...@apache.org
Committed: Tue Dec 9 10:57:41 2014 -0800

--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 .../org/apache/hadoop/minikdc/TestMiniKdc.java  | 22 +---
 2 files changed, 17 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa9ca250/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 48a7fb8..35b2807 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -179,6 +179,9 @@ Release 2.7.0 - UNRELEASED
 HADOOP-11372. Fix new findbugs warnings in mapreduce-examples.
 (Li Lu via wheat9)
 
+HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM
+JDK. (Gao Zhong Liang via wheat9)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa9ca250/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
--
diff --git 
a/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
 
b/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
index c052bb1..fac7f0f 100644
--- 
a/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
+++ 
b/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
@@ -37,7 +37,8 @@ import java.util.HashMap;
 import java.util.Arrays;
 
 public class TestMiniKdc extends KerberosSecurityTestcase {
-
+  private static final boolean IBM_JAVA = System.getProperty(java.vendor)
+  .contains(IBM);
   @Test
   public void testMiniKdcStart() {
 MiniKdc kdc = getKdc();
@@ -94,15 +95,20 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
 @Override
 public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
   MapString, String options = new HashMapString, String();
-  options.put(keyTab, keytab);
   options.put(principal, principal);
-  options.put(useKeyTab, true);
-  options.put(storeKey, true);
-  options.put(doNotPrompt, true);
-  options.put(useTicketCache, true);
-  options.put(renewTGT, true);
   options.put(refreshKrb5Config, true);
-  options.put(isInitiator, Boolean.toString(isInitiator));
+  if (IBM_JAVA) {
+options.put(useKeytab, keytab);
+options.put(credsType, both);
+  } else {
+options.put(keyTab, keytab);
+options.put(useKeyTab, true);
+options.put(storeKey, true);
+options.put(doNotPrompt, true);
+options.put(useTicketCache, true);
+options.put(renewTGT, true);
+options.put(isInitiator, Boolean.toString(isInitiator));
+  }
   String ticketCache = System.getenv(KRB5CCNAME);
   if (ticketCache != null) {
 options.put(ticketCache, ticketCache);

hadoop git commit: HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. Contributed by Gao Zhong Liang.

2014-12-09 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/trunk d8352b9b2 - d08fc9aca


HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM JDK. 
Contributed by Gao Zhong Liang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d08fc9ac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d08fc9ac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d08fc9ac

Branch: refs/heads/trunk
Commit: d08fc9aca807af5a240f5e1904d9c0ba027196b8
Parents: d8352b9
Author: Haohui Mai whe...@apache.org
Authored: Tue Dec 9 10:57:32 2014 -0800
Committer: Haohui Mai whe...@apache.org
Committed: Tue Dec 9 10:58:34 2014 -0800

--
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 .../org/apache/hadoop/minikdc/TestMiniKdc.java  | 22 +---
 2 files changed, 17 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d08fc9ac/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4b23471..b030bf7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -545,6 +545,9 @@ Release 2.7.0 - UNRELEASED
 HADOOP-11372. Fix new findbugs warnings in mapreduce-examples.
 (Li Lu via wheat9)
 
+HADOOP-11273. TestMiniKdc failure: login options not compatible with IBM
+JDK. (Gao Zhong Liang via wheat9)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d08fc9ac/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
--
diff --git 
a/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
 
b/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
index c052bb1..fac7f0f 100644
--- 
a/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
+++ 
b/hadoop-common-project/hadoop-minikdc/src/test/java/org/apache/hadoop/minikdc/TestMiniKdc.java
@@ -37,7 +37,8 @@ import java.util.HashMap;
 import java.util.Arrays;
 
 public class TestMiniKdc extends KerberosSecurityTestcase {
-
+  private static final boolean IBM_JAVA = System.getProperty(java.vendor)
+  .contains(IBM);
   @Test
   public void testMiniKdcStart() {
 MiniKdc kdc = getKdc();
@@ -94,15 +95,20 @@ public class TestMiniKdc extends KerberosSecurityTestcase {
 @Override
 public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
   MapString, String options = new HashMapString, String();
-  options.put(keyTab, keytab);
   options.put(principal, principal);
-  options.put(useKeyTab, true);
-  options.put(storeKey, true);
-  options.put(doNotPrompt, true);
-  options.put(useTicketCache, true);
-  options.put(renewTGT, true);
   options.put(refreshKrb5Config, true);
-  options.put(isInitiator, Boolean.toString(isInitiator));
+  if (IBM_JAVA) {
+options.put(useKeytab, keytab);
+options.put(credsType, both);
+  } else {
+options.put(keyTab, keytab);
+options.put(useKeyTab, true);
+options.put(storeKey, true);
+options.put(doNotPrompt, true);
+options.put(useTicketCache, true);
+options.put(renewTGT, true);
+options.put(isInitiator, Boolean.toString(isInitiator));
+  }
   String ticketCache = System.getenv(KRB5CCNAME);
   if (ticketCache != null) {
 options.put(ticketCache, ticketCache);