You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by bo...@apache.org on 2015/04/20 00:11:58 UTC

[4/4] incubator-ranger git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger.git

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger.git

Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/44f403ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/44f403ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/44f403ea

Branch: refs/heads/master
Commit: 44f403ead9f920495af247e97450eb9e6a3c29b8
Parents: eb1e9b5 4a20a9d
Author: Don Bosco Durai <bo...@apache.org>
Authored: Sun Apr 19 15:10:57 2015 -0700
Committer: Don Bosco Durai <bo...@apache.org>
Committed: Sun Apr 19 15:10:57 2015 -0700

----------------------------------------------------------------------
 .../plugin/policyengine/RangerPolicyEngine.java |   8 -
 .../policyengine/RangerPolicyEngineImpl.java    |  21 --
 .../RangerDefaultPolicyEvaluator.java           |   2 +-
 .../RangerAbstractResourceMatcher.java          |  20 +-
 .../RangerDefaultResourceMatcher.java           |  13 +-
 .../RangerPathResourceMatcher.java              |  67 ++--
 .../resourcematcher/RangerResourceMatcher.java  |   9 +-
 .../ranger/plugin/service/RangerBasePlugin.java |  38 +-
 .../resourcematcher/TestResourceMatcher.java    | 136 +++++++
 .../test_resourcematcher_default.json           | 327 +++++++++++++++++
 .../test_resourcematcher_path.json              | 290 +++++++++++++++
 .../hbase/AuthorizationSession.java             |  16 +-
 .../authorization/hbase/HbaseAuditHandler.java  |   5 +
 .../hbase/HbaseAuditHandlerImpl.java            |  21 +-
 .../authorization/hbase/HbaseAuthUtilsImpl.java |   1 -
 .../authorization/hbase/HbaseFactory.java       |   6 +
 .../authorization/hbase/HbaseUserUtils.java     |   7 +
 .../authorization/hbase/HbaseUserUtilsImpl.java |  50 ++-
 .../hbase/RangerAuthorizationCoprocessor.java   |  44 +--
 .../hadoop/RangerHdfsAuthorizer.java            |  52 ++-
 kms/scripts/db_setup.py                         |  21 +-
 kms/scripts/dba_script.py                       |  58 ++-
 kms/scripts/install.properties                  | 109 +++++-
 kms/scripts/kms-initd                           |  78 ----
 kms/scripts/ranger-kms                          |  48 ++-
 kms/scripts/ranger-kms-services.sh              |   4 +-
 kms/scripts/setup.sh                            |  61 +++-
 .../apache/hadoop/crypto/key/RangerKMSDB.java   |   2 +
 .../crypto/key/RangerKeyStoreProvider.java      |  12 +-
 plugin-kms/scripts/enable-kms-plugin.sh         |  39 +-
 plugin-kms/scripts/install.properties           | 112 ------
 plugin-kms/scripts/install.sh                   | 364 -------------------
 .../scripts/kms-plugin-install.properties       |  23 --
 plugin-kms/scripts/uninstall.sh                 |  70 ----
 pom.xml                                         |   2 +-
 security-admin/scripts/db_setup.py              |  17 +-
 security-admin/scripts/dba_script.py            |  19 +-
 .../java/org/apache/ranger/biz/AssetMgr.java    |   2 +-
 .../org/apache/ranger/biz/ServiceDBStore.java   |  31 ++
 .../java/org/apache/ranger/biz/ServiceMgr.java  |  19 +-
 .../org/apache/ranger/common/ServiceUtil.java   | 161 +++++---
 .../org/apache/ranger/rest/ServiceREST.java     |  23 +-
 .../ranger/service/RangerPolicyServiceBase.java |   3 +-
 .../ranger/service/RangerServiceService.java    |  29 +-
 .../service/RangerServiceServiceBase.java       |   3 +-
 .../ranger/solr/SolrAccessAuditsService.java    |  11 +-
 .../main/webapp/scripts/prelogin/XAPrelogin.js  |   1 +
 .../views/policies/RangerPolicyTableLayout.js   |   6 +-
 .../rest/TestServiceRESTForValidation.java      | 120 +++---
 .../src/test/resources/log4j.properties         |  36 ++
 src/main/assembly/kms.xml                       |  25 +-
 51 files changed, 1607 insertions(+), 1035 deletions(-)
----------------------------------------------------------------------