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/22 19:23:27 UTC
[10/12] 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/42a0e254
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/42a0e254
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/42a0e254
Branch: refs/heads/master
Commit: 42a0e254a4f87c5ce661cc9c300aa03f3cd74ab5
Parents: d8542a2 2f8bcd2
Author: Don Bosco Durai <bo...@apache.org>
Authored: Wed Apr 22 09:13:27 2015 -0700
Committer: Don Bosco Durai <bo...@apache.org>
Committed: Wed Apr 22 09:13:27 2015 -0700
----------------------------------------------------------------------
.../ranger/plugin/util/KeySearchFilter.java | 116 +++++++
.../scripts/ranger-admin-services.sh | 39 ++-
kms/config/kms-webapp/dbks-site.xml | 2 +-
.../db/postgres/kms_core_db_postgres.sql | 12 +-
kms/scripts/install.properties | 2 +-
kms/scripts/setup.sh | 12 +
.../crypto/key/RangerKeyStoreProvider.java | 6 -
.../hadoop/crypto/key/kms/server/KMSACLs.java | 12 +-
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 13 +-
.../kms/server/KeyAuthorizationKeyProvider.java | 4 +-
.../apache/ranger/entity/XXRangerKeyStore.java | 4 +-
.../apache/ranger/entity/XXRangerMasterKey.java | 4 +-
.../kms/authorizer/RangerKmsAuthorizer.java | 15 +-
.../ranger/services/kms/client/KMSClient.java | 156 ++++-----
.../services/kms/client/KMSResourceMgr.java | 27 +-
security-admin/src/bin/ranger_install.py | 93 +++--
.../java/org/apache/ranger/biz/KmsKeyMgr.java | 317 +++++++++++++++++
.../org/apache/ranger/common/AppConstants.java | 6 +-
.../java/org/apache/ranger/rest/XKeyREST.java | 169 +++++++++
.../java/org/apache/ranger/view/VXKmsKey.java | 239 +++++++++++++
.../org/apache/ranger/view/VXKmsKeyList.java | 84 +++++
.../src/main/webapp/WEB-INF/log4j.xml | 4 +-
.../collection_bases/VXKmsKeyListBase.js | 68 ++++
.../webapp/scripts/collections/VXKmsKeyList.js | 36 ++
.../webapp/scripts/controllers/Controller.js | 37 ++
.../webapp/scripts/model_bases/VXKmsKeyBase.js | 103 ++++++
.../src/main/webapp/scripts/models/VXKmsKey.js | 54 +++
.../src/main/webapp/scripts/modules/XALinks.js | 34 +-
.../scripts/modules/globalize/message/en.js | 17 +-
.../src/main/webapp/scripts/routers/Router.js | 12 +-
.../src/main/webapp/scripts/utils/XAGlobals.js | 12 +-
.../webapp/scripts/views/kms/KMSTableLayout.js | 345 +++++++++++++++++++
.../webapp/scripts/views/kms/KmsKeyCreate.js | 186 ++++++++++
.../main/webapp/scripts/views/kms/KmsKeyForm.js | 107 ++++++
.../webapp/templates/common/TopNav_tmpl.html | 12 +-
.../webapp/templates/kms/KmsKeyCreate_tmpl.html | 30 ++
.../webapp/templates/kms/KmsKeyForm_tmpl.html | 19 +
.../templates/kms/KmsTableLayout_tmpl.html | 46 +++
38 files changed, 2222 insertions(+), 232 deletions(-)
----------------------------------------------------------------------