Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3BD0B200CD3 for ; Fri, 28 Jul 2017 19:06:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3A1E116D261; Fri, 28 Jul 2017 17:06:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7FA6316D25F for ; Fri, 28 Jul 2017 19:06:21 +0200 (CEST) Received: (qmail 2378 invoked by uid 500); 28 Jul 2017 17:06:20 -0000 Mailing-List: contact commits-help@sentry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sentry.apache.org Delivered-To: mailing list commits@sentry.apache.org Received: (qmail 2365 invoked by uid 99); 28 Jul 2017 17:06:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2017 17:06:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D670DFC28; Fri, 28 Jul 2017 17:06:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akolb@apache.org To: commits@sentry.apache.org Date: Fri, 28 Jul 2017 17:06:32 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] sentry git commit: SENTRY-418 - org.mortbay.log package accidentally picked up in a few test classes - Reviewed by: Na Li. archived-at: Fri, 28 Jul 2017 17:06:22 -0000 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/master Commit: 50a127bf39cccf8a0e5232b0182aa6c35e179980 Parents: 72c2187 Author: Colm O hEigeartaigh Authored: Thu Jul 13 17:27:57 2017 +0100 Committer: Colm O hEigeartaigh 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 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 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()); } }