Repository: sqoop Updated Branches: refs/heads/sqoop2 fe5d615bf -> 816aa0389
SQOOP-1702: Fix typo for SQOOP-1526 (Richard via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/816aa038 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/816aa038 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/816aa038 Branch: refs/heads/sqoop2 Commit: 816aa03896760cbab72482c6d51f8413e22b633b Parents: fe5d615 Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Nov 10 19:31:35 2014 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Nov 10 19:32:15 2014 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/sqoop/security/AuthenticationError.java | 4 ++-- .../org/apache/sqoop/security/KerberosAuthenticationHandler.java | 2 +- .../org/apache/sqoop/security/SimpleAuthenticationHandler.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/816aa038/core/src/main/java/org/apache/sqoop/security/AuthenticationError.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/sqoop/security/AuthenticationError.java b/core/src/main/java/org/apache/sqoop/security/AuthenticationError.java index 338db06..73cd8cf 100644 --- a/core/src/main/java/org/apache/sqoop/security/AuthenticationError.java +++ b/core/src/main/java/org/apache/sqoop/security/AuthenticationError.java @@ -33,8 +33,8 @@ public enum AuthenticationError implements ErrorCode { /** The system was not able to login using Kerberos keytab and principal in sqoop configuration. */ AUTH_0003("Unable to login using Kerberos keytab and principal"), - /** Invalid FileSystemAccess security mode {simple, Kerberos}. */ - AUTH_0004("Invalid FileSystemAccess security mode"); + /** Invalid authentication type {simple, Kerberos}. */ + AUTH_0004("Invalid authentication type"); private final String message; http://git-wip-us.apache.org/repos/asf/sqoop/blob/816aa038/security/src/main/java/org/apache/sqoop/security/KerberosAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/security/src/main/java/org/apache/sqoop/security/KerberosAuthenticationHandler.java b/security/src/main/java/org/apache/sqoop/security/KerberosAuthenticationHandler.java index 4b920f0..9e2a0ca 100644 --- a/security/src/main/java/org/apache/sqoop/security/KerberosAuthenticationHandler.java +++ b/security/src/main/java/org/apache/sqoop/security/KerberosAuthenticationHandler.java @@ -81,7 +81,7 @@ public class KerberosAuthenticationHandler extends AuthenticationHandler { } catch (IOException ex) { throw new SqoopException(AuthenticationError.AUTH_0003); } - LOG.info("Using FileSystemAccess Kerberos authentication, principal [" + LOG.info("Using Kerberos authentication, principal [" + principal + "] keytab [" + keytab + "]"); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/sqoop/blob/816aa038/security/src/main/java/org/apache/sqoop/security/SimpleAuthenticationHandler.java ---------------------------------------------------------------------- diff --git a/security/src/main/java/org/apache/sqoop/security/SimpleAuthenticationHandler.java b/security/src/main/java/org/apache/sqoop/security/SimpleAuthenticationHandler.java index 44209bf..c93ff89 100644 --- a/security/src/main/java/org/apache/sqoop/security/SimpleAuthenticationHandler.java +++ b/security/src/main/java/org/apache/sqoop/security/SimpleAuthenticationHandler.java @@ -35,7 +35,7 @@ public class SimpleAuthenticationHandler extends AuthenticationHandler { conf.set(get_hadoop_security_authentication(), AuthenticationConstants.TYPE.SIMPLE.name()); UserGroupInformation.setConfiguration(conf); - LOG.info("Using FileSystemAccess simple/pseudo authentication, principal [" + LOG.info("Using simple/pseudo authentication, principal [" + System.getProperty("user.name") + "]"); } } \ No newline at end of file
