Repository: airavata Updated Branches: refs/heads/master bf9b277e7 -> 21cae7eab
Fixed AIRAVATA-1413 to load the output location Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9ee9dd2a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9ee9dd2a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9ee9dd2a Branch: refs/heads/master Commit: 9ee9dd2af9099920989978882edcab05126c7d5a Parents: 5557902 Author: raminder <[email protected]> Authored: Thu Aug 21 13:48:22 2014 -0400 Committer: raminder <[email protected]> Committed: Thu Aug 21 13:48:22 2014 -0400 ---------------------------------------------------------------------- .../airavata/gfac/gsissh/handler/GSISSHOutputHandler.java | 1 + .../apache/airavata/gfac/ssh/handler/SSHOutputHandler.java | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee9dd2a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java index 2f91eac..be333c1 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java @@ -242,6 +242,7 @@ public class GSISSHOutputHandler extends AbstractRecoverableHandler { GFacUtils.savePluginData(jobExecutionContext, temp.insert(0, ++index), this.getClass().getName()); } jobExecutionContext.addOutputFile(outputFile); + MappingFactory.fromString(actualParameter, outputFile); DataObjectType dataObjectType = new DataObjectType(); dataObjectType.setValue(valueList); dataObjectType.setKey(paramName); http://git-wip-us.apache.org/repos/asf/airavata/blob/9ee9dd2a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java index 3ad0543..35ae508 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java @@ -188,9 +188,11 @@ public class SSHOutputHandler extends AbstractHandler { } else { String valueList = outputList.get(0); cluster.scpFrom(app.getOutputDataDirectory() + File.separator + valueList, outputDataDir); - jobExecutionContext.addOutputFile(outputDataDir + File.separator + valueList); - DataObjectType dataObjectType = new DataObjectType(); - dataObjectType.setValue(valueList); + String outputPath = outputDataDir + File.separator + valueList; + jobExecutionContext.addOutputFile(outputPath); + MappingFactory.fromString(actualParameter, outputPath); + DataObjectType dataObjectType = new DataObjectType(); + dataObjectType.setValue(outputPath); dataObjectType.setKey(paramName); dataObjectType.setType(DataType.URI); outputArray.add(dataObjectType);
