Repository: sentry Updated Branches: refs/heads/sentry-ha-redesign 72c21872a -> 50a127bf3
SENTRY-418 - org.mortbay.log package accidentally picked up in a few test classes - Reviewed by: Na Li. Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/50a127bf Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/50a127bf Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/50a127bf Branch: refs/heads/sentry-ha-redesign Commit: 50a127bf39cccf8a0e5232b0182aa6c35e179980 Parents: 72c2187 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jul 13 17:27:57 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jul 13 17:28:48 2017 +0100 ---------------------------------------------------------------------- .../sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java | 6 ++++-- .../sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/50a127bf/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java index 875e9aa..b13165c 100644 --- a/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java +++ b/sentry-tests/sentry-tests-hive-v2/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java @@ -37,11 +37,13 @@ import org.apache.sentry.provider.db.service.thrift.TSentryRole; import org.apache.sentry.provider.file.PolicyFile; import org.apache.sentry.tests.e2e.hive.StaticUserGroup; import org.apache.tools.ant.util.StringUtils; -import org.mortbay.log.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Sets; public class SentryPolicyProviderForDb extends PolicyFile { + private static final Logger LOG = LoggerFactory.getLogger(SentryPolicyProviderForDb.class); protected static final Set<String> ADMIN_GROUP_SET = Sets .newHashSet(StaticUserGroup.ADMINGROUP); private SentryPolicyServiceClient sentryClient; @@ -93,7 +95,7 @@ public class SentryPolicyProviderForDb extends PolicyFile { sentryClient .grantRoleToGroup(StaticUserGroup.ADMIN1, groupEntry.getKey(), roleName); } catch (SentryUserException e) { - Log.warn("Error granting role " + roleName + " to group " + LOG.warn("Error granting role " + roleName + " to group " + groupEntry.getKey()); } } http://git-wip-us.apache.org/repos/asf/sentry/blob/50a127bf/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java index 875e9aa..b13165c 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/metastore/SentryPolicyProviderForDb.java @@ -37,11 +37,13 @@ import org.apache.sentry.provider.db.service.thrift.TSentryRole; import org.apache.sentry.provider.file.PolicyFile; import org.apache.sentry.tests.e2e.hive.StaticUserGroup; import org.apache.tools.ant.util.StringUtils; -import org.mortbay.log.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Sets; public class SentryPolicyProviderForDb extends PolicyFile { + private static final Logger LOG = LoggerFactory.getLogger(SentryPolicyProviderForDb.class); protected static final Set<String> ADMIN_GROUP_SET = Sets .newHashSet(StaticUserGroup.ADMINGROUP); private SentryPolicyServiceClient sentryClient; @@ -93,7 +95,7 @@ public class SentryPolicyProviderForDb extends PolicyFile { sentryClient .grantRoleToGroup(StaticUserGroup.ADMIN1, groupEntry.getKey(), roleName); } catch (SentryUserException e) { - Log.warn("Error granting role " + roleName + " to group " + LOG.warn("Error granting role " + roleName + " to group " + groupEntry.getKey()); } }