Merge branch 'master' into tag-policy

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

Branch: refs/heads/tag-policy
Commit: 2fffd02564f274a7c38853e948f06da2977fa7b4
Parents: 6259fb6 7c185e1
Author: Madhan Neethiraj <[email protected]>
Authored: Wed Nov 11 12:41:52 2015 -0800
Committer: Madhan Neethiraj <[email protected]>
Committed: Wed Nov 11 12:41:52 2015 -0800

----------------------------------------------------------------------
 .gitignore                                      |   1 -
 agents-common/scripts/enable-agent.sh           |  11 +-
 .../ranger/plugin/util/RangerPerfTracer.java    |  80 ++
 hbase-agent/scripts/install.sh                  |  10 +-
 hdfs-agent/scripts/install.sh                   |  10 +-
 hive-agent/scripts/install.sh                   |  10 +-
 kms/scripts/db_setup.py                         |  72 +-
 kms/scripts/dba_script.py                       | 322 ++++---
 kms/scripts/install.properties                  |  10 +-
 kms/scripts/setup.sh                            |  16 +-
 knox-agent/scripts/install.sh                   |  10 +-
 plugin-kms/scripts/enable-kms-plugin.sh         |  11 +-
 ranger-examples/.gitignore                      |   2 +
 ranger-hbase-plugin-shim/.gitignore             |   2 +
 ranger-hdfs-plugin-shim/.gitignore              |   2 +
 ranger-hive-plugin-shim/.gitignore              |   2 +
 .../authorizer/RangerHiveAuthorizerFactory.java |   8 +-
 ranger-knox-plugin-shim/.gitignore              |   2 +
 ranger-plugin-classloader/.gitignore            |   2 +
 ranger-storm-plugin-shim/.gitignore             |   2 +
 ranger-yarn-plugin-shim/.gitignore              |   2 +
 security-admin/scripts/db_setup.py              | 165 +++-
 security-admin/scripts/dba_script.py            | 478 +++++++----
 security-admin/scripts/install.properties       |  34 +-
 security-admin/scripts/setup.sh                 | 831 +------------------
 security-admin/src/bin/ranger_install.py        | 163 ++--
 .../ranger/biz/RangerPolicyRetriever.java       | 672 +++++++++++++++
 .../org/apache/ranger/biz/ServiceDBStore.java   |  21 +-
 .../java/org/apache/ranger/biz/XUserMgr.java    | 113 ++-
 .../org/apache/ranger/common/AppConstants.java  |   1 +
 .../apache/ranger/db/XXPolicyItemAccessDao.java |  26 +
 .../ranger/db/XXPolicyItemConditionDao.java     |  26 +
 .../org/apache/ranger/db/XXPolicyItemDao.java   |  16 +
 .../ranger/db/XXPolicyItemGroupPermDao.java     |  25 +
 .../ranger/db/XXPolicyItemUserPermDao.java      |  25 +
 .../apache/ranger/db/XXPolicyResourceDao.java   |  13 +
 .../ranger/db/XXPolicyResourceMapDao.java       |  25 +
 .../org/apache/ranger/rest/ServiceREST.java     | 302 +++++--
 .../handler/RangerAuthenticationProvider.java   |   4 +
 .../ranger/service/RangerBaseModelService.java  | 133 ++-
 .../ranger/service/RangerPolicyService.java     |  10 +-
 .../ranger/service/RangerPolicyServiceBase.java | 121 ---
 .../RangerPolicyWithAssignedIdService.java      |  12 +-
 .../resources/META-INF/jpa_named_queries.xml    | 104 ++-
 .../src/main/webapp/WEB-INF/log4j.xml           |  16 +
 .../main/webapp/scripts/prelogin/XAPrelogin.js  |  13 +-
 .../ranger/service/TestRangerPolicyService.java | 813 ------------------
 src/main/assembly/hbase-agent.xml               |   1 +
 storm-agent/scripts/install.sh                  |  10 +-
 tagsync/.gitignore                              |   2 +
 .../ldapconfigcheck/.gitignore                  |   3 +
 51 files changed, 2489 insertions(+), 2276 deletions(-)
----------------------------------------------------------------------


Reply via email to