Repository: airavata Updated Branches: refs/heads/master b424dfee1 -> 5d1201078
fixing listDirectory error Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5d120107 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5d120107 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5d120107 Branch: refs/heads/master Commit: 5d12010786a0a4836af5736e4996620d0b3f0a5a Parents: b424dfe Author: lahiru <[email protected]> Authored: Thu Mar 13 09:22:50 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Mar 13 09:22:50 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/cpi/GFacImpl.java | 4 ++-- .../airavata/gfac/provider/impl/GSISSHProvider.java | 3 ++- .../airavata/gsi/ssh/api/job/JobDescriptor.java | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5d120107/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java index 6022885..f82fb7f 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java @@ -297,8 +297,8 @@ public class GFacImpl implements GFac { JobDescriptor jobDescriptor = JobDescriptor.fromXML(jobDescription); applicationDeploymentDescription.getType().setScratchWorkingDirectory( jobDescriptor.getJobDescriptorDocument().getJobDescriptor().getWorkingDirectory()); - applicationDeploymentDescription.getType().setInputDataDirectory(jobDescriptor.getJobDescriptorDocument().getJobDescriptor().getInputDirectory()); - applicationDeploymentDescription.getType().setOutputDataDirectory(jobDescriptor.getJobDescriptorDocument().getJobDescriptor().getOutputDirectory()); + applicationDeploymentDescription.getType().setInputDataDirectory(jobDescriptor.getInputDirectory()); + applicationDeploymentDescription.getType().setOutputDataDirectory(jobDescriptor.getOutputDirectory()); applicationDeploymentDescription.getType().setStandardError(jobDescriptor.getJobDescriptorDocument().getJobDescriptor().getStandardErrorFile()); applicationDeploymentDescription.getType().setStandardOutput(jobDescriptor.getJobDescriptorDocument().getJobDescriptor().getStandardOutFile()); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/5d120107/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java index db5c29a..e8c7ff4 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java @@ -111,7 +111,8 @@ public class GSISSHProvider extends AbstractProvider implements GFacProvider{ jobDescriptor.setQueueName(app.getQueue().getQueueName()); } jobDescriptor.setOwner(((PBSCluster) cluster).getServerInfo().getUserName()); - + jobDescriptor.setInputDirectory(app.getInputDataDirectory()); + jobDescriptor.setOutputDirectory(app.getOutputDataDirectory()); TaskDetails taskData = jobExecutionContext.getTaskData(); if(taskData != null && taskData.isSetTaskScheduling()){ ComputationalResourceScheduling computionnalResource = taskData.getTaskScheduling(); http://git-wip-us.apache.org/repos/asf/airavata/blob/5d120107/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java index d5a0837..c34b657 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/JobDescriptor.java @@ -114,6 +114,21 @@ public class JobDescriptor { this.getJobDescriptorDocument().getJobDescriptor().setProcessesPerNode(name); } + public String getOutputDirectory() { + return this.getJobDescriptorDocument().getJobDescriptor().getOutputDirectory(); + } + + public String getInputDirectory() { + return this.getJobDescriptorDocument().getJobDescriptor().getInputDirectory(); + } + public void setOutputDirectory(String name) { + this.getJobDescriptorDocument().getJobDescriptor().setOutputDirectory(name); + } + + public void setInputDirectory(String name) { + this.getJobDescriptorDocument().getJobDescriptor().setInputDirectory(name); + } + /** * Users can pass the minute count for maxwalltime * @param minutes
