You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/03/05 08:12:54 UTC
[1/2] incubator-ranger git commit: RANGER-289: removed unused class
ServiceStoreFactory
Repository: incubator-ranger
Updated Branches:
refs/heads/master b8d94100f -> 7cd51c9d9
RANGER-289: removed unused class ServiceStoreFactory
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d4b50119
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d4b50119
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d4b50119
Branch: refs/heads/master
Commit: d4b50119ddc7a0c3e81cd8ff84ededb93737b1f3
Parents: c45e1e7
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Wed Mar 4 11:06:56 2015 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Wed Mar 4 11:06:56 2015 -0800
----------------------------------------------------------------------
.../plugin/store/ServiceStoreFactory.java | 113 -------------------
.../hbase/client/HBaseConnectionMgr.java | 1 -
.../services/hdfs/client/HdfsConnectionMgr.java | 1 -
.../services/hive/client/HiveConnectionMgr.java | 1 -
.../services/knox/client/KnoxConnectionMgr.java | 25 ----
.../knox/client/TestRangerServiceKnox.java | 1 -
6 files changed, 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4b50119/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStoreFactory.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStoreFactory.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStoreFactory.java
deleted file mode 100644
index f9a2404..0000000
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/ServiceStoreFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.ranger.plugin.store;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
-
-
-public class ServiceStoreFactory {
- private static final Log LOG = LogFactory.getLog(ServiceStoreFactory.class);
-
- private static ServiceStoreFactory sInstance = null;
-
- private Map<String, ServiceStore> serviceStores = null;
- private ServiceStore defaultServiceStore = null;
-
-
- public static ServiceStoreFactory instance() {
- if(sInstance == null) {
- sInstance = new ServiceStoreFactory();
- }
-
- return sInstance;
- }
-
- public ServiceStore getServiceStore() {
- ServiceStore ret = defaultServiceStore;
-
- if(ret == null) { // if no service store has been created yet, create the default store. TODO: review the impact and update, if necessary
- String defaultServiceStoreClass = RangerConfiguration.getInstance().get("ranger.default.service.store.class", "org.apache.ranger.plugin.store.file.ServiceFileStore");
-
- ret = getServiceStore(defaultServiceStoreClass);
- }
-
- return ret;
- }
-
- public ServiceStore getServiceStore(String storeClassname) {
- ServiceStore ret = serviceStores.get(storeClassname);
-
- if(ret == null) {
- synchronized(this) {
- ret = serviceStores.get(storeClassname);
-
- if(ret == null) {
- try {
- @SuppressWarnings("unchecked")
- Class<ServiceStore> storeClass = (Class<ServiceStore>)Class.forName(storeClassname);
-
- ret = storeClass.newInstance();
-
- ret.init();
-
- serviceStores.put(storeClassname, ret);
-
- if(defaultServiceStore == null) {
- defaultServiceStore = ret;
- }
- } catch(Exception excp) {
- LOG.error("failed to instantiate service store of type " + storeClassname, excp);
- }
- }
- }
- }
-
- return ret;
- }
-
- private ServiceStoreFactory() {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceStoreFactory.ServiceStoreFactory()");
- }
-
- init();
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== ServiceStoreFactory.ServiceStoreFactory()");
- }
- }
-
- private void init() {
- if(LOG.isDebugEnabled()) {
- LOG.debug("==> ServiceStoreFactory.init()");
- }
-
- serviceStores = new HashMap<String, ServiceStore>();
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("<== ServiceStoreFactory.init()");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4b50119/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
index 88ea9ee..ef0b9ae 100644
--- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
+++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.Logger;
import org.apache.ranger.services.hbase.client.HBaseClient;
-import org.apache.ranger.plugin.store.ServiceStoreFactory;
import org.apache.ranger.plugin.util.TimedEventUtil;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4b50119/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
index 17dcb31..c329a94 100644
--- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
+++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.Logger;
import org.apache.ranger.plugin.util.TimedEventUtil;
-import org.apache.ranger.plugin.store.ServiceStoreFactory;
import org.apache.ranger.services.hdfs.client.HdfsClient;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4b50119/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
index b511960..a5eda0b 100644
--- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
+++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.Logger;
import org.apache.ranger.plugin.util.TimedEventUtil;
-import org.apache.ranger.plugin.store.ServiceStoreFactory;
import org.apache.ranger.services.hive.client.HiveClient;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4b50119/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
index 9c5fb22..5c1bcbe 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.log4j.Logger;
import org.apache.ranger.services.knox.client.KnoxClient;
import org.apache.ranger.plugin.model.RangerService;
-import org.apache.ranger.plugin.store.ServiceStoreFactory;
@@ -32,30 +31,6 @@ public class KnoxConnectionMgr {
private static Logger LOG = Logger.getLogger(KnoxConnectionMgr.class);
- public KnoxClient getKnoxClientbyServiceName(String serviceName) {
- KnoxClient knoxClient = null;
- RangerService service = null;
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("Getting knoxClient for ServiceName: " + serviceName);
- }
-
- try {
- service = ServiceStoreFactory
- .instance()
- .getServiceStore()
- .getServiceByName(serviceName);
-
- } catch (Exception ex) {
- LOG.error("Service could not be found for the Service Name : " + serviceName , ex);
- }
-
- if (service != null) {
- knoxClient = getKnoxClientbyService(service);
- }
- return knoxClient;
- }
-
public KnoxClient getKnoxClientbyService(RangerService service) {
KnoxClient knoxClient = null;
Map<String,String> configs = null;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d4b50119/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java b/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
index 3499714..6bba0c7 100644
--- a/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
+++ b/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java
@@ -32,7 +32,6 @@ import org.apache.ranger.plugin.model.RangerService;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.service.ResourceLookupContext;
import org.apache.ranger.plugin.store.ServiceStore;
-import org.apache.ranger.plugin.store.ServiceStoreFactory;
import org.apache.ranger.services.knox.RangerServiceKnox;
import org.junit.After;
import org.junit.Before;
[2/2] incubator-ranger git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ranger
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/7cd51c9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/7cd51c9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/7cd51c9d
Branch: refs/heads/master
Commit: 7cd51c9d9cfa7b6abf5dc58131d8a616cc731050
Parents: d4b5011 b8d9410
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Wed Mar 4 21:22:48 2015 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Wed Mar 4 21:22:48 2015 -0800
----------------------------------------------------------------------
.../ranger/plugin/store/TestServiceStore.java | 51 ++++++++++++++-----
.../utils/RangerCredentialProviderTest.java | 52 ++++++++++++++++----
.../credentialapi/TestCredentialReader.java | 40 +++++++++++++--
.../ranger/credentialapi/Testbuildks.java | 41 ++++++++++++++-
embeddedwebserver/scripts/ranger-admin | 12 +++--
pom.xml | 2 +-
security-admin/pom.xml | 2 +
security-admin/scripts/setup.sh | 7 ++-
.../webapp/scripts/views/reports/AuditLayout.js | 4 +-
ugsync/pom.xml | 4 +-
10 files changed, 178 insertions(+), 37 deletions(-)
----------------------------------------------------------------------