RANGER-1457 - Move COMPONENT_INSTALL_DIR_NAME to install.properties for Yarn plugin
Signed-off-by: Colm O hEigeartaigh <cohei...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a20e7a2f Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a20e7a2f Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a20e7a2f Branch: refs/heads/master Commit: a20e7a2f9d5c4ad47030eb07968414fdcadb6c3d Parents: 8cc4374 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Mar 15 11:15:03 2017 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Apr 7 14:32:34 2017 +0100 ---------------------------------------------------------------------- plugin-yarn/scripts/install.properties | 7 ++++++ .../scripts/yarn-plugin-install.properties | 23 -------------------- src/main/assembly/plugin-yarn.xml | 6 ----- 3 files changed, 7 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/a20e7a2f/plugin-yarn/scripts/install.properties ---------------------------------------------------------------------- diff --git a/plugin-yarn/scripts/install.properties b/plugin-yarn/scripts/install.properties index 9c11271..f776c5f 100644 --- a/plugin-yarn/scripts/install.properties +++ b/plugin-yarn/scripts/install.properties @@ -29,6 +29,13 @@ POLICY_MGR_URL= # REPOSITORY_NAME= +# +# Name of the directory where the component's lib and conf directory exist. +# This location should be relative to the parent of the directory containing +# the plugin installation files. +# +COMPONENT_INSTALL_DIR_NAME=hadoop + # Enable audit logs to Solr #Example #XAAUDIT.SOLR.ENABLE=true http://git-wip-us.apache.org/repos/asf/ranger/blob/a20e7a2f/plugin-yarn/scripts/yarn-plugin-install.properties ---------------------------------------------------------------------- diff --git a/plugin-yarn/scripts/yarn-plugin-install.properties b/plugin-yarn/scripts/yarn-plugin-install.properties deleted file mode 100644 index 074bc4d..0000000 --- a/plugin-yarn/scripts/yarn-plugin-install.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -# installation properties for this plugin - -# -# Name of the directory where the component's lib and conf directory exist. -# This location should be relative to the parent of the directory containing -# the plugin installation files. -# -COMPONENT_INSTALL_DIR_NAME=hadoop http://git-wip-us.apache.org/repos/asf/ranger/blob/a20e7a2f/src/main/assembly/plugin-yarn.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml index 75b312c..c6a48e8 100644 --- a/src/main/assembly/plugin-yarn.xml +++ b/src/main/assembly/plugin-yarn.xml @@ -155,11 +155,5 @@ <outputDirectory>/</outputDirectory> <fileMode>755</fileMode> </file> - <file> - <source>plugin-yarn/scripts/yarn-plugin-install.properties</source> - <outputDirectory>/</outputDirectory> - <destName>yarn-plugin-install.properties</destName> - <fileMode>755</fileMode> - </file> </files> </assembly>