You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2019/06/02 18:04:57 UTC
[airavata] branch master updated: Adding experiment data dir to
groovy map
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe 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 ba0f3e5 Adding experiment data dir to groovy map
ba0f3e5 is described below
commit ba0f3e5eb49e068533fdd8c9ce1aecb9115c7096
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Sun Jun 2 14:04:43 2019 -0400
Adding experiment data dir to groovy map
---
.../helix/impl/task/submission/config/GroovyMapBuilder.java | 1 +
.../helix/impl/task/submission/config/GroovyMapData.java | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
index d1964eb..2d1a7bc 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
@@ -79,6 +79,7 @@ public class GroovyMapBuilder {
mapData.setJobName("A" + String.valueOf(generateJobName()));
mapData.setWorkingDirectory(taskContext.getWorkingDir());
mapData.setTaskId(taskContext.getTaskId());
+ mapData.setExperimentDataDir(taskContext.getProcessModel().getExperimentDataDir());
List<String> inputValues = getProcessInputValues(taskContext.getProcessModel().getProcessInputs(), true);
inputValues.addAll(getProcessOutputValues(taskContext.getProcessModel().getProcessOutputs(), true));
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java
index ed5983a..7f74361 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java
@@ -135,6 +135,8 @@ public class GroovyMapData {
@ScriptTag(name = "taskId")
private String taskId;
+ @ScriptTag(name = "experimentDataDir")
+ private String experimentDataDir;
public Map<String, Object> getMap() {
@@ -452,6 +454,14 @@ public class GroovyMapData {
this.taskId = taskId;
}
+ public String getExperimentDataDir() {
+ return experimentDataDir;
+ }
+
+ public void setExperimentDataDir(String experimentDataDir) {
+ this.experimentDataDir = experimentDataDir;
+ }
+
public Map toImmutableMap() {
Map<String, Object> dataMap = new HashMap<>();