You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2016/01/28 07:08:52 UTC

incubator-atlas git commit: ATLAS-450 quick_start fails on cygwin (dkantor via shwethags)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master 19f24d50d -> 7b07a222c


ATLAS-450 quick_start fails on cygwin (dkantor via shwethags)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/7b07a222
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/7b07a222
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/7b07a222

Branch: refs/heads/master
Commit: 7b07a222c14c9093abbee587131402c783c45e6e
Parents: 19f24d5
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Thu Jan 28 11:38:45 2016 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Thu Jan 28 11:38:45 2016 +0530

----------------------------------------------------------------------
 distro/src/bin/quick_start.py | 13 +++++++++++--
 release-log.txt               |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b07a222/distro/src/bin/quick_start.py
----------------------------------------------------------------------
diff --git a/distro/src/bin/quick_start.py b/distro/src/bin/quick_start.py
index c176be3..1e0ac05 100755
--- a/distro/src/bin/quick_start.py
+++ b/distro/src/bin/quick_start.py
@@ -30,11 +30,18 @@ def main():
     confdir = mc.dirMustExist(mc.confDir(atlas_home))
     mc.executeEnvSh(confdir)
     logdir = mc.dirMustExist(mc.logDir(atlas_home))
+    if mc.isCygwin():
+        # Pathnames that are passed to JVM must be converted to Windows format.
+        jvm_atlas_home = mc.convertCygwinPath(atlas_home)
+        jvm_logdir = mc.convertCygwinPath(logdir)
+    else:
+        jvm_atlas_home = atlas_home
+        jvm_logdir = logdir
 
     #create sys property for conf dirs
-    jvm_opts_list = (ATLAS_LOG_OPTS % logdir).split()
+    jvm_opts_list = (ATLAS_LOG_OPTS % jvm_logdir).split()
 
-    cmd_opts = (ATLAS_COMMAND_OPTS % atlas_home)
+    cmd_opts = (ATLAS_COMMAND_OPTS % jvm_atlas_home)
     jvm_opts_list.extend(cmd_opts.split())
 
     default_jvm_opts = DEFAULT_JVM_OPTS
@@ -50,6 +57,8 @@ def main():
                        + os.path.join(web_app_dir, "atlas", "WEB-INF", "classes" ) + p \
                        + os.path.join(web_app_dir, "atlas", "WEB-INF", "lib", "*" )  + p \
                        + os.path.join(atlas_home, "libext", "*")
+    if mc.isCygwin():
+        atlas_classpath = mc.convertCygwinPath(atlas_classpath, True)
 
     process = mc.java("org.apache.atlas.examples.QuickStart", sys.argv[1:], atlas_classpath, jvm_opts_list)
     return process.wait()

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/7b07a222/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 29efe8f..82e4357 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -7,6 +7,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset
 ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags)
 
 ALL CHANGES:
+ATLAS-450 quick_start fails on cygwin (dkantor via shwethags)
 ATLAS-451 Doc: Fix few broken links due to Wiki words in Atlas documentation (ssainath via shwethags)
 ATLAS-439 Investigate apache build failure - EntityJerseyResourceIT.testEntityDeduping (shwethags)
 ATLAS-426 atlas_start fails on cygwin (dkantor via shwethags)