Return-Path: X-Original-To: apmail-ranger-commits-archive@www.apache.org Delivered-To: apmail-ranger-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 32390180CE for ; Wed, 27 May 2015 19:56:30 +0000 (UTC) Received: (qmail 75648 invoked by uid 500); 27 May 2015 19:56:08 -0000 Delivered-To: apmail-ranger-commits-archive@ranger.apache.org Received: (qmail 75621 invoked by uid 500); 27 May 2015 19:56:08 -0000 Mailing-List: contact commits-help@ranger.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.incubator.apache.org Delivered-To: mailing list commits@ranger.incubator.apache.org Received: (qmail 75611 invoked by uid 99); 27 May 2015 19:56:08 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 19:56:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 920FBC9325 for ; Wed, 27 May 2015 19:56:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.23 X-Spam-Level: X-Spam-Status: No, score=-3.23 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id R9T2g1LIvPX6 for ; Wed, 27 May 2015 19:56:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id BC9AD20539 for ; Wed, 27 May 2015 19:56:06 +0000 (UTC) Received: (qmail 75594 invoked by uid 99); 27 May 2015 19:56:06 -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; Wed, 27 May 2015 19:56:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65461E0525; Wed, 27 May 2015 19:56:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sneethir@apache.org To: commits@ranger.incubator.apache.org Date: Wed, 27 May 2015 19:56:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] incubator-ranger git commit: RANGER-246 Enable Kafka service by default RANGER-246 Enable Kafka service by default Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/80c46f22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/80c46f22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/80c46f22 Branch: refs/heads/ranger-0.5 Commit: 80c46f22f2790f8dfe5eea66d4fd433c469c2a0d Parents: 5596d2e Author: Don Bosco Durai Authored: Tue May 26 16:51:09 2015 -0700 Committer: Don Bosco Durai Committed: Tue May 26 16:51:09 2015 -0700 ---------------------------------------------------------------------- .../plugin/store/EmbeddedServiceDefsUtil.java | 14 +++++ src/main/assembly/admin-web.xml | 65 ++++++++++++++++++++ 2 files changed, 79 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/80c46f22/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java index 2930606..2115256 100755 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java @@ -50,6 +50,8 @@ public class EmbeddedServiceDefsUtil { public static final String EMBEDDED_SERVICEDEF_STORM_NAME = "storm"; public static final String EMBEDDED_SERVICEDEF_YARN_NAME = "yarn"; public static final String EMBEDDED_SERVICEDEF_KMS_NAME = "kms"; + public static final String EMBEDDED_SERVICEDEF_KAFKA_NAME = "kafka"; + public static final String EMBEDDED_SERVICEDEF_SOLR_NAME = "solr"; public static final String PROPERTY_CREATE_EMBEDDED_SERVICE_DEFS = "ranger.service.store.create.embedded.service-defs"; private static EmbeddedServiceDefsUtil instance = new EmbeddedServiceDefsUtil(); @@ -62,6 +64,8 @@ public class EmbeddedServiceDefsUtil { private RangerServiceDef stormServiceDef = null; private RangerServiceDef yarnServiceDef = null; private RangerServiceDef kmsServiceDef = null; + private RangerServiceDef kafkaServiceDef = null; + private RangerServiceDef solrServiceDef = null; private Gson gsonBuilder = null; @@ -89,6 +93,8 @@ public class EmbeddedServiceDefsUtil { stormServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_STORM_NAME); yarnServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_YARN_NAME); kmsServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KMS_NAME); + kafkaServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_KAFKA_NAME); + solrServiceDef = getOrCreateServiceDef(store, EMBEDDED_SERVICEDEF_SOLR_NAME); } catch(Throwable excp) { LOG.fatal("EmbeddedServiceDefsUtil.init(): failed", excp); } @@ -124,6 +130,14 @@ public class EmbeddedServiceDefsUtil { return getId(kmsServiceDef); } + public long getKafkaServiceDefId() { + return getId(kafkaServiceDef); + } + + public long getSolrServiceDefId() { + return getId(solrServiceDef); + } + private long getId(RangerServiceDef serviceDef) { return serviceDef == null || serviceDef.getId() == null ? -1 : serviceDef.getId().longValue(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/80c46f22/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index 9136418..4f34ef6 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -266,8 +266,73 @@ org.apache.ranger:jisql + + + + true + /ews/webapp/WEB-INF/classes/ranger-plugins/kafka + false + 755 + 644 + + + security_plugins.ranger-kafka-plugin:ranger-kafka-plugin + + + + + + true + /ews/webapp/WEB-INF/classes/ranger-plugins/solr + false + 755 + 644 + + + security_plugins.ranger-solr-plugin:ranger-solr-plugin + + + /ews