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 2015/08/01 01:41:13 UTC

airavata git commit: Corrected scpTo interface method arguments order

Repository: airavata
Updated Branches:
  refs/heads/master b103e6fbd -> 7ae9cc387


Corrected scpTo interface method arguments order


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7ae9cc38
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7ae9cc38
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7ae9cc38

Branch: refs/heads/master
Commit: 7ae9cc387de6929c1a5198fa5aeac5a7f072e727
Parents: b103e6f
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jul 31 19:41:04 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jul 31 19:41:04 2015 -0400

----------------------------------------------------------------------
 .../org/apache/airavata/gfac/core/cluster/RemoteCluster.java   | 6 +++---
 .../airavata/gfac/impl/task/AdvancedSCPDataStageTask.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/7ae9cc38/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
index b3a8ffb..6afeb59 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/RemoteCluster.java
@@ -47,11 +47,11 @@ public interface RemoteCluster { // FIXME: replace SSHApiException with suitable
 	/**
 	 * This will copy the localFile to remoteFile location in configured cluster
 	 *
-	 * @param remoteFile      remote file location, this can be a directory too
-	 * @param localFile local file path of the file which needs to copy to remote location
+	 * @param localFile  local file path of the file which needs to copy to remote location
+	 * @param remoteFile remote file location, this can be a directory too
 	 * @throws SSHApiException throws exception during error
 	 */
-	public void scpTo(String remoteFile, String localFile) throws SSHApiException;
+	public void scpTo(String localFile, String remoteFile) throws SSHApiException;
 
 	/**
 	 * This will copy a remote file in path rFile to local file lFile

http://git-wip-us.apache.org/repos/asf/airavata/blob/7ae9cc38/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
index 45f5ff6..f44621c 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AdvancedSCPDataStageTask.java
@@ -180,7 +180,7 @@ public class AdvancedSCPDataStageTask implements Task{
 		/**
 		 * scp local file to compute resource.
 		 */
-		taskContext.getParentProcessContext().getRemoteCluster().scpTo(destinationURI.getPath(), filePath);
+		taskContext.getParentProcessContext().getRemoteCluster().scpTo(filePath, destinationURI.getPath());
 	}
 
 	private void outputDataStaging(TaskContext taskContext, Session sshSession, URI sourceURI, URI destinationURI,