Repository: incubator-ranger Updated Branches: refs/heads/master 24b310d64 -> 4b892a358
RANGER-1027 : ranger-atlas-plugin - fix in packaging and installation Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/4b892a35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/4b892a35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/4b892a35 Branch: refs/heads/master Commit: 4b892a358089844710c8257a0f87c2096fa9eca8 Parents: 24b310d Author: Mehul Parikh <[email protected]> Authored: Mon Jun 13 14:32:16 2016 +0530 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Jun 13 12:55:15 2016 -0700 ---------------------------------------------------------------------- agents-common/scripts/enable-agent.sh | 2 +- plugin-atlas/pom.xml | 8 +- pom.xml | 2 +- src/main/assembly/atlas-agent.xml | 172 ----------------------------- src/main/assembly/plugin-atlas.xml | 170 ++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 175 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4b892a35/agents-common/scripts/enable-agent.sh ---------------------------------------------------------------------- diff --git a/agents-common/scripts/enable-agent.sh b/agents-common/scripts/enable-agent.sh index 1c94c40..d612d19 100755 --- a/agents-common/scripts/enable-agent.sh +++ b/agents-common/scripts/enable-agent.sh @@ -185,7 +185,7 @@ elif [ "${HCOMPONENT_NAME}" = "kafka" ]; then elif [ "${HCOMPONENT_NAME}" = "storm" ]; then HCOMPONENT_LIB_DIR=${HCOMPONENT_INSTALL_DIR}/extlib-daemon elif [ "${HCOMPONENT_NAME}" = "atlas" ]; then - HCOMPONENT_LIB_DIR=${HCOMPONENT_INSTALL_DIR}/server/webapp/atlas/WEB-INF/lib + HCOMPONENT_LIB_DIR=${HCOMPONENT_INSTALL_DIR}/libext fi HCOMPONENT_CONF_DIR=${HCOMPONENT_INSTALL_DIR}/conf http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4b892a35/plugin-atlas/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml index 22be838..67c5a63 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -59,11 +59,17 @@ <groupId>org.apache.atlas</groupId> <artifactId>atlas-common</artifactId> <version>${atlas.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> <version>${solr.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <version>${hadoop-auth.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4b892a35/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8220bf8..9fe2753 100644 --- a/pom.xml +++ b/pom.xml @@ -404,7 +404,7 @@ <descriptor>src/main/assembly/kms.xml</descriptor> <descriptor>src/main/assembly/ranger-tools.xml</descriptor> <descriptor>src/main/assembly/ranger-src.xml</descriptor> - <descriptor>src/main/assembly/atlas-agent.xml</descriptor> + <descriptor>src/main/assembly/plugin-atlas.xml</descriptor> </descriptors> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4b892a35/src/main/assembly/atlas-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/atlas-agent.xml b/src/main/assembly/atlas-agent.xml deleted file mode 100644 index 9a3e618..0000000 --- a/src/main/assembly/atlas-agent.xml +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<assembly> - <id>atlas-plugin</id> - <formats> - <format>tar.gz</format> - <format>zip</format> - </formats> - <baseDirectory>${project.name}-${project.version}-atlas-plugin</baseDirectory> - <includeBaseDirectory>true</includeBaseDirectory> - <moduleSets> - - <moduleSet> - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - <directoryMode>755</directoryMode> - <fileMode>644</fileMode> - <outputDirectory>/lib</outputDirectory> - </binaries> - <includes> - <include>org.apache.ranger:ranger-atlas-plugin-shim</include> - <include>org.apache.ranger:ranger-plugin-classloader</include> - </includes> - </moduleSet> - - <moduleSet> - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - <directoryMode>755</directoryMode> - <fileMode>644</fileMode> - <dependencySets> - <dependencySet> - <outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory> - <includes> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>com.google.code.gson:gson</include> - <include>org.eclipse.persistence:eclipselink</include> - <include>org.eclipse.persistence:javax.persistence</include> - <include>com.sun.jersey:jersey-bundle</include> - <include>com.google.guava:guava:jar:${guava.version}</include> - <include>org.codehaus.jackson:jackson-core-asl</include> - <include>org.codehaus.jackson:jackson-jaxrs</include> - <include>org.codehaus.jackson:jackson-mapper-asl</include> - <include>org.codehaus.jackson:jackson-xc</include> - <include>commons-configuration:commons-configuration</include> - <include>com.google.code.gson:gson*</include> - <include>org.apache.httpcomponents:httpclient:jar:${httpcomponents.httpclient.version}</include> - <include>org.apache.httpcomponents:httpcore:jar:${httpcomponents.httpcore.version}</include> - <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include> - <include>org.noggit:noggit:jar:${noggit.version}</include> - <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> - <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> - <include>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.version}</include> - <include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.version}</include> - <include>org.apache.solr:solr-solrj</include> - </includes> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>/install/lib</outputDirectory> - <unpack>false</unpack> - <directoryMode>755</directoryMode> - <fileMode>644</fileMode> - <includes> - <include>commons-cli:commons-cli</include> - <include>commons-collections:commons-collections</include> - <include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include> - <include>commons-io:commons-io:jar:${commons.io.version}</include> - <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> - <include>commons-logging:commons-logging</include> - <include>com.google.guava:guava:jar:${guava.version}</include> - <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> - <include>org.apache.ranger:ranger-plugins-cred</include> - <include>org.apache.ranger:credentialbuilder</include> - </includes> - </dependencySet> - </dependencySets> - <outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory> - </binaries> - <includes> - <include>org.apache.ranger:ranger-plugins-audit</include> - <include>org.apache.ranger:ranger-plugins-cred</include> - <include>org.apache.ranger:ranger-plugins-common</include> - <include>org.apache.ranger:ranger-atlas-plugin</include> - </includes> - </moduleSet> - <moduleSet> - <binaries> - <includeDependencies>false</includeDependencies> - <outputDirectory>/install/lib</outputDirectory> - <unpack>false</unpack> - </binaries> - <includes> - <include>org.apache.ranger:ranger-plugins-installer</include> - <include>org.apache.ranger:credentialbuilder</include> - </includes> - </moduleSet> - </moduleSets> - <fileSets> - <!-- conf.templates for enable --> - <fileSet> - <outputDirectory>/install/conf.templates/enable</outputDirectory> - <directory>plugin-atlas/conf</directory> - <excludes> - <exclude>*.sh</exclude> - </excludes> - <fileMode>700</fileMode> - </fileSet> - <fileSet> - <outputDirectory>/install/conf.templates/default</outputDirectory> - <directory>plugin-atlas/template</directory> - <fileMode>700</fileMode> - </fileSet> - <!-- version file --> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>${project.build.outputDirectory}</directory> - <includes> - <include>version</include> - </includes> - <fileMode>444</fileMode> - </fileSet> - </fileSets> - <!-- enable/disable script for plugin --> - <files> - <file> - <source>agents-common/scripts/enable-agent.sh</source> - <outputDirectory>/</outputDirectory> - <destName>enable-atlas-plugin.sh</destName> - <fileMode>755</fileMode> - </file> - <file> - <source>security-admin/scripts/ranger_credential_helper.py</source> - <outputDirectory>/</outputDirectory> - <fileMode>755</fileMode> - </file> - <file> - <source>agents-common/scripts/enable-agent.sh</source> - <outputDirectory>/</outputDirectory> - <destName>disable-atlas-plugin.sh</destName> - <fileMode>755</fileMode> - </file> - <file> - <source>plugin-atlas/scripts/install.properties</source> - <outputDirectory>/</outputDirectory> - <destName>install.properties</destName> - <fileMode>755</fileMode> - </file> - </files> -</assembly> - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4b892a35/src/main/assembly/plugin-atlas.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-atlas.xml b/src/main/assembly/plugin-atlas.xml new file mode 100644 index 0000000..6bdeb80 --- /dev/null +++ b/src/main/assembly/plugin-atlas.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<assembly> + <id>atlas-plugin</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <baseDirectory>${project.name}-${project.version}-atlas-plugin</baseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> + <moduleSets> + + <moduleSet> + <binaries> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + <directoryMode>755</directoryMode> + <fileMode>644</fileMode> + <outputDirectory>/lib</outputDirectory> + </binaries> + <includes> + <include>org.apache.ranger:ranger-atlas-plugin-shim</include> + <include>org.apache.ranger:ranger-plugin-classloader</include> + </includes> + </moduleSet> + + <moduleSet> + <binaries> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + <directoryMode>755</directoryMode> + <fileMode>644</fileMode> + <dependencySets> + <dependencySet> + <outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory> + <includes> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> + <include>com.google.code.gson:gson</include> + <include>org.eclipse.persistence:eclipselink</include> + <include>org.eclipse.persistence:javax.persistence</include> + <include>com.sun.jersey:jersey-bundle</include> + <include>com.google.guava:guava:jar:${guava.version}</include> + <include>org.codehaus.jackson:jackson-core-asl</include> + <include>org.codehaus.jackson:jackson-jaxrs</include> + <include>org.codehaus.jackson:jackson-mapper-asl</include> + <include>org.codehaus.jackson:jackson-xc</include> + <include>commons-configuration:commons-configuration</include> + <include>com.google.code.gson:gson*</include> + <include>org.apache.httpcomponents:httpmime:jar:${httpcomponents.httpmime.version}</include> + <include>org.noggit:noggit:jar:${noggit.version}</include> + <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> + <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> + <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> + <include>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.version}</include> + <include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.version}</include> + <include>org.apache.solr:solr-solrj</include> + </includes> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>/install/lib</outputDirectory> + <unpack>false</unpack> + <directoryMode>755</directoryMode> + <fileMode>644</fileMode> + <includes> + <include>commons-cli:commons-cli</include> + <include>commons-collections:commons-collections</include> + <include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include> + <include>commons-io:commons-io:jar:${commons.io.version}</include> + <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> + <include>commons-logging:commons-logging</include> + <include>com.google.guava:guava:jar:${guava.version}</include> + <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> + <include>org.apache.ranger:ranger-plugins-cred</include> + <include>org.apache.ranger:credentialbuilder</include> + </includes> + </dependencySet> + </dependencySets> + <outputDirectory>/lib/ranger-atlas-plugin-impl</outputDirectory> + </binaries> + <includes> + <include>org.apache.ranger:ranger-plugins-audit</include> + <include>org.apache.ranger:ranger-plugins-cred</include> + <include>org.apache.ranger:ranger-plugins-common</include> + <include>org.apache.ranger:ranger-atlas-plugin</include> + </includes> + </moduleSet> + <moduleSet> + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>/install/lib</outputDirectory> + <unpack>false</unpack> + </binaries> + <includes> + <include>org.apache.ranger:ranger-plugins-installer</include> + <include>org.apache.ranger:credentialbuilder</include> + </includes> + </moduleSet> + </moduleSets> + <fileSets> + <!-- conf.templates for enable --> + <fileSet> + <outputDirectory>/install/conf.templates/enable</outputDirectory> + <directory>plugin-atlas/conf</directory> + <excludes> + <exclude>*.sh</exclude> + </excludes> + <fileMode>700</fileMode> + </fileSet> + <fileSet> + <outputDirectory>/install/conf.templates/default</outputDirectory> + <directory>plugin-atlas/template</directory> + <fileMode>700</fileMode> + </fileSet> + <!-- version file --> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>${project.build.outputDirectory}</directory> + <includes> + <include>version</include> + </includes> + <fileMode>444</fileMode> + </fileSet> + </fileSets> + <!-- enable/disable script for plugin --> + <files> + <file> + <source>agents-common/scripts/enable-agent.sh</source> + <outputDirectory>/</outputDirectory> + <destName>enable-atlas-plugin.sh</destName> + <fileMode>755</fileMode> + </file> + <file> + <source>security-admin/scripts/ranger_credential_helper.py</source> + <outputDirectory>/</outputDirectory> + <fileMode>755</fileMode> + </file> + <file> + <source>agents-common/scripts/enable-agent.sh</source> + <outputDirectory>/</outputDirectory> + <destName>disable-atlas-plugin.sh</destName> + <fileMode>755</fileMode> + </file> + <file> + <source>plugin-atlas/scripts/install.properties</source> + <outputDirectory>/</outputDirectory> + <destName>install.properties</destName> + <fileMode>755</fileMode> + </file> + </files> +</assembly>
