You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2014/04/24 20:27:20 UTC

git commit: FALCON-418 FALCON-395 introduces a regression with hadoop-1. Contributed by Jean-Baptiste Onofré

Repository: incubator-falcon
Updated Branches:
  refs/heads/master 173ebec19 -> fbd790c45


FALCON-418 FALCON-395 introduces a regression with hadoop-1. Contributed by Jean-Baptiste Onofré


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

Branch: refs/heads/master
Commit: fbd790c45dd9a5b689314722b64661c0125e4a87
Parents: 173ebec
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Thu Apr 24 11:22:47 2014 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Thu Apr 24 11:22:58 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                   | 3 +++
 .../java/org/apache/falcon/security/BasicAuthFilterTest.java  | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fbd790c4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 153aebe..0151a7c 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -214,6 +214,9 @@ Trunk (Unreleased)
     FALCON-377 Unit test fails consistently - EntityManagerJerseyIT.testProcessInputUpdate.
     (Shwetha GS via Venkatesh Seetharam)
 
+    FALCON-418 FALCON-395 introduces a regression with hadoop-1
+    (Jean-Baptiste Onofré via Venkatesh Seetharam)
+
 Release Version: 0.4-incubating
 
    NEW FEATURES

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fbd790c4/webapp/src/test/java/org/apache/falcon/security/BasicAuthFilterTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/security/BasicAuthFilterTest.java b/webapp/src/test/java/org/apache/falcon/security/BasicAuthFilterTest.java
index 74073d0..62e889a 100644
--- a/webapp/src/test/java/org/apache/falcon/security/BasicAuthFilterTest.java
+++ b/webapp/src/test/java/org/apache/falcon/security/BasicAuthFilterTest.java
@@ -20,7 +20,6 @@ package org.apache.falcon.security;
 
 import org.apache.falcon.util.StartupProperties;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
 import org.mockito.Mock;
@@ -185,8 +184,7 @@ public class BasicAuthFilterTest {
         String expectedPrincipal = "falcon/" + SecurityUtil.getLocalHostName() + "@Example.com";
         try {
             Configuration conf = new Configuration(false);
-            conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
-                    UserGroupInformation.AuthenticationMethod.KERBEROS.name());
+            conf.set("hadoop.security.authentication", "kerberos");
             UserGroupInformation.setConfiguration(conf);
             Assert.assertTrue(UserGroupInformation.isSecurityEnabled());
 
@@ -205,8 +203,7 @@ public class BasicAuthFilterTest {
     public void testGetKerberosPrincipalWithSubstitutedHostNonSecure() throws Exception {
         String principal = StartupProperties.get().getProperty(BasicAuthFilter.KERBEROS_PRINCIPAL);
         Configuration conf = new Configuration(false);
-        conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION,
-                UserGroupInformation.AuthenticationMethod.SIMPLE.name());
+        conf.set("hadoop.security.authentication", "simple");
         UserGroupInformation.setConfiguration(conf);
         Assert.assertFalse(UserGroupInformation.isSecurityEnabled());