[airavata] branch master updated: AIRAVATA-2997 Add experimentDataDir to Groovy script variables

[machristie]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 88ca00b  AIRAVATA-2997 Add experimentDataDir to Groovy script variables
88ca00b is described below

commit 88ca00b78d553d595ec229238114389a13288532
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Fri Mar 15 15:52:34 2019 -0400

    AIRAVATA-2997 Add experimentDataDir to Groovy script variables
---
 .../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java         | 1 +
 .../gfac-core/src/main/java/org/apache/airavata/gfac/core/Script.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
 
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 18e9f2c..b8abbe0 100644
--- 
a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ 
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -457,6 +457,7 @@ public class GFacUtils {
         List<String> inputValues = 
getProcessInputValues(processModel.getProcessInputs());
         
inputValues.addAll(getProcessOutputValues(processModel.getProcessOutputs()));
         groovyMap.add(Script.INPUTS, inputValues);
+        groovyMap.add(Script.EXPERIMENT_DATA_DIR, 
processModel.getExperimentDataDir());
 
         groovyMap.add(Script.USER_NAME, 
processContext.getJobSubmissionRemoteCluster().getServerInfo().getUserName());
         groovyMap.add(Script.SHELL_NAME, "/bin/bash");
diff --git 
a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Script.java
 
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Script.java
index 0937c7e..4b2cdca 100644
--- 
a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Script.java
+++ 
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/Script.java
@@ -70,7 +70,8 @@ public enum Script {
     GATEWAY_ID("gatewayId"),
     GATEWAY_USER_NAME("gatewayUserName"),
     APPLICATION_NAME("applicationName"),
-    QUEUE_SPECIFIC_MACROS("queueSpecificMacros")
+    QUEUE_SPECIFIC_MACROS("queueSpecificMacros"),
+    EXPERIMENT_DATA_DIR("experimentDataDir"),
     ;
 
     String name;