You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2015/04/22 20:52:24 UTC
[1/2] incubator-ranger git commit: RANGER-247: added ranger-kms.initd
as part of the tar bundle and renamed as ranger-kms-initd
Repository: incubator-ranger
Updated Branches:
refs/heads/master 4f3cea223 -> d9edf2fc1
RANGER-247: added ranger-kms.initd as part of the tar bundle and renamed as ranger-kms-initd
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/00a24fc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/00a24fc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/00a24fc6
Branch: refs/heads/master
Commit: 00a24fc6fb8912dfaee5958223c4cea454e57893
Parents: 94bf590
Author: sneethiraj <sn...@apache.org>
Authored: Wed Apr 22 14:22:20 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Wed Apr 22 14:51:43 2015 -0400
----------------------------------------------------------------------
kms/config/webserver/kms_webserver.properties | 4 ++--
kms/scripts/setup.sh | 2 +-
src/main/assembly/kms.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/00a24fc6/kms/config/webserver/kms_webserver.properties
----------------------------------------------------------------------
diff --git a/kms/config/webserver/kms_webserver.properties b/kms/config/webserver/kms_webserver.properties
index 1d227cf..0051dcd 100644
--- a/kms/config/webserver/kms_webserver.properties
+++ b/kms/config/webserver/kms_webserver.properties
@@ -20,7 +20,7 @@ service.host=localhost
http.service.port=9292
service.shutdownPort=7085
service.shutdownCommand=SHUTDOWN
-service.waitTimeForForceShutdownInSeconds=120
+service.waitTimeForForceShutdownInSeconds=0
#
# SSL Connector Information
@@ -62,4 +62,4 @@ JAVA_VERSION_REQUIRED="1.7"
# Log file path
#
LOGFILE=${RANGER_KMS_DIR}/logfile
-LOGFILES="$LOGFILE"
\ No newline at end of file
+LOGFILES="$LOGFILE"
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/00a24fc6/kms/scripts/setup.sh
----------------------------------------------------------------------
diff --git a/kms/scripts/setup.sh b/kms/scripts/setup.sh
index 295a71d..7d98a25 100644
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh
@@ -462,7 +462,7 @@ setup_install_files(){
if [ -d /etc/init.d ]; then
log "[I] Setting up init.d"
- cp ${INSTALL_DIR}/${RANGER_KMS}.initd /etc/init.d/${RANGER_KMS}
+ cp ${INSTALL_DIR}/${RANGER_KMS}-initd /etc/init.d/${RANGER_KMS}
chmod ug+rx /etc/init.d/${RANGER_KMS}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/00a24fc6/src/main/assembly/kms.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml
index 28b0a27..6882d1b 100644
--- a/src/main/assembly/kms.xml
+++ b/src/main/assembly/kms.xml
@@ -292,8 +292,8 @@
<include>dba_script.py</include>
<include>db_setup.py</include>
<include>update_property.py</include>
+ <include>ranger-kms-initd</include>
<include>ranger-kms</include>
- <include>ranger-kms-services.sh</include>
<include>setup.sh</include>
<include>install.properties</include>
<include>migrate-keystore-dbks.sh</include>
[2/2] incubator-ranger git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ranger
Posted by sn...@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/d9edf2fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d9edf2fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d9edf2fc
Branch: refs/heads/master
Commit: d9edf2fc1ec79057c56ac7a92d41023bb6dd505c
Parents: 00a24fc 4f3cea2
Author: sneethiraj <sn...@apache.org>
Authored: Wed Apr 22 14:52:08 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Wed Apr 22 14:52:08 2015 -0400
----------------------------------------------------------------------
.../audit/destination/AuditDestination.java | 81 ++
.../audit/destination/FileAuditDestination.java | 244 +++++
.../audit/destination/HDFSAuditDestination.java | 258 ++++++
.../ranger/audit/model/AuditEventBase.java | 9 +-
.../ranger/audit/model/AuthzAuditEvent.java | 247 ++---
.../audit/provider/AsyncAuditProvider.java | 60 +-
.../ranger/audit/provider/AuditAsyncQueue.java | 167 ----
.../audit/provider/AuditBatchProcessor.java | 327 -------
.../ranger/audit/provider/AuditDestination.java | 70 --
.../ranger/audit/provider/AuditFileSpool.java | 875 ------------------
.../ranger/audit/provider/AuditHandler.java | 46 +
.../ranger/audit/provider/AuditProvider.java | 56 --
.../audit/provider/AuditProviderFactory.java | 144 ++-
.../ranger/audit/provider/BaseAuditHandler.java | 271 ++++++
.../audit/provider/BaseAuditProvider.java | 431 ---------
.../audit/provider/BufferedAuditProvider.java | 48 +-
.../ranger/audit/provider/DbAuditProvider.java | 27 +-
.../audit/provider/DummyAuditProvider.java | 35 +-
.../audit/provider/FileAuditDestination.java | 230 -----
.../audit/provider/HDFSAuditDestination.java | 243 -----
.../audit/provider/Log4jAuditProvider.java | 3 +-
.../audit/provider/MultiDestAuditProvider.java | 61 +-
.../provider/kafka/KafkaAuditProvider.java | 22 +-
.../audit/provider/solr/SolrAuditProvider.java | 33 +-
.../ranger/audit/queue/AuditAsyncQueue.java | 158 ++++
.../ranger/audit/queue/AuditBatchQueue.java | 328 +++++++
.../ranger/audit/queue/AuditFileSpool.java | 897 +++++++++++++++++++
.../apache/ranger/audit/queue/AuditQueue.java | 174 ++++
.../ranger/audit/queue/AuditSummaryQueue.java | 236 +++++
.../apache/ranger/audit/test/TestEvents.java | 4 +-
.../ranger/plugin/util/KeySearchFilter.java | 116 +++
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 +-
.../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 ++
.../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 +
.../apache/ranger/audit/TestAuditProcessor.java | 786 ----------------
.../org/apache/ranger/audit/TestAuditQueue.java | 702 +++++++++++++++
.../org/apache/ranger/audit/TestConsumer.java | 210 +++++
68 files changed, 6076 insertions(+), 3725 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d9edf2fc/kms/scripts/setup.sh
----------------------------------------------------------------------
diff --cc kms/scripts/setup.sh
index 7d98a25,a3680b7..d576797
mode 100644,100755..100755
--- a/kms/scripts/setup.sh
+++ b/kms/scripts/setup.sh