Repository: airavata Updated Branches: refs/heads/master 7a3f11b15 -> 8561d4f5e
output with relative paths Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8561d4f5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8561d4f5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8561d4f5 Branch: refs/heads/master Commit: 8561d4f5e575f4d4b10295ea114d0d7fc5d32e13 Parents: 7a3f11b Author: Chathuri Wimalasena <[email protected]> Authored: Tue Jan 13 16:21:58 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Jan 13 16:21:58 2015 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java | 6 +++++- .../java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/8561d4f5/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index 6a4d2ef..c3546f0 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -245,7 +245,11 @@ public class GFACGSISSHUtils { inputValues.add(output.getApplicationArgument()); } if (output.getValue() != null && !output.getValue().equals("") && output.isRequiredToAddedToCommandLine()) { - inputValues.add(output.getValue()); + if (output.getType() == DataType.URI){ + String filePath = output.getValue(); + filePath = filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length()); + inputValues.add(filePath); + } } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/8561d4f5/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index b313dc2..b3c155d 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -301,7 +301,11 @@ public class GFACSSHUtils { inputValues.add(output.getApplicationArgument()); } if (output.getValue() != null && !output.getValue().equals("") && output.isRequiredToAddedToCommandLine()) { - inputValues.add(output.getValue()); + if (output.getType() == DataType.URI){ + String filePath = output.getValue(); + filePath = filePath.substring(filePath.lastIndexOf(File.separatorChar) + 1, filePath.length()); + inputValues.add(filePath); + } } } }
