Repository: incubator-ranger Updated Branches: refs/heads/master 0be1d9897 -> b1f4daf8a
RANGER-257: added sample key provider factory and fixed a misspelling in forceshutdown param Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b1f4daf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b1f4daf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b1f4daf8 Branch: refs/heads/master Commit: b1f4daf8a3f6e37e07750bc0f0498ca1b92cc678 Parents: 0be1d98 Author: sneethiraj <[email protected]> Authored: Sun Feb 22 18:03:53 2015 -0800 Committer: sneethiraj <[email protected]> Committed: Sun Feb 22 18:03:53 2015 -0800 ---------------------------------------------------------------------- .../ranger/server/tomcat/EmbeddedServer.java | 2 +- kms/config/webserver/kms_webserver.properties | 2 +- .../crypto/key/SampleKeyProviderFactory.java | 42 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b1f4daf8/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java ---------------------------------------------------------------------- diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java index f9c7fcc..e1f1bfd 100644 --- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java +++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java @@ -269,7 +269,7 @@ public class EmbeddedServer { public void shutdownServer() { - int timeWaitForShutdownInSeconds = getIntConfig("service.waitTimeForFoceShutdownInSeconds", 120) ; + int timeWaitForShutdownInSeconds = getIntConfig("service.waitTimeForForceShutdownInSeconds", 120) ; if (timeWaitForShutdownInSeconds > 0) { long endTime = System.currentTimeMillis() + (timeWaitForShutdownInSeconds * 1000L) ; LOG.info("Will wait for all threads to shutdown gracefully. Final shutdown Time: " + new Date(endTime)) ; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b1f4daf8/kms/config/webserver/kms_webserver.properties ---------------------------------------------------------------------- diff --git a/kms/config/webserver/kms_webserver.properties b/kms/config/webserver/kms_webserver.properties index 4118a1f..e96b9fc 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.waitTimeForFoceShutdownInSeconds=120 +service.waitTimeForForceShutdownInSeconds=120 # # SSL Connector Information http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b1f4daf8/kms/src/main/java/org/apache/hadoop/crypto/key/SampleKeyProviderFactory.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/SampleKeyProviderFactory.java b/kms/src/main/java/org/apache/hadoop/crypto/key/SampleKeyProviderFactory.java new file mode 100644 index 0000000..6fc43c3 --- /dev/null +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/SampleKeyProviderFactory.java @@ -0,0 +1,42 @@ +/* + * 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.hadoop.crypto.key; + +import java.io.IOException; +import java.net.URI; + +import org.apache.hadoop.conf.Configuration; + +public class SampleKeyProviderFactory extends KeyProviderFactory { + + private static final String SAMPLE_KEY_PROVIDER_SCHEMA_NAME = "sample" ; + + @Override + public KeyProvider createProvider(URI aURI, Configuration aConf) throws IOException { + KeyProvider keyprovider = null ; + if (aURI != null) { + if (aURI.getScheme().equalsIgnoreCase(SAMPLE_KEY_PROVIDER_SCHEMA_NAME)) { + keyprovider = new SampleKeyProvider(aConf) ; + } + } + return keyprovider ; + } + +}
