Repository: atlas Updated Branches: refs/heads/branch-0.8 49d2a2723 -> 27fad9f4a
ATLAS-2554: package migration-exporter in Atlas server Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/27fad9f4 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/27fad9f4 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/27fad9f4 Branch: refs/heads/branch-0.8 Commit: 27fad9f4a0cb60b05dc18718e6281a61bf7c5913 Parents: 49d2a27 Author: Ashutosh Mestry <[email protected]> Authored: Fri Apr 13 16:05:10 2018 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Fri Apr 13 16:44:51 2018 -0700 ---------------------------------------------------------------------- distro/pom.xml | 1 - .../src/main/assemblies/migration-exporter.xml | 60 -------------------- .../src/main/assemblies/standalone-package.xml | 32 +++++++++++ .../main/resources/atlas_migration_export.py | 2 +- 4 files changed, 33 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/27fad9f4/distro/pom.xml ---------------------------------------------------------------------- diff --git a/distro/pom.xml b/distro/pom.xml index 096181e..68b967d 100644 --- a/distro/pom.xml +++ b/distro/pom.xml @@ -106,7 +106,6 @@ atlas.graph.index.search.solr.zookeeper-session-timeout=60000 <descriptors> <descriptor>src/main/assemblies/standalone-package.xml</descriptor> <descriptor>src/main/assemblies/src-package.xml</descriptor> - <descriptor>src/main/assemblies/migration-exporter.xml</descriptor> </descriptors> <finalName>apache-atlas-${project.version}</finalName> <tarLongFileMode>gnu</tarLongFileMode> http://git-wip-us.apache.org/repos/asf/atlas/blob/27fad9f4/distro/src/main/assemblies/migration-exporter.xml ---------------------------------------------------------------------- diff --git a/distro/src/main/assemblies/migration-exporter.xml b/distro/src/main/assemblies/migration-exporter.xml deleted file mode 100644 index be0a9d5..0000000 --- a/distro/src/main/assemblies/migration-exporter.xml +++ /dev/null @@ -1,60 +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. -* -* ---> -<assembly> - <id>migration-exporter</id> - <formats> - <format>dir</format> - <format>zip</format> - </formats> - - <baseDirectory>atlas-migration-exporter</baseDirectory> - - <fileSets> - <fileSet> - <includes> - <include>README*</include> - </includes> - </fileSet> - <fileSet> - <directory>../tools/atlas-migration-exporter/src/main/resources</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>*.py</include> - <include>migrationContext.xml</include> - <include>atlas-log4j.xml</include> - <include>README</include> - </includes> - <fileMode>0755</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <directory>../tools/atlas-migration-exporter/target</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>atlas-migration-*.jar</include> - </includes> - <excludes> - <exclude>*-test-sources.jar</exclude> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - </fileSets> -</assembly> http://git-wip-us.apache.org/repos/asf/atlas/blob/27fad9f4/distro/src/main/assemblies/standalone-package.xml ---------------------------------------------------------------------- diff --git a/distro/src/main/assemblies/standalone-package.xml b/distro/src/main/assemblies/standalone-package.xml index 1881082..3a7fed1 100755 --- a/distro/src/main/assemblies/standalone-package.xml +++ b/distro/src/main/assemblies/standalone-package.xml @@ -172,6 +172,38 @@ <directory>../notification/target/dependency/hook</directory> <outputDirectory>hook</outputDirectory> </fileSet> + + <!-- for migration setup --> + <fileSet> + <includes> + <include>README*</include> + </includes> + <outputDirectory>tools/migration-exporter</outputDirectory> + </fileSet> + <fileSet> + <directory>../tools/atlas-migration-exporter/src/main/resources</directory> + <includes> + <include>*.py</include> + <include>migrationContext.xml</include> + <include>atlas-log4j.xml</include> + <include>README</include> + </includes> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + <outputDirectory>tools/migration-exporter</outputDirectory> + </fileSet> + <fileSet> + <directory>../tools/atlas-migration-exporter/target</directory> + <includes> + <include>atlas-migration-*.jar</include> + </includes> + <excludes> + <exclude>*-test-sources.jar</exclude> + <exclude>*-sources.jar</exclude> + </excludes> + <outputDirectory>tools/migration-exporter</outputDirectory> + </fileSet> + </fileSets> <files> http://git-wip-us.apache.org/repos/asf/atlas/blob/27fad9f4/tools/atlas-migration-exporter/src/main/resources/atlas_migration_export.py ---------------------------------------------------------------------- diff --git a/tools/atlas-migration-exporter/src/main/resources/atlas_migration_export.py b/tools/atlas-migration-exporter/src/main/resources/atlas_migration_export.py index ab7c8e5..591043f 100755 --- a/tools/atlas-migration-exporter/src/main/resources/atlas_migration_export.py +++ b/tools/atlas-migration-exporter/src/main/resources/atlas_migration_export.py @@ -71,7 +71,7 @@ def main(): mc.expandWebApp(atlas_home) p = os.pathsep - atlas_classpath = os.path.join(os.getcwd(), ".", "*") + p \ + atlas_classpath = os.path.join(os.path.dirname(os.path.realpath(__file__)), ".", "*") + p \ + confdir + p \ + os.path.join(web_app_dir, "atlas", "WEB-INF", "classes" ) + p \ + os.path.join(web_app_dir, "atlas", "WEB-INF", "lib", "*" ) + p \
