You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/03/26 01:09:41 UTC
airavata git commit: Added host name to unicore output path URI values
Repository: airavata
Updated Branches:
refs/heads/develop 7bde79be3 -> e8b7773e5
Added host name to unicore output path URI values
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e8b7773e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e8b7773e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e8b7773e
Branch: refs/heads/develop
Commit: e8b7773e57491097872b302e7ee7111c1be5db63
Parents: 7bde79b
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Mar 25 20:09:36 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Mar 25 20:09:36 2016 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/task/BESJobSubmissionTask.java | 5 ++---
.../main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e8b7773e/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
index 067bbe8..591ce69 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/BESJobSubmissionTask.java
@@ -260,15 +260,14 @@ public class BESJobSubmissionTask implements JobSubmissionTask {
switch (output.getType()) {
case STDERR: case STDOUT: case STRING: case URI:
localFilePath = output.getValue();
- if (localFilePath.indexOf("://") != -1) {
+ if (localFilePath.contains("://")) {
localFilePath = localFilePath.substring(localFilePath.indexOf("://") + 2, localFilePath.length());
}
fileName = localFilePath.substring(localFilePath.lastIndexOf("/") + 1);
URI destinationURI = TaskUtils.getDestinationURI(taskContext, hostName, inputPath, fileName);
remoteFilePath = destinationURI.getPath();
-// = pc.getInputDir() + File.separator + fileName;
SSHUtils.scpTo(localFilePath, remoteFilePath, sshSession);
- output.setValue("file:/" + destinationURI.getPath());
+ output.setValue(destinationURI.toString());
break;
default:
break;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e8b7773e/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java
index be8f6bb..888abb0 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/TaskUtils.java
@@ -43,7 +43,7 @@ public class TaskUtils {
} else {
filePath = inputPath + taskContext.getParentProcessContext().getProcessId() + File.separator + fileName;
}
- return new URI("SCP", hostName, filePath, null);
+ return new URI("file", hostName, filePath, null);
}
}