KNOX-998 - Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/557d569f Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/557d569f Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/557d569f Branch: refs/heads/KNOX-998-Package_Restructuring Commit: 557d569faef9b9e894ac380f8488cd03eb52823d Parents: cdac6ff Author: Sandeep More <m...@apache.org> Authored: Mon Oct 2 10:43:09 2017 -0400 Committer: Sandeep More <m...@apache.org> Committed: Mon Oct 2 10:43:09 2017 -0400 ---------------------------------------------------------------------- gateway-adapter/pom.xml | 2 +- .../hadoop/gateway/audit/log4j/layout/AuditLayout.java | 2 +- .../hadoop/gateway/shirorealm/KnoxLdapContextFactory.java | 2 +- .../org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java | 2 +- .../org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java | 8 +++++++- 5 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/557d569f/gateway-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-adapter/pom.xml b/gateway-adapter/pom.xml index 0f1ae4c..4bb62e3 100644 --- a/gateway-adapter/pom.xml +++ b/gateway-adapter/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>gateway-adapter</artifactId> <name>gateway-adapter</name> - <description>Adapter/Shims for old package structure to ensure compatibility.</description> + <description>Adapter for old package structure to ensure compatibility.</description> <licenses> <license> http://git-wip-us.apache.org/repos/asf/knox/blob/557d569f/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java index 303618f..612026f 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java @@ -20,7 +20,7 @@ package org.apache.hadoop.gateway.audit.log4j.layout; import org.apache.log4j.spi.LoggingEvent; /** - * An adapter class that deligates calls to {@link org.apache.knox.gateway.audit.log4j.layout.AuditLayout} + * An adapter class that delegate calls to {@link org.apache.knox.gateway.audit.log4j.layout.AuditLayout} * for backwards compatability with package structure. * * @since 0.14.0 http://git-wip-us.apache.org/repos/asf/knox/blob/557d569f/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java index e06cd9a..acc726f 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java @@ -22,7 +22,7 @@ import javax.naming.ldap.LdapContext; import java.util.Hashtable; /** - * An adapter class that deligates calls to {@link org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory} + * An adapter class that delegate calls to {@link org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory} * for backwards compatability with package structure. * @since 0.14.0 */ http://git-wip-us.apache.org/repos/asf/knox/blob/557d569f/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java index 17dffdd..75204b0 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java @@ -29,7 +29,7 @@ import java.util.Map; */ /** - * An adapter class that deligates calls to {@link org.apache.knox.gateway.shirorealm.KnoxLdapRealm} + * An adapter class that delegate calls to {@link org.apache.knox.gateway.shirorealm.KnoxLdapRealm} * for backwards compatability with package structure. * @since 0.14.0 */ http://git-wip-us.apache.org/repos/asf/knox/blob/557d569f/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java index fd475d5..245d9d5 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java @@ -24,7 +24,7 @@ import org.apache.shiro.subject.PrincipalCollection; */ /** - * An adapter class that deligates calls to {@link org.apache.knox.gateway.shirorealm.KnoxPamRealm} + * An adapter class that delegate calls to {@link org.apache.knox.gateway.shirorealm.KnoxPamRealm} * for backwards compatability with package structure. * @since 0.14.0 */ @@ -44,4 +44,10 @@ public class KnoxPamRealm AuthenticationToken token) throws AuthenticationException { return super.doGetAuthenticationInfo(token); } + + @Override + protected AuthorizationInfo doGetAuthorizationInfo( + PrincipalCollection principals) { + return super.doGetAuthorizationInfo(principals); + } }
