[Swift-commit] r6400 - in trunk: docs/merged/refmanual src/org/globus/swift/data src/org/griphyn/vdl/karajan

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-03-19 09:28:23 -0500 (Tue, 19 Mar 2013)
New Revision: 6400

Modified:
   trunk/docs/merged/refmanual/grammar
   trunk/src/org/globus/swift/data/Action.java
   trunk/src/org/griphyn/vdl/karajan/VDSTaskTransformer.java
Log:
fix for case when workdir specified as relative path or missing in sites catalog

Modified: trunk/docs/merged/refmanual/grammar
===================================================================
--- trunk/docs/merged/refmanual/grammar	2013-03-19 00:35:30 UTC (rev 6399)
+++ trunk/docs/merged/refmanual/grammar	2013-03-19 14:28:23 UTC (rev 6400)
@@ -23,8 +23,7 @@
     ;
 ----
 
-
-Import statement
+The import statement
 ----
 importStatement [StringTemplate code] :
 "import" name:STRING_LITERAL SEMI {

Modified: trunk/src/org/globus/swift/data/Action.java
===================================================================
--- trunk/src/org/globus/swift/data/Action.java	2013-03-19 00:35:30 UTC (rev 6399)
+++ trunk/src/org/globus/swift/data/Action.java	2013-03-19 14:28:23 UTC (rev 6400)
@@ -92,7 +92,9 @@
             srcdir = ".";
         String desthost = bc.getHost();
         String workdir = (String) bc.getProperty("workdir");
-        
+        if (workdir!=null && !workdir.startsWith("/")){
+            workdir=System.getProperty("user.dir")+"/"+workdir;
+        }
         External.doExternal(srcfile, srcdir, 
                             desthost, workdir+"/"+destdir);
     }

Modified: trunk/src/org/griphyn/vdl/karajan/VDSTaskTransformer.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/VDSTaskTransformer.java	2013-03-19 00:35:30 UTC (rev 6399)
+++ trunk/src/org/griphyn/vdl/karajan/VDSTaskTransformer.java	2013-03-19 14:28:23 UTC (rev 6400)
@@ -125,6 +125,14 @@
 			String dir = spec.getDirectory();
 			BoundContact bc = (BoundContact) contacts[0];
 			String workdir = (String) bc.getProperty("workdir");
+            
+            if (workdir==null){
+                workdir=System.getProperty("user.dir");
+            }
+
+            if (workdir!=null && !workdir.startsWith("/")){
+                   workdir=System.getProperty("user.dir")+"/"+workdir;
+            }
 			if (dir == null || !dir.startsWith("/")) {
 				if (workdir != null) {
 					if (dir == null) {