Repository: airavata Updated Branches: refs/heads/master ab1ab84a2 -> 0edfa860a
Fixing input moving error - https://issues.apache.org/jira/browse/AIRAVATA-1080 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/444f2df5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/444f2df5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/444f2df5 Branch: refs/heads/master Commit: 444f2df50ea660817d6a9bb1bf571da9b9d7d322 Parents: 783a26a Author: lahiru <[email protected]> Authored: Fri Mar 14 11:52:20 2014 -0400 Committer: lahiru <[email protected]> Committed: Fri Mar 14 11:52:20 2014 -0400 ---------------------------------------------------------------------- .../airavata-server/src/main/resources/conf/gfac-config.xml | 6 +++++- .../apache/airavata/gfac/handler/AdvancedSCPInputHandler.java | 7 +------ 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/444f2df5/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml b/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml index b0a9bce..0607e49 100644 --- a/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml +++ b/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml @@ -79,7 +79,9 @@ <property name="publicKeyPath" value="/Users/lahirugunathilake/.ssh/id_dsa.pub"/> <property name="userName" value="root"/> <property name="hostName" value="gw98.iu.xsede.org"/> - <property name="outputPath" value="/tmp"/> + <property name="inputPath" value="/tmp"/> + <property name="passPhrase" value="/home/airavata/outputData"/> + <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference> </Handler--> <Handler class="org.apache.airavata.gfac.handler.SCPInputHandler"/> </InHandlers> @@ -91,6 +93,8 @@ <property name="userName" value="root"/> <property name="hostName" value="gw111.iu.xsede.org"/> <property name="outputPath" value="/tmp"/> + <property name="passPhrase" value="/home/airavata/outputData"/> + <property name="password" value="/home/airavata/outputData"/> <either we have to set password or keys, password has higher preference> </Handler--> </OutHandlers> </Provider> http://git-wip-us.apache.org/repos/asf/airavata/blob/444f2df5/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPInputHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPInputHandler.java index 30dd983..361bac7 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPInputHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AdvancedSCPInputHandler.java @@ -41,8 +41,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.net.MalformedURLException; -import java.net.URI; import java.util.*; /** @@ -132,13 +130,10 @@ public class AdvancedSCPInputHandler extends AbstractHandler{ private String stageInputFiles(Cluster cluster, String paramValue, String parentPath) throws GFacException { try { cluster.scpFrom(paramValue, parentPath); - return "file://" + parentPath + File.separator + URI.create(paramValue).toURL().getFile(); + return "file://" + parentPath + File.separator + (new File(paramValue)).getName(); } catch (SSHApiException e) { log.error("Error tranfering remote file to local file, remote path: " + paramValue); throw new GFacException(e); - } catch (MalformedURLException e) { - log.error("Error processing input URL"); - throw new GFacException(e); } } }
